From 58d195037ed43ddd73d3483637716af4287fd3d0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 6 Aug 2024 14:52:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E6=9F=A5=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=BF=94=E5=9B=9E=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/func/smssalesbill/GoodsCountVo.java | 20 ++++++++++++++++++ .../biz/func/smssalesbill/ReviewGoods.java | 2 ++ .../smssalesbill/SmsSalesBillService.java | 21 +++++++++++++++++-- .../WarehouseInventoryFeign.java | 5 +++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java new file mode 100644 index 0000000..ef89323 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/8/6 14:44 + */ +@Data +public class GoodsCountVo { + + @ApiModelProperty("实际库存") + private String inventoryCount; // 库存数量 + @ApiModelProperty("可分配库存") + private String allocateCount; // 可分配库存 + @ApiModelProperty("可用库存") + private String useCount; // 可用库存 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java index a1cdf23..5c1e073 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java @@ -19,6 +19,8 @@ public class ReviewGoods { private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Sku名称") private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("goodsSkuSid") + private String goodsSkuSid; // goodsSkuSid @ApiModelProperty("商品编码") private String goodsSkuCode; // 商品编码 @ApiModelProperty("规格型号") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index 3666912..af90c80 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -34,10 +34,12 @@ 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.feign.sales.smssalesbill.SmsSalesBillFeign; +import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import java.util.ArrayList; @@ -61,7 +63,8 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -115,7 +118,21 @@ public class SmsSalesBillService extends MybatisBaseService reviewDetails(String sid) { - return smsSalesBillFeign.reviewDetails(sid); + ResultBean rb = ResultBean.fireFail(); + ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData(); + List goods = data.getGoods(); + if (!goods.isEmpty()) { + for (ReviewGoods good : goods) { + String goodsSkuSid = good.getGoodsSkuSid(); + GoodsCountVo goodsCountVo = warehouseInventoryFeign.selCountsBySkuSid(goodsSkuSid); + if (null != goodsCountVo) { + good.setAllocateCount(goodsCountVo.getAllocateCount()); + good.setUseCount(goodsCountVo.getUseCount()); + good.setInventoryCount(goodsCountVo.getInventoryCount()); + } + } + } + return rb.success().setData(data); } public ResultBean saveShipper(ReviewDetailsVo dto) { 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 abc23fb..f693f2a 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 @@ -1,6 +1,7 @@ package com.yxt.oms.feign.warehouse.warehouseInventory; import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.smssalesbill.GoodsCountVo; import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,4 +34,8 @@ public interface WarehouseInventoryFeign { @ApiOperation("根据skuSid查询商品库存") @PostMapping("/selInventoryCountBySkuSid") public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid); + + @ApiOperation("根据skuSid查询商品库存") + @PostMapping("/selCountsBySkuSid") + public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid); }