企业信息查询的接口

warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java

@@ -3,7 +3,6 @@ package com.wh.pojo.api;
 import com.yxt.common.core.query.Query;
 import lombok.Data;
 import lombok.experimental.Accessors;
-
 public class ProdStockQuery implements Query {
     private String proName;//	varchar	50					质物名称
     private String proSid;//质物sid

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java

@@ -42,8 +42,6 @@ public class InStoreHouseMainController {
     }
     @PostMapping("listPage")
     public ResultBean listPage(@RequestBody PagerQuery<InStorehouseMainQuery> pq){
-        PagerQuery<WhEnterpriseInformationQuery> pqq=new PagerQuery<>();
-        ResultBean enterpriseBySid = enterpriseInformationFeign.listPage(pqq);
         PagerVo<InStoreHouseMainVo> pv = inStorehouseMainService.listPage(pq);
         ResultBean<PagerVo<InStoreHouseMainVo>> r = ResultBean.fireSuccess();
         return r.setData(pv);

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java

@@ -1,5 +1,9 @@
 package com.wh.controller.purchasenew;
 
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformation;
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformationFeign;
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformationQuery;
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformationVo;
 import com.wh.pojo.purchasenew.*;
 import com.wh.service.purchasenew.PurchasenewService;
 import com.yxt.common.core.query.PagerQuery;
@@ -18,6 +22,9 @@ public class PurchasenewController {
     @Autowired
     private PurchasenewService purchasenewService;
 
+    @Autowired
+    private WhEnterpriseInformationFeign whEnterpriseInformationFeign;
+
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<PurchasenewVo>> listPage(@RequestBody PagerQuery<PurchasenewQuery> pq){
@@ -59,4 +66,11 @@ public class PurchasenewController {
         }
         return rb.success().setData(vo);
     }
+    @ApiOperation("获取所有的企业信息")
+    @GetMapping("/fetchEntList")
+    public ResultBean<List<WhEnterpriseInformationVo>> fetchDetailsBySid(){
+        ResultBean<List<WhEnterpriseInformationVo>> enterpriseBySid = whEnterpriseInformationFeign.EnterpriseList();
+        return enterpriseBySid;
+    }
+
 }

warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java

@@ -26,6 +26,8 @@
 package com.wh.controller.shstorehouse;
 
 import cn.hutool.core.lang.Assert;
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformationFeign;
+import com.wh.feign.enterpriseinformation.WhEnterpriseInformationVo;
 import com.wh.pojo.shstorehouse.*;
 import com.wh.service.shstorehouse.ShStorehouseService;
 import com.yxt.common.core.query.PagerQuery;
@@ -63,7 +65,8 @@ public class ShStorehouseRest {
 
 	@Autowired
 	private ShStorehouseService shStorehouseService;
-
+	@Autowired
+	private WhEnterpriseInformationFeign whEnterpriseInformationFeign;
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
 	public ResultBean<PagerVo<ShStorehouseVo>> listPage(@RequestBody PagerQuery<ShStorehouseQuery> pq){
@@ -144,4 +147,10 @@ public class ShStorehouseRest {
 		}
 		return ResultBean.fireSuccess().setData(urlPath);
 	}
+	@ApiOperation("获取所有的企业信息")
+	@GetMapping("/fetchEntList")
+	public ResultBean<List<WhEnterpriseInformationVo>> fetchDetailsBySid(){
+		ResultBean<List<WhEnterpriseInformationVo>> enterpriseBySid = whEnterpriseInformationFeign.EnterpriseList();
+		return enterpriseBySid;
+	}
 }

warehousing-system/project_web/src/components/instorehouse/purchase.vue

@@ -305,7 +305,7 @@ export default {
         size: 10,
         params: {
           purchaseNo:''
-        }   
+        }
       },
       total: 0,
       purchaseList: [],
@@ -377,7 +377,7 @@ export default {
       }
     },
     async getcustListList () {
-      const { data: result } = await this.$http.post('/crm/v1/enterpriseinformation/list')
+      const { data: result } = await this.$http.post('/v1/shstorehouse/fetchEntList')
       if (result.code == 200){
         this.custList = result.data
       }
@@ -410,7 +410,7 @@ export default {
          storehouse: '',
          status: '',
          products:[]
-               
+
          }
     },
     async getProductList () {