From ed3c4100f9b16023f7291a0dbf692c59059db449 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Mon, 11 Aug 2025 15:05:06 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=BB=98=E8=AE=A4=E6=9C=9F=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/FundingplanapplyPlugin.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java index 7fc045e..bc775ee 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyPlugin.java @@ -41,14 +41,16 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin //设置期间 DynamicObject org = (DynamicObject) this.getModel().getValue("zcgj_org"); if(org!=null){ - //查询组织下对应的当前期间数据 + /*//查询组织下对应的当前期间数据 DynamicObject[] orgByCurperiod = BusinessDataServiceHelper.load("gl_accountbook", "org,curperiod", new QFilter[]{new QFilter("enable", QCP.equals, Boolean.TRUE). and("status", QCP.equals, "C").and("org.id", QCP.equals, org.getLong("id"))}); if(orgByCurperiod!=null && orgByCurperiod.length>0){ this.getModel().setValue("zcgj_period",orgByCurperiod[0].getDynamicObject("curperiod")); - } + }*/ + //设置期间 + carryCurrentPeriodAndDate(); //初始化值 initData(org); } @@ -156,4 +158,19 @@ public class FundingplanapplyPlugin extends AbstractBillPlugIn implements Plugin return LocalDate.of(year, 12, 31); } + + protected void carryCurrentPeriodAndDate() { + Calendar cal = Calendar.getInstance(); + int year = cal.get(1); + int month = cal.get(2) + 1; + QFilter yearFilter = new QFilter("periodyear", "=", year); + QFilter monthFilter = new QFilter("periodnumber", "=", month); + DynamicObject bdPeriod = BusinessDataServiceHelper.loadSingle("bd_period", "id,name,begindate,enddate", new QFilter[]{yearFilter, monthFilter}); + if (bdPeriod != null) { + this.getModel().setValue("zcgj_period", bdPeriod.getPkValue()); + //this.getModel().setValue("begindate", bdPeriod.get("begindate")); + // this.getModel().setValue("enddate", bdPeriod.get("enddate")); + } + + } } From 9d10e600fba7901cb82990ca40203258159cd7fc Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Mon, 11 Aug 2025 15:31:32 +0800 Subject: [PATCH 2/9] =?UTF-8?q?1.=E4=BB=98=E6=AC=BE=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8D=95=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D=E5=8F=8D=E5=86=99?= =?UTF-8?q?=E5=92=8C=E5=89=A9=E4=BD=99=E5=BE=85=E6=8B=A8=E4=BB=98=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=202.=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=8F=96=E6=95=B0=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9C=9F?= =?UTF-8?q?=E5=88=9D=E4=BD=99=E9=A2=9D=E5=8F=96=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/fs/plugin/common/AssistbalanceAutoData.java | 1 + .../plugin/operate/CasPaybillToEcFundPlanApplyOp.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java index 69e3ba6..697d707 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssistbalanceAutoData.java @@ -133,6 +133,7 @@ public class AssistbalanceAutoData { DynamicObject assistbalance =BusinessDataServiceHelper.newDynamicObject("zcgj_rpt_assistbalance"); assistbalance.set("zcgj_debitlocal", record.getDebitlocal()); + assistbalance.set("zcgj_beginlocal", record.getBeginlocal()); assistbalance.set("zcgj_creditlocal", record.getCreditlocal()); assistbalance.set("zcgj_yeardebitfor", record.getYeardebitfor()); assistbalance.set("zcgj_yearcreditfor", record.getYearcreditfor()); diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java index 4dcb4e1..d2b6023 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/CasPaybillToEcFundPlanApplyOp.java @@ -101,6 +101,17 @@ public class CasPaybillToEcFundPlanApplyOp extends AbstractOperationServicePlugI allActamt = allActamt.add(zcgjAmountRecommended); dynamicObject.set("zcgj_amountpaid", allActamt);//实付金额 dynamicObject.set("zcgj_amount_inpayment",amountrecommended);// + + //zcgj_amount_remaining = zcgj_hdamount - zcgj_amount_inpayment - zcgj_amountpaid + //剩余待拨付金额 = 财务核定金额 - 付款处理中金额 - 实付金额 + BigDecimal hdamount = dynamicObject.getBigDecimal("zcgj_hdamount"); + if(hdamount !=null && isPay){ + BigDecimal subtract = hdamount.subtract(amountrecommended).subtract(allActamt); + dynamicObject.set("zcgj_amount_remaining",subtract); + }else if(hdamount != null){ + BigDecimal subtract = hdamount.add(amountrecommended).subtract(allActamt);//实付金额已经成为相反数 + dynamicObject.set("zcgj_amount_remaining",subtract); + } } } updateData.add(fundingplanapply); From da15158c2fa4236c980c2bbf69a74fc467a8a2bf Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Mon, 11 Aug 2025 15:34:52 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=86=B2=E9=94=80=E5=8D=95=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=B2=E9=94=80=E7=94=9F=E6=88=90=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/OutContractSettleFiConfirmWorkFlowPlugin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java index 77c8bcb..e2fb71f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java @@ -49,7 +49,6 @@ public class OutContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin outFinaceconfirm.set("zcgj_invoice_org",outContractSettle.getDynamicObject("project").getDynamicObject("projectorg")); outFinaceconfirm.set("zcgj_jscustomer",outContractSettle.getDynamicObject("zcgj_jscustomer")); outFinaceconfirm.set("billstatus","A"); - outFinaceconfirm.set("zcgj_is_reversabillid",true); outFinaceconfirm.set("creator",outContractSettle.getDynamicObject("creator")); DynamicObjectCollection itementry = outContractSettle.getDynamicObjectCollection("itementry"); From 84c54e187c30fffd3849444f80a80656ffdcfa29 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Mon, 11 Aug 2025 16:14:03 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8D=95=E6=8F=92=E4=BB=B6=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=8A=A0=E9=80=BB=E8=BE=91=EF=BC=9A1=EF=BC=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BC=96=E7=A0=81=E5=B8=A6=E5=87=BA=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=9B2:=E8=BF=87=E6=BB=A4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5=EF=BC=9B3?= =?UTF-8?q?=EF=BC=9A=E8=B0=83=E5=87=BA=E8=B0=83=E5=85=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E8=B0=83=E5=87=BA=E8=B0=83=E5=85=A5=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EquipmentCommandBillPlugin.java | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java new file mode 100644 index 0000000..3726c6f --- /dev/null +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java @@ -0,0 +1,133 @@ +package zcgj.zcdev.zcdev.pr.plugin.form; + +import kd.bos.bill.AbstractBillPlugIn; +import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.dataentity.entity.DynamicObjectCollection; +import kd.bos.entity.datamodel.events.ChangeData; +import kd.bos.entity.datamodel.events.PropertyChangedArgs; +import kd.bos.form.field.BasedataEdit; +import kd.bos.form.field.events.BeforeF7SelectEvent; +import kd.bos.form.field.events.BeforeF7SelectListener; +import kd.bos.isc.util.misc.StringUtil; +import kd.bos.list.ListShowParameter; +import kd.bos.orm.query.QCP; +import kd.bos.orm.query.QFilter; +import kd.bos.servicehelper.BusinessDataServiceHelper; + +import java.util.ArrayList; +import java.util.EventObject; +import java.util.List; + +/* + * 设备命令单表单插件 + * 说明：1：设备编码带出资产编码；2:过滤设备编码字段；3：调出调入项目带出调出调入负责人 + */ +public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener { + @Override + public void registerListener(EventObject e) { + super.registerListener(e); + BasedataEdit realCard = this.getControl("zcgj_realcard"); //设备编码 + realCard.addBeforeF7SelectListener(this); + BasedataEdit outProject = this.getControl("zcgj_outproject"); //调出项目 + outProject.addBeforeF7SelectListener(this); + BasedataEdit inProject = this.getControl("zcgj_inproject"); //调入项目 + inProject.addBeforeF7SelectListener(this); +// BasedataEdit outUser = this.getControl("zcgj_outuser"); //调出负责人 +// outUser.addBeforeF7SelectListener(this); +// BasedataEdit inUser = this.getControl("zcgj_inuser"); //调入负责人 +// inUser.addBeforeF7SelectListener(this); + } + + @Override + public void propertyChanged(PropertyChangedArgs e) { + super.propertyChanged(e); + String key = e.getProperty().getName(); + if (StringUtil.equals(key, "zcgj_realcard")) { + //设备编码 + ChangeData[] changeSet = e.getChangeSet(); + ChangeData changeData = changeSet[0]; + int rowIndex = changeData.getRowIndex(); + DynamicObject realCard = (DynamicObject) changeData.getNewValue();//新值 + if (realCard != null) { + String realCardNumber = realCard.getString("number");//设备编码-设备编码 + DynamicObject org = (DynamicObject) realCard.get("org");//管理组织 + QFilter[] qFilters = new QFilter[]{new QFilter("number", QCP.equals, realCardNumber).and("org.id", QCP.equals, org.get("id"))}; + DynamicObject fa_card_real_base = BusinessDataServiceHelper.loadSingle("fa_card_real_base", "id", qFilters);//实物卡片基础资料 + this.getModel().setValue("zcgj_realcardsw", fa_card_real_base, rowIndex);//资产编码 + } else { + this.getModel().setValue("zcgj_realcardsw", null, rowIndex);//资产编码 + } + } else if (StringUtil.equals(key, "zcgj_outorg") || StringUtil.equals(key, "zcgj_inorg")) { + //调出组织，调入组织 + ChangeData[] changeSet = e.getChangeSet(); + ChangeData changeData = changeSet[0]; + Object newValue = changeData.getNewValue();//新值 + Object oldValue = changeData.getOldValue();//旧值 + if (newValue == null || !newValue.equals(oldValue)) { + if (StringUtil.equals(key, "zcgj_outorg")) { + //调出组织 + DynamicObjectCollection dispatchEntryCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_dispatchentry");//调出资产详情分录 + dispatchEntryCollection.clear(); + this.getView().updateView("zcgj_dispatchentry");//刷新分录 + this.getModel().setValue("zcgj_outproject", null);//清空调出项目 + } else { + //调入组织 + this.getModel().setValue("zcgj_inproject", null);//清空调入项目 + } + } + } else if (StringUtil.equals(key, "zcgj_outproject") || StringUtil.equals(key, "zcgj_inproject")) { + //调出项目，调入项目 + ChangeData[] changeSet = e.getChangeSet(); + ChangeData changeData = changeSet[0]; + Object newValue = changeData.getNewValue();//新值 + if (newValue != null) { + DynamicObject newValueDy = (DynamicObject) newValue; + QFilter[] qFilters = new QFilter[]{new QFilter("billno", QCP.equals, newValueDy.getString("number"))}; + DynamicObject ec_project = BusinessDataServiceHelper.loadSingle("ec_project", "id,zcgj_pm", qFilters);//项目 + if (ec_project != null) { + if (StringUtil.equals(key, "zcgj_outproject")) { + //调出项目 + this.getModel().setValue("zcgj_outuser", ec_project.get("zcgj_pm"));//调出负责人 + } else { + this.getModel().setValue("zcgj_inuser", ec_project.get("zcgj_pm"));//调出负责人 + } + } + } + } + } + + @Override + public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { + String propertyName = beforeF7SelectEvent.getProperty().getName(); + ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); + List qFilter = new ArrayList<>(); + if (StringUtil.equals(propertyName, "zcgj_realcard") || StringUtil.equals(propertyName, "zcgj_outproject")) { + //设备编码、调出项目 + Object outOrg = this.getModel().getValue("zcgj_outorg");//调出组织 + if (outOrg == null) { + this.getView().showErrorNotification("请先填写调出组织！"); + beforeF7SelectEvent.setCancel(true); + return; + } + DynamicObject outOrgDy = (DynamicObject) outOrg; + if (StringUtil.equals(propertyName, "zcgj_realcard")) { + //设备编码 + qFilter.add(new QFilter("org.id", "=", outOrgDy.get("id"))); + } else { + //调出项目 + qFilter.add(new QFilter("fiaccountorg.id", "=", outOrgDy.get("id"))); + } + } else if (StringUtil.equals(propertyName, "zcgj_inproject")) { + //调入项目 + Object inOrg = this.getModel().getValue("zcgj_inorg");//调入组织 + if (inOrg == null) { + this.getView().showErrorNotification("请先填写调入组织！"); + beforeF7SelectEvent.setCancel(true); + return; + } + DynamicObject inOrgDy = (DynamicObject) inOrg; + qFilter.add(new QFilter("fiaccountorg.id", "=", inOrgDy.get("id"))); + } + formShowParameter.getListFilterParameter().setQFilters(qFilter); + } +} From 1b1cab2029e42d97a9dd37de4668d0ec572d654b Mon Sep 17 00:00:00 2001 From: xiaoshi <2272816786@qq.com> Date: Mon, 11 Aug 2025 16:14:12 +0800 Subject: [PATCH 5/9] youhua --- .../zcdev/pr/plugin/form/EquipmentCardListPlugin.java | 9 ++++++--- .../zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java index 78aeade..d043690 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java @@ -124,7 +124,8 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi Date modifytime = realcard.getDate("modifytime");//修改时间 DynamicObject auditor = realcard.getDynamicObject("auditor");//审核人 Date auditdate = realcard.getDate("auditdate");//审核时间 - + BigDecimal assetamount = realcard.getBigDecimal("assetamount");//资产数量 + String remark = realcard.getString("remark");//备注 DynamicObject equipmentcard = ORM.create().newDynamicObject("eceq_equipment_card"); Date date=new Date(); long timestamp=date.getTime(); //时间戳 @@ -174,7 +175,8 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi equipmentcard.set("zcgj_headusedepts",headusedept);//使用部门 equipmentcard.set("zcgj_costcenters",zcgj_costcenter);//成本中心 equipmentcard.set("zcgj_assetcat",assetcat);//资产类别 - + equipmentcard.set("zcgj_assetamount",assetamount);//数量 + equipmentcard.set("zcgj_remark",remark);//备注 BigDecimal finOriginalval = BigDecimal.ZERO; BigDecimal fin_preusingamount = BigDecimal.ZERO; BigDecimal fin_depredamount = BigDecimal.ZERO; @@ -226,12 +228,13 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi eceq_equipment.set("zcgj_depredamount",fin_depredamount); eceq_equipment.set("zcgj_preresidualval",fin_preresidualval); eceq_equipment.set("zcgj_preusingamount",fin_preusingamount); - eceq_equipment.set("unitprice",finOriginalval); + eceq_equipment.set("zcgj_unitprice",finOriginalval); DynamicObjectCollection entrys = eceq_equipment.getDynamicObjectCollection("zcgj_entryentity"); SaveServiceHelper.save(new DynamicObject[]{eceq_equipment}); } System.out.println("总报错信息为："+operationResultErrorInfos); } + this.getView().showMessage("同步成功！"); } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java index f89bd7e..da6f479 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java @@ -67,7 +67,8 @@ public class EquipmentCardTaskPlugin extends AbstractTask { QFilter qFilter3 = new QFilter("bizstatus", QCP.not_equals, "DELETE"); // QFilter qFilter4 = new QFilter("billstatus", QCP.equals, "C"); DynamicObject[] realcards = BusinessDataServiceHelper.load("fa_asset_card", "zcgj_costcenter,headusedept,finentry,assetcat,number,assetname,model,realaccountdate," + - "assetunit,supplier,zcgj_platenumber,unit,zcgj_manufacturer,zcgj_prodate,storeplace,creator,createtime,modifier,modifytime,auditdate,auditor,finentry.fin_originalval,finentry.fin_preresidualval,finentry.fin_depredamount,finentry.fin_preusingamount,finentry.fin_accumdepre,finentry.fin_networth", new QFilter[]{qFilter,qFilter2,qFilter3}); + "assetunit,supplier,zcgj_platenumber,unit,zcgj_manufacturer,zcgj_prodate,storeplace,creator,createtime,modifier,modifytime,auditdate,auditor,finentry.fin_originalval,finentry.fin_preresidualval," + + "finentry.fin_depredamount,finentry.fin_preusingamount,finentry.fin_accumdepre,finentry.fin_networth,remark,assetamount", new QFilter[]{qFilter,qFilter2,qFilter3}); log.info("同步的实物数量有"+realcards.length); String operationResultErrorInfos = null; for (DynamicObject realcard : realcards) { @@ -86,6 +87,9 @@ public class EquipmentCardTaskPlugin extends AbstractTask { DynamicObject storeplace = realcard.getDynamicObject("storeplace");//存放地点 DynamicObject headusedept = realcard.getDynamicObject("headusedept");//使用部门 DynamicObject zcgj_costcenter = realcard.getDynamicObject("zcgj_costcenter");//成本中心 + BigDecimal assetamount = realcard.getBigDecimal("assetamount");//资产数量 + String remark = realcard.getString("remark");//备注 + DynamicObjectCollection finentrys = realcard.getDynamicObjectCollection("finentry");//财务卡片分录 String fulladdress = null; if(storeplace!=null){ @@ -148,6 +152,8 @@ public class EquipmentCardTaskPlugin extends AbstractTask { equipmentcard.set("zcgj_headusedepts",headusedept);//使用部门 equipmentcard.set("zcgj_costcenters",zcgj_costcenter);//成本中心 equipmentcard.set("zcgj_assetcat",assetcat);//资产类别 + equipmentcard.set("zcgj_assetamount",assetamount);//数量 + equipmentcard.set("zcgj_remark",remark);//备注 BigDecimal finOriginalval = BigDecimal.ZERO; BigDecimal fin_preusingamount = BigDecimal.ZERO; BigDecimal fin_depredamount = BigDecimal.ZERO; @@ -199,7 +205,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask { eceq_equipment.set("zcgj_depredamount",fin_depredamount); eceq_equipment.set("zcgj_preresidualval",fin_preresidualval); eceq_equipment.set("zcgj_preusingamount",fin_preusingamount); - eceq_equipment.set("unitprice",finOriginalval); + eceq_equipment.set("zcgj_unitprice",finOriginalval); DynamicObjectCollection entrys = eceq_equipment.getDynamicObjectCollection("zcgj_entryentity"); QFilter qf = new QFilter("realcard.number", QCP.equals, number); // if (entrys.size() > 0) {//若分录行数大于0 则取上月的 From 3ebb551f44b40c0e6dd369c94e0cda2296370981 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Mon, 11 Aug 2025 16:57:09 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=8D=95=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 --- .../zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java index 3726c6f..b5d9d29 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java @@ -19,7 +19,7 @@ import java.util.EventObject; import java.util.List; /* - * 设备命令单表单插件 + * 设备调令单表单插件 * 说明：1：设备编码带出资产编码；2:过滤设备编码字段；3：调出调入项目带出调出调入负责人 */ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener { @@ -49,7 +49,7 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be int rowIndex = changeData.getRowIndex(); DynamicObject realCard = (DynamicObject) changeData.getNewValue();//新值 if (realCard != null) { - String realCardNumber = realCard.getString("number");//设备编码-设备编码 + String realCardNumber = realCard.getString("zcgj_assetnumber");//设备编码-资产编码 DynamicObject org = (DynamicObject) realCard.get("org");//管理组织 QFilter[] qFilters = new QFilter[]{new QFilter("number", QCP.equals, realCardNumber).and("org.id", QCP.equals, org.get("id"))}; DynamicObject fa_card_real_base = BusinessDataServiceHelper.loadSingle("fa_card_real_base", "id", qFilters);//实物卡片基础资料 From c89d0811f9ac2e40a9f3ea5205785f161795e6d0 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Mon, 11 Aug 2025 17:10:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java index b5d9d29..245288c 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java @@ -32,10 +32,6 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be outProject.addBeforeF7SelectListener(this); BasedataEdit inProject = this.getControl("zcgj_inproject"); //调入项目 inProject.addBeforeF7SelectListener(this); -// BasedataEdit outUser = this.getControl("zcgj_outuser"); //调出负责人 -// outUser.addBeforeF7SelectListener(this); -// BasedataEdit inUser = this.getControl("zcgj_inuser"); //调入负责人 -// inUser.addBeforeF7SelectListener(this); } @Override From 1b4014a8f5088a07a15ccfdc4dd6abaa17bd4442 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Tue, 12 Aug 2025 10:01:07 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B0=83=E4=BB=A4?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8D=95=E6=8F=92=E4=BB=B6=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EquipmentCommandBillPlugin.java | 46 +++++++++++++++++-- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java index 245288c..3004774 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java @@ -13,6 +13,7 @@ import kd.bos.list.ListShowParameter; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.user.UserServiceHelper; import java.util.ArrayList; import java.util.EventObject; @@ -20,7 +21,7 @@ import java.util.List; /* * 设备调令单表单插件 - * 说明：1：设备编码带出资产编码；2:过滤设备编码字段；3：调出调入项目带出调出调入负责人 + * 说明：1：设备编码带出资产编码；2:过滤设备编码字段；3：调出调入项目带出调出调入负责人；4：自动带出所属组织 */ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener { @Override @@ -34,6 +35,14 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be inProject.addBeforeF7SelectListener(this); } + @Override + public void afterCreateNewData(EventObject e) { + super.afterCreateNewData(e); + long currentUserId = UserServiceHelper.getCurrentUserId(); + Long mainOrgId = UserServiceHelper.getUserMainOrgId(currentUserId); + this.getModel().setValue("zcgj_org", mainOrgId);//所属组织 + } + @Override public void propertyChanged(PropertyChangedArgs e) { super.propertyChanged(e); @@ -105,13 +114,31 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be beforeF7SelectEvent.setCancel(true); return; } - DynamicObject outOrgDy = (DynamicObject) outOrg; + DynamicObject outOrgDy = (DynamicObject) outOrg;//调出组织 if (StringUtil.equals(propertyName, "zcgj_realcard")) { //设备编码 - qFilter.add(new QFilter("org.id", "=", outOrgDy.get("id"))); + QFilter Filter = new QFilter("org.id", "=", outOrgDy.get("id")); + DynamicObject[] equipment_infos = BusinessDataServiceHelper.load("eceq_equipment_info", "id", new QFilter[]{Filter});//设备台账F7 + List equipment_infoIds = new ArrayList<>(); + if (equipment_infos != null && equipment_infos.length > 0) { + for (DynamicObject equipment_info : equipment_infos) { + Long equipment_infoId = (Long) equipment_info.get("id"); + equipment_infoIds.add(equipment_infoId); + } + } + qFilter.add(new QFilter("id", QCP.in, equipment_infoIds)); } else { //调出项目 - qFilter.add(new QFilter("fiaccountorg.id", "=", outOrgDy.get("id"))); + QFilter Filter = new QFilter("fiaccountorg.id", "=", outOrgDy.get("id")); + DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{Filter});//工程项目 + List projectF7Ids = new ArrayList<>(); + if (projectF7s != null && projectF7s.length > 0) { + for (DynamicObject projectF7 : projectF7s) { + Long projectF7Id = (Long) projectF7.get("id"); + projectF7Ids.add(projectF7Id); + } + } + qFilter.add(new QFilter("id", QCP.in, projectF7Ids)); } } else if (StringUtil.equals(propertyName, "zcgj_inproject")) { //调入项目 @@ -122,7 +149,16 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be return; } DynamicObject inOrgDy = (DynamicObject) inOrg; - qFilter.add(new QFilter("fiaccountorg.id", "=", inOrgDy.get("id"))); + QFilter Filter = new QFilter("fiaccountorg.id", "=", inOrgDy.get("id")); + DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{Filter});//工程项目 + List projectF7Ids = new ArrayList<>(); + if (projectF7s != null && projectF7s.length > 0) { + for (DynamicObject projectF7 : projectF7s) { + Long projectF7Id = (Long) projectF7.get("id"); + projectF7Ids.add(projectF7Id); + } + } + qFilter.add(new QFilter("id", QCP.in, projectF7Ids)); } formShowParameter.getListFilterParameter().setQFilters(qFilter); } From f1b0676256cb426e4c846772697d5a62a416dfa3 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Tue, 12 Aug 2025 11:16:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EquipmentCommandBillPlugin.java | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java index 3004774..6ceaaef 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java @@ -105,41 +105,38 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { String propertyName = beforeF7SelectEvent.getProperty().getName(); ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); - List qFilter = new ArrayList<>(); - if (StringUtil.equals(propertyName, "zcgj_realcard") || StringUtil.equals(propertyName, "zcgj_outproject")) { - //设备编码、调出项目 + List qFilters = new ArrayList<>(); + + if (StringUtil.equals(propertyName, "zcgj_realcard")) { + //设备编码 Object outOrg = this.getModel().getValue("zcgj_outorg");//调出组织 if (outOrg == null) { this.getView().showErrorNotification("请先填写调出组织！"); beforeF7SelectEvent.setCancel(true); return; } + DynamicObject outOrgDy = (DynamicObject) outOrg;//调出组织 - if (StringUtil.equals(propertyName, "zcgj_realcard")) { - //设备编码 - QFilter Filter = new QFilter("org.id", "=", outOrgDy.get("id")); - DynamicObject[] equipment_infos = BusinessDataServiceHelper.load("eceq_equipment_info", "id", new QFilter[]{Filter});//设备台账F7 - List equipment_infoIds = new ArrayList<>(); - if (equipment_infos != null && equipment_infos.length > 0) { - for (DynamicObject equipment_info : equipment_infos) { - Long equipment_infoId = (Long) equipment_info.get("id"); - equipment_infoIds.add(equipment_infoId); - } - } - qFilter.add(new QFilter("id", QCP.in, equipment_infoIds)); - } else { - //调出项目 - QFilter Filter = new QFilter("fiaccountorg.id", "=", outOrgDy.get("id")); - DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{Filter});//工程项目 - List projectF7Ids = new ArrayList<>(); - if (projectF7s != null && projectF7s.length > 0) { - for (DynamicObject projectF7 : projectF7s) { - Long projectF7Id = (Long) projectF7.get("id"); - projectF7Ids.add(projectF7Id); - } - } - qFilter.add(new QFilter("id", QCP.in, projectF7Ids)); + QFilter filter = new QFilter("org.id", "=", outOrgDy.get("id")); + DynamicObject[] equipmentInfos = BusinessDataServiceHelper.load("eceq_equipment_info", "id", new QFilter[]{filter});//设备台账F7 + List equipmentInfoIds = getIdsFromDynamicObjects(equipmentInfos); + qFilters.add(new QFilter("id", QCP.in, equipmentInfoIds)); + + } else if (StringUtil.equals(propertyName, "zcgj_outproject")) { + // 调出项目 + Object outOrg = this.getModel().getValue("zcgj_outorg");//调出组织 + if (outOrg == null) { + this.getView().showErrorNotification("请先填写调出组织！"); + beforeF7SelectEvent.setCancel(true); + return; } + + DynamicObject outOrgDy = (DynamicObject) outOrg;//调出组织 + QFilter filter = new QFilter("fiaccountorg.id", "=", outOrgDy.get("id")); + DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{filter});//工程项目 + List projectF7Ids = getIdsFromDynamicObjects(projectF7s); + qFilters.add(new QFilter("id", QCP.in, projectF7Ids)); + } else if (StringUtil.equals(propertyName, "zcgj_inproject")) { //调入项目 Object inOrg = this.getModel().getValue("zcgj_inorg");//调入组织 @@ -149,17 +146,22 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be return; } DynamicObject inOrgDy = (DynamicObject) inOrg; - QFilter Filter = new QFilter("fiaccountorg.id", "=", inOrgDy.get("id")); - DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{Filter});//工程项目 - List projectF7Ids = new ArrayList<>(); - if (projectF7s != null && projectF7s.length > 0) { - for (DynamicObject projectF7 : projectF7s) { - Long projectF7Id = (Long) projectF7.get("id"); - projectF7Ids.add(projectF7Id); - } - } - qFilter.add(new QFilter("id", QCP.in, projectF7Ids)); + QFilter filter = new QFilter("fiaccountorg.id", "=", inOrgDy.get("id")); + DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{filter}); + List projectF7Ids = getIdsFromDynamicObjects(projectF7s); + qFilters.add(new QFilter("id", QCP.in, projectF7Ids)); } - formShowParameter.getListFilterParameter().setQFilters(qFilter); + + formShowParameter.getListFilterParameter().setQFilters(qFilters); + } + + private List getIdsFromDynamicObjects(DynamicObject[] dynamicObjects) { + List ids = new ArrayList<>(); + if (dynamicObjects != null && dynamicObjects.length > 0) { + for (DynamicObject obj : dynamicObjects) { + ids.add((Long) obj.get("id")); + } + } + return ids; } }