1. 补充入库记录列表sql缺失条件查询,合约号,钢种,订货单号批量查询功能

2.修改入库记录页面接口sql,补充缺失字段
3.库房管理系统,新增批量入库功能接口

sto/src/main/java/com/shinsoft/sto/mapper/record/InrecordMapper.xml

@@ -92,8 +92,44 @@
         <if test="parms.endDtm != null and parms.endDtm != ''">
             and ir.IN_DTM &lt;= TO_DATE(#{parms.endDtm}, 'yyyy-MM-dd hh24:mi:ss')
         </if>
-        <if test="parms.prodNo != null and parms.prodNo != ''">
-            and ir.PROD_NO like '%' || #{parms.prodNo} || '%'
+<!--        <if test="parms.prodNo != null and parms.prodNo != ''">-->
+<!--            and ir.PROD_NO like '%' || #{parms.prodNo} || '%'-->
+<!--        </if>-->
+        <if test="parms.stGrade != null and parms.stGrade.size() > 0 and parms.stGrade!=''">
+            and ir.st_grade in
+            <foreach collection="parms.stGrade" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+        </if>
+        <if test="parms.attrib_01 != null and parms.attrib_01.size() > 0">
+            and PROD.attrib_01 in
+            <foreach collection="parms.attrib_01" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+        </if>
+        <if test="parms.attrib_02 != null and parms.attrib_02.size() > 0 ">
+            and PROD.attrib_02 in
+            <foreach collection="parms.attrib_02" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+        </if>
+        <if test="parms.attrib_04 != null and parms.attrib_04.size() > 0 ">
+            and PROD.attrib_04 in
+            <foreach collection="parms.attrib_04" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+        </if>
+        <if test="parms.inTruckNo != null and parms.inTruckNo.size() > 0 ">
+            and PROD.IN_TRUCK_NO in
+            <foreach collection="parms.inTruckNo" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+        </if>
+        <if test="parms.prodNo != null and parms.prodNo.size() > 0 ">
+            and ir.prod_no in
+            <foreach collection="parms.prodNo" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
         </if>
 <!--        <if test="parms.orderNo != null and parms.orderNo != ''">-->
 <!--            and ir.order_NO like '%' || #{parms.orderNo} || '%'-->
@@ -106,66 +142,70 @@
 
     <select id="selectInrecordPage" resultMap="InrecordResultMap" parameterType="map">
         select
-            ir.id,
-            ir.belong_id,
-            ir.in_truck_no,
-            ir.tally_people,
-            ir.in_dtm,
-            ir.in_ware_name,
-            ir.in_stack_name,
-            ir.in_layer_no,
-            ir.prod_no,
-            ir.owner_company,
-            ir.receiving_company,
-            ir.customer_company,
-            ir.material_id,
-            ir.st_grade,
-            ir.in_weight,
-            ir.in_quantity,
-            ir.in_flag,
-            nvl(ir.delivery_address, owner.default_address) as delivery_address,
-            ir.attrib_01,
-            ir.attrib_02,
-            ir.attrib_03,
-            ir.attrib_04,
-            ir.attrib_05,
-            ir.attrib_06,
-            ir.attrib_07,
-            ir.attrib_08,
-            ir.attrib_09,
-            ir.attrib_10,
-            ir.attrib_11,
-            ir.attrib_12,
-            ir.attrib_13,
-            ir.attrib_14,
-            ir.attrib_15,
-            ir.attrib_16,
-            ir.attrib_17,
-            ir.attrib_18,
-            ir.attrib_19,
-            ir.attrib_20,
-            ir.attrib_21,
-            ir.attrib_22,
-            ir.attrib_23,
-            ir.attrib_24,
-            ir.attrib_25,
-            ir.remark_1,
-            ir.remark_2,
-            ir.remark_3,
-            ir.remark_4,
-            ir.remark_5,
-            owner.customer_nm as owner_company_name,
-            receiving.customer_nm as receiving_company_name,
-            customer.customer_nm as customer_company_name,
-            material.material_name as material_name,
-            material.material_code as material_code,
-            material.material_standard as material_standard,
-            material.material_model as material_model
+        ir.id,
+        ir.belong_id,
+        ir.in_truck_no,
+        ir.tally_people,
+        ir.in_dtm,
+        ir.in_ware_name,
+        ir.in_stack_name,
+        ir.in_layer_no,
+        ir.prod_no,
+        ir.owner_company,
+        ir.receiving_company,
+        ir.customer_company,
+        ir.material_id,
+        ir.st_grade,
+        ir.in_weight,
+        ir.in_quantity,
+        ir.in_flag,
+        nvl(ir.delivery_address, owner.default_address) as delivery_address,
+        ir.attrib_01,
+        ir.attrib_02,
+        ir.attrib_03,
+        ir.attrib_04,
+        ir.attrib_05,
+        ir.attrib_06,
+        ir.attrib_07,
+        ir.attrib_08,
+        ir.attrib_09,
+        ir.attrib_10,
+        ir.attrib_11,
+        ir.attrib_12,
+        ir.attrib_13,
+        ir.attrib_14,
+        ir.attrib_15,
+        ir.attrib_16,
+        ir.attrib_17,
+        ir.attrib_18,
+        ir.attrib_19,
+        ir.attrib_20,
+        ir.attrib_21,
+        ir.attrib_22,
+        ir.attrib_23,
+        ir.attrib_24,
+        ir.attrib_25,
+        ir.remark_1,
+        ir.remark_2,
+        ir.remark_3,
+        ir.remark_4,
+        ir.remark_5,
+        owner.customer_nm as owner_company_name,
+        receiving.customer_nm as receiving_company_name,
+        customer.customer_nm as customer_company_name,
+        material.material_name as material_name,
+        material.material_code as material_code,
+        material.material_standard as material_standard,
+        material.material_model as material_model,
+        prod.ATTRIB_01 as orderNo,
+        PROD.ATTRIB_02 as contractNo,
+        PROD.IN_TRUCK_NO as carNo
         from T_IN_RECORD ir
-                 left join T_MAIN_CUSTOMER owner on owner.id = ir.owner_company
-                 left join T_MAIN_CUSTOMER receiving on receiving.id = ir.receiving_company
-                 left join T_MAIN_CUSTOMER customer on customer.id = ir.customer_company
-                 left join T_MAIN_MATERIAL material on material.id = ir.material_id
+        left join T_MAIN_CUSTOMER owner on owner.id = ir.owner_company
+        left join T_MAIN_CUSTOMER receiving on receiving.id = ir.receiving_company
+        left join T_MAIN_CUSTOMER customer on customer.id = ir.customer_company
+        left join T_MAIN_MATERIAL material on material.id = ir.material_id
+        left JOIN T_PROD_MASTER PROD ON PROD.PROD_No = ir.prod_no
         <include refid="StatisticsWhere"/>
         order by ir.in_dtm desc
     </select>

sto/src/main/java/com/shinsoft/sto/model/record/Inrecord.java

@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 入库记录视图模型，对应 STO_IN_RECORD 表
@@ -157,6 +158,18 @@ public class Inrecord extends BaseModel {
 
     @TableField(exist = false)
     private String materialModel;
+
+    @TableField(exist = false)
+    private String orderNo;
+
+    @TableField(exist = false)
+    private String contractNo;
+
+    @TableField(exist = false)
+    private String carNo;
+
+    @TableField(exist = false)
+    private List<String> stGrades;
 }