Merge remote-tracking branch 'origin/master'

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; // 可用库存
+}

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("规格型号")

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<SmsSalesBillMapper,
 
     @Resource
     private SmsSalesBillFeign smsSalesBillFeign;
-
+    @Resource
+    private WarehouseInventoryFeign warehouseInventoryFeign;
     private QueryWrapper<SmsSalesBill> 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<SmsSalesBillMapper,
     }
 
     public ResultBean<ReviewDetailsVo> reviewDetails(String sid) {
-        return smsSalesBillFeign.reviewDetails(sid);
+       ResultBean rb = ResultBean.fireFail();
+        ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData();
+        List<ReviewGoods> 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) {

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);
 }