From 79de93c208e90036485e2a215ceb67c4a3044ff7 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Fri, 26 Sep 2025 15:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=88=90=E6=9C=AC=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E8=A1=A8=E5=8D=95=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/EntCostSplitBillPlugin.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 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 2360586..e60d992 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 @@ -59,21 +59,29 @@ public class EntCostSplitBillPlugin extends AbstractBillPlugIn { if (bd_accountview == null) { continue; } - QFilter filter1 = new QFilter("zcgj_entryentity.zcgj_accountname", QCP.equals, bd_accountview.getString("name"));//科目名称 - filter1.and(new QFilter("zcgj_entryentity.zcgj_accountnumber", QCP.equals, bd_accountview.getString("number")));//科目变化 - filter1.and(new QFilter("zcgj_org", QCP.equals, org1.getPkValue()));//组织 + QFilter filter1 = new QFilter("zcgj_acccostentry.zcgj_accountname", QCP.equals, bd_accountview.getString("name"));//科目名称 + filter1.and(new QFilter("zcgj_acccostentry.zcgj_accountnumber", QCP.equals, bd_accountview.getString("number")));//科目编码 +// filter1.and(new QFilter("zcgj_org", QCP.equals, org1.getPkValue()));//组织 DynamicObject zcgj_accountcost = QueryServiceHelper.queryOne("zcgj_accountcost", - "id,zcgj_entryentity.zcgj_costtype,zcgj_entryentity.zcgj_sectype", + "id,zcgj_acccostentry.zcgj_costtype,zcgj_acccostentry.zcgj_sectype", new QFilter[]{filter1});//会计科目与成本项目 - - DynamicObject newEntry = new DynamicObject(entryType); - QFilter[] qFilters = new QFilter[]{new QFilter("name", QCP.equals, rptAssistBalanceGx.get("zcgj_processname"))}; + QFilter[] qFilters = new QFilter[]{new QFilter("name", QCP.equals, rptAssistBalanceGx.get("zcgj_processname"))};//工序名称 DynamicObject ec_ecbd_pro_cbs = BusinessDataServiceHelper.loadSingle("ec_ecbd_pro_cbs", "id", qFilters);//项目工序 - if (ec_ecbd_pro_cbs != null) { - newEntry.set("cbs", ec_ecbd_pro_cbs.getPkValue()); + + if (ec_ecbd_pro_cbs == null && zcgj_accountcost == null) { + continue; + } + DynamicObject newEntry = new DynamicObject(entryType); +// QFilter[] qFilters1 = new QFilter[]{new QFilter("number", QCP.equals, "10000000-XM014")}; +// DynamicObject ec_project_f7 = BusinessDataServiceHelper.loadSingle("ec_project_f7", "id", qFilters1); +// newEntry.set("project", ec_project_f7); + if (ec_ecbd_pro_cbs != null) { + newEntry.set("cbs", ec_ecbd_pro_cbs.getPkValue());//成本分解结构 + } + if (zcgj_accountcost != null) { + newEntry.set("costtype", zcgj_accountcost.get("zcgj_acccostentry.zcgj_costtype"));//成本项 + newEntry.set("zcgj_sectype", zcgj_accountcost.get("zcgj_acccostentry.zcgj_sectype"));//二级分类 } - newEntry.set("costtype", zcgj_accountcost.get("zcgj_entryentity.zcgj_costtype")); - newEntry.set("zcgj_sectype", zcgj_accountcost.get("zcgj_entryentity.zcgj_sectype")); entryCollection.add(newEntry); } this.getView().updateView("entryentity");//刷新分录