From ce4f56962fd9b188a6b5e73c99eba4639b7926ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 14 Jul 2026 15:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/OutMaterialDetailDO.java | 4 ++++ .../stockOutOrder/service/StockOutOrderDomainService.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index 32838018a..ea24b9fe7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -528,4 +528,8 @@ public class OutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("出库体积") @Excel(name = "出库体积") private BigDecimal outVolume; + + @ApiModelProperty("出库数量") + @Excel(name = "出库数量") + private BigDecimal outQuantity; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 0a900d0b1..4c6f3ac51 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -887,7 +887,7 @@ public class StockOutOrderDomainService { throw new RuntimeException("出库单明细不存在!"); } List pickingMaterialDetailList = materialDetailList.stream() - .filter(m -> m.getOutWeight() != null || m.getOutVolume() != null) + .filter(m -> m.getOutWeight() != null || m.getOutVolume() != null || m.getOutQuantity() != null) .collect(Collectors.toList()); if (pickingMaterialDetailList != null && pickingMaterialDetailList.size() > 0) { for (OutMaterialDetailDO outMaterialDetailDO : pickingMaterialDetailList) { @@ -903,8 +903,8 @@ public class StockOutOrderDomainService { pickingMaterialDetail.setTotalGrossWeight(outVolume); pickingMaterialDetail.setVolumeLimit(outVolume); pickingMaterialDetail.setTotalVolume(outVolume); - pickingMaterialDetail.setPickingQuantity(pickingMaterialDetail.getQuantity()); - pickingMaterialDetail.setAlreadyPickingQuantity(pickingMaterialDetail.getQuantity()); + pickingMaterialDetail.setPickingQuantity(outMaterialDetailDO.getOutQuantity()); + pickingMaterialDetail.setAlreadyPickingQuantity(outMaterialDetailDO.getOutQuantity()); pickingMaterialDetailService.updateById(pickingMaterialDetail); } }