diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index cc68fd571..d6c3f698b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -618,13 +618,17 @@ public class StockInOrderApplicationService { //上架任务下发 StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO(); - Long inOrderId = stockInOrderDO.getInOrderId(); - StockInOrder stockInOrder = stockInOrderService.getById(inOrderId); - stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId()); - List ids = new ArrayList<>(); - ids.add(stockShelfOrder.getShelfOrderId()); - stockShelfOrderDO.setShelfOrderIds(ids); - stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); + String inOrderId = stockInOrderDO.getInOrderNumber(); + StockInOrder stockInOrder = stockInOrderService.getOne(new LambdaQueryWrapper() + .eq(StockInOrder::getInOrderNumber, inOrderId) + .eq(StockInOrder::getDelFlag,1) ,false); + if (stockInOrder != null) { + stockShelfOrderDO.setOperatorsBy(stockInOrder.getWorkUserId()); + List ids = new ArrayList<>(); + ids.add(stockShelfOrder.getShelfOrderId()); + stockShelfOrderDO.setShelfOrderIds(ids); + stockShelfOrderApplicationService.taskDistribution(stockShelfOrderDO); + } //完成上架 Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId());