PDA复核数量更改

mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml

@@ -32,6 +32,9 @@
         <result property="updateByName" column="update_by_name"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="materialKindCount" column="material_kind_count"/>
+        <result property="totalPlanQty" column="total_plan_qty"/>
+        <result property="totalReviewedQty" column="total_reviewed_qty"/>
     </resultMap>
 
     <resultMap type="com.mhd.wms.domain.reviewOrder.repository.po.ReviewMaterialDetailPO" id="ReviewMaterialDetailResult">
@@ -50,6 +53,7 @@
         <result property="pendingReviewQty" column="pending_review_qty"/>
         <result property="reviewedQty" column="reviewed_qty"/>
         <result property="cancelQty" column="cancel_qty"/>
+        <result property="materialPlanQty" column="material_plan_qty"/>
         <result property="receiptOrderNumber" column="receipt_order_number"/>
         <result property="lotNo" column="lot_no"/>
         <result property="batchNumber" column="batch_number"/>
@@ -168,12 +172,25 @@
         </choose>
     </sql>
 
-    <!-- 复核单列表查询 -->
+    <!-- 复核单列表查询（头表 + 明细聚合：种类数、计划总量、已复核总量） -->
     <select id="queryList" parameterType="com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO"
             resultMap="ReviewOrderResult">
         select
-        <include refid="reviewOrderSelectColumns"/>
+        <include refid="reviewOrderSelectColumns"/>,
+        ifnull(agg.material_kind_count, 0) as material_kind_count,
+        ifnull(agg.total_plan_qty, 0) as total_plan_qty,
+        ifnull(agg.total_reviewed_qty, 0) as total_reviewed_qty
         from review_order a
+        left join (
+            select
+                d.review_order_id,
+                count(distinct d.material_base_info_id) as material_kind_count,
+                sum(ifnull(d.material_plan_qty, ifnull(d.pending_review_qty, 0) + ifnull(d.reviewed_qty, 0))) as total_plan_qty,
+                sum(ifnull(d.reviewed_qty, 0)) as total_reviewed_qty
+            from review_material_detail d
+            where d.del_flag = 1
+            group by d.review_order_id
+        ) agg on a.review_order_id = agg.review_order_id
         <where>
             <include refid="reviewOrderWhere"/>
         </where>
@@ -214,6 +231,7 @@
         d.pending_review_qty,
         d.reviewed_qty,
         d.cancel_qty,
+        d.material_plan_qty,
         d.receipt_order_number,
         d.lot_no,
         d.batch_number,