查询条件

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

@@ -102,6 +102,8 @@ public class StoreController {
                               String plateNo,
                               String fromDate,
                               String toDate,
+                              String fkcustmerName,
+                              String ordNo,
                               HttpServletRequest request) {
 
         try {
@@ -117,6 +119,8 @@ public class StoreController {
                     plateNo,
                     fromDate,
                     toDate,
+                    fkcustmerName,
+                    ordNo,
                     userId,
                     belongId);
         } catch (Exception ex) {

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

@@ -31,7 +31,9 @@ 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 fromDate,   String toDate, String userId,String belongId,String plateNo);
+    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);
 
     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/InServiceImpl.java

@@ -436,6 +436,7 @@ public class InServiceImpl implements InService {
         inRecord.setOrdNo(store.getOrdNo());
         inRecord.setCarNo(store.getCarNo());
         inRecord.setTallyPeople(store.getTallyPeople());
+        inRecord.setContractNo(store.getContractNo());
 
         return inRecord;
     }

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

@@ -310,7 +310,7 @@ public class OutServiceImpl implements OutService {
             outRecord.setInvoicePrice(price.getOrdPrice());
             outRecord.setUnitPrice(price.getOrdPrice());
         }
-
+        outRecord.setContractNo(store.getContractNo());
 
 
         return outRecord;

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

@@ -82,12 +82,23 @@ public class StoreServiceImpl implements StoreService {
                              String plateNo,
                              String fromDate,
                              String toDate,
+                             String fkcustmerName,
+                             String ordNo,
                              String userId,
                              String belongId) {
-        PageHelper.startPage(page, rows);
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,fromDate, toDate,  userId,belongId, plateNo);
-        PageInfo<Store> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        if(page == -1 && rows == -1){
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo);
+            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);
+            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,10 @@ 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 fromDate,  String toDate, 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 fromDate,
+                      String toDate, String fkcustmerName,String ordNo,
+                      String userId,String belongId);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/localhost/db.properties

@@ -1,4 +1,4 @@
-#????????
+????????
 #jdbc.driverClass=com.mysql.jdbc.Driver
 #jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root
@@ -9,7 +9,7 @@
 #jdbc.user=root
 #jdbc.password=root
 
-#60?????
+##60?????
 jdbc.driverClass=com.mysql.jdbc.Driver
 jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware?useUnicode=true&characterEncoding=utf8
 jdbc.user=root

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

@@ -427,11 +427,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
 
 
   <select id="selectStore" resultMap="BaseResultMap" >
-    select t.* from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d
+    select e.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.customer_id = d.id
+    and t.fk_compony_id = e.id
     and  a.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
     and  b.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
@@ -440,6 +441,8 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
     and t.belong_id = #{param10,jdbcType=VARCHAR}
     and t.plate_no like concat('%',#{param11,jdbcType=VARCHAR},'%')
+    and e.name like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    and t.ord_no like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
     and t.out_flag = '0'
       <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">