zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
hello 2025-07-30 14:54:02 +08:00
parent 490a0f58d8 131530c483
commit e10db24301
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/DailyReimburseAccountPlugin.java
View File

@ -133,7 +133,7 @@ public class DailyReimburseAccountPlugin extends AbstractBillPlugIn implements P
} else { } else {
//组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表 //组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表
this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性
this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); // this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！");
} }
} else { } else {
this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性

2
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/ReimbursementAccountTypePlugin.java
View File

@ -332,7 +332,7 @@ public class ReimbursementAccountTypePlugin extends AbstractBillPlugIn implement
} else { } else {
//组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表 //组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表
this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性
this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); // this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！");
} }
} else { } else {
this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性 this.getModel().setValue("zcgj_accounttype", null, rowIndex);//科目属性

2
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/TripEntryEditAccountTypePlugin.java
View File

@ -253,7 +253,7 @@ public class TripEntryEditAccountTypePlugin extends AbstractBillPlugIn implement
} else { } else {
//组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表 //组织分类配置表中未查询到对应数据，说明组织分类中编码有所改变，需维护对应的组织分类配置表
this.getModel().setValue("zcgj_accounttype", null);//科目属性 this.getModel().setValue("zcgj_accounttype", null);//科目属性
this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！"); // this.getView().showErrorNotification("组织分类中编码有所改变，请维护对应的组织分类配置表！");
} }
} else { } else {
this.getModel().setValue("zcgj_accounttype", null);//科目属性 this.getModel().setValue("zcgj_accounttype", null);//科目属性

7
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
View File

@ -71,7 +71,8 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
} }
} }
QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); 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) { for (DynamicObject realcard : realcards) {
String number = realcard.getString("number");//资产编码 String number = realcard.getString("number");//资产编码
// DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别 // DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
@ -145,7 +146,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
if(finentrys.size()>0){ if(finentrys.size()>0){
DynamicObject finentry = finentrys.get(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_preusingamount = finentry.getBigDecimal("fin_preusingamount");//预计使用月
BigDecimal fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月 BigDecimal fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月
BigDecimal fin_preresidualval = finentry.getBigDecimal("fin_preresidualval");//预计净残值 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_depredamount",fin_depredamount);
equipmentcard.set("zcgj_preresidualval",fin_preresidualval); equipmentcard.set("zcgj_preresidualval",fin_preresidualval);
equipmentcard.set("zcgj_preusingamount",fin_preusingamount); equipmentcard.set("zcgj_preusingamount",fin_preusingamount);
equipmentcard.set("zcgj_unitprice",finOriginalval); equipmentcard.set("unitprice",fin_originalval);
} }
if (eceq_equipment_card!=null){ if (eceq_equipment_card!=null){
SaveServiceHelper.update(equipmentcard); SaveServiceHelper.update(equipmentcard);

5
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/task/EquipmentCardTaskPlugin.java
View File

@ -47,7 +47,8 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
} }
} }
QFilter qFilter = new QFilter("assetcat.number", QCP.in, strings); 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) { for (DynamicObject realcard : realcards) {
String number = realcard.getString("number");//资产编码 String number = realcard.getString("number");//资产编码
// DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别 // DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
@ -132,7 +133,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
equipmentcard.set("zcgj_depredamount",fin_depredamount); equipmentcard.set("zcgj_depredamount",fin_depredamount);
equipmentcard.set("zcgj_preresidualval",fin_preresidualval); equipmentcard.set("zcgj_preresidualval",fin_preresidualval);
equipmentcard.set("zcgj_preusingamount",fin_preusingamount); equipmentcard.set("zcgj_preusingamount",fin_preusingamount);
equipmentcard.set("zcgj_unitprice",finOriginalval); equipmentcard.set("unitprice",finOriginalval);
} }
if (eceq_equipment_card != null) { if (eceq_equipment_card != null) {
SaveServiceHelper.update(equipmentcard); SaveServiceHelper.update(equipmentcard);