1111

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

@@ -35,6 +35,8 @@ public class InRecordController {
                         String carNo,
                         String tallyPeople,
                         String fkComponyName,
+                        String contractNo,
+                        String packNo,
                         HttpServletRequest request) {
 
         try {
@@ -43,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);
+                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,contractNo,packNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
@@ -69,19 +71,21 @@ public class InRecordController {
     }
     @RequestMapping(value = "/queryTotal.do")
     public String queryTotal(int page, int rows,
-                        String wareName,
-                        String stackName,
-                        String model,
-                        String materialName,
-                        String standard,
-                        String customerName,
-                        String plateNo,
-                        String fromDate,
-                        String toDate,
-                        String ordNo,
-                        String carNo,
-                        String tallyPeople,
-                        String fkComponyName,
+                             String wareName,
+                             String stackName,
+                             String model,
+                             String materialName,
+                             String standard,
+                             String customerName,
+                             String plateNo,
+                             String fromDate,
+                             String toDate,
+                             String ordNo,
+                             String carNo,
+                             String tallyPeople,
+                             String fkComponyName,
+                             String contractNo,
+                             String packNo,
                         HttpServletRequest request) {
 
         try {
@@ -90,7 +94,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.queryTotal(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,packNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -33,6 +33,8 @@ public class OutRecordController {
                            String tallyPeople,
                            String ordNo,
                            String fkComponyName,
+                           String contractNo,
+                           String packNo,
                            HttpServletRequest request) {
 
         try {
@@ -42,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);
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo,packNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
@@ -64,6 +66,8 @@ public class OutRecordController {
                         String tallyPeople,
                         String ordNo,
                         String fkComponyName,
+                             String contractNo,
+                             String packNo,
                         HttpServletRequest request) {
 
         try {
@@ -72,7 +76,7 @@ public class OutRecordController {
             Date fromDate = DateTools.StrToDate(pFromDate, "yyyy-MM-dd HH:mm:ss");
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
             result = outRecordService.queryTotal(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,packNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -103,6 +103,7 @@ public class StoreController {
                              String plateNo,
                              String ordNo,
                              String contractNo,
+                             String packNo,
                               HttpServletRequest request) {
 
         try {
@@ -116,7 +117,7 @@ public class StoreController {
                     standard,
                       customerName,
                     userId,
-                    belongId,plateNo,ordNo,contractNo,fkcustmerName);
+                    belongId,plateNo,ordNo,contractNo,fkcustmerName,packNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -23,12 +23,16 @@ 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);
+                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople,
+                          String fkComponyName,String contractNo,String packNo,List<String> pltNos,
+                          List<String> ordNos,List<String> contractNos,List<String> packNos);
 
     int updateIn(InRecord inRecord);
 
     List<TrackRecord> selectTrackRecord(String plateNo, String userId, String belongId);
 
     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 ordNo, String carNo, String tallyPeople, String fkComponyName);
+                                  String plateNo, Date fromDate, Date toDate, String userId, String belongId, String ordNo,
+                                  String carNo, String tallyPeople, String fkComponyName,String contractNo,String packNo,List<String> pltNos,
+                                  List<String> ordNos,List<String> contractNos,List<String> packNos);
 }

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

@@ -20,11 +20,16 @@ public interface OutRecordMapper {
     int updateByPrimaryKey(OutRecord record);
 
     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);
+                            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,String packNo,List<String> pltNos,
+                                List<String> ordNos,List<String> contractNos,List<String> packNos);
     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);
+                                   String plateNo, Date fromDate, Date toDate, String userId, String belongId,
+                                   String carNo, String tallyPeople, String ordNo, String fkComponyName,String contractNo,String packNo,List<String> pltNos,
+                                   List<String> ordNos,List<String> contractNos,List<String> packNos);
 
     int updateVerifyAccount(String id, String uuid);
 

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

@@ -34,7 +34,8 @@ public interface StoreMapper {
     List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
                             String customerName, String userId,String belongId,
                             String fkcustmerName, String plateNo,String ordNo,String contractNo,
-                            List<String> plateNos,List<String> ordNos, List<String> contractNos);
+                            List<String> plateNos,List<String> ordNos, List<String> contractNos,
+                            String packNo, List<String> packNos);
 
     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/ChangeServiceImpl.java

@@ -68,8 +68,10 @@ public class ChangeServiceImpl implements ChangeService {
             num += changeRecordMapper.insert(changeRecord);
 
 
-            list.get(i).setFkComponyId(list.get(i).getCustomer().getId());
-            list.get(i).setCustomer(c);
+//            list.get(i).setFkComponyId(list.get(i).getCustomer().getId());
+//            list.get(i).setCustomer(c);
+            list.get(i).setFkComponyId(c.getId());
+            list.get(i).setCustomer(list.get(i).getCustomer());
             list.get(i).setReceiveAddress(address);
             list.get(i).setChangeCount(list.get(i).getChangeCount()+1);
             num += storeMapper.updateFKByPKey(list.get(i));

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

@@ -12,6 +12,8 @@ import com.th.demo.tools.JSONTools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -27,16 +29,36 @@ public class InRecordServiceImpl implements InRecordService {
     @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,String packNo) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        List<String> packNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (packNo.indexOf(",") != -1){
+            packNos = Arrays.asList(packNo.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);;
+                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,
+                    contractNo,packNo,pltNos,ordNos,contractNos,packNos);
             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,packNo,pltNos,ordNos,contractNos,packNos);
 
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
@@ -60,9 +82,27 @@ public class InRecordServiceImpl implements InRecordService {
     }
     @Override
     public 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 ordNo, String carNo, String tallyPeople, String fkComponyName) {
+                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String ordNo,
+                             String carNo, String tallyPeople, String fkComponyName, String contractNo,String packNo) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        List<String> packNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (packNo.indexOf(",") != -1){
+            packNos = Arrays.asList(packNo.split(","));
+        }
         List<TotalRecord> list=inRecordMapper.selectTotal(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,packNo,pltNos,ordNos,contractNos,packNos);
         result = JSONTools.toStringyyyyMMddHHmmss(list);
         return result;
     }

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

