From 6a87c5a75a2b1f2a16369784d4ef7386321462f0 Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Fri, 14 Aug 2026 11:02:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E9=A2=84=E7=BA=A6=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E7=94=B3=E6=8A=A5=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

reservationStockInOrderApi/list 返回缺少申报数量，原因为查询只查主表、
未关联明细表汇总，且返回对象无对应字段

- ReservationStockInOrderPO 新增 declaredQuantity 字段
- StockInOrderResult resultMap 增加 declaredQuantity 映射
- selectStockInOrderPo 片段增加 reservation_in_material_detail
  的 DECLARED_QUANTITY 汇总子查询(按 level=1 过滤主明细行)
---
 .../repository/po/ReservationStockInOrderPO.java          | 7 +++++++
 .../ReservationStockInOrderMapper.xml                     | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
index 0fbd2e06a..9f3e61c01 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
@@ -163,6 +163,13 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @Excel(name = "入库数量")
     private BigDecimal inQuantity;
 
+    /**
+     * 申报数量：入库单明细中申报数量(DECLARED_QUANTITY)汇总
+     */
+    @ApiModelProperty("申报数量")
+    @Excel(name = "申报数量")
+    private BigDecimal declaredQuantity;
+
     /**
      * 计划入库数量：取入库单明细中的入库数量汇总
      */
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index dd5b3f7cf..e1e55aa0f 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -33,6 +33,7 @@
         <result property="directWarehouse"    column="direct_warehouse"    />
         <result property="annexUrl"    column="annex_url"    />
         <result property="quantity"    column="quantity"    />
+        <result property="declaredQuantity"    column="declared_quantity"    />
         <result property="planInQuantity"    column="plan_in_quantity"    />
         <result property="receiptQuantity"    column="receipt_quantity"    />
         <result property="shelvesQuantity"    column="shelves_quantity"    />
@@ -136,6 +137,13 @@
 <!--          where sso.in_order_number = a.in_order_number-->
 <!--            and sso.del_flag = 1-->
 <!--        ) as shelves_quantity,-->
+        -- 申报数量：入库单明细表 reservation_in_material_detail 的 DECLARED_QUANTITY 汇总
+        (select ifnull(sum(imd.declared_quantity), 0)
+           from reservation_in_material_detail imd
+          where imd.in_order_number = a.in_order_number
+            and imd.del_flag = 1
+            and (imd.level is null or imd.level = 1)
+        ) as declared_quantity,
         a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by,a.PICTURE_URL,
         a.cancel_by_name, a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.remark, a.create_time, a.create_by,
         a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.over_stock_id, a.over_stock_status, a.over_stock_type,