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')"); }