fanxiongwei 3 years ago
parent
commit
fc0edaee23

+ 5 - 1
src/main/java/com/chinaitop/depot/feign/StorageHouseFeignClient.java

@@ -15,5 +15,9 @@ public interface StorageHouseFeignClient {
15
 
15
 
16
 
16
 
17
     @RequestMapping(value = "/StorageProductFcbgz/getNumberList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
17
     @RequestMapping(value = "/StorageProductFcbgz/getNumberList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
18
-    JSONObject getNumberList(@RequestParam(value = "request")HttpServletRequest request, @RequestParam(value = "pageNum")Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize);
18
+    JSONObject getNumberList(@RequestParam(value = "pageNum")Integer pageNum,
19
+                             @RequestParam(value = "pageSize")Integer pageSize,
20
+                             @RequestParam(value = "houseId")Integer houseId,
21
+                             @RequestParam(value = "wareId")Integer wareId,
22
+                             @RequestParam(value = "orgId")Integer orgId);
19
 }
23
 }

+ 7 - 2
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -647,9 +647,14 @@ public class StorageQualitycheckController {
647
     @ApiImplicitParams({
647
     @ApiImplicitParams({
648
             @ApiImplicitParam(name = "orgId", value = "数据ID", paramType = "query")
648
             @ApiImplicitParam(name = "orgId", value = "数据ID", paramType = "query")
649
     })
649
     })
650
-    public JSONArray getHouseIdAll(Integer orgId, HttpServletRequest request) {
650
+    public JSONArray getHouseIdAll(Integer orgId) {
651
 
651
 
652
-        JSONArray list = storageQualitycheckService.getHouseIdAll(orgId,request);
652
+        JSONArray list = null;
653
+        try {
654
+            list = storageQualitycheckService.getHouseIdAll(orgId);
655
+        } catch (Exception e) {
656
+            e.printStackTrace();
657
+        }
653
 
658
 
654
         return list;
659
         return list;
655
     }
660
     }

+ 2 - 2
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -331,7 +331,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
331
     }
331
     }
332
 
332
 
333
     @Override
333
     @Override
334
-    public JSONArray getHouseIdAll(Integer orgId, HttpServletRequest request) {
334
+    public JSONArray getHouseIdAll(Integer orgId) {
335
 
335
 
336
         List<JSONArray> ListAll = new ArrayList();
336
         List<JSONArray> ListAll = new ArrayList();
337
 
337
 
@@ -343,7 +343,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
343
         JSONObject crkobj =  agileHouseFeignClient.getList(null, null, kcswStr, "ZJ");
343
         JSONObject crkobj =  agileHouseFeignClient.getList(null, null, kcswStr, "ZJ");
344
 
344
 
345
         //调用depot-storage接口
345
         //调用depot-storage接口
346
-        JSONObject cpyobj =  storageHouseFeignClient.getNumberList(request,null, null);
346
+        JSONObject cpyobj =  storageHouseFeignClient.getNumberList(null, null, null, null, orgId);
347
 
347
 
348
         JSONArray crkJson = crkobj.getJSONArray("list");
348
         JSONArray crkJson = crkobj.getJSONArray("list");
349
         JSONArray cpyJson = cpyobj.getJSONArray("list");
349
         JSONArray cpyJson = cpyobj.getJSONArray("list");