From 8e1746f6ea057d853ef10809b75ea08cc553af4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 30 May 2026 00:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=8D=95bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/BusinessDocumentOrderImpl.java  | 2 +-
 .../repository/persistence/ExecuteOrderImpl.java           | 2 +-
 .../service/ReservationStockOutOrderDomainService.java     | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
index 157768725..07f2e62e5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
@@ -548,7 +548,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                 Integer bag = businessDeliveryDetailsLink.getBag();
                 Integer box = businessDeliveryDetailsLink.getBox();
                 //相加
-                tmsOrderAddDTO.setGoodsName(String.valueOf(bag + box));
+                tmsOrderAddDTO.setGoodsName("数量"+String.valueOf(bag + box));
             }
             
             //货物信息
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
index ca7770ce9..8938d49e8 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
@@ -216,7 +216,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                         Integer bag = businessDeliveryDetailsLink.getBag();
                         Integer box = businessDeliveryDetailsLink.getBox();
                         //相加
-                        tmsOrderAddDTO.setGoodsName(String.valueOf(bag + box));
+                        tmsOrderAddDTO.setGoodsName("数量"+String.valueOf(bag + box));
                     }
 
                     tmsOrderAddDTO.setOrganizationName(orgName);
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 2f7e1d81a..16fe40cbb 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
@@ -15,6 +15,7 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.oms.domain.businessDeliveryDetailsLink.entity.BusinessDeliveryDetailsLink;
 import com.mhd.oms.domain.businessDeliveryDetailsLink.repository.facade.IBusinessDeliveryDetailsLinkService;
+import com.mhd.oms.domain.businessDeliveryDetailsLink.repository.mapper.BusinessDeliveryDetailsLinkMapper;
 import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
 import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
 import com.mhd.oms.domain.reservationDeliveryDetailsLink.entity.ReservationDeliveryDetailsLink;
@@ -81,6 +82,8 @@ public class ReservationStockOutOrderDomainService {
     private IReservationDeliveryDetailsLinkService reservationDeliveryDetailsLinkService;
     @Autowired
     private IBusinessDeliveryDetailsLinkService businessDeliveryDetailsLinkService;
+    @Autowired
+    private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper;
 
     /**
      * 分页查询出库单列表
@@ -814,6 +817,10 @@ public class ReservationStockOutOrderDomainService {
                         stockOutOrder.setReturnQuantity(returnQuantity.add(new BigDecimal(bag)));
                     }
                     stockOutOrderService.updateById(stockOutOrder);
+                    String subOrderId = businessDeliveryDetailsLink.getSubOrderId();
+                    BusinessDocumentOrder businessDocumentOrder = businessDocumentOrderMapper.selectOne(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getId, subOrderId));
+                    businessDocumentOrder.setOrderStatus(3L);
+                    businessDocumentOrderMapper.updateById(businessDocumentOrder);
                 }
             }
         }