From 571c41f6fe25f6634e7a8cdd6e24fe46d4fae9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Thu, 2 Apr 2026 18:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=B0=BA=E5=AF=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/pickingOrder/PickingOrderApplicationService.java | 5 +++++ .../pickingMaterialDetail/entity/PickingMaterialDetail.java | 2 ++ .../repository/persistence/PickingMaterialDetailImpl.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 3c8b951bc..61a041c6c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -619,6 +619,11 @@ public class PickingOrderApplicationService { PickingMaterialDetailDO returnPickingMaterialDetailDO = new PickingMaterialDetailDO(); BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO); returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity()); + + // 尺寸：优先使用前端传递的值（允许拣货确认时修改）；否则沿用数据库值 + if (StringUtils.isNotBlank(pickingMaterialDetailDO.getSize())) { + returnPickingMaterialDetailDO.setSize(pickingMaterialDetailDO.getSize()); + } // 毛重、净重、面积、体积：如果前端传递了值，使用前端传递的值（允许修改）；否则从出库单明细中自动带出 Long outUniqueId = pickingMaterialDetailPO.getOutUniqueId(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java index 4c31bee62..3c3e45980 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java @@ -272,9 +272,11 @@ public class PickingMaterialDetail extends BaseVOEntity { @ApiModelProperty("装卸费") @Excel(name = "装卸费") + @TableField(exist = false) private BigDecimal loadUnloadFee; @ApiModelProperty("贴标费") @Excel(name = "贴标费") + @TableField(exist = false) private BigDecimal stickerFee; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java index 3bc65d402..33b650bfc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java @@ -165,6 +165,10 @@ public class PickingMaterialDetailImpl extends ServiceImpl