From 99403729306a7e904fa8616b927db09e1390b3d8 Mon Sep 17 00:00:00 2001
From: xiaoshi <2272816786@qq.com>
Date: Mon, 4 Aug 2025 15:46:25 +0800
Subject: [PATCH] youhua

---
 .../pr/plugin/form/EquipmentCardListPlugin.java    | 14 ++++++++------
 .../zcdev/pr/task/EquipmentCardTaskPlugin.java     | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 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 7b84352..54a3267 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
@@ -179,12 +179,14 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
                 BigDecimal fin_networth = BigDecimal.ZERO;
                 if(finentrys.size()>0){
                     DynamicObject finentry = finentrys.get(0);
-                    finOriginalval = finentry.getBigDecimal("fin_originalval");//资产原值
-                    fin_preusingamount = finentry.getBigDecimal("fin_preusingamount");//预计使用月
-                    fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月
-                    fin_preresidualval = finentry.getBigDecimal("fin_preresidualval");//预计净残值
-                    fin_accumdepre = finentry.getBigDecimal("fin_accumdepre");//累计折旧
-                    fin_networth = finentry.getBigDecimal("fin_networth");//净值
+                    DynamicObject fincard = finentry.getDynamicObject("fincard");
+                    DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin_base", new QFilter[]{new QFilter("id", QCP.equals, fincard.getLong("id"))});
+                    finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值
+                    fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月
+                    fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月
+                    fin_preresidualval = fincardInfo.getBigDecimal("preresidualval");//预计净残值
+                    fin_accumdepre = fincardInfo.getBigDecimal("accumdepre");//累计折旧
+                    fin_networth = fincardInfo.getBigDecimal("networth");//净值
                     equipmentcard.set("zcgj_networth",fin_networth);
                     equipmentcard.set("zcgj_accumdepre",fin_accumdepre);
                     equipmentcard.set("zcgj_depredamount",fin_depredamount);
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 ee52d31..b94217f 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
@@ -153,12 +153,14 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
             BigDecimal fin_networth = BigDecimal.ZERO;
             if(finentrys.size()>0){
                 DynamicObject finentry = finentrys.get(0);
-                finOriginalval = finentry.getBigDecimal("fin_originalval");//资产原值
-                fin_preusingamount = finentry.getBigDecimal("fin_preusingamount");//预计使用月
-                fin_depredamount = finentry.getBigDecimal("fin_depredamount");//已折旧月
-                fin_preresidualval = finentry.getBigDecimal("fin_preresidualval");//预计净残值
-                fin_accumdepre = finentry.getBigDecimal("fin_accumdepre");//累计折旧
-                fin_networth = finentry.getBigDecimal("fin_networth");//净值
+                DynamicObject fincard = finentry.getDynamicObject("fincard");
+                DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin_base", new QFilter[]{new QFilter("id", QCP.equals, fincard.getLong("id"))});
+                finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值
+                fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月
+                fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月
+                fin_preresidualval = fincardInfo.getBigDecimal("preresidualval");//预计净残值
+                fin_accumdepre = fincardInfo.getBigDecimal("accumdepre");//累计折旧
+                fin_networth = fincardInfo.getBigDecimal("networth");//净值
                 equipmentcard.set("zcgj_networth",fin_networth);
                 equipmentcard.set("zcgj_accumdepre",fin_accumdepre);
                 equipmentcard.set("zcgj_depredamount",fin_depredamount);