|
@@ -422,7 +422,7 @@ public class HandInReceiveTicketPlugin extends AbstractFormPlugin implements Row
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if(isHasReceipt){
|
|
|
|
|
|
+ if(!isHasReceipt){
|
|
getView().showTipNotification("没有相应的电子回单!");
|
|
getView().showTipNotification("没有相应的电子回单!");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -573,7 +573,7 @@ public class HandInReceiveTicketPlugin extends AbstractFormPlugin implements Row
|
|
|
|
|
|
for(DynamicObject selectRow : selectRows){
|
|
for(DynamicObject selectRow : selectRows){
|
|
DynamicObject billInfo = BusinessDataServiceHelper.loadSingle(selectRow.getString(HandInReceiveTicketConstant.SCANBILLENTRY.KEY_NCKD_BILLID),
|
|
DynamicObject billInfo = BusinessDataServiceHelper.loadSingle(selectRow.getString(HandInReceiveTicketConstant.SCANBILLENTRY.KEY_NCKD_BILLID),
|
|
- selectRow.getString(HandInReceiveTicketConstant.SCANBILLENTRY.KEY_NCKD_FORMID), ErReimBurseBillConstant.KEY_BILLSTATUS);
|
|
|
|
|
|
+ selectRow.getString(HandInReceiveTicketConstant.SCANBILLENTRY.KEY_NCKD_FORMID), String.join(",",ErReimBurseBillConstant.KEY_BILLSTATUS,ErReimBurseBillConstant.KEY_BILLNO));
|
|
if(!status.contains(billInfo.getString(ErReimBurseBillConstant.KEY_BILLSTATUS))){
|
|
if(!status.contains(billInfo.getString(ErReimBurseBillConstant.KEY_BILLSTATUS))){
|
|
getView().showTipNotification(String.format("单据%s打印失败:只有审核通过、等待付款、已付款状态的单据允许打印。",billInfo.getString(ErReimBurseBillConstant.KEY_BILLNO)));
|
|
getView().showTipNotification(String.format("单据%s打印失败:只有审核通过、等待付款、已付款状态的单据允许打印。",billInfo.getString(ErReimBurseBillConstant.KEY_BILLNO)));
|
|
args.setCancel(true);
|
|
args.setCancel(true);
|