From 9caa641a6acb419ef441368a54be2031a4c3e8f6 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Wed, 19 Feb 2025 17:15:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E5=85=A8=E9=83=A8=E5=9B=9Ei?= =?UTF-8?q?=E6=AC=BE=E4=BA=86=EF=BC=8C=E5=80=92=E8=AE=A1=E6=97=B6=E8=BF=98?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E5=9C=A8=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=8F=A6?= =?UTF-8?q?=E5=A4=96=E8=83=BD=E4=B8=8D=E8=83=BD=E6=9C=AA=E8=B6=85=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=AD=A3=E6=95=B0=EF=BC=8C=E8=B6=85?= =?UTF-8?q?=E6=9C=9F=E7=9A=84=E6=98=BE=E7=A4=BA=E8=B4=9F=E6=95=B0=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=203.=E5=BA=93=E5=8C=BA=E3=80=81?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E8=B0=83=E5=BA=A6=E8=AE=A1=E5=88=92=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96CMMP=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8CCMMP=E6=A0=B9=E6=8D=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E5=BA=93=E5=8C=BA=E5=92=8C?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=B8=8D=E4=B8=80=E5=AE=9A=E4=BB=80=E4=B9=88?= =?UTF-8?q?=E6=97=B6=E5=80=99=E4=BC=9A=E6=96=B0=E5=A2=9E=EF=BC=8C=E8=BF=99?= =?UTF-8?q?=E8=BE=B9=E9=9C=80=E8=A6=81=E8=83=BD=E8=8E=B7=E5=8F=96=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E5=8F=AA=E8=8E=B7=E5=8F=96=E6=96=B0=E5=A2=9E=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=AF=8F=E5=A4=A9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?=E5=89=8D24=E5=B0=8F=E6=97=B6=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csrCreditLine/task/CsrCreditLineTask.java | 19 ++++++++++++------- .../form/tracktaskconsoleFormPlugIn.java | 4 +++- .../com/yem/wm/task/SynWareAreaCMMPTask.java | 2 +- .../yem/wm/task/SynWhLocationCMMPTask.java | 3 +-- 4 files changed, 17 insertions(+), 11 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 f36e2171..4ebff7fe 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 @@ -41,9 +41,12 @@ public class CsrCreditLineTask extends AbstractTask { // } DynamicObjectCollection collection = dynamicObject.getDynamicObjectCollection("yem_im_info"); for (DynamicObject object : collection) { - Date receivableDate = object.getDate("yem_paydate1"); - if (receivableDate == null) continue; - daysBetween(object, receivableDate, "yem_countpayback"); + BigDecimal yemAmountowed = object.getBigDecimal("yem_amountowed"); + if (yemAmountowed.compareTo(yemInactivityperiod) > 0) { + Date receivableDate = object.getDate("yem_paydate1"); + if (receivableDate == null) continue; + daysBetween(object, receivableDate, "yem_countpayback"); + } } } SaveServiceHelper.save(csrcreditlines); @@ -52,10 +55,12 @@ public class CsrCreditLineTask extends AbstractTask { for (DynamicObject storagetran : storagetrans) { DynamicObjectCollection collection = storagetran.getDynamicObjectCollection("yem_creditdetail"); for (DynamicObject object : collection) { + BigDecimal yemAmountowed = object.getBigDecimal("yem_amountowed"); + if(yemAmountowed.compareTo(BigDecimal.ZERO) > 0){ Date receivableDate = object.getDate("yem_paydate1"); if (receivableDate == null) continue; daysBetween(object, receivableDate, "yem_countpayback"); - } + }} } SaveServiceHelper.save(storagetrans); } @@ -63,8 +68,8 @@ public class CsrCreditLineTask extends AbstractTask { public static void recentl(DynamicObject dynamicObject, BigDecimal yemInactivityperiod, Date date) { if (date != null) { if (yemInactivityperiod.compareTo(BigDecimal.ZERO) != 0) { - BigDecimal yemSumamountowed = dynamicObject.getBigDecimal("yem_sumamountowed"); - if (yemSumamountowed.compareTo(BigDecimal.ZERO) != 0) { +// 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); @@ -75,7 +80,7 @@ public class CsrCreditLineTask extends AbstractTask { 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 af773bcb..d3f2014d 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,7 +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_qtyq1", dynamicObject.getString("yem_qtyq")); date.set("yem_stockqty", dynamicObject.getBigDecimal("yem_nqty"));//备料数量 date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位 date.set("yem_stockbaseunit", dynamicObject.getDynamicObject("yem_baseunit"));//基本计量单位 @@ -932,6 +932,7 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be } salesorder.set("yem_materielg", dynamicObject.getDynamicObject("yem_materiel")); + salesorder.set("yem_qtyq1", dynamicObject.getString("yem_qtyq")); salesorder.set("yem_stockqty", dynamicObject.getBigDecimal("yem_nqty"));//备料数量 salesorder.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位 salesorder.set("yem_stockbaseunit", dynamicObject.getDynamicObject("yem_baseunit"));//基本计量单位 @@ -1033,6 +1034,7 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be // 预计完成时间 date.set("yem_yieldetacdate", this.getModel().getValue("yem_yieldetacdate")); date.set("yem_entrtyid", dynamicObject.getLong("yem_entrtyid")); + date.set("yem_qtyq1", dynamicObject.getLong("yem_qtyq")); date.set("yem_materielg", dynamicObject.getDynamicObject("yem_materielg")); date.set("yem_stockqty", nqty);//备料数量 date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_stockunit"));//计量单位 diff --git a/src/main/java/com/yem/wm/task/SynWareAreaCMMPTask.java b/src/main/java/com/yem/wm/task/SynWareAreaCMMPTask.java index 02064368..5dca4724 100644 --- a/src/main/java/com/yem/wm/task/SynWareAreaCMMPTask.java +++ b/src/main/java/com/yem/wm/task/SynWareAreaCMMPTask.java @@ -42,7 +42,7 @@ public class SynWareAreaCMMPTask extends AbstractTask { if (!"true".equals(isInit)) { Date dateed = new Date(); dateed = DateUtils.getBeginTime(dateed); - Date datebg = DateUtils.getAddDay(dateed, -2); + Date datebg = DateUtils.getAddDay(dateed, -1); dateed = DateUtils.getEndTime(dateed); sql.append(" and plmlastupdate>=to_date('" + DateUtils.formatString(datebg) + "','yyyy-mm-dd')" + " and plmlastupdate<=to_date('" + DateUtils.formatString(dateed) + "','yyyy-mm-dd')"); } diff --git a/src/main/java/com/yem/wm/task/SynWhLocationCMMPTask.java b/src/main/java/com/yem/wm/task/SynWhLocationCMMPTask.java index 5d5452fd..20feadab 100644 --- a/src/main/java/com/yem/wm/task/SynWhLocationCMMPTask.java +++ b/src/main/java/com/yem/wm/task/SynWhLocationCMMPTask.java @@ -20,7 +20,6 @@ import kd.bos.schedule.executor.AbstractTask; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.operation.OperationServiceHelper; -import kd.bos.servicehelper.operation.SaveServiceHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +48,7 @@ public class SynWhLocationCMMPTask extends AbstractTask { if (!"true".equals(isInit)) { Date dateed = new Date(); dateed = DateUtils.getBeginTime(dateed); - Date datebg = DateUtils.getAddDay(dateed, -2); + Date datebg = DateUtils.getAddDay(dateed, -1); dateed = DateUtils.getEndTime(dateed); sql.append(" and plmlastupdate>=to_date('" + DateUtils.formatString(datebg) + "','yyyy-mm-dd')" + " and plmlastupdate<=to_date('" + DateUtils.formatString(dateed) + "','yyyy-mm-dd')"); }