From 704f32cf469cab825b582e976c104ce6ee1728cc Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Tue, 9 Dec 2025 17:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/modules/salesreturn/entity/SalesReturnDto.java | 2 ++ .../salesreturn/service/impl/SalesReturnServiceImpl.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java b/src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java index 38093b6..6e0c419 100644 --- a/src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java +++ b/src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java @@ -21,6 +21,8 @@ public class SalesReturnDto { */ private String engChgLevel; private String invUOM; + private String wdr; + private String expiryDate; @Data public static class PackUnitDto { diff --git a/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java b/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java index 8a6316c..f1ff255 100644 --- a/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java +++ b/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java @@ -345,7 +345,8 @@ public class SalesReturnServiceImpl implements SalesReturnService { handlingUnit.setPrintCount(0); handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty())); handlingUnit.setReceiveDate(new Date()); - + handlingUnit.setUmId(dto.getInvUOM()); + handlingUnit.setEngChgLevel(dto.getEngChgLevel()!= null ? dto.getEngChgLevel() : "1"); // 设置高度 if (dto.getHeight() != null && dto.getHeight() > 0) { handlingUnit.setHeight(BigDecimal.valueOf(dto.getHeight())); @@ -427,12 +428,12 @@ public class SalesReturnServiceImpl implements SalesReturnService { params.put("ifsPartNo", dto.getPartNo()); params.put("ifsConfigurationID", "*"); params.put("ifsQytToReceive", dto.getProcessQty().doubleValue()); - params.put("ifsExpiryDate", null); + params.put("ifsExpiryDate", dto.getExpiryDate()!=null?dto.getExpiryDate():null); params.put("ifsLocationNo", dto.getLocationNo()); params.put("ifsLotBatchNo", dto.getBatchNo()); params.put("ifsSerialNo", "*"); params.put("ifsEngChgLevel", dto.getEngChgLevel() != null ? dto.getEngChgLevel() : "1"); - params.put("ifsWDR", "*"); + params.put("ifsWDR", dto.getWdr()!=null?dto.getWdr():"*"); params.put("ifsPartOwnership", "COMPANY OWNED"); params.put("ifsHandlingUnitID", 0); params.put("ifsOwningVendorNo", null);