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

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

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

@@ -36,6 +36,7 @@ public class InRecordController {
                         String tallyPeople,
                         String fkComponyName,
                         String remark1,
+                        String contractNo,
                         HttpServletRequest request) {
 
         try {
@@ -44,7 +45,7 @@ public class InRecordController {
             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

@@ -34,6 +34,7 @@ public class OutRecordController {
                            String ordNo,
                            String fkComponyName,
                            String remark1,
+                           String contractNo,
                            HttpServletRequest request) {
 
         try {
@@ -43,7 +44,7 @@ public class OutRecordController {
             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

@@ -25,7 +25,7 @@ public interface InRecordMapper {
     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

@@ -2,6 +2,7 @@ package com.th.demo.mapping.ware;
 
 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;
@@ -21,9 +22,11 @@ public interface OutRecordMapper {
 
     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

@@ -35,25 +35,29 @@ public class InRecordServiceImpl implements InRecordService {
     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

@@ -45,24 +45,28 @@ public class OutRecordServiceImpl implements OutRecordService {
 
     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

@@ -5,7 +5,7 @@ import java.util.Date;
 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

@@ -6,7 +6,7 @@ public interface OutRecordService {
 
     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

@@ -346,6 +346,12 @@
             #{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

@@ -490,6 +490,12 @@
          #{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