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

2026-05-18 10:26:49 +08:00
parent bb66a76762 10a3cd1740
commit 187710f578
16 changed files with 255 additions and 105 deletions
@@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="reviseApplyByName"    column="REVISE_APPLY_BY_NAME"    />
        <result property="reviseApplyReason"    column="REVISE_APPLY_REASON"    />
        <result property="reviseApplyTime"    column="REVISE_APPLY_TIME"    />
+        <result property="cargoNum"    column="CARGO_NUM"    />
    </resultMap>


@@ -711,7 +712,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        select  SALESPERSON_NC_CODE from NGWL_TEST_USER."USER" where USER_ID = #{salesmanCodeNc}</select>

    <select id="queryListAndMaterial" parameterType="com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO" resultMap="BusinessDocumentOrderResult">
-        select o.*,a.material_code , a.material_base_info_id ,a.product_type
+        select o.*,a.material_code , a.material_base_info_id ,a.product_type,a.cargo_num
        from business_document_order as o
        left join business_document_cargo_multi as a ON o.id = a.order_id
 <include refid="selectBusinessDocumentOrderPo3"/>