From c3b7d9162565478906e66dda5c5969dd1bc58ff0 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 24 Jul 2024 17:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../aggregation/CrmCustomerTempRest.java | 122 ++++++++++++++++++
.../crmcustomer/CrmCustomerTempService.java | 67 ++++++++++
.../func/crmcustomer/SalesCustomerQuery.java | 28 ++++
.../biz/func/crmcustomer/SalesCustomerVo.java | 59 +++++++++
.../biz/func/goodsspu/GoodsSpuService.java | 16 ++-
.../oms/biz/func/smssalesbill/AccountVo.java | 21 +++
.../smssalesbill/SmsSalesBillDetailsVo.java | 10 +-
.../func/smssalesbill/SmsSalesBillDto.java | 7 +-
.../customertemp/CrmCustomerTempFeign.java | 94 ++++++++++++++
.../feign/goods/goodsSpu/GoodsSpuFeign.java | 2 +-
.../oms/feign/goods/sku/GoodsSkuFeign.java | 2 +-
.../sales/smssalesbill/SmsSalesBillFeign.java | 2 +-
.../smssalesreturn/SmsSalesReturnFeign.java | 2 +-
.../WarehouseInventoryFeign.java | 2 +-
.../warehouseinfo/WarehouseInfoFeign.java | 2 +-
15 files changed, 415 insertions(+), 21 deletions(-)
create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java
create mode 100644 oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java
new file mode 100644
index 0000000..e459d4a
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java
@@ -0,0 +1,122 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import com.yxt.oms.biz.func.crmcustomer.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ * Project: anrui-crm(客户管理)
+ * File: CrmCustomerTempFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempRest
+ * Description: 潜在客户信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:17
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "潜在客户信息")
+@RestController
+@RequestMapping("v1/crmcustomertemp")
+public class CrmCustomerTempRest {
+
+ @Autowired
+ private CrmCustomerTempService crmCustomerTempService;
+
+ @ApiOperation("销售订单选择客户")
+ @PostMapping("/chooseCustomerList")
+ public ResultBean> chooseCustomerList(@RequestBody PagerQuery pq) {
+ return crmCustomerTempService.chooseCustomerList(pq);
+ }
+
+//
+// /**
+// * 潜在客户管理的分页查询
+// *
+// * @param pq
+// * @return
+// */
+// @ApiOperation("根据条件分页查询数据的列表")
+// @PostMapping("/listPage")
+// public ResultBean> listPage(@RequestBody PagerQuery pq) {
+// return crmCustomerTempService.listPageVo(pq);
+// }
+//
+//
+// /**
+// * 潜在客户新增保存
+// *
+// * @param dto 数据传输对象
+// * @return
+// */
+// @ApiOperation("新增保存")
+// @PostMapping("/save")
+// public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto) {
+// return crmCustomerTempService.saveCrmCustomer(dto);
+// }
+//
+// /**
+// * 潜在客户修改保存
+// *
+// * @param dto 数据传输对象
+// * @param sid 潜在客户sid
+// * @return
+// */
+// @ApiOperation("修改保存")
+// @PostMapping("/update/{sid}")
+// public ResultBean update(@RequestBody CrmCustomerTempUpdateDto dto, @PathVariable("sid") String sid) {
+// ResultBean rb = ResultBean.fireFail();
+// String weixin = dto.getWeixin();
+// if (StringUtils.isNotBlank(weixin)) {
+// if (!weixin.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weixin.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
+// return rb.setMsg("微信号格式不正确");
+// }
+// }
+// String email = dto.getE_mail();
+// if (StringUtils.isNotBlank(email)) {
+// if (!email.matches("^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$")) {
+// return rb.setMsg("邮箱格式不正确");
+// }
+// }
+// ResultBean resultBean = crmCustomerTempService.updateCrmCustomer(dto, sid);
+// if (!resultBean.getSuccess()) {
+// return rb.setMsg(resultBean.getMsg());
+// }
+// return rb.success().setMsg(resultBean.getMsg());
+// }
+//
+// @ApiOperation("删除记录")
+// @DeleteMapping("/del")
+// public ResultBean del(@RequestBody String[] sid) {
+// ResultBean rb = ResultBean.fireFail();
+// crmCustomerTempService.delBySids(sid);
+// return rb.success();
+// }
+//
+// @ApiOperation("获取一条记录")
+// @GetMapping("/fetchSid/{sid}")
+// public ResultBean fetchSid(@PathVariable("sid") String sid) {
+// ResultBean rb = ResultBean.fireFail();
+// CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(sid);
+// if (customerTemp == null) {
+// return rb.setMsg("该客户不存在");
+// }
+// CrmCustomerTempVo vo = crmCustomerTempService.fetchAllBySid(sid);
+// return rb.success().setData(vo);
+// }
+
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java
new file mode 100644
index 0000000..9fe395d
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java
@@ -0,0 +1,67 @@
+package com.yxt.oms.biz.func.crmcustomer;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.HanZiConverterPinYin;
+import com.yxt.common.base.utils.HttpStatusEnum;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo;
+import com.yxt.oms.feign.customer.customertemp.CrmCustomerTempFeign;
+import com.yxt.oms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.oms.feign.portal.sysuser.SysUserVo;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * Project: anrui-crm(客户管理)
+ * File: CrmCustomerTempService.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempService
+ * Description: 潜在客户信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:17
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmCustomerTempService {
+ public static final Logger logger = LoggerFactory.getLogger(CrmCustomerTempService.class);
+
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Resource
+ private SysUserFeign sysUserFeign;
+ @Autowired
+ private CrmCustomerTempFeign crmCustomerTempFeign;
+
+// public ResultBean> listPageVo(PagerQuery pq) {
+// if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+// String staffSid = sysUserFeign.selectBySid(pq.getParams().getUserSid()).getData().getStaffSid();
+// pq.getParams().setStaffSid(staffSid);
+// }
+// return crmCustomerTempFeign.listPage(pq);
+// }
+
+
+ public ResultBean> chooseCustomerList(PagerQuery pq) {
+ ResultBean> pagerVoResultBean = crmCustomerTempFeign.chooseCustomerList(pq);
+ return pagerVoResultBean;
+ }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java
new file mode 100644
index 0000000..3147a6e
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java
@@ -0,0 +1,28 @@
+package com.yxt.oms.biz.func.crmcustomer;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/24 15:17
+ */
+@Data
+public class SalesCustomerQuery implements Query {
+
+ private String createOrgSid;
+ /**
+ * 客户编码
+ */
+ private String customerNo;
+ /**
+ * 手机号
+ */
+ private String mobile;
+ /**
+ * 客户名称
+ */
+ private String name;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java
new file mode 100644
index 0000000..5908015
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java
@@ -0,0 +1,59 @@
+package com.yxt.oms.biz.func.crmcustomer;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/24 15:18
+ */
+@Data
+public class SalesCustomerVo {
+
+ /**
+ * 地址
+ */
+ private String address;
+ /**
+ * 昵称
+ */
+ private String buyserNickname;
+ /**
+ * 市
+ */
+ private String city;
+ /**
+ * 县
+ */
+ private String county;
+ /**
+ * 客户编码
+ */
+ private String customerNo;
+ /**
+ * 手机
+ */
+ private String mobile;
+ /**
+ * 客户名称
+ */
+ private String name;
+ /**
+ * 平台
+ */
+ private String originalPlat;
+ /**
+ * 固话
+ */
+ private String phone;
+ /**
+ * 省
+ */
+ private String province;
+ private String sid;
+ /**
+ * 街道
+ */
+ private String street;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
index 46d94b9..829b20f 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
@@ -32,15 +32,17 @@ public class GoodsSpuService {
public ResultBean> getGoodsForSales(PagerQuery pq) {
ResultBean> goodsForSales = goodsSpuFeign.getGoodsForSales(pq);
PagerVo data = goodsForSales.getData();
- List records = data.getRecords();
- if (!records.isEmpty()) {
- for (SalesGoodsVo record : records) {
- String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid());
- record.setInventoryCount(count);
+ if (data != null) {
+ List records = data.getRecords();
+ if (!records.isEmpty()) {
+ for (SalesGoodsVo record : records) {
+ String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid());
+ record.setInventoryCount(count);
+ }
}
+ data.setRecords(records);
+ goodsForSales.setData(data);
}
- data.setRecords(records);
- goodsForSales.setData(data);
return goodsForSales;
}
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java
new file mode 100644
index 0000000..a6099fe
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java
@@ -0,0 +1,21 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/24 17:19
+ */
+@Data
+public class AccountVo {
+
+ @ApiModelProperty("结算账户")
+ private String bankAccount; // 结算账户
+ @ApiModelProperty("结算账户")
+ private String bankAccountKey; // 结算账户
+ @ApiModelProperty("结算金额")
+ private String amount; // 结算金额
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
index 6052d6a..981b645 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
@@ -158,13 +158,13 @@ public class SmsSalesBillDetailsVo implements Vo {
private String advanceBalance; // 预收款余额
//结算
@ApiModelProperty("结算账户")
- private String bankAccount; // 结算账户
- @ApiModelProperty("结算金额")
- private String settleAmount; // 结算金额
-
+ private List accounts;
@ApiModelProperty("付款凭证")
private List files = new ArrayList<>(); // 付款凭证
-
+ @ApiModelProperty("结算账户")
+ private String bankAccount; // 结算账户
+ @ApiModelProperty("结算账户")
+ private String bankAccountKey; // 结算账户
//-------------补充-------------
@ApiModelProperty("快递公司sid")
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
index b70c1d6..a01f8ab 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
@@ -158,10 +158,11 @@ public class SmsSalesBillDto implements Dto {
private String advanceBalance; // 预收款余额
//结算
@ApiModelProperty("结算账户")
+ private List accounts;
+ @ApiModelProperty("结算账户")
private String bankAccount; // 结算账户
- @ApiModelProperty("结算金额")
- private String settleAmount; // 结算金额
-
+ @ApiModelProperty("结算账户")
+ private String bankAccountKey; // 结算账户
@ApiModelProperty("付款凭证")
private List files = new ArrayList<>(); // 付款凭证
diff --git a/oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java b/oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java
new file mode 100644
index 0000000..2d49bdd
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java
@@ -0,0 +1,94 @@
+package com.yxt.oms.feign.customer.customertemp;
+
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.crmcustomer.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户管理)
+ * File: CrmCustomerTempFeign.java
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign
+ * Description: 潜在客户信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:16
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "潜在客户信息")
+@FeignClient(
+ contextId = "ss-common-customer-CrmCustomerTemp",
+ name = "ss-common-customer",
+ path = "v1/crmcustomertemp"
+ )
+public interface CrmCustomerTempFeign {
+
+ @ApiOperation("销售订单选择客户")
+ @PostMapping("/chooseCustomerList")
+ public ResultBean> chooseCustomerList(@RequestBody PagerQuery pq);
+
+// /**
+// * 潜在客户管理的分页查询
+// *
+// * @param pq
+// * @return
+// */
+// @ApiOperation("根据条件分页查询数据的列表")
+// @PostMapping("/listPage")
+// public ResultBean> listPage(@RequestBody PagerQuery pq);
+//
+// /**
+// * pc端潜在客户新增保存
+// *
+// * @param dto 客户信息及运行信息数据传输对象
+// * @return
+// */
+// @ApiOperation("新增保存")
+// @PostMapping("/save")
+// public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto);
+//
+// /**
+// * pc端潜在客户编辑保存
+// *
+// * @param dto 数据传输对象
+// * @param sid 潜在客户sid
+// * @return
+// */
+// @ApiOperation("修改保存")
+// @PostMapping("/update/{sid}")
+// public ResultBean update(@RequestBody CrmCustomerTempUpdateDto dto, @PathVariable("sid") String sid);
+//
+// /**
+// * pc潜在客户的批量删除
+// *
+// * @param sid
+// * @return
+// */
+// @ApiOperation("删除记录")
+// @DeleteMapping("/del")
+// public ResultBean del(@RequestBody String[] sid);
+//
+// /**
+// * pc潜在客户的编辑回显
+// *
+// * @param sid
+// * @return
+// */
+// @ApiOperation("获取一条记录")
+// @GetMapping("/fetchSid/{sid}")
+// public ResultBean fetchSid(@PathVariable("sid") String sid);
+
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java
index 8c40793..5ba2975 100644
--- a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
**/
@FeignClient(
contextId = "ss-goods-GoodsSpu",
- name = "ss-goods",
+ name = "ss-common-goods",
path = "/apiadmin/base/basegoodsspu")
public interface GoodsSpuFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java
index 464393d..6b1fc7b 100644
--- a/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
**/
@FeignClient(
contextId = "ss-goods-GoodsSku",
- name = "ss-goods",
+ name = "ss-common-goods",
path = "/apiadmin/base/basegoodssku")
public interface GoodsSkuFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java
index 77ecaec..92f75bb 100644
--- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
**/
@FeignClient(
contextId = "ss-common-sales-SmsSalesBill",
- name = "ss-common-smssalesbill",
+ name = "ss-common-sales",
path = "/v1/smssalesbill",
fallback = SmsSalesBillFeignFallback.class)
public interface SmsSalesBillFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
index 8ab6cce..6d452ac 100644
--- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
@@ -55,7 +55,7 @@ import java.util.List;
@Api(tags = "销售退货单据")
@FeignClient(
contextId = "sms-SmsSalesReturn",
- name = "sms",
+ name = "ss-common-sales",
path = "v1/smssalesreturn"
)
public interface SmsSalesReturnFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
index d251fad..abc23fb 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
@@ -26,7 +26,7 @@ import java.util.List;
@Api(tags = "库存")
@FeignClient(
contextId = "ss-common-warehouse-WarehouseInventory",
- name = "ss-common-WarehouseInventory",
+ name = "ss-common-warehouse",
path = "/apiadmin/inventory/Warehouseinventory"
)
public interface WarehouseInventoryFeign {
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
index 4621d05..c96771f 100644
--- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
@@ -31,7 +31,7 @@ import java.util.List;
@Api(tags = "仓库")
@FeignClient(
contextId = "ss-common-warehouse-WmsHouseInfo",
- name = "ss-common-WmsHouseInfo",
+ name = "ss-common-warehouse",
path = "/apiadmin/warehouseinfo"
)
public interface WarehouseInfoFeign {