修改太杂，懒得写了(下次再细分)

README.md

@@ -31,7 +31,7 @@
 前台；
 1、 将本地打包的dist文件夹压缩成zip文件(一定要压缩成zip文件)
 2、 执行 cd /home/apache-tomcat-8.5.51/webapps/
-3、 查看是否有dist.zip文件，如果有则执行 rm -f dist.zip
+3、 查看是否有dist.zip文件，如果有则执行 rm -f dist_mj.zip
 4、 执行 rz
 5、 选择本地打包好的文件上传zip文件
 6、 上传至完成之后执行 unzip dist.zip 在选择是否全部替换的时候选择A

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

@@ -99,18 +99,23 @@ public class StoreController {
                               String materialName,
                              String standard,
                              String customerName,
+                             String plateNo,
+                             String ordNo,
                               HttpServletRequest request) {
 
         try {
             String userId = (String) request.getAttribute("userId");
             String belongId = (String) request.getAttribute("belongId");
+            // String plateNos = String.join(",", plateNo);
             result = storeService.queryStore(page,rows,
                     wareName,
                     stackName,
                     model,
                     materialName,
                     standard,
-                      customerName,
+                    customerName,
+                    plateNo,
+                    ordNo,
                     userId,
                     belongId);
         } catch (Exception ex) {

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

@@ -31,7 +31,8 @@ public interface StoreMapper {
 
     Store selectByOutId(String id,String noUserParam,String userId, String belongId);
 
-    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,   String customerName, String userId,String belongId);
+    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
+                            String customerName,String plateNo,String orderNo,List<String> plateNos,List<String> ordNos, String userId,String belongId);
 
     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/StoreServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -79,10 +80,21 @@ public class StoreServiceImpl implements StoreService {
                              String materialName,
                              String standard,
                              String customerName,
+                             String plateNo,
+                             String ordNo,
                              String userId,
                              String belongId) {
         PageHelper.startPage(page, rows);
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId);
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+
+        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard, customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId);
         PageInfo<Store> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;

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

@@ -11,7 +11,8 @@ public interface StoreService {
     
     String modify(String json, String userId, String belongId);
 
-    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,  String customerName, String userId,String belongId);
+    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String
+            standard,  String customerName,  String plateNo,String ordNo, String userId,String belongId);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/localhost/db.properties

@@ -1,14 +1,14 @@
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_mj?useUnicode=true&characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
-
-#???????????????????????????????
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_mj?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root
 #jdbc.password=root
 
+#???????????????????????????????
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
+jdbc.user=root
+jdbc.password=root
+
 #jdbc.driverClass=com.mysql.jdbc.Driver
 #jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/thware?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root

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

@@ -438,11 +438,23 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
     and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
-    and t.belong_id = #{param8,jdbcType=VARCHAR}
+    and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+        <if test="param9 != null and param9.size() !=0" >
+          OR t.plate_no IN <foreach  item="item" collection="param9" index="index"  open="(" separator="," close=")">
+          #{item,jdbcType=VARCHAR}  </foreach>
+        </if>
+    )
+    and  (t.ord_no like concat('%',#{param8,jdbcType=VARCHAR},'%')
+        <if test="param10 != null and param10.size() !=0" >
+          OR t.ord_no IN <foreach  item="item" collection="param10" index="index"  open="(" separator="," close=")">
+          #{item,jdbcType=VARCHAR}  </foreach>
+        </if>
+    )
+    and t.belong_id = #{param12,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = '0'
     and t.ware_id in (
-    select m.ware_id from t_maint_userware m  where m.user_id = #{param7,jdbcType=VARCHAR}
+    select m.ware_id from t_maint_userware m  where m.user_id = #{param11,jdbcType=VARCHAR}
      )
     order by b.code,t.layer desc
   </select>