承运商可输入+合约号查询

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

                         String carNo,
                         String tallyPeople,
                         String fkComponyName,
+                        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);
+                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,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 tallyPeople,
                            String ordNo,
                            String fkComponyName,
+                           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);
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

                               String toDate,
                               String fkcustmerName,
                               String ordNo,
+                              String contractNo,
                               HttpServletRequest request) {
 
         try {
                     toDate,
                     fkcustmerName,
                     ordNo,
+                    contractNo,
                     userId,
                     belongId);
         } catch (Exception ex) {

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);
+                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo);
 
     int updateIn(InRecord inRecord);
 

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

     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);
+                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                            String ordNo, String fkComponyName,String contractNo);
     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);
 

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

 
     List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
                             String customerName, String fromDate,   String toDate, String userId,
-                            String belongId,String plateNo,String fkcustmerName,String ordNo,List<String> plateNos);
+                            String belongId,String plateNo,String fkcustmerName,String ordNo,List<String> plateNos,
+                            String contractNo);
 
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 

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

     @Override
     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) {
+                        Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo) {
         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);;
+                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,contractNo);;
             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);
+                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName,contractNo);
 
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

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

     int num = 0;
 
     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 plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
+                        String contractNo) {
         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);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName,contractNo);
             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);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
 //        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

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

                              String toDate,
                              String fkcustmerName,
                              String ordNo,
-
+                             String contractNo,
                              String userId,
                              String belongId) {
 
 
         if(page == -1 && rows == -1){
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
-                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos,contractNo);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else {
             PageHelper.startPage(page, rows);
 
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
-                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos,contractNo);
             PageInfo<Store> pageInfo = new PageInfo<>(list);
             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);
+                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo);
 
     String updateIn(String json, String userId, String belongId);
 

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

 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 plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
+                 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);
 

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

 
     String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,
                       String standard, String customerName, String plateNo,String fromDate,
-                      String toDate, String fkcustmerName,String ordNo,
+                      String toDate, String fkcustmerName,String ordNo,String contractNo,
                       String userId,String belongId);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);

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

       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},'%')
+    and ifnull(t.contract_no,'*') like concat('%',#{param16,jdbcType=VARCHAR},'%')
     and ifnull(t.car_no,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ((t.belong_id=#{param11,jdbcType=VARCHAR} and  t.ware_name in (
             select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id

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

     )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    and ifnull(t.contract_no,'*') like concat('%',#{param16,jdbcType=VARCHAR},'%')
     and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
     and ifnull(t.back_flag,0) <> '1'
     order by t.add_time desc

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

         )
     and e.name like concat('%',#{param12,jdbcType=VARCHAR},'%')
     and t.ord_no like concat('%',#{param13,jdbcType=VARCHAR},'%')
+    and ifnull(t.contract_no,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
     and t.out_flag = '0'
       <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">