From 60e4b3ec13b95e7a3b23c2efb680109c53606d11 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Wed, 29 Oct 2025 16:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/production/entity/dto/ShopOrderInboundDto.java | 5 +++++ .../service/impl/ProductionInboundServiceImpl.java | 6 ++++++ .../gaotao/modules/salesreturn/entity/SalesReturnDto.java | 1 + .../salesreturn/service/impl/SalesReturnServiceImpl.java | 5 +++++ 4 files changed, 17 insertions(+) diff --git a/src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java b/src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java index 04905ae..206beae 100644 --- a/src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java +++ b/src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java @@ -81,6 +81,11 @@ public class ShopOrderInboundDto { private String wdr; + /** + * 高度(mm) + */ + private Double height; + /** * 订单数量 */ diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java index 4f13927..c63b971 100644 --- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java +++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java @@ -711,6 +711,12 @@ public class ProductionInboundServiceImpl implements ProductionInboundService { handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty())); handlingUnit.setReceiveDate(new Date()); handlingUnit.setWdr(dto.getWdr()!=null ? dto.getWdr() : "*"); + + // 设置高度 + if (dto.getHeight() != null && dto.getHeight() > 0) { + handlingUnit.setHeight(BigDecimal.valueOf(dto.getHeight())); + } + // 保存HandlingUnit主记录 handlingUnitService.save(handlingUnit); } 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 71e6098..58b0778 100644 --- a/src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java +++ b/src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java @@ -14,6 +14,7 @@ public class SalesReturnDto { private String locationNo; private String warehouseId; private Integer rmaLineNo; // RMA行号 + private Double height; // 高度(mm) private List packUnitList; @Data 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 02ebcb1..1ba6cbb 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 @@ -328,6 +328,11 @@ public class SalesReturnServiceImpl implements SalesReturnService { handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty())); handlingUnit.setReceiveDate(new Date()); + // 设置高度 + if (dto.getHeight() != null && dto.getHeight() > 0) { + handlingUnit.setHeight(BigDecimal.valueOf(dto.getHeight())); + } + // 保存HandlingUnit主记录 handlingUnitService.save(handlingUnit); }