Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java

@@ -192,4 +192,10 @@ public class WarehouseInventoryRest {
     public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid) {
         return WarehouseInventoryService.selInventoryCountBySkuSid(skuSid);
     }
+
+    @ApiOperation("根据skuSid查询商品库存")
+    @PostMapping("/selCountsBySkuSid")
+    public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid) {
+        return WarehouseInventoryService.selCountsBySkuSid(skuSid);
+    }
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventory/GoodsCountVo.java

@@ -0,0 +1,20 @@
+package com.yxt.warehouse.biz.warehouseinventory;
+
+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; // 可用库存
+}

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java

@@ -53,4 +53,6 @@ public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory>
     IPage<WarehouseInventoryHandleSelectList> handleGoodsListPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
 
     String selInventoryCountBySkuSid(@Param("skuSid") String skuSid);
+
+    GoodsCountVo selCountsBySkuSid(@Param("skuSid") String skuSid);
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml

@@ -296,4 +296,14 @@
         WHERE
             goodsSkuSid = #{skuSid}
     </select>
+    <select id="selCountsBySkuSid" resultType="com.yxt.warehouse.biz.warehouseinventory.GoodsCountVo">
+        SELECT
+            IFNULL( SUM( count ), 0 ) as inventoryCount,
+            IFNULL( SUM( count ), 0 ) as useCount,
+            IFNULL( SUM( allocateCount ), 0 ) as allocateCount
+        FROM
+            warehouse_inventory
+        WHERE
+            goodsSkuSid = #{skuSid}
+    </select>
 </mapper>

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java

@@ -455,4 +455,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     public String selInventoryCountBySkuSid(String skuSid) {
         return baseMapper.selInventoryCountBySkuSid(skuSid);
     }
+
+    public GoodsCountVo selCountsBySkuSid(String skuSid) {
+        return baseMapper.selCountsBySkuSid(skuSid);
+    }
 }