Merge branch 'dev' into dev_WMS20260401

# Conflicts:
#	mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml

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

@@ -20,6 +20,9 @@
         <result property="customerId" column="customer_id"/>
         <result property="customerCode" column="customer_code"/>
         <result property="customerName" column="customer_name"/>
+        <result property="shipperId" column="shipper_id"/>
+        <result property="shipperCode" column="shipper_code"/>
+        <result property="shipperName" column="shipper_name"/>
         <result property="receiveTime" column="receive_time"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
@@ -29,9 +32,9 @@
         <result property="updateByName" column="update_by_name"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
-        <result property="shipperId" column="SHIPPER_ID"/>
-        <result property="shipperCode" column="SHIPPER_CODE"/>
-        <result property="shipperName" column="SHIPPER_NAME"/>
+        <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"/>
@@ -95,6 +99,9 @@
         a.customer_id,
         a.customer_code,
         a.customer_name,
+        a.shipper_id,
+        a.shipper_code,
+        a.shipper_name,
         a.receive_time,
         a.remark,
         a.create_by,
@@ -103,10 +110,7 @@
         a.update_by,
         a.update_by_name,
         a.update_time,
-        a.del_flag,
-        a.SHIPPER_ID,
-        a.SHIPPER_CODE,
-        a.SHIPPER_NAME
+        a.del_flag
     </sql>
 
     <sql id="reviewOrderWhere">
@@ -146,6 +150,9 @@
         <if test="customerName != null and customerName != ''">
             and a.customer_name like concat('%', #{customerName}, '%')
         </if>
+        <if test="shipperName != null and shipperName != ''">
+            and a.shipper_name like concat('%', #{shipperName}, '%')
+        </if>
         <if test="createTimeStart != null and createTimeStart != ''">
             and date_format(a.create_time, '%Y-%m-%d') &gt;= #{createTimeStart}
         </if>
@@ -168,12 +175,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 +234,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,
@@ -262,4 +283,4 @@
         and d.del_flag = 1
         order by d.review_material_detail_id asc
     </select>
-</mapper>
+</mapper>

mhd_wms/src/main/resources/mapper/stockInTaskOrder/StockInTaskOrderMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <include refid="selectStockInTaskOrderPo1"/>
         </where>
-        order by a.operators_end_time desc, a.create_time desc
+--         创建时间为空的排最后
+        order by a.create_time is null, a.create_time desc
     </select>
 </mapper>