Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PdaCheckController.java

@@ -57,4 +57,11 @@ public class PdaCheckController {
         return new ResponseEntity<>(pdaCheckService.confirmCheck(whereJson),HttpStatus.OK);
     }
 
+    @PostMapping("/getStor")
+    @Log("获取人员对应仓库下拉框")
+    @ApiOperation("获取人员对应仓库下拉框")
+    public ResponseEntity<Object> getStor(){
+        return new ResponseEntity<>(pdaCheckService.getStor(),HttpStatus.OK);
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java

@@ -1,6 +1,7 @@
 
 package org.nl.wms.pda.st.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 /**
@@ -37,4 +38,10 @@ public interface PdaCheckService {
      * @return JSONObject /
      */
     JSONObject confirmCheck(JSONObject whereJson);
+
+    /**
+     * 获取人员对应仓库下拉框
+     * @return JSONObject /
+     */
+    JSONObject getStor();
 }

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
 import org.nl.wms.pda.st.service.PdaCheckService;
 import org.nl.wms.st.instor.service.CheckService;
 import org.springframework.stereotype.Service;
@@ -30,10 +31,17 @@ public class PdaCheckServiceImpl implements PdaCheckService {
     public JSONObject checkQuery(JSONObject whereJson) {
 
         String check_code = whereJson.getString("check_code");
+        String stor_id = whereJson.getString("stor_id");
 
         JSONObject map = new JSONObject();
         map.put("flag", "1");
+        map.put("stor_id",stor_id);
         if (ObjectUtil.isNotEmpty(check_code)) map.put("check_code","%"+check_code+"%");
+        //获取人员对应的仓库
+        UserStorServiceImpl userStorService = new UserStorServiceImpl();
+        String in_stor_id = userStorService.getInStor();
+        if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id);
+
         JSONArray resultJSONArray = WQL.getWO("PDA_CHECK").addParamMap(map).process().getResultJSONArray(0);
 
         JSONObject jo = new JSONObject();
@@ -111,4 +119,26 @@ public class PdaCheckServiceImpl implements PdaCheckService {
         return result;
     }
 
+    @Override
+    public JSONObject getStor() {
+
+        UserStorServiceImpl userStorService = new UserStorServiceImpl();
+        JSONArray userStor = userStorService.getUserStor();
+
+        JSONArray resultJSONArray = new JSONArray();
+
+        for (int i = 0; i < userStor.size(); i++) {
+            JSONObject json = userStor.getJSONObject(i);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("value", json.getString("stor_id"));
+            jsonObject.put("text", json.getString("stor_name"));
+            resultJSONArray.add(jsonObject);
+        }
+        JSONObject jo = new JSONObject();
+        jo.put("data", resultJSONArray);
+        jo.put("message", "查询成功!");
+
+        return jo;
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql

@@ -15,6 +15,8 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.check_code					    TYPEAS s_string
+	输入.in_stor_id					    TYPEAS f_string
+	输入.stor_id					        TYPEAS s_string
 
 
 [临时表]
@@ -84,6 +86,14 @@
                     check_code like 输入.check_code
                 ENDOPTION
 
+                OPTION 输入.stor_id <> ""
+                    stor_id = 输入.stor_id
+                ENDOPTION
+
+                OPTION 输入.in_stor_id <> ""
+                    stor_id in 输入.in_stor_id
+                ENDOPTION
+
 			ENDSELECT
 		ENDQUERY
 	ENDIF