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 d24b0cc..84a212e 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 @@ -182,7 +182,15 @@ 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)}); + BigDecimal depredamount = BigDecimal.ZERO; + DynamicObject[] fincards = BusinessDataServiceHelper.load("fa_card_fin","id,depredamount" ,new QFilter[]{new QFilter("number", QCP.equals,number)}); + for (DynamicObject fincard : fincards) { + BigDecimal decimal = fincard.getBigDecimal("depredamount"); + if (decimal.compareTo(depredamount)==1){ + depredamount = decimal; + } + } + DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin", new QFilter[]{new QFilter("number", QCP.equals,number),new QFilter("depredamount", QCP.equals,depredamount)}); finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值 fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月 fin_depredamount = fincardInfo.getBigDecimal("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 2a0a0df..f826efe 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 @@ -155,7 +155,15 @@ 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)}); + BigDecimal depredamount = BigDecimal.ZERO; + DynamicObject[] fincards = BusinessDataServiceHelper.load("fa_card_fin","id,depredamount" ,new QFilter[]{new QFilter("number", QCP.equals,number)}); + for (DynamicObject fincard : fincards) { + BigDecimal decimal = fincard.getBigDecimal("depredamount"); + if (decimal.compareTo(depredamount)==1){ + depredamount = decimal; + } + } + DynamicObject fincardInfo = BusinessDataServiceHelper.loadSingle("fa_card_fin", new QFilter[]{new QFilter("number", QCP.equals,number),new QFilter("depredamount", QCP.equals,depredamount)}); finOriginalval = fincardInfo.getBigDecimal("originalval");//资产原值 fin_preusingamount = fincardInfo.getBigDecimal("preusingamount");//预计使用月 fin_depredamount = fincardInfo.getBigDecimal("depredamount");//已折旧月