wms / wms4_hefeijingke · Commits

Commit 653ed5e64ab3b61873d051e400e33b40a1dac64d

Authored by 谭毅彬
1 parent 55b8f0b4

波次定时任务优化 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 1 changed file with 5 additions and 6 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoCreateWaveConfigTask.java
  View file @653ed5e
... ... @@ -58,16 +58,16 @@ public class AutoCreateWaveConfigTask implements Job {
58 58 shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getWaveConfigId, waveConfig.getId()).orderByDesc(ShipmentHeader::getId);
59 59 List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
60 60 if (!shipmentHeaderList.isEmpty()) {
61   - List<ShipmentHeader> uncompleteShipmentHeader =
  61 + List<ShipmentHeader> uncompleteShipmentHeaderList =
62 62 shipmentHeaderList.stream().filter(t -> t.getLastStatus() < QuantityConstant.SHIPMENT_HEADER_COMPLETED).collect(Collectors.toList());
63   - if (!CollectionUtils.isEmpty(uncompleteShipmentHeader)) {
  63 + if (!CollectionUtils.isEmpty(uncompleteShipmentHeaderList)) {
64 64 log.info("波次ID：{} 波次任务正在进行中，结束波次生成", waveConfig.getId());
65 65 continue;
66 66 }
67 67 ShipmentHeader lastShipmentHeader = shipmentHeaderList.get(0);
68   - Long betweenSecond = DateUtil.between(lastShipmentHeader.getCreateTime(), new Date(), DateUnit.SECOND);
69   - if (betweenSecond < waveConfig.getWaveCycle()) {
70   - log.info("波次ID：{} 波次周期：{}（秒），当前周期：{}（秒），结束波次生成", waveConfig.getId(), waveConfig.getWaveCycle(), betweenSecond);
  68 + Long currentCycle = DateUtil.between(lastShipmentHeader.getCreateTime(), new Date(), DateUnit.SECOND);
  69 + if (currentCycle < waveConfig.getWaveCycle()) {
  70 + log.info("波次ID：{} 波次周期：{}（秒），当前周期：{}（秒），结束波次生成", waveConfig.getId(), waveConfig.getWaveCycle(), currentCycle);
71 71 continue;
72 72 }
73 73 }
... ... @@ -80,7 +80,6 @@ public class AutoCreateWaveConfigTask implements Job {
80 80 }
81 81 try {
82 82 shipmentHeaderService.createShipment(waveConfig, waveConfigDetailList);
83   -
84 83 } catch (Exception e) {
85 84 log.error("波次ID：{} 下发任务异常，waveConfig：{}", waveConfig.getId(), JSON.toJSONString(waveConfig), e);
86 85 }
... ...