Commit d0d2619a authored by 332784038@qq.com's avatar 332784038@qq.com

已预装未提交预装审核的订单补充出货状态更新冗余

parent 919da54c
...@@ -355,7 +355,6 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM ...@@ -355,7 +355,6 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
} }
preloadGoodsDOList.add(boxPreloadGoods); preloadGoodsDOList.add(boxPreloadGoods);
} }
// 插入 // 插入
boxPreloadGoodsMapper.insertBatch(preloadGoodsDOList); boxPreloadGoodsMapper.insertBatch(preloadGoodsDOList);
...@@ -363,6 +362,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM ...@@ -363,6 +362,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
//修改为预装中 //修改为预装中
boxDO.setPrStatus(PrStatusEnum.PRELOAD_ING.getPrStatus()); boxDO.setPrStatus(PrStatusEnum.PRELOAD_ING.getPrStatus());
boxService.updateById(boxDO); boxService.updateById(boxDO);
for (Long oId : orderIdList) {
boxService.updateOrderStatus(oId, null, null,
BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
}
boxService.addOrderLog(orderIdList, OrderShipmentLog.PRELOAD_ADD, ""); boxService.addOrderLog(orderIdList, OrderShipmentLog.PRELOAD_ADD, "");
} else if (boxDO.getPrStatus() == PrStatusEnum.PRELOAD_APPROVAL_SUCCESS.getPrStatus()) { } else if (boxDO.getPrStatus() == PrStatusEnum.PRELOAD_APPROVAL_SUCCESS.getPrStatus()) {
//补单。修改订单状态 //补单。修改订单状态
...@@ -370,12 +373,14 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM ...@@ -370,12 +373,14 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
boxService.updateOrderStatus(oId, OrderStatusEnum.PRE_INSTALLED.getValue(), 0, boxService.updateOrderStatus(oId, OrderStatusEnum.PRE_INSTALLED.getValue(), 0,
BoxStatusEnum.PREINSTALL_EXAMINE_SUCCESS.getStatus(), null, null, Boolean.FALSE); BoxStatusEnum.PREINSTALL_EXAMINE_SUCCESS.getStatus(), null, null, Boolean.FALSE);
} }
//生成提单号 //生成提单号
boxService.generateBillLadingNo(shipmentId, false, false); boxService.generateBillLadingNo(shipmentId, false, false);
boxService.addOrderLog(orderIdList, OrderShipmentLog.CABINET_PATCH, ""); boxService.addOrderLog(orderIdList, OrderShipmentLog.CABINET_PATCH, "");
} else { } else {
for (Long oId : orderIdList) {
boxService.updateOrderStatus(oId, null, null,
BoxStatusEnum.PREINSTALLING.getStatus(), null, null, Boolean.FALSE);
}
boxService.addOrderLog(orderIdList, OrderShipmentLog.PRELOAD_ADD, ""); boxService.addOrderLog(orderIdList, OrderShipmentLog.PRELOAD_ADD, "");
} }
......
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