1111

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

@@ -5,12 +5,14 @@ import com.th.demo.model.system.Type;
 import com.th.demo.model.ware.Store;
 import com.th.demo.service.maint.CustomerService;
 import com.th.demo.service.ware.StoreService;
+import com.th.demo.tools.DateTools;
 import com.th.demo.tools.JSONTools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 @RestController
 @RequestMapping(value = "/WareStore")
@@ -104,9 +106,24 @@ public class StoreController {
                              String ordNo,
                              String contractNo,
                              String packNo,
+                              String outFlag,
+                              String fromDate,
+                              String toDate,
                               HttpServletRequest request) {
 
         try {
+            Date fromDate2 = new Date();
+            Date toDate2 = new Date();
+            if (fromDate != null && fromDate!= ""){
+                fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
+            }else {
+                fromDate2 =null;
+            }
+            if (toDate != null && toDate != ""){
+                toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
+            }else {
+                toDate2 =null;
+            }
             String userId = (String) request.getAttribute("userId");
             String belongId = (String) request.getAttribute("belongId");
             result = storeService.queryStore(page,rows,
@@ -117,7 +134,7 @@ public class StoreController {
                     standard,
                       customerName,
                     userId,
-                    belongId,plateNo,ordNo,contractNo,fkcustmerName,packNo);
+                    belongId,plateNo,ordNo,contractNo,fkcustmerName,packNo,outFlag,fromDate2,toDate2);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -5,6 +5,7 @@ import com.th.demo.model.ware.Store;
 import com.th.demo.model.ware.StoreOfWareStack;
 import com.th.demo.model.ware.TotalRecord;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,10 +33,11 @@ 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,
-                            String fkcustmerName, String plateNo,String ordNo,String contractNo,
-                            List<String> plateNos,List<String> ordNos, List<String> contractNos,
-                            String packNo, List<String> packNos);
+                            String customerName, String userId, String belongId,
+                            String fkcustmerName, String plateNo, String ordNo, String contractNo,
+                            List<String> plateNos, List<String> ordNos, List<String> contractNos,
+                            String packNo, List<String> packNos,
+                            String out_lag, String localFlag, String outBound, Date fromDate, Date toDate);
 
     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

@@ -19,6 +19,7 @@ import com.th.demo.tools.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.xml.crypto.Data;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -95,7 +96,8 @@ public class StoreServiceImpl implements StoreService {
                              String ordNo,
                              String contractNo,
                              String fkcustmerName,
-                             String packNo) {
+                             String packNo,
+                             String outFlag, Date fromDate, Date toDate) {
         List<String> pltNos =new ArrayList<>() ;
         List<String> ordNos =new ArrayList<>() ;
         List<String> contractNos =new ArrayList<>() ;
@@ -113,14 +115,48 @@ public class StoreServiceImpl implements StoreService {
             packNos = Arrays.asList(packNo.split(","));
         }
 
+        String out_lag ="0";
+        String localFlag = "0";
+        String outBound = "";
+        // add by zhangqy 库存信息增加状态信息，
+        // 0: 正常在库
+        // 1: 已出库
+        // 2: 在库已锁定
+        // 3: 在库已标记入仓
+        // 4: 出库已标记入仓
+        if (outFlag.equals("0")){
+            out_lag = "0";
+            localFlag="0";
+            outBound = "";
+        }else if (outFlag.equals("1")){
+            out_lag = "1";
+            localFlag="1";
+            outBound = "";
+        }else if (outFlag.equals("2")){
+            out_lag = "0";
+            localFlag="1";
+            outBound = "";
+        }else if (outFlag.equals("3")){
+            out_lag = "0";
+            localFlag="0";
+            outBound = "已入仓";
+        }else if (outFlag.equals("4")){
+            out_lag = "1";
+            localFlag="1";
+            outBound = "已入仓";
+        }
+
+
         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,packNo,packNos);
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos,packNo,packNos,
+                    out_lag,localFlag,outBound,fromDate,toDate);
             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,packNo,packNos);
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos,packNo,packNos,
+                    out_lag,localFlag,outBound,fromDate,toDate);
             PageInfo<Store> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         }

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

@@ -2,6 +2,9 @@ package com.th.demo.service.ware;
 
 import com.th.demo.model.ware.Store;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
+
 public interface StoreService {
     String queryLayerByStackId(String stackId, String userId, String belongId);
 
@@ -11,9 +14,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 userId,String belongId,
-                      String plateNo, String ordNo, String contractNo,String fkcustmerName,String packNo);
+    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 packNo,
+                      String outFlag, Date fromDate, Date toDate);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/localhost/db.properties

@@ -1,7 +1,7 @@
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
-#jdbc.user=root
-#jdbc.password=root
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
+jdbc.user=root
+jdbc.password=root
 
 #jdbc.driverClass=com.mysql.jdbc.Driver
 #jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8

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

@@ -524,7 +524,14 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     )
     and t.belong_id = #{param8,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
-    and t.out_flag = '0'
+    and t.out_flag = #{param18,jdbcType=VARCHAR}
+    and t.lock_flag = #{param19,jdbcType=VARCHAR}
+      <if test="param20 != null and param20 !=''">
+        and t.out_bound = #{param20,jdbcType=VARCHAR}
+      </if>
+      <if test="param21 != null and param22 != null">
+        and t.add_time between #{param21,jdbcType=TIMESTAMP} and #{param22,jdbcType=TIMESTAMP}
+      </if>
     and t.ware_id in (
     select m.ware_id from t_maint_userware m  where m.user_id = #{param7,jdbcType=VARCHAR}
      )