库存操作客户名称查询+导出限制

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

@@ -97,11 +97,12 @@ public class StoreController {
                               String stackName,
                               String model,
                               String materialName,
-                             String standard,
-                             String customerName,
-                             String plateNo,
-                             String ordNo,
+                              String standard,
+                              String customerName,
+                              String plateNo,
+                              String ordNo,
                               String remark1,
+                              String fkcustmerName,
                               HttpServletRequest request) {
 
         try {
@@ -118,6 +119,7 @@ public class StoreController {
                     plateNo,
                     ordNo,
                     remark1,
+                    fkcustmerName,
                     userId,
                     belongId);
         } catch (Exception ex) {

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

@@ -33,7 +33,7 @@ public interface StoreMapper {
 
     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, String remark1);
+                            String userId,String belongId, String remark1,String fkcustmerName);
 
     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

@@ -83,6 +83,7 @@ public class StoreServiceImpl implements StoreService {
                              String plateNo,
                              String ordNo,
                              String remark1,
+                             String fkcustmerName,
                              String userId,
                              String belongId) {
         PageHelper.startPage(page, rows);
@@ -96,9 +97,15 @@ public class StoreServiceImpl implements StoreService {
         }
 
         List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
-                customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1);
-        PageInfo<Store> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+                customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1,fkcustmerName);
+
+        if(page != -1){
+            PageInfo<Store> pageInfo = new PageInfo<>(list);
+            result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        }else {
+            result = JSONTools.toStringyyyyMMddHHmmss(list);
+        }
+
         return result;
     }
 

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

@@ -12,7 +12,7 @@ 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 plateNo,String ordNo,String remark1, String userId,String belongId);
+            standard,  String customerName,  String plateNo,String ordNo,String remark1, String fkcustmerName,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

@@ -432,13 +432,16 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
 
 
   <select id="selectStore" resultMap="BaseResultMap" >
-    select d.name as fk_compony_id,t.* from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d
+    select d.name as fk_compony_id,t.* from t_ware_store t, t_maint_ware a, t_maint_stack b,
+                                            t_maint_material c,t_maint_customer d,t_maint_customer e
     where t.ware_id = a.id
     and t.stack_id = b.id
     and t.material_id  = c.id
     and t.fk_compony_id = d.id
+    and t.customer_id = e.id
     and  a.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
-    and  b.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and  e.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and  d.name like concat('%',#{param14,jdbcType=VARCHAR},'%')
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')