Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml

@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.SPECIFICATION_MODEL, a.SKU_CODE, a.INVOICE_NO, a.LITER, a.DIMENSIONS, a.DECLARATION_UNIT, a.BATCH_REF_NO, a.SHEET_REF_NO,
         a.ORIGIN_COUNTRY, a.BOX_PALLET_NO, a.CURRENCY, a.UNIT, a.DECLARED_QUANTITY, a.BOX_COUNT, a.PIECE_COUNT, a.INBOUND_QUANTITY,
         a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_PRICE,
-        a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4
+        a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4,
         a.OMS_IN_MATERIAL_DETAIL
         ,CASE
             WHEN (a.quantity - a.receipt_quantity) < 0 THEN 0

mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml

@@ -92,14 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="joinStockOutOrderPoWhere">
-        <if test="warehouseId != null and warehouseId != '' ">
+        <if test="warehouseId != null">
             and b.warehouse_id = #{warehouseId}
         </if>
-        <if test="shipperId != null  and shipperId != ''">
+        <if test="shipperId != null">
             and b.shipper_id = #{shipperId}
         </if>
         <if test="orderTypeCode != null  and orderTypeCode != ''">
-            and a.order_type_code = #{orderTypeCode}
+            and b.order_type_code = #{orderTypeCode}
         </if>
         <choose>
             <when test="delFlag != null"> and b.del_flag = #{delFlag} </when>