violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：

Browse Source 
1.全部回i款了，倒计时还一直在更新，另外能不能未超期的显示正数，超期的显示负数
2.跟单任务控制台执行备料时，其他要求字段从商品明细携带到备料信息
3.库区、库位调度计划可以定时获取CMMP数据，CMMP根据仓库业务管理库区和库位不一定什么时候会新增，这边需要能获取新增的数据。执行时只获取新增的数据，可以每天获取修改时间为前24小时的数据。
This commit is contained in:
25655 2025-02-19 17:15:11 +08:00
parent 4aee1db12b
commit 9caa641a6a
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
View File

@ -41,21 +41,26 @@ public class CsrCreditLineTask extends AbstractTask {
// } // }
DynamicObjectCollection collection = dynamicObject.getDynamicObjectCollection("yem_im_info"); DynamicObjectCollection collection = dynamicObject.getDynamicObjectCollection("yem_im_info");
for (DynamicObject object : collection) { for (DynamicObject object : collection) {
BigDecimal yemAmountowed = object.getBigDecimal("yem_amountowed");
if (yemAmountowed.compareTo(yemInactivityperiod) > 0) {
Date receivableDate = object.getDate("yem_paydate1"); Date receivableDate = object.getDate("yem_paydate1");
if (receivableDate == null) continue; if (receivableDate == null) continue;
daysBetween(object, receivableDate, "yem_countpayback"); daysBetween(object, receivableDate, "yem_countpayback");
} }
} }
}
SaveServiceHelper.save(csrcreditlines); SaveServiceHelper.save(csrcreditlines);
DynamicObject[] storagetrans = BusinessDataServiceHelper.load("yem_es_storagetrans", "id, billno, yem_creditdetail, yem_creditdetail.yem_paydate1, yem_creditdetail.yem_countpayback", null); DynamicObject[] storagetrans = BusinessDataServiceHelper.load("yem_es_storagetrans", "id, billno, yem_creditdetail, yem_creditdetail.yem_paydate1, yem_creditdetail.yem_countpayback", null);
for (DynamicObject storagetran : storagetrans) { for (DynamicObject storagetran : storagetrans) {
DynamicObjectCollection collection = storagetran.getDynamicObjectCollection("yem_creditdetail"); DynamicObjectCollection collection = storagetran.getDynamicObjectCollection("yem_creditdetail");
for (DynamicObject object : collection) { for (DynamicObject object : collection) {
BigDecimal yemAmountowed = object.getBigDecimal("yem_amountowed");
if(yemAmountowed.compareTo(BigDecimal.ZERO) > 0){
Date receivableDate = object.getDate("yem_paydate1"); Date receivableDate = object.getDate("yem_paydate1");
if (receivableDate == null) continue; if (receivableDate == null) continue;
daysBetween(object, receivableDate, "yem_countpayback"); daysBetween(object, receivableDate, "yem_countpayback");
} }}
} }
SaveServiceHelper.save(storagetrans); SaveServiceHelper.save(storagetrans);
} }
@ -63,8 +68,8 @@ public class CsrCreditLineTask extends AbstractTask {
public static void recentl(DynamicObject dynamicObject, BigDecimal yemInactivityperiod, Date date) { public static void recentl(DynamicObject dynamicObject, BigDecimal yemInactivityperiod, Date date) {
if (date != null) { if (date != null) {
if (yemInactivityperiod.compareTo(BigDecimal.ZERO) != 0) { if (yemInactivityperiod.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal yemSumamountowed = dynamicObject.getBigDecimal("yem_sumamountowed"); // BigDecimal yemSumamountowed = dynamicObject.getBigDecimal("yem_sumamountowed");
if (yemSumamountowed.compareTo(BigDecimal.ZERO) != 0) { // if (yemSumamountowed.compareTo(BigDecimal.ZERO) != 0) {
long daysInMilliseconds = yemInactivityperiod.longValue() * TimeUnit.DAYS.toMillis(1); long daysInMilliseconds = yemInactivityperiod.longValue() * TimeUnit.DAYS.toMillis(1);
Date yemRecentlapse = new Date(date.getTime() + daysInMilliseconds); Date yemRecentlapse = new Date(date.getTime() + daysInMilliseconds);
dynamicObject.set("yem_unused", yemRecentlapse); dynamicObject.set("yem_unused", yemRecentlapse);
@ -75,7 +80,7 @@ public class CsrCreditLineTask extends AbstractTask {
dynamicObject.set("yem_countdown", bigDecimalDaysDifference.add(BigDecimal.ONE)); dynamicObject.set("yem_countdown", bigDecimalDaysDifference.add(BigDecimal.ONE));
// } else { // } else {
// csrcreditline.set("yem_unused", yemRecentlapse); // csrcreditline.set("yem_unused", yemRecentlapse);
} // }
} }
} }
} }

4
src/main/java/com/yem/wm/im/tracktaskconsole/form/tracktaskconsoleFormPlugIn.java
View File

@ -900,7 +900,7 @@ public class tracktaskconsoleFormPlugIn extends AbstractBillPlugIn implements Be
} }
date.set("yem_materielg", dynamicObject.getDynamicObject("yem_materiel")); 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_stockqty", dynamicObject.getBigDecimal("yem_nqty"));//备料数量
date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位 date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位
date.set("yem_stockbaseunit", dynamicObject.getDynamicObject("yem_baseunit"));//基本计量单位 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_materielg", dynamicObject.getDynamicObject("yem_materiel"));
salesorder.set("yem_qtyq1", dynamicObject.getString("yem_qtyq"));
salesorder.set("yem_stockqty", dynamicObject.getBigDecimal("yem_nqty"));//备料数量 salesorder.set("yem_stockqty", dynamicObject.getBigDecimal("yem_nqty"));//备料数量
salesorder.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位 salesorder.set("yem_stockunit", dynamicObject.getDynamicObject("yem_unit"));//计量单位
salesorder.set("yem_stockbaseunit", dynamicObject.getDynamicObject("yem_baseunit"));//基本计量单位 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_yieldetacdate", this.getModel().getValue("yem_yieldetacdate"));
date.set("yem_entrtyid", dynamicObject.getLong("yem_entrtyid")); 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_materielg", dynamicObject.getDynamicObject("yem_materielg"));
date.set("yem_stockqty", nqty);//备料数量 date.set("yem_stockqty", nqty);//备料数量
date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_stockunit"));//计量单位 date.set("yem_stockunit", dynamicObject.getDynamicObject("yem_stockunit"));//计量单位

