From ea958aec804e0c137f9f545837cb46b433270e63 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 8 Jul 2024 15:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/PurchaseBillRest.java | 6 ++++ .../purchasebill/GoodsSkuPurSelectList.java | 23 ++++++++++++++ .../purchasebill/GoodsSkuPurSelectQuery.java | 22 +++++++++++++ .../purchasebill/PurchaseBillService.java | 7 +++++ .../oms/feign/goods/sku/GoodsSkuFeign.java | 31 +++++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java index fef2554..25e1500 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java @@ -65,4 +65,10 @@ public class PurchaseBillRest { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ return purchaseBillService.fetchDetailsVoBySid(sid); } + + @ApiOperation("采购单选择商品") + @PostMapping("/purGoodsListPage") + public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq) { + return purchaseBillService.purGoodsListPage(pq); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java new file mode 100644 index 0000000..3a2c765 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -0,0 +1,23 @@ +package com.yxt.oms.biz.func.purchasebill; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class GoodsSkuPurSelectList { + + //sid + private String sid; + //商品编码 + private String goodsSkuCode; + //商品名称 + private String goodsName; + //商品条码 + private String barCode; + //规格名称 + private String goodsSkuOwnSpec; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java new file mode 100644 index 0000000..0042a1f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.purchasebill; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class GoodsSkuPurSelectQuery implements Query { + + //商品编码 + private String goodsSkuCode; + //商品名称 + private String goodsName; + //商品条码 + private String barCode; + //规格名称 + private String goodsSkuOwnSpec; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index 06b87db..074ef59 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -31,6 +31,7 @@ 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.goods.sku.GoodsSkuFeign; import com.yxt.oms.feign.portal.privilege.PrivilegeQuery; import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -55,6 +56,8 @@ public class PurchaseBillService extends MybatisBaseService> listPageVo(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -119,4 +122,8 @@ public class PurchaseBillService extends MybatisBaseService> purGoodsListPage(PagerQuery pq) { + return goodsSkuFeign.purGoodsListPage(pq); + } } 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 new file mode 100644 index 0000000..464393d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java @@ -0,0 +1,31 @@ +package com.yxt.oms.feign.goods.sku; + +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.purchasebill.GoodsSkuPurSelectList; +import com.yxt.oms.biz.func.purchasebill.GoodsSkuPurSelectQuery; +import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo; +import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto; +import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery; +import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo; +import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeignFallback; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * @description: + * @author: fzz + * @date: 2024/7/4 + **/ +@FeignClient( + contextId = "ss-goods-GoodsSku", + name = "ss-goods", + path = "/apiadmin/base/basegoodssku") +public interface GoodsSkuFeign { + + @ApiOperation("采购单选择商品") + @PostMapping("/purGoodsListPage") + public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq); +}