报关明细表添加

mhd_wms/src/main/resources/mapper/customsDeclarationDetail/CustomsDeclarationDetailMapper.xml

@@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"    column="material_name"    />
         <result property="bondInvtNo"    column="bond_invt_no"    />
         <result property="invtRow"    column="invt_row"    />
+        <result property="inOrderNumber"    column="in_order_number"    />
+        <result property="outOrderId"    column="out_order_id"    />
+        <result property="outOrderNumber"    column="out_order_number"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="createByName"    column="create_by_name"    />
@@ -26,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectCustomsDeclarationDetailPo">
-        select id, organization_id, organization_name, top_organization_id, document_number, material_base_info_id, material_code, material_name, bond_invt_no, invt_row, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from customs_declaration_detail
+        select id, organization_id, organization_name, top_organization_id, document_number, material_base_info_id, material_code, material_name, bond_invt_no, invt_row, in_order_number, out_order_id, out_order_number, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from customs_declaration_detail
     </sql>
 
     <sql id="selectCustomsDeclarationDetailPo1">
@@ -58,6 +61,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="inOrderNumber != null and inOrderNumber != ''">
+            and in_order_number = #{inOrderNumber}
+        </if>
+        <if test="inOrderNumberList != null and inOrderNumberList.size > 0">
+            and in_order_number in
+            <foreach collection="inOrderNumberList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <choose>
             <when test="delFlag != null"> and del_flag = #{delFlag} </when>
             <otherwise> and del_flag = 1 </otherwise>