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

@@ -96,7 +96,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
             String operationResultErrorInfos = null;
             for (DynamicObject realcard : realcards) {
                 String number = realcard.getString("number");//资产编码
-                DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
+//                DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
                 String assetname = realcard.getString("assetname");//资产名称
                 log.info("同步的实物卡片为"+number+assetname);
                 String model = realcard.getString("model");//规格型号
@@ -171,8 +171,6 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
                 equipmentcard.set("zcgj_assetnumber",number);//资产编码
                 equipmentcard.set("zcgj_headusedepts",headusedept);//使用部门
                 equipmentcard.set("zcgj_costcenters",zcgj_costcenter);//成本中心
-                equipmentcard.set("zcgj_assetcat",assetcat);//资产类别
-
                 BigDecimal finOriginalval = BigDecimal.ZERO;
                 BigDecimal fin_preusingamount = BigDecimal.ZERO;
                 BigDecimal fin_depredamount = BigDecimal.ZERO;
@@ -182,7 +180,7 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
                 if(finentrys.size()>0){
                     DynamicObject finentry = finentrys.get(0);
 //                DynamicObject fincard = finentry.getDynamicObject("fincard");
-                    DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin", new QFilter[]{new QFilter("number", QCP.equals,number)});
+                    DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin_base", new QFilter[]{new QFilter("number", QCP.equals,number)});
                     finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值
                     fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月
                     fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月

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

@@ -23,6 +23,7 @@ import kd.bos.servicehelper.coderule.CodeRuleServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.bos.servicehelper.org.OrgUnitServiceHelper;
+
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -49,7 +50,6 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
                 strings.add(number) ;
             }
         }
-
         QFilter filterOrgId = new QFilter("number", QCP.equals,"10006431");//中材矿山建设有限公司
         DynamicObject adminOrg = BusinessDataServiceHelper.loadSingle("bos_org", "number,name,fullname", new QFilter[]{filterOrgId});
         long orgId = adminOrg.getLong("id");
@@ -70,7 +70,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
         String operationResultErrorInfos = null;
         for (DynamicObject realcard : realcards) {
             String number = realcard.getString("number");//资产编码
-            DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
+//                DynamicObject assetcat = realcard.getDynamicObject("assetcat");//资产类别
             String assetname = realcard.getString("assetname");//资产名称
             log.info("同步的实物卡片为"+number+assetname);
             String model = realcard.getString("model");//规格型号
@@ -145,7 +145,6 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
             equipmentcard.set("zcgj_assetnumber",number);//资产编码
             equipmentcard.set("zcgj_headusedepts",headusedept);//使用部门
             equipmentcard.set("zcgj_costcenters",zcgj_costcenter);//成本中心
-            equipmentcard.set("zcgj_assetcat",assetcat);//资产类别
             BigDecimal finOriginalval = BigDecimal.ZERO;
             BigDecimal fin_preusingamount = BigDecimal.ZERO;
             BigDecimal fin_depredamount = BigDecimal.ZERO;
@@ -155,7 +154,7 @@ public class EquipmentCardTaskPlugin extends AbstractTask {
             if(finentrys.size()>0){
                 DynamicObject finentry = finentrys.get(0);
 //                DynamicObject fincard = finentry.getDynamicObject("fincard");
-                DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin", new QFilter[]{new QFilter("number", QCP.equals,number)});
+                DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin_base", new QFilter[]{new QFilter("number", QCP.equals,number)});
                 finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值
                 fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月
                 fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月