@@ -22,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -42,15 +44,34 @@ public class OutRecordServiceImpl implements OutRecordService {
     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, String packNo) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        List<String> packNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (packNo.indexOf(",") != -1){
+            packNos = Arrays.asList(packNo.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);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName,
+                    contractNo,packNo,pltNos,ordNos,contractNos,packNos);
             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,packNo,pltNos,ordNos,contractNos,packNos);
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
 //        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
@@ -59,9 +80,27 @@ public class OutRecordServiceImpl implements OutRecordService {
         return result;
     }
     public 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 plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
+                             String tallyPeople, String ordNo, String fkComponyName, String contractNo, String packNo) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        List<String> packNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (packNo.indexOf(",") != -1){
+            packNos = Arrays.asList(packNo.split(","));
+        }
         List<TotalRecord> list=outRecordMapper.selectTotal(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,packNo,pltNos,ordNos,contractNos,packNos);
         result = JSONTools.toString(list);
         return result;
     }

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

@@ -96,50 +96,30 @@ public class OutServiceImpl implements OutService {
         });
         Stack stack = JSON.parseObject(to, new TypeReference<Stack>() {
         });
-        int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(stack.getId(), belongId));
+        int currentLayer = 0;
         Store store;
         String noUserParam = "a";
-        if (stack.getIsLayer().equals("0")) {
-            for (int i = 0; i < listOutRecord.size(); i++) {
-                listOutRecord.get(i).setBackFlag("1");
-                num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
-                store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam,userId, belongId);
-                storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
-                store.setOutFlag("0");
-                store.setOutId("");
-                store.setLayer(0);
-                store.setLockFlag("0");
-                store.setStack(stack);
-                OutRecord outRecord = getOutRecord(store, "", "0", userId);
-                num += outRecordMapper.insert(outRecord);
-                num += storeMapper.insert(store);
-                Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
-                distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
-                distribution.setSumCount(distribution.getSumCount()- store.getCount());
-                num=distributionMapper.updateByPrimaryKey(distribution);
-            }
-            result = Tools.moreThanZeroResultJSON(num);
-        } else {
-            for (int i = 0; i < listOutRecord.size(); i++) {
-                listOutRecord.get(i).setBackFlag("1");
-                num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
-                store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
-                storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
-                store.setOutFlag("0");   //孙雪松 取消出库恢复原有状态
-                store.setOutId("");
-                store.setLockFlag("0");
-                store.setLayer(currentLayer + i + 1);
-                store.setStack(stack);
-                OutRecord outRecord = getOutRecord(store, "", "0", userId);
-                num += outRecordMapper.insert(outRecord);
-                num += storeMapper.insert(store);
-                Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
-                distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
-                distribution.setSumCount(distribution.getSumCount()- store.getCount());
-                num=distributionMapper.updateByPrimaryKey(distribution);
-            }
-            result = Tools.moreThanZeroResultJSON(num);
+        for (int i = 0; i < listOutRecord.size(); i++) {
+            listOutRecord.get(i).setBackFlag("1");
+            listOutRecord.get(i).setCancelFlag("9");
+            num += outRecordMapper.updateByPrimaryKey(listOutRecord.get(i));
+            store = storeMapper.selectByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
+            storeMapper.updateByOutId(listOutRecord.get(i).getId(), noUserParam, userId, belongId);
+            store.setOutFlag("0");   //孙雪松 取消出库恢复原有状态
+            store.setOutId("");
+            store.setLockFlag("0");
+            currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(store.getStack().getId(), belongId));
+            store.setLayer(currentLayer + 1);
+            //store.setStack(stack);
+            OutRecord outRecord = getOutRecord(store, "", "0", userId);
+            num += outRecordMapper.insert(outRecord);
+            num += storeMapper.insert(store);
+            Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
+            distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
+            distribution.setSumCount(distribution.getSumCount()- store.getCount());
+            num=distributionMapper.updateByPrimaryKey(distribution);
         }
