From 2fb7d117c0b3462f857697a2e1a64af13f425062 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 17:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=87=BA=E5=BA=93=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E7=AD=89;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 4c6f3ac51..aa0066995 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 @@ -894,6 +894,7 @@ public class StockOutOrderDomainService { Long uniqueId = outMaterialDetailDO.getUniqueId(); BigDecimal outWeight = outMaterialDetailDO.getOutWeight(); BigDecimal outVolume = outMaterialDetailDO.getOutVolume(); + BigDecimal outQuantity = outMaterialDetailDO.getOutQuantity(); PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new QueryWrapper().lambda() .eq(PickingMaterialDetail::getOutUniqueId, uniqueId) .eq(PickingMaterialDetail::getDelFlag, 1), false); @@ -903,9 +904,18 @@ public class StockOutOrderDomainService { pickingMaterialDetail.setTotalGrossWeight(outVolume); pickingMaterialDetail.setVolumeLimit(outVolume); pickingMaterialDetail.setTotalVolume(outVolume); - pickingMaterialDetail.setPickingQuantity(outMaterialDetailDO.getOutQuantity()); - pickingMaterialDetail.setAlreadyPickingQuantity(outMaterialDetailDO.getOutQuantity()); + pickingMaterialDetail.setPickingQuantity(outQuantity == null || outQuantity.compareTo(BigDecimal.ZERO) == 0 ? outMaterialDetailDO.getOutQuantity() : outQuantity); + pickingMaterialDetail.setAlreadyPickingQuantity(outQuantity == null || outQuantity.compareTo(BigDecimal.ZERO) == 0 ? outMaterialDetailDO.getOutQuantity() : outQuantity); pickingMaterialDetailService.updateById(pickingMaterialDetail); + OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper() + .eq(OutMaterialDetail::getUniqueId, uniqueId) + .eq(OutMaterialDetail::getDelFlag, 1), false); + if (outMaterialDetail != null) { + outMaterialDetail.setOutWeight(outWeight); + outMaterialDetail.setOutVolume(outVolume); + outMaterialDetail.setOutQuantity(outQuantity == null || outQuantity.compareTo(BigDecimal.ZERO) == 0 ? outMaterialDetailDO.getOutQuantity() : outQuantity); + outMaterialDetailService.updateById(outMaterialDetail); + } } } }