From e6d0ff8bca13aeb3515d2f60845d276d586d0be1 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Thu, 27 Nov 2025 16:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=88=90=E6=9C=AC=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E5=92=8C=E6=9D=90=E6=96=99=E6=88=90=E6=9C=AC=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9C=AC=E6=9C=9F=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/EntCostSplitBillPlugin.java | 49 ++----------------- .../form/EquipmentCostSplitFormPluginExt.java | 12 +++++ .../form/MaterialCostBillPluginExt.java | 13 +++++ 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EntCostSplitBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EntCostSplitBillPlugin.java index dce2533..8d45a37 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EntCostSplitBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EntCostSplitBillPlugin.java @@ -390,21 +390,12 @@ public class EntCostSplitBillPlugin extends AbstractBillPlugIn implements Before } }); - entryCollection.clear(); - StringBuilder costTypeBuilder = new StringBuilder(); - for (int i = 0; i < sortedEntries.size(); i++) { - DynamicObject dynamicObject = sortedEntries.get(i); - String costtype = dynamicObject.getString("costtype"); - - if (i > 0) { - costTypeBuilder.append("+"); - } - costTypeBuilder.append(costtype); - } - String mergedCostTypes = costTypeBuilder.toString(); - this.getModel().setValue("description", mergedCostTypes); // 按排序后的顺序添加数据 - entryCollection.addAll(sortedEntries); + for (int i = 0; i < sortedEntries.size(); i++) { + DynamicObject entry = sortedEntries.get(i); + entry.set("seq", i + 1); + entryCollection.add(entry); + } this.getModel().endInit(); OperateOption option = OperateOption.create(); @@ -414,34 +405,4 @@ public class EntCostSplitBillPlugin extends AbstractBillPlugIn implements Before this.getView().showSuccessNotification("已完成取数"); this.getView().invokeOperation("refresh");//刷新全局页面 } - - private static Integer getSortValue(String type) { - if ("10.".equals(type)) return 10; - if ("20.".equals(type)) return 20; - if ("30.".equals(type)) return 30; - if ("40.".equals(type)) return 40; - if ("50.".equals(type)) return 50; - if ("60.".equals(type)) return 60; - if ("70.".equals(type)) return 70; - if ("80.".equals(type)) return 80; - if ("90.".equals(type)) return 90; - if ("100.".equals(type)) return 100; - return null; - } - - private static void comboItemFor(List comboItems, List item, List comboItemss) { - //下拉字段过滤逻辑 - ComboItem comboItem; - for (ValueMapItem valueMapItem : comboItems) { - String value = valueMapItem.getValue(); - //将item1包含的key设置为可见 - if (item.contains(value)) { - valueMapItem.setItemVisible(true); - comboItem = new ComboItem(); - comboItem.setCaption(valueMapItem.getName()); - comboItem.setValue(value); - comboItemss.add(comboItem); - } - } - } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCostSplitFormPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCostSplitFormPluginExt.java index 2d3bcf5..a9bc312 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCostSplitFormPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCostSplitFormPluginExt.java @@ -9,6 +9,7 @@ import kd.bos.orm.ORM; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; import kd.bos.servicehelper.user.UserServiceHelper; import kd.ec.eceq.business.model.BaseConstant; @@ -101,6 +102,17 @@ public class EquipmentCostSplitFormPluginExt extends EquipmentCardListPlugin{ settleSplit.set("contract", settleList[i].getDynamicObject("contract")); settleSplit.set("period", settleList[i].getDynamicObject("period")); + //二开添加↓ + DynamicObject period1 = settleList[i].getDynamicObject("period"); + if (period1 != null) { + QFilter filter = new QFilter("zcgj_notinperiod.fbasedataid", QCP.in, period1.getPkValue()); + filter.and(new QFilter("number", QCP.equals, "001")); + DynamicObject zcgj_costperiod = QueryServiceHelper.queryOne("zcgj_costperiod", "id", new QFilter[]{filter});//成本期间范围 + if (zcgj_costperiod != null) { + continue; + } + } + //二开添加↑ settleSplit.set("curamount", settleList[i].get("curamount")); settleSplit.set("settleid", settleList[i].getPkValue()); QFilter settleFilter = new QFilter("settlesplitentity.settleno", "=", settleList[i].get("billno")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java index 292b4c5..2b2e037 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialCostBillPluginExt.java @@ -52,8 +52,10 @@ import kd.bos.list.ListFilterParameter; import kd.bos.list.ListShowParameter; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; +import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.QueryServiceHelper; import kd.ec.contract.common.utils.CurrencyHelper; import kd.ec.cost.common.enums.BillStatusEnum; import kd.ec.cost.common.enums.PayDirectionEnum; @@ -666,6 +668,17 @@ public class MaterialCostBillPluginExt extends AbstractEccoBillPlugin implements for (int var6 = 0; var6 < var5; ++var6) { DynamicObject materialInfo = var4[var6]; + //二开添加↓ + DynamicObject period1 = materialInfo.getDynamicObject("period"); + if (period1 != null) { + QFilter filter = new QFilter("zcgj_notinperiod.fbasedataid", QCP.in, period1.getPkValue()); + filter.and(new QFilter("number", QCP.equals, "001")); + DynamicObject zcgj_costperiod = QueryServiceHelper.queryOne("zcgj_costperiod", "id", new QFilter[]{filter});//成本期间范围 + if (zcgj_costperiod != null) { + continue; + } + } + //二开添加↑ boolean isMultiCurrency = materialInfo.getBoolean("ismulticurrency"); DynamicObjectCollection entryEntity = materialInfo.getDynamicObjectCollection("entryentity"); logger.info("创建的出/入库单: " + materialInfo.getString("billname") + "," + materialInfo.getPkValue().toString());