+        result = Tools.moreThanZeroResultJSON(num);
         return result;
 
 
@@ -302,6 +282,7 @@ public class OutServiceImpl implements OutService {
 
         outRecord.setPackNo(store.getPackNo());
         outRecord.setContractNo(store.getContractNo());
+        outRecord.setOrdNo(store.getOrdNo());
 
         outRecord.setRemark(store.getRemark());
         outRecord.setBelongId(store.getBelongId());

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

@@ -91,10 +91,12 @@ public class StoreServiceImpl implements StoreService {
                              String plateNo,
                              String ordNo,
                              String contractNo,
-                             String fkcustmerName) {
+                             String fkcustmerName,
+                             String packNo) {
         List<String> pltNos =new ArrayList<>() ;
         List<String> ordNos =new ArrayList<>() ;
         List<String> contractNos =new ArrayList<>() ;
+        List<String> packNos =new ArrayList<>() ;
         if (plateNo.indexOf(",") != -1){
             pltNos = Arrays.asList(plateNo.split(","));
         }
@@ -104,15 +106,18 @@ public class StoreServiceImpl implements StoreService {
         if (contractNo.indexOf(",") != -1){
             contractNos = Arrays.asList(contractNo.split(","));
         }
+        if (packNo.indexOf(",") != -1){
+            packNos = Arrays.asList(packNo.split(","));
+        }
 
         if (page == -1 && rows == -1){
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
-                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos);
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos,packNo,packNos);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else {
             PageHelper.startPage(page, rows);
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
-                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos);
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos,packNo,packNos);
             PageInfo<Store> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         }

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

@@ -5,10 +5,12 @@ 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);
+                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople,
+                 String fkComponyName, String contractNo,String packNo);
 
     String updateIn(String json, String userId, String belongId);
 
     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 ordNo, String carNo, String tallyPeople, String fkComponyName);
+                      String plateNo, Date fromDate, Date toDate, String userId, String belongId, String ordNo,
+                      String carNo, String tallyPeople, String fkComponyName, String contractNo,String packNo);
 }

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

@@ -5,9 +5,11 @@ import java.util.Date;
 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 packNo);
     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 plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
+                      String tallyPeople, String ordNo, String fkComponyName, String contractNo, String packNo);
 
     String saveVerifyAcc(String json, String accWgt, String accAmt, String invoiceAmt, String accDate, String accReminder, String userId, String belongId);
 

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

@@ -13,7 +13,7 @@ public interface StoreService {
 
     String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,
                       String customerName, String userId,String belongId,
-                      String plateNo, String ordNo, String contractNo,String fkcustmerName);
+                      String plateNo, String ordNo, String contractNo,String fkcustmerName,String packNo);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

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

@@ -346,11 +346,8 @@
     <if test="param6 != null and param6 != ''" >
       and t.customer_name  = #{param6,jdbcType=VARCHAR}
     </if>
