From bd05d7f2ff82e3f573fc1e9d79accbeaf931961f Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Wed, 18 Jun 2025 18:34:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E5=8D=95=E6=97=A0=E5=90=88=E5=90=8C=E5=8F=8D=E5=86=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pr/plugin/operate/PaymentRegisterFundOpExt.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java index d61a23f..47c4995 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java @@ -109,6 +109,18 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp { } else { paymentEntry.set("completepay", false); } + }else{ + BigDecimal oldRealPayAmt = paymentEntry.getBigDecimal("thisrealpayamt"); + BigDecimal applyOfTaxAmount = paymentEntry.getBigDecimal("applyoftaxamount"); + BigDecimal thisRealPayAmt = oldRealPayAmt.add(thisOfTaxAmt); + BigDecimal thisWaitPayAmt = applyOfTaxAmount.subtract(thisRealPayAmt); + paymentEntry.set("thisrealpayamt", thisRealPayAmt); + paymentEntry.set("thiswaitpayamt", thisWaitPayAmt); + if (thisRealPayAmt.compareTo(applyOfTaxAmount) >= 0) { + paymentEntry.set("completepay", true); + } else { + paymentEntry.set("completepay", false); + } } } From c342e7ca0a23c1489ab71611f88bb13b05ff2327 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Wed, 18 Jun 2025 18:37:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E5=8D=95=E6=97=A0=E5=90=88=E5=90=8C=E5=8F=8D=E5=86=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java index 47c4995..f7ec450 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java @@ -109,7 +109,8 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp { } else { paymentEntry.set("completepay", false); } - }else{ + break; + }else if (StringUtils.equals(payType, applyPayType) && payBillSer.contains(seq)){ BigDecimal oldRealPayAmt = paymentEntry.getBigDecimal("thisrealpayamt"); BigDecimal applyOfTaxAmount = paymentEntry.getBigDecimal("applyoftaxamount"); BigDecimal thisRealPayAmt = oldRealPayAmt.add(thisOfTaxAmt); @@ -121,6 +122,7 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp { } else { paymentEntry.set("completepay", false); } + break; } } From 0aabbc73de839d2b80e9e70b422bf87316598150 Mon Sep 17 00:00:00 2001 From: zhangzhiguo Date: Thu, 19 Jun 2025 09:15:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E9=87=8D=E5=86=99=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8B=89=E5=8E=BB=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/DynamicContractViewUIExt.java | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/DynamicContractViewUIExt.java diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/DynamicContractViewUIExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/DynamicContractViewUIExt.java new file mode 100644 index 0000000..4e415bd --- /dev/null +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/DynamicContractViewUIExt.java @@ -0,0 +1,101 @@ +package zcgj.zcdev.zcdev.pr.plugin.form; + +import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.dataentity.entity.DynamicObjectCollection; +import kd.bos.dataentity.resource.ResManager; +import kd.bos.dataentity.utils.StringUtils; +import kd.bos.orm.query.QCP; +import kd.bos.orm.query.QFilter; +import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.ec.basedata.common.enums.DirectionEnum; +import kd.ec.contract.common.enums.BillStatusEnum; +import kd.ec.contract.common.enums.PayDirectionEnum; +import kd.ec.contract.formplugin.DynamicContractViewUI; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +public class DynamicContractViewUIExt extends DynamicContractViewUI { + + /** + * 重写合同看板拉去合同结算数据逻辑 + * @param contractId + * @param payDirection + */ + @Override + protected void updateSettle(Long contractId, String payDirection) { + this.getModel().deleteEntryData("settleEntry"); + String settleBillId; + String finalSettleBillId; + if (PayDirectionEnum.IN.getValue().equals(payDirection)) { + settleBillId = "ec_in_contract_settle"; + finalSettleBillId = "ec_in_finalsettle"; + } else { + settleBillId = "ec_out_contract_settle"; + finalSettleBillId = "ec_out_finalsettle"; + } + + QFilter finalSettleFilter = new QFilter("billstatus", "=", BillStatusEnum.AUDIT.getValue()); + finalSettleFilter.and("contract", "=", contractId); + DynamicObject[] finalSettles = BusinessDataServiceHelper.load(finalSettleBillId, "id", new QFilter[]{finalSettleFilter}); + if (finalSettles != null && finalSettles.length > 0) { + int index = this.getModel().createNewEntryRow("settleEntry"); + DynamicObject finalSettleBill = BusinessDataServiceHelper.loadSingle(finalSettles[0].getPkValue(), finalSettleBillId); + DynamicObjectCollection settleDetailEntries = finalSettleBill.getDynamicObjectCollection("settledetailentry"); + BigDecimal thisSettleAmount = BigDecimal.ZERO; + BigDecimal thisSettleOfTax = BigDecimal.ZERO; + + for(DynamicObject settleDetailEntry : settleDetailEntries) { + DynamicObject payItem = settleDetailEntry.getDynamicObject("payitem"); + BigDecimal coe = BigDecimal.ONE; + if (payItem != null) { + String direction = payItem.getString("direction"); + if (StringUtils.equals(direction, DirectionEnum.NON.getValue())) { + coe = BigDecimal.ZERO; + } else if (StringUtils.equals(direction, DirectionEnum.SUB.getValue())) { + coe = coe.negate(); + } + } + + BigDecimal finalSettleAmount = settleDetailEntry.getBigDecimal("payitemfinalsettleamt"); + BigDecimal finalSettleOfTax = settleDetailEntry.getBigDecimal("payitemsettleoftax"); + BigDecimal settleAmount = settleDetailEntry.getBigDecimal("payitemsettleamt"); + BigDecimal settleOfTax = settleDetailEntry.getBigDecimal("itemsettleoftax"); + thisSettleAmount = thisSettleAmount.add(finalSettleAmount.subtract(settleAmount).multiply(coe)); + thisSettleOfTax = thisSettleOfTax.add(finalSettleOfTax.subtract(settleOfTax).multiply(coe)); + } + + this.getModel().setValue("settleperiod", ResManager.loadKDString("合同决算", "DynamicContractViewUI_21", "ec-contract-formplugin", new Object[0]), index); + this.getModel().setValue("settlenum", finalSettleBill.get("billno"), index); + this.getModel().setValue("settlename", finalSettleBill.get("name"), index); + this.getModel().setValue("settleamount", thisSettleAmount, index); + this.getModel().setValue("settletax", thisSettleOfTax.subtract(thisSettleAmount), index); + this.getModel().setValue("oftaxsettleamount", thisSettleOfTax, index); + this.getModel().setValue("settlecreator", finalSettleBill.get("creator"), index); + this.getModel().setValue("settlecreatdate", finalSettleBill.get("createtime"), index); + this.getModel().setValue("isfinalsettle", true, index); + } + + QFilter filter = new QFilter("contract.id", "=", contractId); + List billstatusList = new ArrayList<>(); + billstatusList.add("C"); + billstatusList.add("D"); + filter.and(new QFilter("billstatus", QCP.in,billstatusList)); + DynamicObject[] settleContractCols = BusinessDataServiceHelper.load(settleBillId, "period.number,billno,billname,settleamount,taxamount,settleoftaxamount,creator,createtime", new QFilter[]{filter}); + + for(int i = 0; i < settleContractCols.length; ++i) { + int index = this.getModel().createNewEntryRow("settleEntry"); + DynamicObject settleInfo = settleContractCols[i]; + this.getModel().setValue("settleperiod", settleInfo.get("period.number"), index); + this.getModel().setValue("settlenum", settleInfo.get("billno"), index); + this.getModel().setValue("settlename", settleInfo.get("billname"), index); + this.getModel().setValue("settleamount", settleInfo.get("settleamount"), index); + this.getModel().setValue("settletax", settleInfo.get("taxamount"), index); + this.getModel().setValue("oftaxsettleamount", settleInfo.get("settleoftaxamount"), index); + this.getModel().setValue("settlecreator", settleInfo.get("creator"), index); + this.getModel().setValue("settlecreatdate", settleInfo.get("createtime"), index); + } + + } +} From bc93ccf9ddc14e537cbbe985994fa9d6e54ba32c Mon Sep 17 00:00:00 2001 From: zhangzhiguo Date: Thu, 19 Jun 2025 09:17:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E8=B4=A2=E5=8A=A1=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/InContractFinaceConfirmePlugin.java | 1 + .../form/InContractSettleInvalidListPlugin.java | 15 +++++++++++---- .../form/OutContractFinaceConfirmePlugin.java | 7 ++++++- .../OutContractSettleInvalidListPlugin.java | 17 ++++++++++++----- .../OutContractSettleReversalListPlugin.java | 13 ++++++++++++- ...OutContractSettleReversalWorkFlowPlugin.java | 2 +- 6 files changed, 43 insertions(+), 12 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java index 2e44e4f..e6605a3 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java @@ -60,6 +60,7 @@ public class InContractFinaceConfirmePlugin extends AbstractBillPlugIn implement getModel().setValue("zcgj_contract",ecincontractsettle.getDynamicObject("contract")); getModel().setValue("zcgj_contattr",ecincontractsettle.getDynamicObject("contattr")); getModel().setValue("zcgj_project",ecincontractsettle.getDynamicObject("project")); + getModel().setValue("zcgj_org",ecincontractsettle.getDynamicObject("project").getDynamicObject("projectorg")); getModel().setValue("zcgj_period",ecincontractsettle.getDynamicObject("period")); getModel().setValue("zcgj_begindate",ecincontractsettle.getDate("begindate")); getModel().setValue("zcgj_enddate",ecincontractsettle.getDate("enddate")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractSettleInvalidListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractSettleInvalidListPlugin.java index 9d123c8..414dd5b 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractSettleInvalidListPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractSettleInvalidListPlugin.java @@ -50,19 +50,26 @@ public class InContractSettleInvalidListPlugin extends AbstractListPlugin implem if(data.getBoolean("zcgj_is_invalid")){ this.getView().showTipNotification(String.format("当前结算单为作废单据，无法再次作废。")); return; - }else if(data.getBoolean("zcgj_is_reversabillid")){ - this.getView().showTipNotification(String.format("当前结算单为冲销单据，无法作废。")); - return; }else{ this.getView().showTipNotification(String.format("当前结算单已作废，无法再次作废。")); return; } }else{ + QFilter reversaBillFilter = new QFilter("zcgj_reversabillid", QCP.equals,String.valueOf(contractSettleId)); + DynamicObject reversaData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_reversabillid", new QFilter[]{reversaBillFilter}); + if(reversaData != null){ + this.getView().showTipNotification(String.format("当前结算单已被冲销，无法作废。")); + return; + } + QFilter idFilter = new QFilter("id", QCP.equals,contractSettleId); - DynamicObject selectData = BusinessDataServiceHelper.loadSingle("ec_in_contract_settle", "id,number,zcgj_is_invalid", new QFilter[]{idFilter}); + DynamicObject selectData = BusinessDataServiceHelper.loadSingle("ec_in_contract_settle", "id,number,zcgj_is_invalid,zcgj_is_reversabillid", new QFilter[]{idFilter}); if(selectData.getBoolean("zcgj_is_invalid")){ this.getView().showTipNotification(String.format("当前为作废单据，无法再次作废。")); return; + }else if(selectData.getBoolean("zcgj_is_reversabillid")){ + this.getView().showTipNotification(String.format("当前结算单为冲销单据，无法作废。")); + return; } showParameter.setCustomParam("invalidbillid", contractSettleId); //showParameter.setPkId(contractSettleId); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java index 8c53965..4be8394 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java @@ -67,6 +67,8 @@ public class OutContractFinaceConfirmePlugin extends AbstractBillPlugIn impleme getModel().setValue("zcgj_contract",contract); getModel().setValue("zcgj_contattr",ecoutcontractsettle.getDynamicObject("contattr")); getModel().setValue("zcgj_project",ecoutcontractsettle.getDynamicObject("project")); + getModel().setValue("zcgj_org",ecoutcontractsettle.getDynamicObject("project").getDynamicObject("projectorg")); + getModel().setValue("zcgj_period",ecoutcontractsettle.getDynamicObject("period")); getModel().setValue("zcgj_begindate",ecoutcontractsettle.getDate("begindate")); getModel().setValue("zcgj_enddate",ecoutcontractsettle.getDate("enddate")); @@ -207,7 +209,10 @@ public class OutContractFinaceConfirmePlugin extends AbstractBillPlugIn impleme BigDecimal bccxamtAll = BigDecimal.ZERO; for (DynamicObject outcontractmeasure : outcontractmeasures) { for (DynamicObject dynamicObject : outcontractmeasure.getDynamicObjectCollection("zcgj_itementry")) { - bccxamtAll =bccxamtAll.add(dynamicObject.getBigDecimal("zcgj_bccxamt")); + BigDecimal bccxamt = dynamicObject.getBigDecimal("zcgj_bccxamt"); + if(bccxamt != null){ + bccxamtAll = bccxamtAll.add(bccxamt); + } } } return bccxamtAll; diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleInvalidListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleInvalidListPlugin.java index c2adc07..e4198f9 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleInvalidListPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleInvalidListPlugin.java @@ -46,23 +46,30 @@ public class OutContractSettleInvalidListPlugin extends AbstractListPlugin imple String billNo = selectedRow.getBillNo(); QFilter accountTableFilter = new QFilter("zcgj_invalidbillid", QCP.equals,String.valueOf(contractSettleId)); DynamicObject data = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_invalid", new QFilter[]{accountTableFilter}); - if(data != null){ //财务确认单 + if(data != null){ //支出合同结算单 if(data.getBoolean("zcgj_is_invalid")){ this.getView().showTipNotification(String.format("当前结算单为作废单据，无法再次作废。")); return; - }else if(data.getBoolean("zcgj_is_reversabillid")){ - this.getView().showTipNotification(String.format("当前结算单为冲销单据，无法作废。")); - return; }else{ this.getView().showTipNotification(String.format("当前结算单已作废，无法再次作废。")); return; } }else{ + QFilter reversaBillFilter = new QFilter("zcgj_reversabillid", QCP.equals,String.valueOf(contractSettleId)); + DynamicObject reversaData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_reversabillid", new QFilter[]{reversaBillFilter}); + if(reversaData != null){ + this.getView().showTipNotification(String.format("当前结算单已被冲销，无法作废。")); + return; + } + QFilter idFilter = new QFilter("id", QCP.equals,contractSettleId); - DynamicObject selectData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_invalid", new QFilter[]{idFilter}); + DynamicObject selectData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_invalid,zcgj_is_reversabillid", new QFilter[]{idFilter}); if(selectData.getBoolean("zcgj_is_invalid")){ this.getView().showTipNotification(String.format("当前为作废单据，无法再次作废。")); return; + }else if(selectData.getBoolean("zcgj_is_reversabillid")){ + this.getView().showTipNotification(String.format("当前结算单为冲销单据，无法作废。")); + return; } showParameter.setCustomParam("invalidbillid", contractSettleId); //showParameter.setPkId(contractSettleId); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleReversalListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleReversalListPlugin.java index 4b6c8fb..22c435b 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleReversalListPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleReversalListPlugin.java @@ -50,12 +50,23 @@ public class OutContractSettleReversalListPlugin extends AbstractListPlugin impl this.getView().showTipNotification(String.format("当前结算单已冲销，无法再次冲销。")); return; }else{ + QFilter invalidTableFilter = new QFilter("zcgj_invalidbillid", QCP.equals,String.valueOf(contractSettleId)); + DynamicObject invalidData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_invalid", new QFilter[]{invalidTableFilter}); + if(invalidData!=null){ + this.getView().showTipNotification(String.format("当前结算单已被作废，无法冲销。")); + return; + } + QFilter idFilter = new QFilter("id", QCP.equals,contractSettleId); - DynamicObject selectData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_reversabillid", new QFilter[]{idFilter}); + DynamicObject selectData = BusinessDataServiceHelper.loadSingle("ec_out_contract_settle", "id,number,zcgj_is_invalid,zcgj_is_reversabillid", new QFilter[]{idFilter}); if(selectData.getBoolean("zcgj_is_reversabillid")){ this.getView().showTipNotification(String.format("当前为冲销单据，无法再次冲销。")); return; + }else if(selectData.getBoolean("zcgj_is_invalid")){ + this.getView().showTipNotification(String.format("当前为作废单据，无法再冲销。")); + return; } + showParameter.setCustomParam("reversabillid", contractSettleId); //showParameter.setPkId(contractSettleId); showParameter.setFormId("ec_out_contract_settle"); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java index fb4a1bc..6aaf18a 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java @@ -36,7 +36,7 @@ public class OutContractSettleReversalWorkFlowPlugin implements IWorkflowPlugin inContractSettle.set("contract",contractInfo); inContractSettle.set("org", outContractSettle.getDynamicObject("org")); inContractSettle.set("billstatus","C"); - inContractSettle.set("zcgj_org",outContractSettle.getDynamicObject("org")); + inContractSettle.set("org",outContractSettle.getDynamicObject("org")); inContractSettle.set("begindate",outContractSettle.getDate("begindate")); inContractSettle.set("enddate",outContractSettle.getDate("enddate")); inContractSettle.set("period",outContractSettle.getDynamicObject("period"));