From a9a95e41418f8fddf28a9e1ded39d9878d9addea Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Tue, 11 Nov 2025 15:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=E8=BF=90=E8=B4=B9=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4=E6=92=A4=E9=94=80?= =?UTF-8?q?=E5=92=8C=E5=8F=8D=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/operate/OutContractSubmitOp.java | 22 +++++++++++++-- .../operate/OutContractUnSubmitUnAuditOp.java | 28 +++++++++++++++++-- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSubmitOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSubmitOp.java index 81de1ba..9a1973f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSubmitOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSubmitOp.java @@ -29,15 +29,31 @@ public class OutContractSubmitOp extends AbstractOperationServicePlugIn { boolean zcgj_transset = ec_out_contract_settle.getBoolean("zcgj_transset");//按入库运费结算 if (zcgj_transset) { DynamicObjectCollection itemEntryCollection = ec_out_contract_settle.getDynamicObjectCollection("itementry");//支付项分录 - if (itemEntryCollection != null && itemEntryCollection.size() > 0) { + if (itemEntryCollection != null && itemEntryCollection.size() > 1) { + DynamicObject itemEntry0 = itemEntryCollection.get(0); + DynamicObject itemEntry1 = itemEntryCollection.get(1); + itemEntry0.set("payitem", itemEntry1.get("payitem")); + itemEntry0.set("oftaxamount", itemEntry1.get("oftaxamount")); + itemEntry0.set("amount", itemEntry1.get("amount")); + itemEntry0.set("rate", itemEntry1.get("rate")); + itemEntry0.set("taxamt", itemEntry1.get("taxamt")); + itemEntry0.set("itemunitproject", itemEntry1.get("itemunitproject")); + itemEntry0.set("itemca", itemEntry1.get("itemca")); + itemEntry0.set("itemcbs", itemEntry1.get("itemcbs")); + itemEntry0.set("itemboq", itemEntry1.get("itemboq")); + itemEntry0.set("remark", itemEntry1.get("remark")); Iterator iterator = itemEntryCollection.iterator();//迭代器 while (iterator.hasNext()) { DynamicObject itemEntry = iterator.next(); - DynamicObject payItem1 = itemEntry.getDynamicObject("payitem");//合同支付项-名称 + int seq = (int) itemEntry.get("seq"); + if (seq == 2) { + iterator.remove();//注意一定要用迭代器remove + } +/* DynamicObject payItem1 = itemEntry.getDynamicObject("payitem");//合同支付项-名称 boolean hasSettleTrans1 = "HTJL".equals(payItem1.getString("number")); if (hasSettleTrans1) { iterator.remove();//注意一定要用迭代器remove - } + }*/ } } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractUnSubmitUnAuditOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractUnSubmitUnAuditOp.java index 080528f..855391f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractUnSubmitUnAuditOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractUnSubmitUnAuditOp.java @@ -9,6 +9,8 @@ import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; +import java.math.BigDecimal; + /** * 支出合同结算撤销反审核操作插件 */ @@ -30,9 +32,29 @@ public class OutContractUnSubmitUnAuditOp extends AbstractOperationServicePlugIn boolean hasSettleTrans1 = "YFJS".equals(payItem1.getString("number")); if (hasSettleTrans1) { DynamicObjectType entrytype = ec_out_contract_settle.getDynamicObjectCollection("itementry").getDynamicObjectType(); - DynamicObject newItemEntry = new DynamicObject(entrytype); - newItemEntry.set("payitem", "506427748873442304"); - itemEntryCollection.add(0, newItemEntry); + DynamicObject newItemEntry1 = new DynamicObject(entrytype); + newItemEntry1.set("payitem", itemEntry.get("payitem")); + newItemEntry1.set("oftaxamount", itemEntry.get("oftaxamount")); + newItemEntry1.set("amount", itemEntry.get("amount")); + newItemEntry1.set("rate", itemEntry.get("rate")); + newItemEntry1.set("taxamt", itemEntry.get("taxamt")); + newItemEntry1.set("itemunitproject", itemEntry.get("itemunitproject")); + newItemEntry1.set("itemca", itemEntry.get("itemca")); + newItemEntry1.set("itemcbs", itemEntry.get("itemcbs")); + newItemEntry1.set("itemboq", itemEntry.get("itemboq")); + newItemEntry1.set("remark", itemEntry.get("remark")); + newItemEntry1.set("seq", "2"); + itemEntryCollection.add(2, newItemEntry1); + itemEntry.set("payitem", "506427748873442304"); + itemEntry.set("oftaxamount", BigDecimal.ZERO); + itemEntry.set("amount", BigDecimal.ZERO); + itemEntry.set("rate", BigDecimal.ZERO); + itemEntry.set("taxamt", BigDecimal.ZERO); + itemEntry.set("itemunitproject", null); + itemEntry.set("itemca", null); + itemEntry.set("itemcbs", null); + itemEntry.set("itemboq", null); + itemEntry.set("remark", ""); } } }