From 220946ec05925f7ee43a4fc0e5c8f2f398e48d86 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 28 Oct 2024 16:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E4=BA=AB=E9=80=9A?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E8=AF=A6=E6=83=85=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiadmin/WarehouseInventoryRest.java      |  4 ++--
 .../WarehouseInventoryMapper.java             |  2 +-
 .../WarehouseInventoryMapper.xml              | 21 +++++++++++++------
 .../WarehouseInventoryService.java            |  4 ++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java
index 9678b82..c1320fc 100644
--- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java
+++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java
@@ -203,8 +203,8 @@ public class WarehouseInventoryRest {
 
     @ApiOperation("根据skuSid查询商品库存")
     @PostMapping("/selCountsBySkuSid")
-    public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid) {
-        return WarehouseInventoryService.selCountsBySkuSid(skuSid);
+    public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid,@RequestParam("useOrgSid") String useOrgSid) {
+        return WarehouseInventoryService.selCountsBySkuSid(skuSid,useOrgSid);
     }
 
     @ApiOperation("根据skuSid查询商品可用库存")
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java
index 1651a79..19fa377 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java
@@ -62,7 +62,7 @@ public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory>
 
     String selInventoryCountBySkuSid(@Param("skuSid") String skuSid);
 
-    GoodsCountVo selCountsBySkuSid(@Param("skuSid") String skuSid);
+    GoodsCountVo selCountsBySkuSid(@Param("skuSid") String skuSid,@Param("useOrgSid") String useOrgSid);
     List<AvailableCountVo> selAvailableBySkuSid(@Param("skuSid") String skuSid,@Param("orgSid") String orgSid);
     List<AvailableCountVo> selAvailableBySkuSid1(@Param("skuSid") String skuSid,@Param("rackSid")String rackSid,@Param("orgSid") String orgSid);
     String selectNum(String billNo);
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml
index d01fc44..79d54db 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml
@@ -431,13 +431,22 @@
     </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
+            a.inventoryCount,
+            a.allocateCount,
+            (a.inventoryCount - a.allocateCount - a.freezeCount - a.pickCount) as useCount
         FROM
-            warehouse_inventory
-        WHERE
-            goodsSkuSid = #{skuSid}
+            (
+                SELECT
+                    IFNULL( SUM( count ), 0 ) AS inventoryCount,
+                    IFNULL( SUM( allocateCount ), 0 ) AS allocateCount,
+                    IFNULL( SUM( pickCount ), 0 ) AS pickCount,
+                    IFNULL( SUM( freezeCount ), 0 ) AS freezeCount
+                FROM
+                    warehouse_inventory
+                WHERE
+                    goodsSkuSid = #{skuSid}
+                  AND useOrgSid = #{useOrgSid}
+            ) a
     </select>
 
     <select id="selAvailableBySkuSid" resultType="com.yxt.warehouse.biz.warehouseinventory.AvailableCountVo">
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java
index fc84f94..e8382ab 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java
@@ -641,8 +641,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         return baseMapper.selInventoryCountBySkuSid(skuSid);
     }
 
-    public GoodsCountVo selCountsBySkuSid(String skuSid) {
-        return baseMapper.selCountsBySkuSid(skuSid);
+    public GoodsCountVo selCountsBySkuSid(String skuSid,String useOrgSid) {
+        return baseMapper.selCountsBySkuSid(skuSid,useOrgSid);
     }
     public List<AvailableCountVo> selAvailableBySkuSid(String skuSid,String orgSid) {
         return baseMapper.selAvailableBySkuSid(skuSid,orgSid);