From 762c9d4bf4f04ad8cb1cd4f5082e8cfdfa2d08fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 10 Jul 2026 15:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=98=8E=E7=BB=86=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7id=E5=80=BC;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/ReservationStockInOrderImpl.java   | 3 +++
 .../service/ReservationStockInOrderApplicationService.java    | 4 ----
 .../repository/mapper/ReservationStockOutOrderMapper.java     | 3 +++
 .../ReservationStockOutOrderMapper.xml                        | 4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index 0ee86bf18..ee11a2413 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -293,6 +293,9 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             reservationDeliveryDetailsLink.setAmount(customerDeliveryDetail.getAmount());
             reservationDeliveryDetailsLink.setCustomerNumber(customerDeliveryDetail.getCustomerCode());
             reservationDeliveryDetailsLink.setDeliveryName(customerDeliveryDetail.getCustomerName());
+            String customerCode = customerDeliveryDetail.getCustomerCode();
+            Long userId = stockOutOrderMapper.queryShipperId(customerCode, loginUser.getUserPo().getOrganizationId());
+            reservationDeliveryDetailsLink.setCustomerId(userId);
             reservationDeliveryDetailsLink.setBox(customerDeliveryDetail.getBoxCount());
             reservationDeliveryDetailsLink.setBag(customerDeliveryDetail.getPackageCount());
             reservationDeliveryDetailsLink.setCategory(customerDeliveryDetail.getCategory());
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
index a5dd3894e..6b0c7ff48 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
@@ -234,10 +234,6 @@ public class ReservationStockInOrderApplicationService {
             if (stockInOrderPO == null) {
                 throw new ServiceException("入库单不存在，入库单ID：" + inOrderId);
             }
-            // 只有已创建状态（status = 1）的入库单可以删除
-            if (stockInOrderPO.getStatus() == null || !stockInOrderPO.getStatus().equals(1)) {
-                throw new ServiceException("只有已创建状态的入库单可以删除，入库单号：" + stockInOrderPO.getInOrderNumber() + "，当前状态：" + getStatusName(stockInOrderPO.getStatus()));
-            }
         }
 
         return stockInOrderDomainService.delete(inOrderIds);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java
index 3c7231583..b22548db1 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java
@@ -6,6 +6,7 @@ import com.mhd.oms.domain.reservationOutMaterialDetail.repository.po.Reservation
 import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO;
+import org.apache.ibatis.annotations.Param;
 //import com.mhd.wms.domain.stockOutOrder.entity.ReservationStockOutOrder;
 //import com.mhd.wms.domain.stockOutOrder.repository.po.ReservationStockOutOrderPO;
 //import com.mhd.wms.domain.stockOutOrder.repository.todo.ReservationStockOutOrderDO;
@@ -34,4 +35,6 @@ public interface ReservationStockOutOrderMapper extends BaseMapper<ReservationSt
      * 出库单提货单打印-明细
      */
     List<ReservationOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReservationStockOutOrderDO stockOutOrderDO);
+
+    Long queryShipperId(@Param("userMemberCode") String userMemberCode,@Param("organizationId") Long organizationId);
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index fa77182c2..33dfef60e 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -466,4 +466,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="boxPalletNo" column="box_pallet_no"/>
     </resultMap>
 
+    <select id="queryShipperId" resultType="java.lang.Long">
+        select max(user_id) as user_id from NGWL_TEST_USER."USER" where ORGANIZATION_ID = #{organizationId} and USER_MEMBER_CODE = #{userMemberCode} and DEL_FLAG = 1
+    </select>
+
 </mapper>
\ No newline at end of file