1

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java

@@ -72,7 +72,7 @@ public class ProjectInformationRest implements ProjectInformationFeign {
     }
     @ApiOperation("全部")
     @PostMapping("/warehouseList")
-    public Object warehouseList(@RequestBody ProjectInformationQuery query) {
+    public ResultBean warehouseList(@RequestBody ProjectInformationQuery query) {
         return ProjectInformationService.warehouseList(query);
     }
     @ApiOperation("保存")

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -76,6 +76,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
     @Autowired
     ProjectPhaseService projectPhaseService;
 
+
     public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq,String token) {
         ProjectInformationQuery query = pq.getParams();
         QueryWrapper<ProjectInformation> qw = new QueryWrapper<>();
@@ -240,28 +241,35 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         return rb.success().setMsg("保存项目信息成功");
     }
     @Transactional
-    public Object warehouseList(ProjectInformationQuery query) {
+    public ResultBean warehouseList(ProjectInformationQuery query) {
+        ResultBean rb=new ResultBean().fail();
         String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list";
         RestTemplate restTemplate = new RestTemplate();
         Map<String, Object> sendBodyMM = new HashMap<>();
-        ProjectInformation projectInformation=baseMapper.selectOne(new QueryWrapper<ProjectInformation>().eq("sid",query.getSid()));
-        List<StoreHouseProjectVo> s =storeHouseProjectService.selectStoreBySid2(projectInformation.getEnterpriseSid(),"2");
-        sendBodyMM.put("orgPath",projectInformation.getEnterpriseSid());
-        ResponseEntity<String> forEntity = restTemplate.postForEntity(a, sendBodyMM,String.class);
-        com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject();
-        jsonObject = com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody());
-        JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data");
         List<WarehouseInfo> warehouseInfos=new ArrayList<>();
-        for (int i = 0; i < jsonArray.size(); i++) {
+//        ProjectInformation projectInformation=baseMapper.selectOne(new QueryWrapper<ProjectInformation>().eq("sid",query.getSid()));
-            WarehouseInfo vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfo.class);
+        List<EnterpriseProjectVo> list=enterpriseProjectService.getEnterpriseByProjectSid(query.getSid());
-            for (StoreHouseProjectVo storeHouseProjectVo : s) {
+        for (EnterpriseProjectVo enterpriseProjectVo : list) {
-                if(vo.getSid()!=storeHouseProjectVo.getShSid()){
+            List<StoreHouseProjectVo> s =storeHouseProjectService.selectStoreBySid2(enterpriseProjectVo.getEnterpriseSid(),"2");
+            sendBodyMM.put("orgPath",enterpriseProjectVo.getEnterpriseSid());
+            ResponseEntity<String> forEntity = restTemplate.postForEntity(a, sendBodyMM,String.class);
+            com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject();
+            jsonObject = com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody());
+            JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data");
+            for (int i = 0; i < jsonArray.size(); i++) {
+                WarehouseInfo vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfo.class);
+                if(s.size()!=0){
+                    for (StoreHouseProjectVo storeHouseProjectVo : s) {
+                        if(vo.getSid()!=storeHouseProjectVo.getShSid()){
+                            warehouseInfos.add(vo);
+                        }
+                    }
+                }else{
                     warehouseInfos.add(vo);
                 }
             }
         }
-
+        return rb.success().setData(warehouseInfos);
-        return warehouseInfos;
     }
 
 //    @Transactional