diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TaskApproveFormCkPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TaskApproveFormCkPlugin.java index 178acaf..4a1af9f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TaskApproveFormCkPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TaskApproveFormCkPlugin.java @@ -155,7 +155,7 @@ public class TaskApproveFormCkPlugin extends AbstractFormPlugin { return; } }*/ - if(!"G".equals(billstatus)) { + if(!"G".equals(billstatus) && !"I".equals(billstatus)) { if("er_repaymentbill".equals(entityName)) { this.getView().showErrorNotification(String.format("审批结算任务:当前单据的收款未完成,请完成收款后提交。")); evt.setCancel(true); diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TaskListPayStatusCkOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TaskListPayStatusCkOp.java index 5b18baa..2a10621 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TaskListPayStatusCkOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TaskListPayStatusCkOp.java @@ -82,55 +82,7 @@ public class TaskListPayStatusCkOp extends AbstractOperationServicePlugIn { DynamicObject sourceBillObject = BusinessDataServiceHelper.loadSingle(entityName, new QFilter[]{accountTableFilter}); String billstatus = sourceBillObject.getString("billstatus"); //String billNo = sourceBillObject.getString("billno"); - - /*if("er_publicreimbursebill".equals(entityName) || "er_prepaybill".equals(entityName) || "er_dailyreimbursebill".equals(entityName) || "er_tripreimbursebill".equals(entityName)){ - boolean success = false; - boolean isSk = false; //是否司库付款 - boolean settletypeNotNull = true;//付款方式不能为空 - DynamicObject[] dynamicObjectOrg = null; - if("er_publicreimbursebill".equals(entityName) || "er_prepaybill".equals(entityName) ) {//对公报销单,预付单,付款申请单,查询付款处理单 - QFilter billTypeFilter = new QFilter("sourcebilltype",QCP.equals,entityName); - QFilter billIdFilter = new QFilter("sourcebillid",QCP.equals,Long.valueOf(billid)); - //提交司库状态 cnbm_tbskstatus,司库付款状态:cnbm_skpayresult - dynamicObjectOrg = BusinessDataServiceHelper.load("cas_paybill", "number,cnbm_tbskstatus,cnbm_skpayresult,settletype", new QFilter[]{billTypeFilter,billIdFilter}); - } else //if ("er_dailyreimbursebill".equals(entityName) || "er_tripreimbursebill".equals(entityName)) - {//差旅报销单、费用报销单,查询代发处理单 - //代发处理 cas_agentpaybill - //提交司库状态:cnbm_tbskstatus ,司库付款状态:cnbm_skpayresult - //提交司库状态 cnbm_tbskstatus,司库付款状态:cnbm_skpayresult - QFilter billTypeFilter = new QFilter("sourcebilltype",QCP.equals,entityName); - QFilter billNumberFilter = new QFilter("sourcebillnumber",QCP.equals,billnumber); - dynamicObjectOrg = BusinessDataServiceHelper.load("cas_agentpaybill", "number,cnbm_tbskstatus,cnbm_skpayresult,settletype", new QFilter[]{billTypeFilter,billNumberFilter}); - } - - if (dynamicObjectOrg != null && dynamicObjectOrg.length > 0) { - for (DynamicObject dynamicObject : dynamicObjectOrg) { - String tbskstatus = dynamicObject.getString("cnbm_tbskstatus"); - String skpayresult = dynamicObject.getString("cnbm_skpayresult"); - DynamicObject settletype = dynamicObject.getDynamicObject("settletype"); - if (settletype != null) {//没有选择结算方式,则跳过校验 - String settletypeNumber = settletype.getString("number"); - if("success".equals(tbskstatus) || "payed".equals(skpayresult)) { - success = true; - } - if("001".equals(settletypeNumber) || "002".equals(settletypeNumber)) { - isSk = true; - } - }else{ - settletypeNotNull = false; - } - } - }else if(settletypeNotNull){ - //this.getView().showErrorNotification(String.format("没有下游付款处理或代发处理单,无法进行审批。")); - this.addFatalErrorMessage(extendedDataEntity, String.format("审批结算任务:【%s】没有下推付款处理或代发处理单,无法进行审批。",subject)); - return; - } - if(isSk && !success && settletypeNotNull){ - this.addFatalErrorMessage(extendedDataEntity, String.format("审批结算任务:【%s】付款处理单或代发处理单提交司库状态为同步成功或司库付款状态为已付款时,才能审批通过。",subject)); - return; - } - }*/ - if(!"G".equals(billstatus)) { + if(!"G".equals(billstatus) && !"I".equals(billstatus)) { if("er_repaymentbill".equals(entityName)) { this.addFatalErrorMessage(extendedDataEntity, String.format("审批结算任务:【%s】的收款未完成,请完成收款后操作。",subject)); }else if(