diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java b/src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java index 0326299c..f36e2171 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java @@ -1,7 +1,6 @@ package com.yem.wm.im.csrCreditLine.task; import com.yem.wm.utils.DynamicObjectUtil; -import com.yem.wm.utils.YEM; import kd.bos.context.RequestContext; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; @@ -11,7 +10,6 @@ import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.ZoneId; import java.time.temporal.ChronoUnit; @@ -37,9 +35,9 @@ public class CsrCreditLineTask extends AbstractTask { Date unused = dynamicObject.getDate("yem_unused"); // if (YEM.isNotEmpty(unused)) { // data(dynamicObject, unused, "yem_countdown"); - BigDecimal yemInactivityperiod = dynamicObject.getBigDecimal("yem_inactivityperiod"); - Date date = dynamicObject.getDate("yem_recentlapse"); - recentl(dynamicObject, yemInactivityperiod, date); + BigDecimal yemInactivityperiod = dynamicObject.getBigDecimal("yem_inactivityperiod"); + Date date = dynamicObject.getDate("yem_recentlapse"); + recentl(dynamicObject, yemInactivityperiod, date); // } DynamicObjectCollection collection = dynamicObject.getDynamicObjectCollection("yem_im_info"); for (DynamicObject object : collection) { @@ -65,16 +63,19 @@ public class CsrCreditLineTask extends AbstractTask { public static void recentl(DynamicObject dynamicObject, BigDecimal yemInactivityperiod, Date date) { if (date != null) { if (yemInactivityperiod.compareTo(BigDecimal.ZERO) != 0) { - long daysInMilliseconds = yemInactivityperiod.longValue() * TimeUnit.DAYS.toMillis(1); - Date yemRecentlapse = new Date(date.getTime() + daysInMilliseconds); - dynamicObject.set("yem_unused", yemRecentlapse); - Date newdate = new Date(); - long millisDifference = yemRecentlapse.getTime() - newdate.getTime(); - long daysDifference = TimeUnit.MILLISECONDS.toDays(millisDifference); - BigDecimal bigDecimalDaysDifference = BigDecimal.valueOf(daysDifference); - dynamicObject.set("yem_countdown", bigDecimalDaysDifference.add(BigDecimal.ONE)); + BigDecimal yemSumamountowed = dynamicObject.getBigDecimal("yem_sumamountowed"); + if (yemSumamountowed.compareTo(BigDecimal.ZERO) != 0) { + long daysInMilliseconds = yemInactivityperiod.longValue() * TimeUnit.DAYS.toMillis(1); + Date yemRecentlapse = new Date(date.getTime() + daysInMilliseconds); + dynamicObject.set("yem_unused", yemRecentlapse); + Date newdate = new Date(); + long millisDifference = yemRecentlapse.getTime() - newdate.getTime(); + long daysDifference = TimeUnit.MILLISECONDS.toDays(millisDifference); + BigDecimal bigDecimalDaysDifference = BigDecimal.valueOf(daysDifference); + dynamicObject.set("yem_countdown", bigDecimalDaysDifference.add(BigDecimal.ONE)); // } else { // csrcreditline.set("yem_unused", yemRecentlapse); + } } } } diff --git a/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java b/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java index f70a5c7e..af773bcb 100644 --- a/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java +++ b/src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java @@ -900,6 +900,7 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be } date.set("yem_materielg", dynamicObject.getDynamicObject("yem_materiel")); + date.set("yem_qtyq", dynamicObject.getDynamicObject("yem_qtyq1")); date.set("yem_stockqty", dynamicObject.getBigDecimal("yem_nqty"));//备料数量 date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位 date.set("yem_stockbaseunit", dynamicObject.getDynamicObject("yem_baseunit"));//基本计量单位