From bd2a5915ba862f0261d18353763c43ea02bb6eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sat, 18 Apr 2026 11:07:07 +0800
Subject: [PATCH] =?UTF-8?q?OMS=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=BA0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ReservationOutMaterialDetailImpl.java  |  7 ++++++-
 .../service/ReservationStockOutOrderDomainService.java | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/persistence/ReservationOutMaterialDetailImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/persistence/ReservationOutMaterialDetailImpl.java
index dd6e64445..b8fdcd80d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/persistence/ReservationOutMaterialDetailImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/persistence/ReservationOutMaterialDetailImpl.java
@@ -157,7 +157,12 @@ public class ReservationOutMaterialDetailImpl extends ServiceImpl<ReservationOut
             outMaterialDetail.setCreateBy(loginUser.getUserid());
             outMaterialDetail.setCreateByName(userRealName);
             outMaterialDetail.setCreateTime(new Date());
-            outMaterialDetail.setQuantity(outMaterialDetail.getOutboundQuantity());
+            // 计划数量：接口常传 quantity；有 outboundQuantity 时与 quantity 对齐，否则用 quantity 回填 outbound
+            if (outMaterialDetail.getOutboundQuantity() != null) {
+                outMaterialDetail.setQuantity(outMaterialDetail.getOutboundQuantity());
+            } else if (outMaterialDetail.getQuantity() != null) {
+                outMaterialDetail.setOutboundQuantity(outMaterialDetail.getQuantity());
+            }
             String materialNo = outMaterialDetail.getMaterialNo();
             List<MaterialBaseInfoPO> materialBaseInfos = reservationStockInOrderMapper.getMaterialBaseInfoList(materialNo);
             //List<MaterialBaseInfoPO> materialBaseInfos = materialBaseInfoMapper.selectList(new QueryWrapper<MaterialBaseInfo>().lambda().eq(MaterialBaseInfo::getMaterialCode, materialNo));
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
index c1fac00e3..35dccb28c 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
@@ -118,9 +118,15 @@ public class ReservationStockOutOrderDomainService {
         if (stockOutOrderDO.getOutOrderNumber() == null) {
             stockOutOrderDO.setOutOrderNumber(OrderSequence.getOrderCode("CK"));
         }
-        //统计总数量
-        BigDecimal quantity = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getOutboundQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
+        setMaterialDetailInfo(stockOutOrderDO);
+        stockOutOrderDO.setMaterialQuantity(stockOutOrderDO.getMaterialDetailList().size());
+        BigDecimal quantity = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         stockOutOrderDO.setQuantity(quantity);
+        BigDecimal weightLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getWeightLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        stockOutOrderDO.setWeightLimit(weightLimit);
+        BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(ReservationOutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        stockOutOrderDO.setVolumeLimit(volumeLimit);
         // 复核下发状态默认为否（2）
         if (stockOutOrderDO.getCheckTaskDistribution() == null) {
             stockOutOrderDO.setCheckTaskDistribution(2);