From 5a47d42c3372ae5605c212ad70e8d082bd3b3d1e Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Fri, 20 Mar 2026 10:58:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=89=B9=E6=AC=A1=E5=B7=AE=E5=BC=82null?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LocationTransferController.java | 12 +++++----- .../controller/ScanRecordController.java | 22 ++++++++++++++++--- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java index 7e157937..ec544fdc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java @@ -136,11 +136,13 @@ public class LocationTransferController extends BaseController { .collect(Collectors.toList()).size(); VUtil.trueThrowBusinessError(count2 > 0).throwMessage("存在不同仓库的二维码"); - boolean hasDuplicates1 = allQcMasters.stream() - .map(WmsQrCodeMaster::getBarcodeCode) - .collect(Collectors.toSet()) - .size() != request.getItems().size(); - VUtil.trueThrowBusinessError(!hasDuplicates1).throwMessage("存在同时扫箱码和箱中物料码的情况"); + + +// boolean hasDuplicates1 = allQcMasters.stream() +// .map(WmsQrCodeMaster::getBarcodeCode) +// .collect(Collectors.toSet()) +// .size() != request.getItems().size(); +// VUtil.trueThrowBusinessError(!hasDuplicates1).throwMessage("存在同时扫箱码和箱中物料码的情况"); List transferOrders = new ArrayList<>(); List outBoundInventory = new ArrayList<>(); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java index b3e30cac..06762e7d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java @@ -138,14 +138,30 @@ public class ScanRecordController extends BaseController { v.stream() .collect(Collectors.groupingBy(OutMaterialScanRecord::getKey9)) .forEach((key, vv) -> { + List keyParts = StrUtil.split(key, "|"); + String scanBatchNo = ""; + if (keyParts.size() > 1) { + scanBatchNo = "null".equals(keyParts.get(1)) ? "" : keyParts.get(1); + } + String scanSerialNo = ""; + if (keyParts.size() > 2) { + scanSerialNo = "null".equals(keyParts.get(2)) ? "" : keyParts.get(2); + } + String scanBinNo = ""; + if (keyParts.size() > 3) { + scanBinNo = keyParts.get(3); + } vo.getItems().add(new OutDifferenceItemVO() .setRecommendbatchNo("") .setRecommendSerialNo("") .setRecommendBinNo("") // .setRecommendNum(BigDecimal.ZERO) - .setScanBatchNo(StrUtil.split(key, "|").get(1)) - .setScanSerialNo(StrUtil.split(key, "|").get(2)) - .setScanBinNo(StrUtil.split(key, "|").get(3)) +// .setScanBatchNo(StrUtil.split(key, "|").get(1)) +// .setScanSerialNo(StrUtil.split(key, "|").get(2)) +// .setScanBinNo(StrUtil.split(key, "|").get(3)) + .setScanBatchNo(scanBatchNo) + .setScanSerialNo(scanSerialNo) + .setScanBinNo(scanBinNo) .setScanNum(vv.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))); }); }); From a799e83553204086d279dcc7f910aba443c81904 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Fri, 20 Mar 2026 11:22:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=EF=BC=88PDA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=89=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TransferFactoryController.java | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 3b63643f..3dcf8626 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -252,14 +252,30 @@ public class TransferFactoryController extends BaseController { .setCreateBy(UserUtil.getUserName()) .setCreateTime(LocalDateTime.now()); List ticketItems = new ArrayList<>(); - List qrCodeMasters = qrCodeMasterService.lambdaQuery() - .eq(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) - .in(WmsQrCodeMaster::getBarcodeCode, request.getItems().stream() - .map(OutProduceSubmitItemQO::getQrCodes) - .flatMap(Collection::stream) - .toList() - ) - .list(); +// List qrCodeMasters = qrCodeMasterService.lambdaQuery() +// .eq(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) +// .in(WmsQrCodeMaster::getBarcodeCode, request.getItems().stream() +// .map(OutProduceSubmitItemQO::getQrCodes) +// .flatMap(Collection::stream) +// .toList() +// ) +// .list(); + List barcodeCodes = request.getItems().stream() + .map(OutProduceSubmitItemQO::getQrCodes) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(qrCodeQO -> qrCodeQO.getContent()) + .filter(StrUtil::isNotBlank) + .toList(); + final List qrCodeMasters = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(barcodeCodes)) { + List tempList = qrCodeMasterService.lambdaQuery() + .eq(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) + .in(WmsQrCodeMaster::getBarcodeCode, barcodeCodes) + .list(); + qrCodeMasters.addAll(tempList); + } + request.getItems().forEach(qitem -> { WmsTransferFactoryItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qitem.getItemId())).findFirst().orElse(null); VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + qitem.getMaterialNo() + "不需要出库");