From f1302fdf496e6910cd383f8beb63905e5ce847b1 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Mon, 30 Mar 2026 16:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E8=B4=A6=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComponentOutboundController.java | 6 +++--- .../admin/controller/InCostCenterBackController.java | 4 ++-- .../admin/controller/InProduceBackController.java | 4 ++-- .../admin/controller/InProduceOrderController.java | 4 ++-- .../admin/controller/OutAssistanceController.java | 4 ++-- .../admin/controller/OutCostCenterController.java | 2 +- .../wms/admin/controller/OutProduceController.java | 2 +- .../wms/admin/controller/OutPurchaseController.java | 4 ++-- .../controller/StructuralPackageOrderController.java | 12 ++++-------- .../admin/controller/TransferCompanyController.java | 8 ++++---- .../admin/controller/TransferFactoryController.java | 4 ++-- .../service/ComponentOutboundControllerService.java | 8 ++++---- 12 files changed, 29 insertions(+), 33 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 afa32cee..7fa9c44b 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 @@ -154,7 +154,7 @@ public class ComponentOutboundController extends BaseController { } OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(outbound.getVbelv()); + optRecordDTO.setOrderId(outbound.getPackingNo()); optRecordService.add(optRecordDTO); // 组装SAP的信息 ZWM3A20DTO zwm3a20DTO = new ZWM3A20DTO() @@ -212,7 +212,7 @@ public class ComponentOutboundController extends BaseController { //List codeIds = new ArrayList<>(); OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(packing.getVbelv()); + optRecordDTO.setOrderId(packing.getNo()); optRecordService.add(optRecordDTO); ZWM3A20DTO zwm3a20DTO = new ZWM3A20DTO() .setItSernrPatch(new ArrayList<>()) @@ -468,7 +468,7 @@ public class ComponentOutboundController extends BaseController { }); OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(ticket.getOutboundNo()); + optRecordDTO.setOrderId(ticket.getPackingNo()); optRecordService.add(optRecordDTO); Pair result = sapService.zwm3a20(zwm3a20DTO); wmsComponentOutboundService.lambdaUpdate() 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 6648a2c0..d8b45e64 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 @@ -323,8 +323,8 @@ public class InCostCenterBackController extends BaseController { ); Map> dmaps = records.stream().collect(Collectors.groupingBy(InMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(ticket.getNo()); + optRecordDTO.setOperationType((short) 1) + .setOrderId(ticket.getNo()); optRecordService.add(optRecordDTO); C_MaterialReturnDTO vo = sapService.zwm00_MB112(new C_MaterialReturnQO() .setResbRsNum(order.getRsnum()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index 74b2bec9..f5f0119a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -338,8 +338,8 @@ public class InProduceBackController extends BaseController { ); Map> dmaps = records.stream().collect(Collectors.groupingBy(InMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(ticket.getNo()); + optRecordDTO.setOperationType((short)1) + .setOrderId(ticket.getNo()); optRecordService.add(optRecordDTO); Zwm3a11VO vo = sapService.zwm3a11(new Zwm3a11QO() .setAufnr(order.getAufnr()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 4dc0b180..252495cb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -600,8 +600,8 @@ public class InProduceOrderController extends BaseController { ); } OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short) 1); - optRecordDTO.setOrderId(order.getNo()); + optRecordDTO.setOperationType((short) 1) + .setOrderId(order.getNo()); optRecordService.add(optRecordDTO); //同步入库信息到SAP Zwm00Mb107DTO dto = sapService.zwm00_mb107(order.getOrderNo(), UserUtil.getUserName(), input1, sernrs); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 0efd8afa..e17fe600 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -450,8 +450,8 @@ public class OutAssistanceController extends BaseController { ); Map> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short) 1); - optRecordDTO.setOrderId(order.getNo()); + optRecordDTO.setOperationType((short) 1) + .setOrderId(order.getNo()); optRecordService.add(optRecordDTO); SubcontractedOrderConfirmDTO dto = sapService.zwm3a04(new SubcontractedOrderConfirmQO() .setIEbeln(order.getEbeln()) 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 7c713bc5..db45f305 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 @@ -444,7 +444,7 @@ public class OutCostCenterController extends BaseController { Map> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(ticket.getNo()); + optRecordDTO.setOrderId(records.get(0).getKey7()); optRecordService.add(optRecordDTO); C_MaterialOutboundDTO vo = sapService.ZWM00_MB115(new C_MaterialOutboundQO() .setResbRsNum(order.getRsnum()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index a4f1ac74..26aae8dc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -577,7 +577,7 @@ public class OutProduceController extends BaseController { Map> dmaps = records.stream().collect(Collectors.groupingBy(OutMaterialScanRecord::getKey7)); OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(order.getAufnr()); + optRecordDTO.setOrderId(records.get(0).getKey7()); optRecordService.add(optRecordDTO); Zwm3a10VO vo = sapService.zwm3A10(new Zwm3a10QO() .setAufnr(order.getAufnr()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 9a249192..f4c85563 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -319,8 +319,8 @@ public class OutPurchaseController extends BaseController { .update(); } OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(outPurchaseNo); + optRecordDTO.setOperationType((short)1) + .setOrderId(outPurchaseNo); optRecordService.add(optRecordDTO); Pair result = sapService.zwm3A06(request.getEbeln(), input1, input2); outPurchaseService.lambdaUpdate() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 0e7525f4..a78d92a2 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -1003,10 +1003,10 @@ public class StructuralPackageOrderController extends BaseController { VUtil.trueThrowBusinessError(Objects.isNull(dto)).throwMessage("ZIM_004未查询到数据"); VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空"); BigDecimal num = BigDecimal.valueOf(order.getNum()); - OptRecordDTO optRecordDTO1 = new OptRecordDTO(); - optRecordDTO1.setOperationType((short) 1); - optRecordDTO1.setOrderId(order.getOrderNo()); - optRecordService.add(optRecordDTO1); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short) 1) + .setOrderId(order.getOrderNo()); + optRecordService.add(optRecordDTO); Pair, Pair> pair = sapService.zwm3a17(new ZWM3A17DTO() .setEbeln(order.getExternalOrderNo()) .setUsnam(UserUtil.getUserName()) @@ -1030,10 +1030,6 @@ public class StructuralPackageOrderController extends BaseController { ) ); if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) { - OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short) 1); - optRecordDTO.setOrderId(order.getOrderNo()); - optRecordService.add(optRecordDTO); sapService.zwm3a18(new ZWM3A18DTO() .setEbeln(order.getExternalOrderNo()) .setUsnam(UserUtil.getUserName()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 48f08c4e..01df8512 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -481,8 +481,8 @@ public class TransferCompanyController extends BaseController { ).toList() ); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(order.getNo()); + optRecordDTO.setOperationType((short)1) + .setOrderId(order.getNo()); optRecordService.add(optRecordDTO); ZWM00_MB116VO vo = sapService.zwm00_mb116(new ZWM00_MB116QO() .setEbeln(order.getEbeln()) @@ -753,8 +753,8 @@ public class TransferCompanyController extends BaseController { ); inMaterialScanRecordRespository.saveAll(records); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(ticket.getTicketNo()); + optRecordDTO.setOperationType((short)1) + .setOrderId(ticket.getTicketNo()); optRecordService.add(optRecordDTO); Pair, Pair> vos = sapService.zwm3a17(new ZWM3A17DTO() .setEbeln(ticket.getEbeln()) 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 152d4168..b71a8019 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 @@ -742,8 +742,8 @@ public class TransferFactoryController extends BaseController { ) ); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(ticket.getNo()); + optRecordDTO.setOperationType((short)1) + .setOrderId(ticket.getNo()); optRecordService.add(optRecordDTO); transferFactoryTicketService.lambdaUpdate() .set(WmsTransferFactoryTicket::getMatDoc, vo.getEMblnr()) 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 8353ca1a..d7573f72 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 @@ -68,8 +68,8 @@ public class ComponentOutboundControllerService { if (Objects.nonNull(zwm3a20DTO)) { OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(outbound.getOutboundNo()); + optRecordDTO.setOperationType((short)1) + .setOrderId(outbound.getPackingNo()); optRecordService.add(optRecordDTO); // 处理SAP的信息，并写入物料凭证和物料年度凭证信息到出口单中 Pair result = sapService.zwm3a20(zwm3a20DTO); @@ -118,8 +118,8 @@ public class ComponentOutboundControllerService { //加操作记录 WmsComponentOutbound outbound = wmsComponentOutboundService.getById(outboundId); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1); - optRecordDTO.setOrderId(outbound.getOutboundNo()); + optRecordDTO.setOperationType((short)1) + .setOrderId(outbound.getPackingNo()); optRecordService.add(optRecordDTO); //SAP冲销 Pair result = sapService.zwm3a20(zwm3a20DTO);