2
src/main/java/com/yem/wm/task/SynWareAreaCMMPTask.java
View File

@ -42,7 +42,7 @@ public class SynWareAreaCMMPTask extends AbstractTask {
if (!"true".equals(isInit)) { if (!"true".equals(isInit)) {
Date dateed = new Date(); Date dateed = new Date();
dateed = DateUtils.getBeginTime(dateed); dateed = DateUtils.getBeginTime(dateed);
Date datebg = DateUtils.getAddDay(dateed, -2); Date datebg = DateUtils.getAddDay(dateed, -1);
dateed = DateUtils.getEndTime(dateed); 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')"); sql.append(" and plmlastupdate>=to_date('" + DateUtils.formatString(datebg) + "','yyyy-mm-dd')" + " and plmlastupdate<=to_date('" + DateUtils.formatString(dateed) + "','yyyy-mm-dd')");
} }

3
src/main/java/com/yem/wm/task/SynWhLocationCMMPTask.java
View File

@ -20,7 +20,6 @@ import kd.bos.schedule.executor.AbstractTask;
import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.QueryServiceHelper;
import kd.bos.servicehelper.operation.OperationServiceHelper; import kd.bos.servicehelper.operation.OperationServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -49,7 +48,7 @@ public class SynWhLocationCMMPTask extends AbstractTask {
if (!"true".equals(isInit)) { if (!"true".equals(isInit)) {
Date dateed = new Date(); Date dateed = new Date();
dateed = DateUtils.getBeginTime(dateed); dateed = DateUtils.getBeginTime(dateed);
Date datebg = DateUtils.getAddDay(dateed, -2); Date datebg = DateUtils.getAddDay(dateed, -1);
dateed = DateUtils.getEndTime(dateed); 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')"); sql.append(" and plmlastupdate>=to_date('" + DateUtils.formatString(datebg) + "','yyyy-mm-dd')" + " and plmlastupdate<=to_date('" + DateUtils.formatString(dateed) + "','yyyy-mm-dd')");
} }