Commit 73dd431f authored by zhengyi's avatar zhengyi

入仓动态业务时间逻辑修改,移除预装导致订单重新入仓时不再对订单动态业务时间进行重置

parent f2af5d64
...@@ -3799,6 +3799,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3799,6 +3799,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.equals(OrderStatusEnum.IN_WAREHOUSE.getValue(), status)) { if (Objects.equals(OrderStatusEnum.IN_WAREHOUSE.getValue(), status)) {
// 每次更新已入仓状态的同时,刷新入仓动态 // 每次更新已入仓状态的同时,刷新入仓动态
Long timeId = null; Long timeId = null;
Date businessTime = null;
currentOrderDO.setLastTimeTotalNum(0); currentOrderDO.setLastTimeTotalNum(0);
if (Objects.nonNull(hasExit) && hasExit == 1) { if (Objects.nonNull(hasExit) && hasExit == 1) {
// 部分退场入仓 // 部分退场入仓
...@@ -3814,14 +3815,15 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3814,14 +3815,15 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (CollectionUtil.isNotEmpty(orderTimeDOS) && orderTimeDOS.size() > 0) { if (CollectionUtil.isNotEmpty(orderTimeDOS) && orderTimeDOS.size() > 0) {
OrderTimeDO timeDO = orderTimeDOS.get(0); OrderTimeDO timeDO = orderTimeDOS.get(0);
timeId = timeDO.getId(); timeId = timeDO.getId();
businessTime = timeDO.getBusinessTime();
currentOrderDO.setLastTimeTotalNum(timeDO.getTotalNum()); currentOrderDO.setLastTimeTotalNum(timeDO.getTotalNum());
} }
if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) { if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null, null, null, null, timeId); orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null, null, businessTime, null, timeId);
} else if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) { } else if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) {
if (currentOrderDO.getLastTimeTotalNum() != currentOrderDO.getSumNum()) { if (currentOrderDO.getLastTimeTotalNum() != currentOrderDO.getSumNum()) {
// 当有入仓箱数变化时才做动态更新 // 当有入仓箱数变化时才做动态更新
orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null, null, null, null, timeId); orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null, null, businessTime, null, timeId);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment