diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 4eee31dd..b21a3b68 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -349,22 +349,22 @@ public class NormalPGIController extends BaseController { .setItem1(new ArrayList<>()) .setItem2(new ArrayList<>()); - SRMInspectionInputDTO srmDto = new SRMInspectionInputDTO(); - srmDto.setCode("WMS_RCV_RECEIVE_TO_SRM"); - SRMInspectionContentDTO content = new SRMInspectionContentDTO(); - content.setSupplierName(order.getSupplierName()); - content.setSupplierNum(order.getSupplierNum()); - content.setReceiveNum(""); - content.setReceiveType("BY_DELIVERY"); +// SRMInspectionInputDTO_D srmDto = new SRMInspectionInputDTO_D(); +// srmDto.setCode("WMS_RCV_RECEIVE_TO_SRM"); +// SRMInspectionContentDTO content = new SRMInspectionContentDTO(); +// content.setSupplierName(order.getSupplierName()); +// content.setSupplierNum(order.getSupplierNum()); +// content.setReceiveNum(""); +// content.setReceiveType("BY_DELIVERY"); // content.setPurchaseGroup(order.getPurchaseGroup()); - content.setLineVOList(new ArrayList<>()); - srmDto.setContent(content); +// content.setLineVOList(new ArrayList<>()); +// srmDto.setContent(content); qcDto = new QCMaterialSyncDTO() .setPoNum(orderItem.getPoNum()) .setReceiptIds(new ArrayList<>()) - .setZwm3A17DTO(sapDto) - .setPushDto(srmDto); + .setZwm3A17DTO(sapDto); +// .setPushDto(srmDto); qcMaterialSyncDTOS.add(qcDto); } @@ -380,22 +380,21 @@ public class NormalPGIController extends BaseController { .setKZKRI(materialInfoInOrder.getKzkri())); // SRM DTO - SRMLineVOListItem srmItem = new SRMLineVOListItem(); - srmItem.setItemCode(item.getMaterialNo()); - srmItem.setItemName(materialInfoInOrder.getMaktx()); - srmItem.setUnit(materialInfoInOrder.getMeins()); - srmItem.setFactory(materialInfoInOrder.getWerks()); - srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); - srmItem.setReceiveBatchNum(""); - srmItem.setReceivedQty(totalQty); - srmItem.setSerialNum(""); - srmItem.setLineNumber(Integer.valueOf(orderItem.getLineNumber())); - srmItem.setNoteNum(order.getNoteNum()); - srmItem.setRequestNo(String.valueOf(qcItem.getId())); - srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); - srmItem.setInspectionFlag("Y"); - qcDto.getPushDto().getContent().getLineVOList().add(srmItem); - +// SRMLineVOListItem srmItem = new SRMLineVOListItem(); +// srmItem.setItemCode(item.getMaterialNo()); +// srmItem.setItemName(materialInfoInOrder.getMaktx()); +// srmItem.setUnit(materialInfoInOrder.getMeins()); +// srmItem.setFactory(materialInfoInOrder.getWerks()); +// srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); +// srmItem.setReceiveBatchNum(""); +// srmItem.setReceivedQty(totalQty); +// srmItem.setSerialNum(""); +// srmItem.setLineNumber(Integer.valueOf(orderItem.getLineNumber())); +// srmItem.setNoteNum(order.getNoteNum()); +// srmItem.setRequestNo(String.valueOf(qcItem.getId())); +// srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); +// srmItem.setInspectionFlag("Y"); +// qcDto.getPushDto().getContent().getLineVOList().add(srmItem); qcDto.getIncomingInspectionApplyQOS().add( new ExternalIncomingInspectionApplyQO() .setRequestNo(String.valueOf(receiveItemId)) @@ -1130,54 +1129,53 @@ public class NormalPGIController extends BaseController { } private void setSrmData( - SRMInspectionInputDTO pushDto, +// SRMInspectionInputDTO_D pushDto, List incomingInspectionApplyQOS, WmsSrmOrder order, List codes, SrmMaterialReceiptQO item, - Long receiveItemId, - SAPSyncParamsDTO materialInfoInOrder + Long receiveItemId ) { - if (CollectionUtil.isNotEmpty(codes)) { - // 根据 BatchNumber 和 SerialNumbers 分组并汇总 CodeNum - Map batchNumbers = codes.stream() - .collect(Collectors.groupingBy(SrmMaterialReceiptScanCodes::getKey, - Collectors.mapping(SrmMaterialReceiptScanCodes::getCodeNum, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)))); - for (Map.Entry entry : batchNumbers.entrySet()) { - String[] keys = entry.getKey().split(";", -1); - SRMLineVOListItem srmItem = new SRMLineVOListItem(); - srmItem.setItemCode(item.getItemCode()); - srmItem.setItemName(materialInfoInOrder.getMaktx()); - srmItem.setUnit(materialInfoInOrder.getMeins()); - srmItem.setFactory(materialInfoInOrder.getWerks()); - srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); - srmItem.setReceiveBatchNum(keys[0]); - srmItem.setReceivedQty(entry.getValue()); - srmItem.setSerialNum(keys[1]); - srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); - srmItem.setNoteNum(item.getNoteNum()); - srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr()); - srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); - srmItem.setInspectionFlag("Y"); - pushDto.getContent().getLineVOList().add(srmItem); - } - } else { - SRMLineVOListItem srmItem = new SRMLineVOListItem(); - srmItem.setItemCode(item.getItemCode()); - srmItem.setItemName(materialInfoInOrder.getMaktx()); - srmItem.setUnit(materialInfoInOrder.getMeins()); - srmItem.setFactory(materialInfoInOrder.getWerks()); - srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); - srmItem.setReceiveBatchNum(""); - srmItem.setReceivedQty(item.getReceiptNum()); - srmItem.setSerialNum(""); - srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); - srmItem.setNoteNum(item.getNoteNum()); - srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr()); - srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); - srmItem.setInspectionFlag("Y"); - pushDto.getContent().getLineVOList().add(srmItem); - } +// if (CollectionUtil.isNotEmpty(codes)) { +// // 根据 BatchNumber 和 SerialNumbers 分组并汇总 CodeNum +// Map batchNumbers = codes.stream() +// .collect(Collectors.groupingBy(SrmMaterialReceiptScanCodes::getKey, +// Collectors.mapping(SrmMaterialReceiptScanCodes::getCodeNum, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)))); +// for (Map.Entry entry : batchNumbers.entrySet()) { +// String[] keys = entry.getKey().split(";", -1); +// SRMLineVOListItem srmItem = new SRMLineVOListItem(); +// srmItem.setItemCode(item.getItemCode()); +// srmItem.setItemName(materialInfoInOrder.getMaktx()); +// srmItem.setUnit(materialInfoInOrder.getMeins()); +// srmItem.setFactory(materialInfoInOrder.getWerks()); +// srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); +// srmItem.setReceiveBatchNum(keys[0]); +// srmItem.setReceivedQty(entry.getValue()); +// srmItem.setSerialNum(keys[1]); +// srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); +// srmItem.setNoteNum(item.getNoteNum()); +// srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr()); +// srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); +// srmItem.setInspectionFlag("Y"); +// pushDto.getContent().getLineVOList().add(srmItem); +// } +// } else { +// SRMLineVOListItem srmItem = new SRMLineVOListItem(); +// srmItem.setItemCode(item.getItemCode()); +// srmItem.setItemName(materialInfoInOrder.getMaktx()); +// srmItem.setUnit(materialInfoInOrder.getMeins()); +// srmItem.setFactory(materialInfoInOrder.getWerks()); +// srmItem.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); +// srmItem.setReceiveBatchNum(""); +// srmItem.setReceivedQty(item.getReceiptNum()); +// srmItem.setSerialNum(""); +// srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); +// srmItem.setNoteNum(item.getNoteNum()); +// srmItem.setRequestNo(IdUtil.getSnowflakeNextIdStr()); +// srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); +// srmItem.setInspectionFlag("Y"); +// pushDto.getContent().getLineVOList().add(srmItem); +// } Set qrCodes = new HashSet<>(); if (CollectionUtil.isNotEmpty(codes)) { List qrCodeMasters = qrCodeMasterService.lambdaQuery() @@ -1233,7 +1231,7 @@ public class NormalPGIController extends BaseController { ) { ZWM3A17DTO zwm3A17DTO = null; QCMaterialSyncDTO qcDto = null; - SRMInspectionInputDTO srmPushDto = null; +// SRMInspectionInputDTO_D srmPushDto = null; qcDto = qcMaterialSyncDTOS.stream() .filter(qcMaterialSyncDTO -> qcMaterialSyncDTO @@ -1258,25 +1256,25 @@ public class NormalPGIController extends BaseController { } zwm3A17DTO = qcDto.getZwm3A17DTO(); - if (Objects.isNull(qcDto.getPushDto())) { - SRMInspectionInputDTO dto = new SRMInspectionInputDTO(); - SRMInspectionContentDTO content = new SRMInspectionContentDTO(); - content.setSupplierName(order.getSupplierName()); - content.setSupplierNum(order.getSupplierNum()); - content.setReceiveNum(""); - content.setReceiveType("BY_DELIVERY"); +// if (Objects.isNull(qcDto.getPushDto())) { +// SRMInspectionInputDTO_D dto = new SRMInspectionInputDTO_D(); +// SRMInspectionContentDTO content = new SRMInspectionContentDTO(); +// content.setSupplierName(order.getSupplierName()); +// content.setSupplierNum(order.getSupplierNum()); +// content.setReceiveNum(""); +// content.setReceiveType("BY_DELIVERY"); // content.setPurchaseGroup(order.getPurchaseGroup()); - content.setLineVOList(new ArrayList<>()); - dto.setContent(content); - dto.setCode("WMS_RCV_RECEIVE_TO_SRM"); - qcDto.setPushDto(dto); - } - srmPushDto = qcDto.getPushDto(); +// content.setLineVOList(new ArrayList<>()); +// dto.setContent(content); +// dto.setCode("WMS_RCV_RECEIVE_TO_SRM"); +// qcDto.setPushDto(dto); +// } +// srmPushDto = qcDto.getPushDto(); //组装SAP的参数 setZWM3A17DTO(zwm3A17DTO, codes, item, materialInfoInOrder); ////组装SRM的参数 - setSrmData(srmPushDto,qcDto.getIncomingInspectionApplyQOS(), order, codes, item, receiveItemId,materialInfoInOrder); + setSrmData(qcDto.getIncomingInspectionApplyQOS(), order, codes, item, receiveItemId); WmsQcReceiveItem qmsReceiptItem = new WmsQcReceiveItem() .setId(receiveItemId) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCMaterialSyncDTO.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCMaterialSyncDTO.java index 214b0af7..9cafc4e9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCMaterialSyncDTO.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCMaterialSyncDTO.java @@ -1,6 +1,5 @@ package com.nflg.wms.admin.pojo.dto; -import com.nflg.wms.common.pojo.dto.SRMInspectionInputDTO; import com.nflg.wms.common.pojo.qo.ExternalIncomingInspectionApplyQO; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ public class QCMaterialSyncDTO { private ZWM3A17DTO zwm3A17DTO; - private SRMInspectionInputDTO pushDto; +// private SRMInspectionInputDTO pushDto; private List incomingInspectionApplyQOS = new ArrayList<>(); 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 0cfb1d94..26936f42 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 @@ -3,7 +3,6 @@ package com.nflg.wms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Pair; 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.QCMaterialSyncDTO; import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO; @@ -25,11 +24,8 @@ import com.nflg.wms.repository.service.*; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.ParameterizedTypeReference; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.http.*; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; @@ -39,9 +35,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.concurrent.TimeUnit; -@Slf4j @Component public class NormalPGIControllerService { @@ -273,10 +267,10 @@ public class NormalPGIControllerService { //导入SAP Pair, Pair> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); //推入srm - SRMInspectionContentDTO content = dto.getPushDto().getContent(); - content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); - pushInspectionMaterialsToSRM(dto.getPushDto()); -// qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); +// SRMInspectionContentDTO content = dto.getPushDto().getContent(); +// content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); +// pushInspectionMaterialsToSRM(dto.getPushDto()); + qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); //修改收货单的物料凭证和年度物料凭证 List ids = dto.getReceiptIds(); //修改收货单的物料凭证和年度物料凭证 @@ -411,10 +405,10 @@ public class NormalPGIControllerService { //导入SAP Pair, Pair> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); //推入srm - SRMInspectionContentDTO content = dto.getPushDto().getContent(); - content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); - pushInspectionMaterialsToSRM(dto.getPushDto()); -// qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); +// SRMInspectionContentDTO content = dto.getPushDto().getContent(); +// content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); +// pushInspectionMaterialsToSRM(dto.getPushDto()); + qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); //修改收货单的物料凭证和年度物料凭证 List ids = dto.getReceiptIds(); //修改收货单的物料凭证和年度物料凭证 @@ -489,10 +483,10 @@ public class NormalPGIControllerService { if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) { for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) { Pair, Pair> zwm3A17ReturnDTO = sapService.zwm3a17(dto.getZwm3A17DTO()); - SRMInspectionContentDTO content = dto.getPushDto().getContent(); - content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); - pushInspectionMaterialsToSRM(dto.getPushDto()); -// qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); +// SRMInspectionContentDTO content = dto.getPushDto().getContent(); +// content.setReceiveNum(zwm3A17ReturnDTO.getValue().getKey()); +// pushInspectionMaterialsToSRM(dto.getPushDto()); + qmsService.pushIQCIncoming(dto.getIncomingInspectionApplyQOS()); List ids = dto.getReceiptIds(); if (CollectionUtil.isNotEmpty(ids)) { @@ -582,78 +576,77 @@ public class NormalPGIControllerService { // } } - /** - * 将检验物料信息推送到SRM系统 - * - * @param request SRM检验输入数据传输对象，包含需要推送的检验物料信息 - */ - private void pushInspectionMaterialsToSRM(SRMInspectionInputDTO request) { - // 获取SRM系统认证Token - String token = GetSRMToken(); - VUtil.trueThrowBusinessError(token.trim().isEmpty()).throwMessage("获取SRM的TOKEN失败"); - - log.info("收货单推送SRM数据：" + JSONUtil.toJsonStr(request)); - - // 构建HTTP请求头信息 - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - headers.add("AuthorizationCode", token); - headers.add("Gateway-Tag", gatewayTag); - HttpEntity requestEntity = new HttpEntity<>(request, headers); - - // 调用SRM认证接口获取新的Token - ResponseEntity> response = restTemplate.exchange( - pushUrl, - HttpMethod.POST, - requestEntity, - new ParameterizedTypeReference>() { - } - ); - - // 记录推送结果日志并验证响应状态 - log.info("收货单推送SRM的结果：{},{}", response.getStatusCodeValue(), JSONUtil.toJsonStr(response.getBody())); - VUtil.trueThrowBusinessError(Objects.isNull(response.getBody()) || !response.getBody().getStatus().equals("S")).throwMessage("收货单推送SRM失败"); - } +// /** +// * 将检验物料信息推送到SRM系统 +// * +// * @param request SRM检验输入数据传输对象，包含需要推送的检验物料信息 +// */ +// private void pushInspectionMaterialsToSRM(SRMInspectionInputDTO_D request) { +// SRMInspectionContentDTO content = request.getContent(); +// if (content == null || CollectionUtil.isEmpty(content.getLineVOList())) { +// return; +// } +// +// List qoList = new ArrayList<>(); +// for (SRMLineVOListItem item : content.getLineVOList()) { +// ExternalIncomingInspectionApplyQO qo = new ExternalIncomingInspectionApplyQO(); +// qo.setRequestNo(item.getRequestNo()); +// qo.setMaterialNo(item.getItemCode()); +// qo.setInspectionType(0); +// qo.setSupplierCode(content.getSupplierNum()); +// qo.setSupplierName(content.getSupplierName()); +// qo.setDeliveryOrderNo(content.getReceiveNum()); +// qo.setDeliveryOrderLine(String.valueOf(item.getLineNumber())); +// qo.setPurchaseOrderNo(item.getNoteNum()); +// qo.setPurchaseOrderLine(String.valueOf(item.getLineNumber())); +// qo.setFactory(item.getFactory()); +// qo.setInspectionQty(item.getReceivedQty() != null ? item.getReceivedQty().intValue() : 0); +// qo.setPurchaseGroup(content.getPurchaseGroup()); +// qoList.add(qo); +// } +// +// qmsService.pushIQCIncoming(qoList); +// } - /** - * 获取SRM系统认证Token - *

- * 该方法首先尝试从Redis缓存中获取SRM Token，如果缓存中不存在或为空， - * 则通过OAuth认证接口重新获取Token并存入Redis缓存50分钟。 - * - * @return SRM系统认证Token字符串 - */ - private String GetSRMToken() { - - // 从Redis缓存中获取SRM Token - String srmToken = stringRedisTemplate.opsForValue().get("srm:token"); - if (srmToken == null || srmToken.trim().isEmpty()) { - // 构造HTTP请求头和请求体 - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - HttpEntity requestEntity = new HttpEntity<>(new SRMTokenInputDTO(oauthApp, oauthSecret), headers); - - // 调用SRM认证接口获取新的Token - ResponseEntity> response = restTemplate.exchange( - tokenUrl, - HttpMethod.POST, - requestEntity, - new ParameterizedTypeReference>() { - - } - ); - - // 提取返回的Token并存储到Redis缓存中，有效期50分钟 - String newToken = response.getBody() == null ? "" : response.getBody().getData().getAuthorizationCode(); - stringRedisTemplate.opsForValue().set("srm:token", newToken, 50, TimeUnit.MINUTES); - log.info("PushTagValue结果：{},{}", response.getStatusCodeValue(), JSONUtil.toJsonStr(response.getBody())); - } - - // 重新从Redis获取Token并返回 - srmToken = stringRedisTemplate.opsForValue().get("srm:token"); - return srmToken; - } +// /** +// * 获取SRM系统认证Token +// *

+// * 该方法首先尝试从Redis缓存中获取SRM Token，如果缓存中不存在或为空， +// * 则通过OAuth认证接口重新获取Token并存入Redis缓存50分钟。 +// * +// * @return SRM系统认证Token字符串 +// */ +// private String GetSRMToken() { +// +// // 从Redis缓存中获取SRM Token +// String srmToken = stringRedisTemplate.opsForValue().get("srm:token"); +// if (srmToken == null || srmToken.trim().isEmpty()) { +// // 构造HTTP请求头和请求体 +// HttpHeaders headers = new HttpHeaders(); +// headers.setContentType(MediaType.APPLICATION_JSON); +// HttpEntity requestEntity = new HttpEntity<>(new SRMTokenInputDTO(oauthApp, oauthSecret), headers); +// +// // 调用SRM认证接口获取新的Token +// ResponseEntity> response = restTemplate.exchange( +// tokenUrl, +// HttpMethod.POST, +// requestEntity, +// new ParameterizedTypeReference>() { +// +// } +// ); +// +// // 提取返回的Token并存储到Redis缓存中，有效期50分钟 +// String newToken = response.getBody() == null ? "" : response.getBody().getData().getAuthorizationCode(); +// stringRedisTemplate.opsForValue().set("srm:token", newToken, 50, TimeUnit.MINUTES); +// log.info("PushTagValue结果：{},{}", response.getStatusCodeValue(), JSONUtil.toJsonStr(response.getBody())); +// } +// +// // 重新从Redis获取Token并返回 +// srmToken = stringRedisTemplate.opsForValue().get("srm:token"); +// return srmToken; +// } public List getPackageContents(@NotNull @NotBlank String packageCode) { List packagePOItems = wmsPackageService.getPackagePOItems(packageCode); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionContentDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionContentDTO.java deleted file mode 100644 index 16c4b8bd..00000000 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionContentDTO.java +++ /dev/null @@ -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 lineVOList; - private String receiveNum; - private String receiveType; -} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionInputDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionInputDTO.java deleted file mode 100644 index 5a13cbb9..00000000 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMInspectionInputDTO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.nflg.wms.common.pojo.dto; - -import lombok.Data; - -@Data -public class SRMInspectionInputDTO { - private String code; - private SRMInspectionContentDTO content; -}