From 8f802a8738525b0ad234773f622d5e6f6d7eac3e Mon Sep 17 00:00:00 2001
From: wenshijun <piratecaptain37@aliyun.com>
Date: Sat, 28 Feb 2026 08:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=BD=BF=E7=94=A8=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RkStatisticsController.java    |  2 +
 .../service/impl/RkInfoServiceImpl.java       |  2 +-
 .../service/impl/RkRecordServiceImpl.java     |  2 +
 .../mybatis/wisdom/RkStatisticsMapper.xml     | 43 ++++++++++++-------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java b/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java
index ee524b5..99b96e4 100644
--- a/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java
+++ b/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java
@@ -70,6 +70,7 @@ public class RkStatisticsController {
         List<TodoStatVO> list = rkStatisticsService.selectTodoStat();
         return AjaxResult.success(list);
     }
+
     /**
      * 小仓库位使用情况统计（总库位/已使用/未使用）
      */
@@ -78,6 +79,7 @@ public class RkStatisticsController {
         List<WarehouseSlotStatVO> list = rkStatisticsService.selectWarehouseSlotStat();
         return AjaxResult.success(list);
     }
+
     /**
      * 库龄>=30天明细导出（分组：>30天 / >60天）
      */
diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
index 7b22213..3f444b8 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
@@ -288,7 +288,7 @@ public class RkInfoServiceImpl implements IRkInfoService
             scan.setTaskId(taskId);
             scan.setPcode(r.getPcode());
 
-            // 👉 你要求：全部都是正常
+            // 全部都是正常
             scan.setStatus("0");
 
             scan.setDeviceId(deviceId);
diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java
index efd5bb0..364d479 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java
@@ -230,6 +230,7 @@ public class RkRecordServiceImpl implements IRkRecordService
             info.setHtDj(rkRecord.getHtDj());
             info.setCangku(rkRecord.getCangku());
             info.setPcode(rkRecord.getPcode());
+            info.setRemark(rkRecord.getRemark());
             info.setIsChuku("0");
         }
 
@@ -266,6 +267,7 @@ public class RkRecordServiceImpl implements IRkRecordService
             info.setHtDj(rkRecord.getHtDj());
             info.setCangku(rkRecord.getCangku());
             info.setPcode(rkRecord.getPcode());
+            info.setRemark(rkRecord.getRemark());
         }
 
         /* ====================== 4. 更新库存表 ====================== */
diff --git a/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml b/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml
index ff62595..21078f3 100644
--- a/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml
@@ -253,33 +253,46 @@
 </select>
     <select id="selectWarehouseSlotStat"
             resultType="com.zg.project.wisdom.domain.vo.WarehouseSlotStatVO">
-        <![CDATA[
+    <![CDATA[
+
         SELECT
-            p.warehouse_code   AS cangkuCode,
-            p.warehouse_name   AS cangkuName,
+            p.warehouse_code AS cangkuCode,
+            p.warehouse_name AS cangkuName,
 
-            COUNT(DISTINCT p.pcode) AS totalSlot,
+            COUNT(p.pcode) AS totalSlot,
 
-            COUNT(DISTINCT CASE WHEN r.id IS NOT NULL THEN p.pcode END) AS usedSlot,
+            COUNT(u.pcode) AS usedSlot,
 
-            COUNT(DISTINCT p.pcode)
-                - COUNT(DISTINCT CASE WHEN r.id IS NOT NULL THEN p.pcode END) AS unusedSlot
+            COUNT(p.pcode) - COUNT(u.pcode) AS unusedSlot
 
         FROM pcde_detail p
-                 LEFT JOIN rk_info r
-                           ON r.pcode  = p.pcode
-                               AND r.cangku = p.warehouse_code
-                               AND r.is_delete = '0'
-                               AND r.is_chuku  = '0'
+
+                 LEFT JOIN (
+            SELECT DISTINCT
+                pcode,
+                cangku
+            FROM rk_info
+            WHERE is_delete = '0'
+              AND is_chuku = '0'
+              AND exec_status = '1'
+        ) u
+                           ON u.pcode = p.pcode
+                               AND u.cangku = p.warehouse_code
 
         WHERE p.is_delete = '0'
           AND p.warehouse_name IS NOT NULL
           AND TRIM(p.warehouse_name) <> ''
 
-        GROUP BY p.warehouse_code, p.warehouse_name
-        ORDER BY p.warehouse_code
+        GROUP BY
+            p.warehouse_code,
+            p.warehouse_name
+
+        ORDER BY
+            p.warehouse_code
+
         ]]>
-    </select>
+</select>
+
     <select id="selectStockAgeExport30"
             resultType="com.zg.project.wisdom.domain.vo.StockAgeExportVO">
         <![CDATA[