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] 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");//资产类别