From 0af11f6f6ceb86a7e9847fe7ef4c5a6a0aafeaa1 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 18 May 2024 01:00:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=95=86=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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..5cc909231 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,16 @@ 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()); + stockupDTO.setMallName(byId1.getMallName()); + } + + // 2打印处理的扫码 // 查询当前库位上最早入库的指定物料库存品 byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getCargoNumber(),stockupDTO.getAllocationId(),stockupDTO.getMallName()); From c1814315e3e29f88918f28df58f2bdd9d9846c33 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 18 May 2024 01:01:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=95=86=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appcontroller/DistributionStockupAppController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5cc909231..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 @@ -1173,7 +1173,9 @@ public class DistributionStockupAppController extends BladeController { if(ObjectUtils.isNull(stockupDTO.getMallName())){ // 查询出来 重新复制 DistributionStockListEntity byId1 = distributionStockListService.getById(stockupDTO.getStockListId()); - stockupDTO.setMallName(byId1.getMallName()); + if(!ObjectUtils.isNull(byId1)){ + stockupDTO.setMallName(byId1.getMallName()); + } }