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

Revert "质检还原为推送到SRM" 

This reverts commit cf8d759287.
This commit is contained in:
曹鹏飞 2026-06-11 14:00:59 +08:00
parent 9a19fdf218
commit cace40f235
5 changed files with 165 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -349,22 +349,22 @@ public class NormalPGIController extends BaseController {
.setItem1(new ArrayList<>()) .setItem1(new ArrayList<>())
.setItem2(new ArrayList<>()); .setItem2(new ArrayList<>());
SRMInspectionInputDTO srmDto = new SRMInspectionInputDTO(); // SRMInspectionInputDTO_D srmDto = new SRMInspectionInputDTO_D();
srmDto.setCode("WMS_RCV_RECEIVE_TO_SRM"); // srmDto.setCode("WMS_RCV_RECEIVE_TO_SRM");
SRMInspectionContentDTO content = new SRMInspectionContentDTO(); // SRMInspectionContentDTO content = new SRMInspectionContentDTO();
content.setSupplierName(order.getSupplierName()); // content.setSupplierName(order.getSupplierName());
content.setSupplierNum(order.getSupplierNum()); // content.setSupplierNum(order.getSupplierNum());
content.setReceiveNum(""); // content.setReceiveNum("");
content.setReceiveType("BY_DELIVERY"); // content.setReceiveType("BY_DELIVERY");
// content.setPurchaseGroup(order.getPurchaseGroup()); // content.setPurchaseGroup(order.getPurchaseGroup());
content.setLineVOList(new ArrayList<>()); // content.setLineVOList(new ArrayList<>());
srmDto.setContent(content); // srmDto.setContent(content);
qcDto = new QCMaterialSyncDTO() qcDto = new QCMaterialSyncDTO()
.setPoNum(orderItem.getPoNum()) .setPoNum(orderItem.getPoNum())
.setReceiptIds(new ArrayList<>()) .setReceiptIds(new ArrayList<>())
.setZwm3A17DTO(sapDto) .setZwm3A17DTO(sapDto);
.setPushDto(srmDto); // .setPushDto(srmDto);
qcMaterialSyncDTOS.add(qcDto); qcMaterialSyncDTOS.add(qcDto);
} }
@ -380,22 +380,21 @@ public class NormalPGIController extends BaseController {
.setKZKRI(materialInfoInOrder.getKzkri())); .setKZKRI(materialInfoInOrder.getKzkri()));
// SRM DTO // SRM DTO
SRMLineVOListItem srmItem = new SRMLineVOListItem(); // SRMLineVOListItem srmItem = new SRMLineVOListItem();
srmItem.setItemCode(item.getMaterialNo()); // srmItem.setItemCode(item.getMaterialNo());
srmItem.setItemName(materialInfoInOrder.getMaktx()); // srmItem.setItemName(materialInfoInOrder.getMaktx());
srmItem.setUnit(materialInfoInOrder.getMeins()); // srmItem.setUnit(materialInfoInOrder.getMeins());
srmItem.setFactory(materialInfoInOrder.getWerks()); // srmItem.setFactory(materialInfoInOrder.getWerks());
srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); // srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo());
srmItem.setReceiveBatchNum(""); // srmItem.setReceiveBatchNum("");
srmItem.setReceivedQty(totalQty); // srmItem.setReceivedQty(totalQty);
srmItem.setSerialNum(""); // srmItem.setSerialNum("");
srmItem.setLineNumber(Integer.valueOf(orderItem.getLineNumber())); // srmItem.setLineNumber(Integer.valueOf(orderItem.getLineNumber()));
srmItem.setNoteNum(order.getNoteNum()); // srmItem.setNoteNum(order.getNoteNum());
srmItem.setRequestNo(String.valueOf(qcItem.getId())); // srmItem.setRequestNo(String.valueOf(qcItem.getId()));
srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); // srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd"));
srmItem.setInspectionFlag("Y"); // srmItem.setInspectionFlag("Y");
qcDto.getPushDto().getContent().getLineVOList().add(srmItem); // qcDto.getPushDto().getContent().getLineVOList().add(srmItem);
qcDto.getIncomingInspectionApplyQOS().add( qcDto.getIncomingInspectionApplyQOS().add(
new ExternalIncomingInspectionApplyQO() new ExternalIncomingInspectionApplyQO()
.setRequestNo(String.valueOf(receiveItemId)) .setRequestNo(String.valueOf(receiveItemId))
@ -1130,54 +1129,53 @@ public class NormalPGIController extends BaseController {
} }
private void setSrmData( private void setSrmData(
SRMInspectionInputDTO pushDto, // SRMInspectionInputDTO_D pushDto,
List<ExternalIncomingInspectionApplyQO> incomingInspectionApplyQOS, List<ExternalIncomingInspectionApplyQO> incomingInspectionApplyQOS,
WmsSrmOrder order, WmsSrmOrder order,
List<SrmMaterialReceiptScanCodes> codes, List<SrmMaterialReceiptScanCodes> codes,
SrmMaterialReceiptQO item, SrmMaterialReceiptQO item,
Long receiveItemId, Long receiveItemId
SAPSyncParamsDTO materialInfoInOrder
) { ) {
if (CollectionUtil.isNotEmpty(codes)) { // if (CollectionUtil.isNotEmpty(codes)) {
// 根据 BatchNumber 和 SerialNumbers 分组并汇总 CodeNum // // 根据 BatchNumber 和 SerialNumbers 分组并汇总 CodeNum
Map<String, BigDecimal> batchNumbers = codes.stream() // Map<String, BigDecimal> batchNumbers = codes.stream()
.collect(Collectors.groupingBy(SrmMaterialReceiptScanCodes::getKey, // .collect(Collectors.groupingBy(SrmMaterialReceiptScanCodes::getKey,
Collectors.mapping(SrmMaterialReceiptScanCodes::getCodeNum, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)))); // Collectors.mapping(SrmMaterialReceiptScanCodes::getCodeNum, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
for (Map.Entry<String, BigDecimal> entry : batchNumbers.entrySet()) { // for (Map.Entry<String, BigDecimal> entry : batchNumbers.entrySet()) {
String[] keys = entry.getKey().split(";", -1); // String[] keys = entry.getKey().split(";", -1);
SRMLineVOListItem srmItem = new SRMLineVOListItem(); // SRMLineVOListItem srmItem = new SRMLineVOListItem();
srmItem.setItemCode(item.getItemCode()); // srmItem.setItemCode(item.getItemCode());
srmItem.setItemName(materialInfoInOrder.getMaktx()); // srmItem.setItemName(materialInfoInOrder.getMaktx());
srmItem.setUnit(materialInfoInOrder.getMeins()); // srmItem.setUnit(materialInfoInOrder.getMeins());
srmItem.setFactory(materialInfoInOrder.getWerks()); // srmItem.setFactory(materialInfoInOrder.getWerks());
srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); // srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo());
srmItem.setReceiveBatchNum(keys[0]); // srmItem.setReceiveBatchNum(keys[0]);
srmItem.setReceivedQty(entry.getValue()); // srmItem.setReceivedQty(entry.getValue());
srmItem.setSerialNum(keys[1]); // srmItem.setSerialNum(keys[1]);
srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); // srmItem.setLineNumber(Integer.valueOf(item.getLineNumber()));
srmItem.setNoteNum(item.getNoteNum()); // srmItem.setNoteNum(item.getNoteNum());
srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr()); // srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr());
srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); // srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd"));
srmItem.setInspectionFlag("Y"); // srmItem.setInspectionFlag("Y");
pushDto.getContent().getLineVOList().add(srmItem); // pushDto.getContent().getLineVOList().add(srmItem);
} // }
} else { // } else {
SRMLineVOListItem srmItem = new SRMLineVOListItem(); // SRMLineVOListItem srmItem = new SRMLineVOListItem();
srmItem.setItemCode(item.getItemCode()); // srmItem.setItemCode(item.getItemCode());
srmItem.setItemName(materialInfoInOrder.getMaktx()); // srmItem.setItemName(materialInfoInOrder.getMaktx());
srmItem.setUnit(materialInfoInOrder.getMeins()); // srmItem.setUnit(materialInfoInOrder.getMeins());
srmItem.setFactory(materialInfoInOrder.getWerks()); // srmItem.setFactory(materialInfoInOrder.getWerks());
srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); // srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo());
srmItem.setReceiveBatchNum(""); // srmItem.setReceiveBatchNum("");
srmItem.setReceivedQty(item.getReceiptNum()); // srmItem.setReceivedQty(item.getReceiptNum());
srmItem.setSerialNum(""); // srmItem.setSerialNum("");
srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); // srmItem.setLineNumber(Integer.valueOf(item.getLineNumber()));
srmItem.setNoteNum(item.getNoteNum()); // srmItem.setNoteNum(item.getNoteNum());
srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr()); // srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr());
srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); // srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd"));
srmItem.setInspectionFlag("Y"); // srmItem.setInspectionFlag("Y");
pushDto.getContent().getLineVOList().add(srmItem); // pushDto.getContent().getLineVOList().add(srmItem);
} // }
Set<String> qrCodes = new HashSet<>(); Set<String> qrCodes = new HashSet<>();
if (CollectionUtil.isNotEmpty(codes)) { if (CollectionUtil.isNotEmpty(codes)) {
List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.lambdaQuery() List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.lambdaQuery()
@ -1233,7 +1231,7 @@ public class NormalPGIController extends BaseController {
) { ) {
ZWM3A17DTO zwm3A17DTO = null; ZWM3A17DTO zwm3A17DTO = null;
QCMaterialSyncDTO qcDto = null; QCMaterialSyncDTO qcDto = null;
SRMInspectionInputDTO srmPushDto = null; // SRMInspectionInputDTO_D srmPushDto = null;
qcDto = qcMaterialSyncDTOS.stream() qcDto = qcMaterialSyncDTOS.stream()
.filter(qcMaterialSyncDTO -> qcMaterialSyncDTO .filter(qcMaterialSyncDTO -> qcMaterialSyncDTO
@ -1258,25 +1256,25 @@ public class NormalPGIController extends BaseController {
} }
zwm3A17DTO = qcDto.getZwm3A17DTO(); zwm3A17DTO = qcDto.getZwm3A17DTO();
if (Objects.isNull(qcDto.getPushDto())) { // if (Objects.isNull(qcDto.getPushDto())) {
SRMInspectionInputDTO dto = new SRMInspectionInputDTO(); // SRMInspectionInputDTO_D dto = new SRMInspectionInputDTO_D();
SRMInspectionContentDTO content = new SRMInspectionContentDTO(); // SRMInspectionContentDTO content = new SRMInspectionContentDTO();
content.setSupplierName(order.getSupplierName()); // content.setSupplierName(order.getSupplierName());
content.setSupplierNum(order.getSupplierNum()); // content.setSupplierNum(order.getSupplierNum());
content.setReceiveNum(""); // content.setReceiveNum("");
content.setReceiveType("BY_DELIVERY"); // content.setReceiveType("BY_DELIVERY");
// content.setPurchaseGroup(order.getPurchaseGroup()); // content.setPurchaseGroup(order.getPurchaseGroup());
content.setLineVOList(new ArrayList<>()); // content.setLineVOList(new ArrayList<>());
dto.setContent(content); // dto.setContent(content);
dto.setCode("WMS_RCV_RECEIVE_TO_SRM"); // dto.setCode("WMS_RCV_RECEIVE_TO_SRM");
qcDto.setPushDto(dto); // qcDto.setPushDto(dto);
} // }
srmPushDto = qcDto.getPushDto(); // srmPushDto = qcDto.getPushDto();
//组装SAP的参数 //组装SAP的参数
setZWM3A17DTO(zwm3A17DTO, codes, item, materialInfoInOrder); setZWM3A17DTO(zwm3A17DTO, codes, item, materialInfoInOrder);
////组装SRM的参数 ////组装SRM的参数
setSrmData(srmPushDto,qcDto.getIncomingInspectionApplyQOS(), order, codes, item, receiveItemId,materialInfoInOrder); setSrmData(qcDto.getIncomingInspectionApplyQOS(), order, codes, item, receiveItemId);
WmsQcReceiveItem qmsReceiptItem = new WmsQcReceiveItem() WmsQcReceiveItem qmsReceiptItem = new WmsQcReceiveItem()
.setId(receiveItemId) .setId(receiveItemId)

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCMaterialSyncDTO.java
View File

@ -1,6 +1,5 @@
package com.nflg.wms.admin.pojo.dto; package com.nflg.wms.admin.pojo.dto;
import com.nflg.wms.common.pojo.dto.SRMInspectionInputDTO;
import com.nflg.wms.common.pojo.qo.ExternalIncomingInspectionApplyQO; import com.nflg.wms.common.pojo.qo.ExternalIncomingInspectionApplyQO;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -14,7 +13,7 @@ public class QCMaterialSyncDTO {
private ZWM3A17DTO zwm3A17DTO; private ZWM3A17DTO zwm3A17DTO;
private SRMInspectionInputDTO pushDto; // private SRMInspectionInputDTO pushDto;
private List<ExternalIncomingInspectionApplyQO> incomingInspectionApplyQOS = new ArrayList<>(); private List<ExternalIncomingInspectionApplyQO> incomingInspectionApplyQOS = new ArrayList<>();

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

@ -3,7 +3,6 @@ package com.nflg.wms.admin.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Pair; import cn.hutool.core.lang.Pair;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.nflg.wms.admin.pojo.dto.GoodReceiptDTO; import com.nflg.wms.admin.pojo.dto.GoodReceiptDTO;
import com.nflg.wms.admin.pojo.dto.QCMaterialSyncDTO; import com.nflg.wms.admin.pojo.dto.QCMaterialSyncDTO;
import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO; import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO;
@ -25,11 +24,8 @@ import com.nflg.wms.repository.service.*;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.*;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -39,9 +35,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component @Component
public class NormalPGIControllerService { public class NormalPGIControllerService {
@ -273,10 +267,10 @@ public class NormalPGIControllerService {
//导入SAP //导入SAP
Pair<Pair<String, String>, Pair<String, String>> 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.getValue().getKey()); // content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey());
pushInspectionMaterialsToSRM(dto.getPushDto()); // pushInspectionMaterialsToSRM(dto.getPushDto());
// qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS());
//修改收货单的物料凭证和年度物料凭证 //修改收货单的物料凭证和年度物料凭证
List<Long> ids = dto.getReceiptIds(); List<Long> ids = dto.getReceiptIds();
//修改收货单的物料凭证和年度物料凭证 //修改收货单的物料凭证和年度物料凭证
@ -411,10 +405,10 @@ public class NormalPGIControllerService {
//导入SAP //导入SAP
Pair<Pair<String, String>, Pair<String, String>> 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.getValue().getKey()); // content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey());
pushInspectionMaterialsToSRM(dto.getPushDto()); // pushInspectionMaterialsToSRM(dto.getPushDto());
// qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS());
//修改收货单的物料凭证和年度物料凭证 //修改收货单的物料凭证和年度物料凭证
List<Long> ids = dto.getReceiptIds(); List<Long> ids = dto.getReceiptIds();
//修改收货单的物料凭证和年度物料凭证 //修改收货单的物料凭证和年度物料凭证
@ -489,10 +483,10 @@ public class NormalPGIControllerService {
if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) { if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) {
for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) { for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) {
Pair<Pair<String, String>, Pair<String, String>> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); Pair<Pair<String, String>, Pair<String, String>> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO());
SRMInspectionContentDTO content = dto.getPushDto().getContent(); // SRMInspectionContentDTO content = dto.getPushDto().getContent();
content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); // content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey());
pushInspectionMaterialsToSRM(dto.getPushDto()); // pushInspectionMaterialsToSRM(dto.getPushDto());
// qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS());
List<Long> ids = dto.getReceiptIds(); List<Long> ids = dto.getReceiptIds();
if (CollectionUtil.isNotEmpty(ids)) { if (CollectionUtil.isNotEmpty(ids)) {
@ -582,78 +576,77 @@ public class NormalPGIControllerService {
// } // }
} }
/** // /**
* 将检验物料信息推送到SRM系统 // * 将检验物料信息推送到SRM系统
* // *
* @param request SRM检验输入数据传输对象，包含需要推送的检验物料信息 // * @param request SRM检验输入数据传输对象，包含需要推送的检验物料信息
*/ // */
private void pushInspectionMaterialsToSRM(SRMInspectionInputDTO request) { // private void pushInspectionMaterialsToSRM(SRMInspectionInputDTO_D request) {
// 获取SRM系统认证Token // SRMInspectionContentDTO content = request.getContent();
String token = GetSRMToken(); // if (content == null || CollectionUtil.isEmpty(content.getLineVOList())) {
VUtil.trueThrowBusinessError(token.trim().isEmpty()).throwMessage("获取SRM的TOKEN失败"); // return;
// }
log.info("收货单推送SRM数据：" + JSONUtil.toJsonStr(request)); //
// List<ExternalIncomingInspectionApplyQO> qoList = new ArrayList<>();
// 构建HTTP请求头信息 // for (SRMLineVOListItem item : content.getLineVOList()) {
HttpHeaders headers = new HttpHeaders(); // ExternalIncomingInspectionApplyQO qo = new ExternalIncomingInspectionApplyQO();
headers.setContentType(MediaType.APPLICATION_JSON); // qo.setRequestNo(item.getRequestNo());
headers.add("AuthorizationCode", token); // qo.setMaterialNo(item.getItemCode());
headers.add("Gateway-Tag", gatewayTag); // qo.setInspectionType(0);
HttpEntity<SRMInspectionInputDTO> requestEntity = new HttpEntity<>(request, headers); // qo.setSupplierCode(content.getSupplierNum());
// qo.setSupplierName(content.getSupplierName());
// 调用SRM认证接口获取新的Token // qo.setDeliveryOrderNo(content.getReceiveNum());
ResponseEntity<SRMBaseDTO<Object>> response = restTemplate.exchange( // qo.setDeliveryOrderLine(String.valueOf(item.getLineNumber()));
pushUrl, // qo.setPurchaseOrderNo(item.getNoteNum());
HttpMethod.POST, // qo.setPurchaseOrderLine(String.valueOf(item.getLineNumber()));
requestEntity, // qo.setFactory(item.getFactory());
new ParameterizedTypeReference<SRMBaseDTO<Object>>() { // qo.setInspectionQty(item.getReceivedQty() != null ? item.getReceivedQty().intValue() : 0);
} // qo.setPurchaseGroup(content.getPurchaseGroup());
); // qoList.add(qo);
// }
// 记录推送结果日志并验证响应状态 //
log.info("收货单推送SRM的结果：{},{}", response.getStatusCodeValue(), JSONUtil.toJsonStr(response.getBody())); // qmsService.pushIQCIncoming(qoList);
VUtil.trueThrowBusinessError(Objects.isNull(response.getBody()) || !response.getBody().getStatus().equals("S")).throwMessage("收货单推送SRM失败"); // }
}
/** // /**
* 获取SRM系统认证Token // * 获取SRM系统认证Token
* <p> // * <p>
* 该方法首先尝试从Redis缓存中获取SRM Token，如果缓存中不存在或为空， // * 该方法首先尝试从Redis缓存中获取SRM Token，如果缓存中不存在或为空，
* 则通过OAuth认证接口重新获取Token并存入Redis缓存50分钟。 // * 则通过OAuth认证接口重新获取Token并存入Redis缓存50分钟。
* // *
* @return SRM系统认证Token字符串 // * @return SRM系统认证Token字符串
*/ // */
private String GetSRMToken() { // private String GetSRMToken() {
//
// 从Redis缓存中获取SRM Token // // 从Redis缓存中获取SRM Token
String srmToken = stringRedisTemplate.opsForValue().get("srm:token"); // String srmToken = stringRedisTemplate.opsForValue().get("srm:token");
if (srmToken == null || srmToken.trim().isEmpty()) { // if (srmToken == null || srmToken.trim().isEmpty()) {
// 构造HTTP请求头和请求体 // // 构造HTTP请求头和请求体
HttpHeaders headers = new HttpHeaders(); // HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); // headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<SRMTokenInputDTO> requestEntity = new HttpEntity<>(new SRMTokenInputDTO(oauthApp, oauthSecret), headers); // HttpEntity<SRMTokenInputDTO> requestEntity = new HttpEntity<>(new SRMTokenInputDTO(oauthApp, oauthSecret), headers);
//
// 调用SRM认证接口获取新的Token // // 调用SRM认证接口获取新的Token
ResponseEntity<SRMBaseDTO<SRMTokenDTO>> response = restTemplate.exchange( // ResponseEntity<SRMBaseDTO<SRMTokenDTO>> response = restTemplate.exchange(
tokenUrl, // tokenUrl,
HttpMethod.POST, // HttpMethod.POST,
requestEntity, // requestEntity,
new ParameterizedTypeReference<SRMBaseDTO<SRMTokenDTO>>() { // new ParameterizedTypeReference<SRMBaseDTO<SRMTokenDTO>>() {
//
} // }
); // );
//
// 提取返回的Token并存储到Redis缓存中，有效期50分钟 // // 提取返回的Token并存储到Redis缓存中，有效期50分钟
String newToken = response.getBody() == null ? "" : response.getBody().getData().getAuthorizationCode(); // String newToken = response.getBody() == null ? "" : response.getBody().getData().getAuthorizationCode();
stringRedisTemplate.opsForValue().set("srm:token", newToken, 50, TimeUnit.MINUTES); // stringRedisTemplate.opsForValue().set("srm:token", newToken, 50, TimeUnit.MINUTES);
log.info("PushTagValue结果：{},{}", response.getStatusCodeValue(), JSONUtil.toJsonStr(response.getBody())); // log.info("PushTagValue结果：{},{}", response.getStatusCodeValue(), JSONUtil.toJsonStr(response.getBody()));
} // }
//
// 重新从Redis获取Token并返回 // // 重新从Redis获取Token并返回
srmToken = stringRedisTemplate.opsForValue().get("srm:token"); // srmToken = stringRedisTemplate.opsForValue().get("srm:token");
return srmToken; // return srmToken;
} // }
public List<PDAOrderItemVO> getPackageContents(@NotNull @NotBlank String packageCode) { public List<PDAOrderItemVO> getPackageContents(@NotNull @NotBlank String packageCode) {
List<PackagePOItemDTO> packagePOItems = wmsPackageService.getPackagePOItems(packageCode); List<PackagePOItemDTO> packagePOItems = wmsPackageService.getPackagePOItems(packageCode);

14
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionContentDTO.java
View File

@ -1,14 +0,0 @@
package com.nflg.wms.common.pojo.dto;
import lombok.Data;
import java.util.List;
@Data
public class SRMInspectionContentDTO {
private String supplierName;
private String supplierNum;
private List<SRMLineVOListItem> lineVOList;
private String receiveNum;
private String receiveType;
}

9
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionInputDTO.java
View File

@ -1,9 +0,0 @@
package com.nflg.wms.common.pojo.dto;
import lombok.Data;
@Data
public class SRMInspectionInputDTO {
private String code;
private SRMInspectionContentDTO content;
}