From 101501516c7d5b00957d00b45c3a1d63796c33f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 1 Dec 2025 11:24:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor(scan):=20=E4=BF=AE=E6=94=B9=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=90=8D=E4=B8=BAserialNum?= =?UTF-8?q?bers=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将ScanCodeQO中serialNumber字段重命名为serialNumbers - 更新ComponentOutboundController中序列号相关判断和赋值逻辑 - 修正InCostCenterBackController和OutCostCenterController中序列号字段映射 - 修改SapService中生成映射时使用serialNumbers字段 - 确保确认PDA方法参数格式统一调整 - 保持所有涉及序列号比较和处理的代码一致使用serialNumbers字段名 --- .../ComponentOutboundController.java | 35 ++++++++++++------- .../InCostCenterBackController.java | 2 +- .../controller/OutCostCenterController.java | 2 +- .../ComponentOutboundControllerService.java | 3 +- .../nflg/wms/admin/service/SapService.java | 4 +-- .../nflg/wms/common/pojo/qo/ScanCodeQO.java | 2 +- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java index b555a9fa..9fbb0370 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java @@ -2,6 +2,7 @@ package com.nflg.wms.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.Pair; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.nflg.wms.admin.repository.InventoryForOutRepository; @@ -248,9 +249,10 @@ public class ComponentOutboundController extends BaseController { if (CollectionUtil.isNotEmpty(item.getScanCodes())) { List scanCodesGroup = new ArrayList<>(); for (ScanCodeQO code : item.getScanCodes()) { - ScanCodeQO codeItem = scanCodesGroup.stream().filter(c -> c.getBatchNumber().equals(code.getBatchNumber()) - && c.getSerialNumber().equals(code.getSerialNumber()) - ).findFirst().orElse(null); + ScanCodeQO codeItem = scanCodesGroup.stream() + .filter(c -> c.getBatchNumber().equals(code.getBatchNumber()) + && c.getSerialNumbers().equals(code.getSerialNumbers()) + ).findFirst().orElse(null); if (Objects.isNull(codeItem)) { scanCodesGroup.add(code); @@ -289,7 +291,7 @@ public class ComponentOutboundController extends BaseController { .setMaterialNo(outboundItem.getIdnrk()) .setContent(code.getCodeContent()) .setBatchNo(code.getBatchNumber()) - .setSerialNo(code.getSerialNumber()) + .setSerialNo(code.getSerialNumbers()) .setUniqNo(code.getCodeId()) .setFactoryNo(packing.getFactoryNo()) .setWarehouseNo(outboundItem.getLgort()) @@ -300,7 +302,7 @@ public class ComponentOutboundController extends BaseController { ); //组装下库存信息 setInventoryDTO(inventories, outboundItem.getIdnrk(), - packing.getFactoryNo(), outboundItem.getLgort(), code.getBatchNumber(), code.getSerialNumber(), code.getCodeNum()); + packing.getFactoryNo(), outboundItem.getLgort(), code.getBatchNumber(), code.getSerialNumbers(), code.getCodeNum()); } } @@ -382,14 +384,17 @@ public class ComponentOutboundController extends BaseController { .filter(record -> Objects.equals(record.getTicketItemId(), item.getId())) .toList() .forEach(record -> { - ScanCodeQO codeItem = scanCodesGroup.stream().filter(c -> c.getBatchNumber().equals(record.getBatchNo()) - && c.getSerialNumber().equals(record.getSerialNo()) - ).findFirst().orElse(null); + ScanCodeQO codeItem = scanCodesGroup.stream() + .filter(c -> c.getBatchNumber().equals(record.getBatchNo()) + && c.getSerialNumbers().equals(record.getSerialNo()) + ) + .findFirst() + .orElse(null); if (Objects.isNull(codeItem)) { scanCodesGroup.add(new ScanCodeQO() .setCodeId(record.getId()) .setBatchNumber(record.getBatchNo()) - .setSerialNumber(record.getSerialNo()) + .setSerialNumbers(record.getSerialNo()) .setCodeContent(record.getContent()) .setCodeNum(record.getNum()) ); @@ -399,6 +404,12 @@ public class ComponentOutboundController extends BaseController { }); buildZwm3a20DTO(zwm3a20DTO, scanCodesGroup, item); }); + Pair result = sapService.zwm3a20(zwm3a20DTO); + wmsComponentOutboundService.lambdaUpdate() + .set(WmsComponentOutbound::getMaterialDoc, result.getKey()) + .set(WmsComponentOutbound::getMaterialDocYear, result.getValue()) + .eq(WmsComponentOutbound::getId, qo.getId()) + .update(); } else { order.setIsCompleted((short) 0); wmscomponentPackingService.updateById(order); @@ -417,7 +428,7 @@ public class ComponentOutboundController extends BaseController { set3A20Item(batchNumbers.get(0), outboundItem, outboundItem.getOutQty(), zwm3a20DTO); //判断是否有多个序列号 List serialNumbers = scanCodesGroup.stream() - .map(ScanCodeQO::getSerialNumber) + .map(ScanCodeQO::getSerialNumbers) .filter(StrUtil::isNotBlank) .distinct() .toList(); @@ -600,11 +611,11 @@ public class ComponentOutboundController extends BaseController { itLipsItemDTO.setLfimg(itLipsItemDTO.getLfimg().add(code.getCodeNum())); } //处理序列号的问题 - if (StrUtil.isNotBlank(code.getSerialNumber())) { + if (StrUtil.isNotBlank(code.getSerialNumbers())) { zwm3a20DTO.getItSernrPatch().add(new ZWM3A20ITSERNRPATCHDTO() .setCharg(code.getBatchNumber()) .setPosnr(outboundItem.getPosnr()) - .setSernr(code.getSerialNumber()) + .setSernr(code.getSerialNumbers()) ); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index 91c709dd..6d86354b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -289,7 +289,7 @@ public class InCostCenterBackController extends BaseController { .setScanCodes(its.stream().map(qrCode -> new ScanCodeQO() .setCodeId(qrCode.getUniqNo()) .setCodeNum(qrCode.getNum()) - .setSerialNumber(qrCode.getSerialNo()) + .setSerialNumbers(qrCode.getSerialNo()) .setBatchNumber(qrCode.getBatchNo()) ).toList() ); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index fa8386e1..50345b6b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -341,7 +341,7 @@ public class OutCostCenterController extends BaseController { .setScanCodes(its.stream().map(qrCode -> new ScanCodeQO() .setCodeId(qrCode.getUniqNo()) .setCodeNum(qrCode.getNum()) - .setSerialNumber(qrCode.getSerialNo()) + .setSerialNumbers(qrCode.getSerialNo()) .setBatchNumber(qrCode.getBatchNo()) ).toList()); }).toList() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentOutboundControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentOutboundControllerService.java index 9f87fe92..98e22d90 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentOutboundControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentOutboundControllerService.java @@ -51,7 +51,8 @@ public class ComponentOutboundControllerService { } @Transactional - public void confirmPda(WmsComponentOutbound outbound, List outboundItems, List records, ZWM3A20DTO zwm3a20DTO, List inventories) { + public void confirmPda(WmsComponentOutbound outbound, List outboundItems + , List records, ZWM3A20DTO zwm3a20DTO, List inventories) { outbound.setOutboundNo(basdeSerialNumberService.generateSerialNumber(5)); wmsComponentOutboundService.save(outbound); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index 584b4579..1a014c10 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -477,7 +477,7 @@ public class SapService { item.getScanCodes().forEach(scanCode -> { Map map = buildMb112TList1Map(item, scanCode.getCodeNum(), scanCode.getBatchNumber()); t_list1.add(map); - Map map1 = buildMb112TList2Map(item.getResbRspos(), scanCode.getSerialNumber()); + Map map1 = buildMb112TList2Map(item.getResbRspos(), scanCode.getSerialNumbers()); t_list2.add(map1); }); } else { @@ -620,7 +620,7 @@ public class SapService { item.getScanCodes().forEach(scanCode -> { Map map = buildMb115TList1Map(item, scanCode.getCodeNum(), scanCode.getBatchNumber()); t_list1.add(map); - Map map1 = buildMb115TList2Map(item.getResbRspos(), scanCode.getSerialNumber()); + Map map1 = buildMb115TList2Map(item.getResbRspos(), scanCode.getSerialNumbers()); t_list2.add(map1); }); } else { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ScanCodeQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ScanCodeQO.java index fe73a9df..6f18730c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ScanCodeQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ScanCodeQO.java @@ -29,7 +29,7 @@ public class ScanCodeQO { /** * 序列号 */ - private String serialNumber; + private String serialNumbers; /** * 二维码内容