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

fix：

Browse Source 
1.接1060行，全部回i款了，倒计时还一直在更新，另外能不能未超期的显示正数，超期的显示负数
  --检查定时任务更新逻辑，负数正数逻辑暂不处理
2.跟单任务控制台执行备料时，其他要求字段从商品明细携带到备料信息
This commit is contained in:
25655 2025-02-18 17:56:51 +08:00
parent 02ce990a09
commit c9caeb4469
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package com.yem.wm.im.csrCreditLine.task; package com.yem.wm.im.csrCreditLine.task;
import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.YEM;
import kd.bos.context.RequestContext; import kd.bos.context.RequestContext;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.dataentity.entity.DynamicObjectCollection;
@ -11,7 +10,6 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
@ -37,9 +35,9 @@ public class CsrCreditLineTask extends AbstractTask {
Date unused = dynamicObject.getDate("yem_unused"); Date unused = dynamicObject.getDate("yem_unused");
// if (YEM.isNotEmpty(unused)) { // if (YEM.isNotEmpty(unused)) {
// data(dynamicObject, unused, "yem_countdown"); // data(dynamicObject, unused, "yem_countdown");
BigDecimal yemInactivityperiod = dynamicObject.getBigDecimal("yem_inactivityperiod"); BigDecimal yemInactivityperiod = dynamicObject.getBigDecimal("yem_inactivityperiod");
Date date = dynamicObject.getDate("yem_recentlapse"); Date date = dynamicObject.getDate("yem_recentlapse");
recentl(dynamicObject, yemInactivityperiod, date); recentl(dynamicObject, yemInactivityperiod, date);
// } // }
DynamicObjectCollection collection = dynamicObject.getDynamicObjectCollection("yem_im_info"); DynamicObjectCollection collection = dynamicObject.getDynamicObjectCollection("yem_im_info");
for (DynamicObject object : collection) { for (DynamicObject object : collection) {
@ -65,16 +63,19 @@ 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) {
long daysInMilliseconds = yemInactivityperiod.longValue() * TimeUnit.DAYS.toMillis(1); BigDecimal yemSumamountowed = dynamicObject.getBigDecimal("yem_sumamountowed");
Date yemRecentlapse = new Date(date.getTime() + daysInMilliseconds); if (yemSumamountowed.compareTo(BigDecimal.ZERO) != 0) {
dynamicObject.set("yem_unused", yemRecentlapse); long daysInMilliseconds = yemInactivityperiod.longValue() * TimeUnit.DAYS.toMillis(1);
Date newdate = new Date(); Date yemRecentlapse = new Date(date.getTime() + daysInMilliseconds);
long millisDifference = yemRecentlapse.getTime() - newdate.getTime(); dynamicObject.set("yem_unused", yemRecentlapse);
long daysDifference = TimeUnit.MILLISECONDS.toDays(millisDifference); Date newdate = new Date();
BigDecimal bigDecimalDaysDifference = BigDecimal.valueOf(daysDifference); long millisDifference = yemRecentlapse.getTime() - newdate.getTime();
dynamicObject.set("yem_countdown", bigDecimalDaysDifference.add(BigDecimal.ONE)); long daysDifference = TimeUnit.MILLISECONDS.toDays(millisDifference);
BigDecimal bigDecimalDaysDifference = BigDecimal.valueOf(daysDifference);
dynamicObject.set("yem_countdown", bigDecimalDaysDifference.add(BigDecimal.ONE));
// } else { // } else {
// csrcreditline.set("yem_unused", yemRecentlapse); // csrcreditline.set("yem_unused", yemRecentlapse);
}
} }
} }
} }

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

@ -900,6 +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_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"));//基本计量单位