From 2e98950f6fb196a60c3c8b2eb1c8015f615c8282 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Wed, 30 Jul 2025 13:51:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java | 2 +- .../zcdev/fs/plugin/form/ReimbursementAccountTypePlugin.java | 2 +- .../zcdev/fs/plugin/form/TripEntryEditAccountTypePlugin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java index 28bbc6b..77678e5 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java @@ -133,7 +133,7 @@ public class DailyReimburseAccountPlugin extends AbstractBillPlugIn implements P } else { //组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表 this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 - this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); +// this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); } } else { this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/ReimbursementAccountTypePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/ReimbursementAccountTypePlugin.java index 0ffd6bd..d70cf05 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/ReimbursementAccountTypePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/ReimbursementAccountTypePlugin.java @@ -332,7 +332,7 @@ public class ReimbursementAccountTypePlugin extends AbstractBillPlugIn implement } else { //组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表 this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 - this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); +// this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); } } else { this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TripEntryEditAccountTypePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TripEntryEditAccountTypePlugin.java index a1f495d..a3540c5 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TripEntryEditAccountTypePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TripEntryEditAccountTypePlugin.java @@ -253,7 +253,7 @@ public class TripEntryEditAccountTypePlugin extends AbstractBillPlugIn implement } else { //组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表 this.getModel().setValue("zcgj_accounttype", null);//科目属性 - this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); +// this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); } } else { this.getModel().setValue("zcgj_accounttype", null);//科目属性 From 1ecae316b3236751158521bc3f8eb0c666b34e8a Mon Sep 17 00:00:00 2001 From: xiaoshi <2272816786@qq.com> Date: Wed, 30 Jul 2025 14:01:49 +0800 Subject: [PATCH 2/4] youhua --- .../zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java | 2 +- .../java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 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 ebd6d0b..a9802fd 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 @@ -66,7 +66,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )}); for (DynamicObject dynamicObject : equipmenttype) { String number = dynamicObject.getDynamicObject("zcgj_assetcat").getString("number"); - if (number.isEmpty() && number!=null){ + if (!number.isEmpty() && number!=null){ strings.add(number) ; } } 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 a5900a0..d41bc1b 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 @@ -42,7 +42,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask { DynamicObject[] equipmenttype = BusinessDataServiceHelper.load("zcgj_equipmenttype", "number,zcgj_assetcat",new QFilter[]{new QFilter("zcgj_assetcat.number", QCP.is_notnull,"" )}); for (DynamicObject dynamicObject : equipmenttype) { String number = dynamicObject.getDynamicObject("zcgj_assetcat").getString("number"); - if (number.isEmpty() && number!=null){ + if (!number.isEmpty() && number!=null){ strings.add(number) ; } } From f8ab23ff3b2a8cd76547ec036dad9fe1b3f32af2 Mon Sep 17 00:00:00 2001 From: xiaoshi <2272816786@qq.com> Date: Wed, 30 Jul 2025 14:22:54 +0800 Subject: [PATCH 3/4] youhua --- .../zcdev/pr/plugin/form/EquipmentCardListPlugin.java | 7 ++++--- .../zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java | 3 ++- 2 files changed, 6 insertions(+), 4 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 a9802fd..1e60929 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 @@ -71,7 +71,8 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi } } QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); - 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", new QFilter[]{qFilter}); + 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}); for (DynamicObject realcard : realcards) { String number = realcard.getString("number");//资产编码 // DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别 @@ -145,7 +146,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi if(finentrys.size()>0){ DynamicObject finentry = finentrys.get(0); - BigDecimal finOriginalval = finentry.getBigDecimal("fin_originalval");//资产原值 + BigDecimal fin_originalval = finentry.getBigDecimal("fin_originalval");//资产原值 BigDecimal fin_preusingamount = finentry.getBigDecimal("fin_preusingamount");//预计使用月 BigDecimal fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月 BigDecimal fin_preresidualval = finentry.getBigDecimal("fin_preresidualval");//预计净残值 @@ -156,7 +157,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi equipmentcard.set("zcgj_depredamount",fin_depredamount); equipmentcard.set("zcgj_preresidualval",fin_preresidualval); equipmentcard.set("zcgj_preusingamount",fin_preusingamount); - equipmentcard.set("zcgj_unitprice",finOriginalval); + equipmentcard.set("zcgj_unitprice",fin_originalval); } if (eceq_equipment_card!=null){ SaveServiceHelper.update(equipmentcard); 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 d41bc1b..7880bd8 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 @@ -47,7 +47,8 @@ public class EquipmentCardTaskPlugin extends AbstractTask { } } QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); - 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", new QFilter[]{qFilter}); + 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}); for (DynamicObject realcard : realcards) { String number = realcard.getString("number");//资产编码 // DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别 From 131530c48381eec0f15cd96e6693124efbdded74 Mon Sep 17 00:00:00 2001 From: xiaoshi <2272816786@qq.com> Date: Wed, 30 Jul 2025 14:48:44 +0800 Subject: [PATCH 4/4] youhua --- .../zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java | 2 +- .../java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 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 1e60929..5909806 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 @@ -157,7 +157,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi equipmentcard.set("zcgj_depredamount",fin_depredamount); equipmentcard.set("zcgj_preresidualval",fin_preresidualval); equipmentcard.set("zcgj_preusingamount",fin_preusingamount); - equipmentcard.set("zcgj_unitprice",fin_originalval); + equipmentcard.set("unitprice",fin_originalval); } if (eceq_equipment_card!=null){ SaveServiceHelper.update(equipmentcard); 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 7880bd8..c283913 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 @@ -133,7 +133,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask { equipmentcard.set("zcgj_depredamount",fin_depredamount); equipmentcard.set("zcgj_preresidualval",fin_preresidualval); equipmentcard.set("zcgj_preusingamount",fin_preusingamount); - equipmentcard.set("zcgj_unitprice",finOriginalval); + equipmentcard.set("unitprice",finOriginalval); } if (eceq_equipment_card != null) { SaveServiceHelper.update(equipmentcard);