-
-      and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
       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.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
@@ -358,6 +355,31 @@
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
     and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+
+    and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    <if test="param18 != null and param18.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param19 != null and param19.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param19" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param16,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.pack_no like concat('%',#{param17,jdbcType=VARCHAR},'%')
+    <if test="param21 != null and param21.size() !=0" >
+      OR t.pack_no IN <foreach  item="item" collection="param21" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     order by t.add_time desc
   </select>
 
@@ -375,10 +397,8 @@
     <if test="param6 != null and param6 != ''" >
       and t.customer_name = #{param6,jdbcType=VARCHAR}
     </if>
-    and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     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.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
@@ -386,6 +406,30 @@
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
     and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    <if test="param18 != null and param18.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param19 != null and param19.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param19" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param16,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.pack_no like concat('%',#{param17,jdbcType=VARCHAR},'%')
+    <if test="param21 != null and param21.size() !=0" >
+      OR t.pack_no IN <foreach  item="item" collection="param21" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     order by t.add_time desc
   </select>
 

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

@@ -125,7 +125,7 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,in_id, record_type,back_flag,receive_address,distribution_id
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,pack_no,contract_no)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,pack_no,contract_no,ord_no)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -136,7 +136,7 @@
     #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
     #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
     ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},
-    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR})
+    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -431,7 +431,7 @@
     select
       sum(t.count) as total_amount
       ,sum(t.weight) as total_weight
-    from t_ware_out_record t,t_ware_distribution p,(select t.plate_no,max(t.ord_no) ord_no from t_ware_store t group by t.plate_no) c,t_ware_in_record d LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
+    from t_ware_out_record t,t_ware_distribution p,t_ware_in_record d LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
     where  t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
     and t.stack_name like concat('%',#{param2,jdbcType=VARCHAR},'%')
     and t.model like concat('%',#{param3,jdbcType=INTEGER},'%')
@@ -440,10 +440,8 @@
     <if test="param6 != null and param6 != ''" >
       and t.customer_name = #{param6,jdbcType=VARCHAR}
     </if>
-    and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     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
     and t.in_id = d.id
     and p.truck_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
@@ -452,18 +450,41 @@
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
             )  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(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
     and ifnull(t.back_flag,0) &lt;> '1'
+    and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    <if test="param18 != null and param18.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    <if test="param19 != null and param19.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param19" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param16,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.pack_no like concat('%',#{param17,jdbcType=VARCHAR},'%')
+    <if test="param21 != null and param21.size() !=0" >
+      OR t.pack_no IN <foreach  item="item" collection="param21" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     order by t.add_time desc
   </select>
   <select id="selectExpt" resultMap="CleanResultMap" >
     select
-    e.name as fk_compony_name,p.tally_people as tally_people,p.truck_no as out_car_no,f.user_desc as add_id,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
+    e.name as fk_compony_name,p.tally_people as tally_people,p.truck_no as out_car_no,f.user_desc as add_id,t.*,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
     ,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
     ,t.invoice_price,t.distribution_id
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
-    ,t_ware_distribution p,(select t.plate_no,max(t.ord_no) ord_no from t_ware_store t group by t.plate_no) c,t_ware_in_record d
+    ,t_ware_distribution p,t_ware_in_record d
     LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
 
     where t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
@@ -474,10 +495,8 @@
     <if test="param6 != null and param6 != ''" >
       and t.customer_name  = #{param6,jdbcType=VARCHAR}
     </if>
-    and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     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
     and t.in_id = d.id
     and p.truck_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
@@ -486,9 +505,33 @@
     and  a.user_id = #{param10,jdbcType=VARCHAR}  )
     )  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(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
     and ifnull(t.back_flag,0) &lt;> '1'
+
+    and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    <if test="param18 != null and param18.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    <if test="param19 != null and param19.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param19" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param16,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.pack_no like concat('%',#{param17,jdbcType=VARCHAR},'%')
+    <if test="param21 != null and param21.size() !=0" >
+      OR t.pack_no IN <foreach  item="item" collection="param21" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     order by t.add_time desc
   </select>
 </mapper>

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

@@ -515,6 +515,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       #{item,jdbcType=VARCHAR}  </foreach>
     </if>
     )
+    and  (t.pack_no like concat('%',#{param16,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR t.pack_no IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     and t.belong_id = #{param8,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = '0'