rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码合并并修改 3a17 的函数接口

This commit is contained in:
zhangke 2025-08-22 18:52:02 +08:00
parent 94fb0d216d
commit 63958f910b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
View File

@ -2,6 +2,7 @@ package com.nflg.wms.admin.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.lang.Pair;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@ -244,18 +245,18 @@ public class NormalPGIControllerService {
if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) { if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) {
for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) { for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) {
//导入SAP //导入SAP
ZWM3A17ReturnDTO zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); Pair<Pair<String, String>, Pair<String, String>> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO());
//推入srm //推入srm
SRMInspectionContentDTO content = dto.getPushDto().getContent(); SRMInspectionContentDTO content = dto.getPushDto().getContent();
content.setReceiveNum(zwm3A17ReturnDTO.getEMblnr()); content.setReceiveNum(zwm3A17ReturnDTO.getKey().getKey());
pushInspectionMaterialsToSRM(dto.getPushDto()); pushInspectionMaterialsToSRM(dto.getPushDto());
//修改收货单的物料凭证和年度物料凭证 //修改收货单的物料凭证和年度物料凭证
List<Long> ids = dto.getReceiptIds(); List<Long> ids = dto.getReceiptIds();
//修改收货单的物料凭证和年度物料凭证 //修改收货单的物料凭证和年度物料凭证
if (CollectionUtil.isNotEmpty(ids)) { if (CollectionUtil.isNotEmpty(ids)) {
wmsQcReceiveItemService.lambdaUpdate() wmsQcReceiveItemService.lambdaUpdate()
.set(WmsQcReceiveItem::getMaterialDoc, zwm3A17ReturnDTO.getEMblnr()) .set(WmsQcReceiveItem::getMaterialDoc, zwm3A17ReturnDTO.getKey().getKey())
.set(WmsQcReceiveItem::getMaterialDocYear, zwm3A17ReturnDTO.getEMjahr()) .set(WmsQcReceiveItem::getMaterialDocYear, zwm3A17ReturnDTO.getKey().getValue())
.in(WmsQcReceiveItem::getId, ids) .in(WmsQcReceiveItem::getId, ids)
.update(); .update();
} }
@ -300,12 +301,12 @@ public class NormalPGIControllerService {
//推送到SAP //推送到SAP
if (CollectionUtil.isNotEmpty(zwm3A17DTOS)) { if (CollectionUtil.isNotEmpty(zwm3A17DTOS)) {
for (ZWM3A17DTO zwm3A17DTO : zwm3A17DTOS) { for (ZWM3A17DTO zwm3A17DTO : zwm3A17DTOS) {
ZWM3A17ReturnDTO returnDto = sapService.zwm3a17(zwm3A17DTO); Pair<Pair<String, String>, Pair<String, String>> returnDto = sapService.zwm3a17(zwm3A17DTO);
wmsPoReceiptItemService.lambdaUpdate() wmsPoReceiptItemService.lambdaUpdate()
.eq(WmsPoReceiptItem::getPoNum, zwm3A17DTO.getEbeln()) .eq(WmsPoReceiptItem::getPoNum, zwm3A17DTO.getEbeln())
.eq(WmsPoReceiptItem::getReceiveId, taskId) .eq(WmsPoReceiptItem::getReceiveId, taskId)
.set(WmsPoReceiptItem::getMaterialDoc, returnDto.getEMblnr()) .set(WmsPoReceiptItem::getMaterialDoc, returnDto.getValue().getKey())
.set(WmsPoReceiptItem::getMaterialDocYear, returnDto.getEMjahr()) .set(WmsPoReceiptItem::getMaterialDocYear, returnDto.getValue().getValue())
.update(); .update();
} }
} }