1.入库明细表单新增查询条件"合约号"

2.出库明细表单新增查询条件"合约号"

src/main/java/com/th/demo/controller/ware/InRecordController.java

                         String tallyPeople,
                         String fkComponyName,
                         String remark1,
+                        String contractNo,
                         HttpServletRequest request) {
 
         try {
             Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
             Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
             result = inRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,remark1);
+                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,remark1,contractNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

src/main/java/com/th/demo/controller/ware/OutRecordController.java

                            String ordNo,
                            String fkComponyName,
                            String remark1,
+                           String contractNo,
                            HttpServletRequest request) {
 
         try {
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
 
             result = outRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,remark1);
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,remark1,contractNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

src/main/java/com/th/demo/mapping/ware/InRecordMapper.java

     List<InRecord> select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                           String plateNo, Date fromDate,
                           Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName
-                            ,List<String> plateNos,List<String> ordNos,String remark1);
+                            ,List<String> plateNos,List<String> ordNos,String remark1,String contractNo,List<String> contractNos);
 
     int updateIn(InRecord inRecord);
 

src/main/java/com/th/demo/mapping/ware/OutRecordMapper.java

 
 import com.th.demo.model.ware.OutRecord;
 import com.th.demo.model.ware.TotalRecord;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 
     List<OutRecord>  select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+
     List<OutRecord>  selectExpt(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
-                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
-                             String ordNo, String fkComponyName,List<String> plateNos,List<String> ordNos,String remark1);
+                                String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                                String ordNo, String fkComponyName, List<String> plateNos, List<String> ordNos, String remark1,String contractNo,List<String> contractNos);
+
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                                    String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
                                    String tallyPeople, String ordNo, String fkComponyName,List<String> plateNos,List<String> ordNos,String remark1);

src/main/java/com/th/demo/service/impl/ware/InRecordServiceImpl.java

     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                         String plateNo, Date fromDate,
                         Date toDate, String userId, String belongId,
-                        String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1) {
+                        String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1,String contractNo) {
         List<String> pltNos =new ArrayList<>() ;
         List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
         if (plateNo.indexOf(",") != -1){
             pltNos = Arrays.asList(plateNo.split(","));
         }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
         if (ordNo.indexOf(",") != -1){
             ordNos = Arrays.asList(ordNo.split(","));
         }
 
         if(page == -1 && rows == -1){
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
-                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName, pltNos,ordNos,remark1);
+                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName, pltNos,ordNos,remark1,contractNo,contractNos);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
 
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
-                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName, pltNos,ordNos,remark1);
+                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName, pltNos,ordNos,remark1,contractNo,contractNos);
 
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

src/main/java/com/th/demo/service/impl/ware/OutRecordServiceImpl.java

 
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                         String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
-                        String tallyPeople, String ordNo, String fkComponyName,String remark1) {
+                        String tallyPeople, String ordNo, String fkComponyName,String remark1,String contractNo) {
         List<String> pltNos =new ArrayList<>() ;
         List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
         if (plateNo.indexOf(",") != -1){
             pltNos = Arrays.asList(plateNo.split(","));
         }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
         if (ordNo.indexOf(",") != -1){
             ordNos = Arrays.asList(ordNo.split(","));
         }
 
         if(page == -1 && rows == -1){
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1,contractNo,contractNos);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1,contractNo,contractNos);
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
 //        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

src/main/java/com/th/demo/service/ware/InRecordService.java

 public interface InRecordService {
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                  String plateNo, Date fromDate,
-                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1);
+                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1,String contractNo);
 
     String updateIn(String json, String userId, String belongId);
 

src/main/java/com/th/demo/service/ware/OutRecordService.java

 
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                  String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
-                 String ordNo, String fkComponyName,String remark1);
+                 String ordNo, String fkComponyName,String remark1,String contractNo);
     String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                       String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
                       String ordNo, String fkComponyName,String remark1);

src/main/resource/mapper/ware/InRecordMapper.xml

             #{item,jdbcType=VARCHAR}  </foreach>
             </if>
           )
+      and (t.contract_no like concat('%',#{param19,jdbcType=VARCHAR},'%')
+      <if test="param20 != null and param20.size() !=0" >
+          OR t.contract_no IN <foreach  item="item" collection="param20" index="index"  open="(" separator="," close=")">
+          #{item,jdbcType=VARCHAR}  </foreach>
+      </if>
+      )
       and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
     and t.cancel_flag = '0'
     and (ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')

src/main/resource/mapper/ware/OutRecordMapper.xml

          #{item,jdbcType=VARCHAR}  </foreach>
         </if>
         )
+      and (t.contract_no like concat('%',#{param19,jdbcType=VARCHAR},'%')
+      <if test="param20 != null and param20.size() !=0" >
+          OR t.contract_no IN <foreach  item="item" collection="param20" index="index"  open="(" separator="," close=")">
+          #{item,jdbcType=VARCHAR}  </foreach>
+      </if>
+      )
     and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
     and t.distribution_id = p.id
     and t.plate_no = c.plate_no