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:
xuhaihui 2025-08-04 16:11:57 +08:00
parent 0138cbf94a 9940372930
commit cfea1526f3
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,12 +179,14 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
BigDecimal fin_networth = BigDecimal.ZERO; BigDecimal fin_networth = BigDecimal.ZERO;
if(finentrys.size()>0){ if(finentrys.size()>0){
DynamicObject finentry = finentrys.get(0); DynamicObject finentry = finentrys.get(0);
finOriginalval = finentry.getBigDecimal("fin_originalval");//资产原值 DynamicObject fincard = finentry.getDynamicObject("fincard");
fin_preusingamount = finentry.getBigDecimal("fin_preusingamount");//预计使用月 DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin_base", new QFilter[]{new QFilter("id", QCP.equals, fincard.getLong("id"))});
fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月 finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值
fin_preresidualval = finentry.getBigDecimal("fin_preresidualval");//预计净残值 fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月
fin_accumdepre = finentry.getBigDecimal("fin_accumdepre");//累计折旧 fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月
fin_networth = finentry.getBigDecimal("fin_networth");//净值 fin_preresidualval = fincardInfo.getBigDecimal("preresidualval");//预计净残值
fin_accumdepre = fincardInfo.getBigDecimal("accumdepre");//累计折旧
fin_networth = fincardInfo.getBigDecimal("networth");//净值
equipmentcard.set("zcgj_networth",fin_networth); equipmentcard.set("zcgj_networth",fin_networth);
equipmentcard.set("zcgj_accumdepre",fin_accumdepre); equipmentcard.set("zcgj_accumdepre",fin_accumdepre);
equipmentcard.set("zcgj_depredamount",fin_depredamount); equipmentcard.set("zcgj_depredamount",fin_depredamount);

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

@ -153,12 +153,14 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
BigDecimal fin_networth = BigDecimal.ZERO; BigDecimal fin_networth = BigDecimal.ZERO;
if(finentrys.size()>0){ if(finentrys.size()>0){
DynamicObject finentry = finentrys.get(0); DynamicObject finentry = finentrys.get(0);
finOriginalval = finentry.getBigDecimal("fin_originalval");//资产原值 DynamicObject fincard = finentry.getDynamicObject("fincard");
fin_preusingamount = finentry.getBigDecimal("fin_preusingamount");//预计使用月 DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin_base", new QFilter[]{new QFilter("id", QCP.equals, fincard.getLong("id"))});
fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月 finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值
fin_preresidualval = finentry.getBigDecimal("fin_preresidualval");//预计净残值 fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月
fin_accumdepre = finentry.getBigDecimal("fin_accumdepre");//累计折旧 fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月
fin_networth = finentry.getBigDecimal("fin_networth");//净值 fin_preresidualval = fincardInfo.getBigDecimal("preresidualval");//预计净残值
fin_accumdepre = fincardInfo.getBigDecimal("accumdepre");//累计折旧
fin_networth = fincardInfo.getBigDecimal("networth");//净值
equipmentcard.set("zcgj_networth",fin_networth); equipmentcard.set("zcgj_networth",fin_networth);
equipmentcard.set("zcgj_accumdepre",fin_accumdepre); equipmentcard.set("zcgj_accumdepre",fin_accumdepre);
equipmentcard.set("zcgj_depredamount",fin_depredamount); equipmentcard.set("zcgj_depredamount",fin_depredamount);