From d23d24822ec12a3812a7d7accff84521cb26b8fe Mon Sep 17 00:00:00 2001 From: djz8236 Date: Fri, 7 Jul 2023 10:44:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/wh/pojo/api/ProdStockQuery.java | 1 - .../api/input/InStoreHouseMainController.java | 2 -- .../purchasenew/PurchasenewController.java | 14 ++++++++++++++ .../controller/shstorehouse/ShStorehouseRest.java | 11 ++++++++++- .../src/components/instorehouse/purchase.vue | 6 +++--- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java index 5aee78b3..a83d5b0c 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java +++ b/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 diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java index cf8c6cf3..45bee75a 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java +++ b/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 pq){ - PagerQuery pqq=new PagerQuery<>(); - ResultBean enterpriseBySid = enterpriseInformationFeign.listPage(pqq); PagerVo pv = inStorehouseMainService.listPage(pq); ResultBean> r = ResultBean.fireSuccess(); return r.setData(pv); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java index 740e0fb1..40d1f140 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java +++ b/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> listPage(@RequestBody PagerQuery pq){ @@ -59,4 +66,11 @@ public class PurchasenewController { } return rb.success().setData(vo); } + @ApiOperation("获取所有的企业信息") + @GetMapping("/fetchEntList") + public ResultBean> fetchDetailsBySid(){ + ResultBean> enterpriseBySid = whEnterpriseInformationFeign.EnterpriseList(); + return enterpriseBySid; + } + } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java index 3e33e9a5..0d8c68ac 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java +++ b/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> listPage(@RequestBody PagerQuery pq){ @@ -144,4 +147,10 @@ public class ShStorehouseRest { } return ResultBean.fireSuccess().setData(urlPath); } + @ApiOperation("获取所有的企业信息") + @GetMapping("/fetchEntList") + public ResultBean> fetchDetailsBySid(){ + ResultBean> enterpriseBySid = whEnterpriseInformationFeign.EnterpriseList(); + return enterpriseBySid; + } } diff --git a/warehousing-system/project_web/src/components/instorehouse/purchase.vue b/warehousing-system/project_web/src/components/instorehouse/purchase.vue index 2fc0da6c..7f762eaa 100644 --- a/warehousing-system/project_web/src/components/instorehouse/purchase.vue +++ b/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 () {