From c9caeb4469840040116346ea89407d0e6224d331 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Tue, 18 Feb 2025 17:56:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E6=8E=A51060=E8=A1=8C?= =?UTF-8?q?=EF=BC=8C=E5=85=A8=E9=83=A8=E5=9B=9Ei=E6=AC=BE=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E5=80=92=E8=AE=A1=E6=97=B6=E8=BF=98=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E5=9C=A8=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=8F=A6=E5=A4=96=E8=83=BD?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=9C=AA=E8=B6=85=E6=9C=9F=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=AD=A3=E6=95=B0=EF=BC=8C=E8=B6=85=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B4=9F=E6=95=B0=20=20=20--=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B4=9F=E6=95=B0=E6=AD=A3=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9A=82=E4=B8=8D=E5=A4=84=E7=90=86=202.?= =?UTF-8?q?=E8=B7=9F=E5=8D=95=E4=BB=BB=E5=8A=A1=E6=8E=A7=E5=88=B6=E5=8F=B0?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=87=E6=96=99=E6=97=B6=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E8=A6=81=E6=B1=82=E5=AD=97=E6=AE=B5=E4=BB=8E=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=98=8E=E7=BB=86=E6=90=BA=E5=B8=A6=E5=88=B0=E5=A4=87?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csrCreditLine/task/CsrCreditLineTask.java | 27 ++++++++++--------- .../form/tracktaskconsoleFormPlugIn.java | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) 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"));//基本计量单位