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

2026-05-20 16:56:55 +08:00
parent 23e57976f3 65f8e6119b
commit 7bd3834e2b
64 changed files with 1753 additions and 128 deletions
@@ -22,6 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="goodsNameId"    column="GOODS_NAME_ID"    />
        <result property="goodsName"    column="GOODS_NAME"    />
        <result property="cargoWeight"    column="CARGO_WEIGHT"    />
+        <result property="orderId"    column="ORDER_ID"    />
+        <result property="cargoNum"    column="CARGO_NUM"    />
+        <result property="materialBaseInfoId"    column="MATERIAL_BASE_INFO_ID"    />
    </resultMap>


@@ -89,4 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <include refid="selectBusinessDocumentCargoMultiPo"/>
        <include refid="selectBusinessDocumentCargoMultiPo1"/>
    </select>
+
+
+
+    <select id="selectBatchByOrderId"  resultMap="BusinessDocumentCargoMultiResult">
+        select id,order_id,cargo_num,material_base_info_id
+        from business_document_cargo_multi
+        where order_id =#{orderId}
+    </select>
+
+
 </mapper>