diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index a39195c45..f97264647 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1139,6 +1139,7 @@ public class DistributionStockupAppController extends BladeController { log.warn("##################stockupScan: 库存品扫码,包件码为空"); return R.fail("库存品扫码:包件码不能为空"); } + if (ObjectUtils.isNull(stockupId)) { log.warn("##################stockupScan: 库存品扫码,备货区为空"); return R.fail("库存品扫码:备货任务ID不能为空"); @@ -1166,8 +1167,18 @@ public class DistributionStockupAppController extends BladeController { if (stockupDTO.getStockPrint() == 1) { //1 原有包条 byId = distributionStockListService.selectStockInforByOrderPackageCode(stockupDTO.getPacketBarCode()); - } - else { + } else { + + // 判断stockupDTO.getMallName() 是否存在 + if(ObjectUtils.isNull(stockupDTO.getMallName())){ + // 查询出来 重新复制 + DistributionStockListEntity byId1 = distributionStockListService.getById(stockupDTO.getStockListId()); + if(!ObjectUtils.isNull(byId1)){ + stockupDTO.setMallName(byId1.getMallName()); + } + } + + // 2打印处理的扫码 // 查询当前库位上最早入库的指定物料库存品 byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getCargoNumber(),stockupDTO.getAllocationId(),stockupDTO.getMallName());