From 63958f910b196dd8d936280f212b46e88791969c Mon Sep 17 00:00:00 2001 From: zhangke Date: Fri, 22 Aug 2025 18:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=203a17=20=E7=9A=84=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/NormalPGIControllerService.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index 35b5e15b..74e0281b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -2,6 +2,7 @@ package com.nflg.wms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.lang.Pair; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -244,18 +245,18 @@ public class NormalPGIControllerService { if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) { for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) { //导入SAP - ZWM3A17ReturnDTO zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); + Pair, Pair> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); //推入srm SRMInspectionContentDTO content = dto.getPushDto().getContent(); - content.setReceiveNum(zwm3A17ReturnDTO.getEMblnr()); + content.setReceiveNum(zwm3A17ReturnDTO.getKey().getKey()); pushInspectionMaterialsToSRM(dto.getPushDto()); //修改收货单的物料凭证和年度物料凭证 List ids = dto.getReceiptIds(); //修改收货单的物料凭证和年度物料凭证 if (CollectionUtil.isNotEmpty(ids)) { wmsQcReceiveItemService.lambdaUpdate() - .set(WmsQcReceiveItem::getMaterialDoc, zwm3A17ReturnDTO.getEMblnr()) - .set(WmsQcReceiveItem::getMaterialDocYear, zwm3A17ReturnDTO.getEMjahr()) + .set(WmsQcReceiveItem::getMaterialDoc, zwm3A17ReturnDTO.getKey().getKey()) + .set(WmsQcReceiveItem::getMaterialDocYear, zwm3A17ReturnDTO.getKey().getValue()) .in(WmsQcReceiveItem::getId, ids) .update(); } @@ -300,12 +301,12 @@ public class NormalPGIControllerService { //推送到SAP if (CollectionUtil.isNotEmpty(zwm3A17DTOS)) { for (ZWM3A17DTO zwm3A17DTO : zwm3A17DTOS) { - ZWM3A17ReturnDTO returnDto = sapService.zwm3a17(zwm3A17DTO); + Pair, Pair> returnDto = sapService.zwm3a17(zwm3A17DTO); wmsPoReceiptItemService.lambdaUpdate() .eq(WmsPoReceiptItem::getPoNum, zwm3A17DTO.getEbeln()) .eq(WmsPoReceiptItem::getReceiveId, taskId) - .set(WmsPoReceiptItem::getMaterialDoc, returnDto.getEMblnr()) - .set(WmsPoReceiptItem::getMaterialDocYear, returnDto.getEMjahr()) + .set(WmsPoReceiptItem::getMaterialDoc, returnDto.getValue().getKey()) + .set(WmsPoReceiptItem::getMaterialDocYear, returnDto.getValue().getValue()) .update(); } }