From fa5f8d68cc248bb93a149516999850c618090d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 9 Jul 2026 16:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=AE=A2=E6=88=B7=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=86=E9=85=8D=E5=BA=93=E5=AD=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/factory/RemoteWmsFallbackFactory.java |  2 +-
 ...vationStockOutOrderApplicationService.java | 12 +++--
 .../StockOutOrderApplicationService.java      | 50 +++++++++----------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java
index 19b01814a..e187b6c4a 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java
@@ -85,7 +85,7 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
 
             @Override
             public AjaxResult execution(StockOutOrderDTO stockOutOrderDTO) {
-                return null;
+                return AjaxResult.error(cause.getMessage());
             }
 
             @Override
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
index 0c61a57cf..a51006cb8 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
@@ -251,9 +251,15 @@ public class ReservationStockOutOrderApplicationService {
         shipperParam(stockOutOrderDO);
         //设置客户信息
         //customerParam(stockOutOrderDO);
-        stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
-        stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
-        stockOutOrderDO.setOrderTypeName("普通出库");
+        if (stockOutOrderDO.getOrderTypeCode() == null) {
+            stockOutOrderDO.setOrderTypeCode("pu_tong_chu_ku");
+        }
+        if (stockOutOrderDO.getBusinessType() == null) {
+            stockOutOrderDO.setBusinessType("pu_tong_chu_ku");
+        }
+        if (stockOutOrderDO.getOrderTypeName() == null) {
+            stockOutOrderDO.setOrderTypeName("普通出库");
+        }
         //设置数据字典键值
         //setDataDict(stockOutOrderDO);
         return stockOutOrderDomainService.insert(stockOutOrderDO);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index 3487a1f13..e940db01a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -989,36 +989,32 @@ public class StockOutOrderApplicationService {
 //                if (materialInventories == null || materialInventories.isEmpty()) {
 //                    throw new ServiceException("库存不存在：" + batchRefNo + " " + sheetRefNo + " " + boxPalletNo);
 //                }
-
+                Long materialInventoryId = detail.getMaterialInventoryId();
+                MaterialInventory materialInventory = materialInventoryMapper.selectById(materialInventoryId);
                 BigDecimal remainingQuantity = detail.getQuantity();  // 计划数量
-                for (MaterialInventory materialInventory : materialInventories) {
-                    if (remainingQuantity.compareTo(BigDecimal.ZERO) <= 0) {
-                        break;
-                    }
-                    // 当前物料的可用库存
-                    BigDecimal availableStock = materialInventory.getAllocationQuantity();
-                    // 如果当前物料没有库存，跳过
-                    if (availableStock == null || availableStock.compareTo(BigDecimal.ZERO) <= 0) {
-                        continue;
-                    }
-                    // 计算本次能扣减的数量：取 剩余计划 和 当前库存 的较小值
-                    BigDecimal deductQuantity = remainingQuantity.compareTo(availableStock) <= 0
-                            ? remainingQuantity   // 剩余计划 <= 库存，扣剩余计划
-                            : availableStock;      // 剩余计划 > 库存，扣全部库存
 
-                    detail.setMaterialInventoryId(materialInventory.getMaterialInventoryId());
-                    detail.setStorageLocationId(materialInventory.getStorageLocationId());
-                    detail.setStorageLocationName(materialInventory.getStorageLocationName());
-                    detail.setStorageLocationCode(materialInventory.getStorageLocationCode());
-                    detail.setStorageSectionId(materialInventory.getStorageSectionId());
-                    detail.setStorageName(materialInventory.getStorageName());
-                    detail.setStorageCode(materialInventory.getStorageCode());
-                    detail.setInventoryQuantity(materialInventory.getInventoryQuantity());
-                    detail.setAllocationQuantity(deductQuantity);
-                    materialDetailList2.add(detail);
-                    // 更新剩余计划数量
-                    remainingQuantity = remainingQuantity.subtract(deductQuantity);
+                // 当前物料的可用库存
+                BigDecimal availableStock = materialInventory.getAllocationQuantity();
+                // 如果当前物料没有库存，跳过
+                if (availableStock == null || availableStock.compareTo(BigDecimal.ZERO) <= 0) {
+                    continue;
                 }
+                if (availableStock.compareTo(remainingQuantity) < 0) {
+                    throw new RuntimeException(
+                            String.format("可用库存不足，计划数量：%s，当前可用库存：%s",
+                                    remainingQuantity, availableStock)
+                    );
+                }
+//                detail.setMaterialInventoryId(materialInventory.getMaterialInventoryId());
+                detail.setStorageLocationId(materialInventory.getStorageLocationId());
+                detail.setStorageLocationName(materialInventory.getStorageLocationName());
+                detail.setStorageLocationCode(materialInventory.getStorageLocationCode());
+                detail.setStorageSectionId(materialInventory.getStorageSectionId());
+                detail.setStorageName(materialInventory.getStorageName());
+                detail.setStorageCode(materialInventory.getStorageCode());
+                detail.setInventoryQuantity(materialInventory.getInventoryQuantity());
+                detail.setAllocationQuantity(remainingQuantity);
+                materialDetailList2.add(detail);
             }
             stockOutOrderD.setMaterialDetailList(materialDetailList2);
             StockOutOrderDO assembleStockOutOrderDO = assembleParamByOutOrder(stockOutOrderD);