From 4e9dbfba27588b6e70fd8cdb43bc0ca18f01aad2 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 9 Dec 2025 16:01:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(cargoSpace):=20=E6=96=B0=E5=A2=9E=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E9=94=81=E5=AE=9A=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96UI=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在BasCargoSpaceMapper中新增lockedCargoSpace方法用于批量锁定货位
- 在BasCargoSpaceMapper.xml中实现根据货位ID锁定同一通道货位的SQL逻辑
- 在BasCargoSpaceServiceImpl中增加锁定状态变更时的业务处理逻辑
- 注释掉index.vue中的巷道ID列以优化界面展示
- 修改空间计划图表中出库分配的颜色配置提升可视化效果
---
 .../bas/cargoSpace/mapper/BasCargoSpaceMapper.java     |  2 ++
 .../service/impl/BasCargoSpaceServiceImpl.java         | 10 ++++++++--
 .../mapper/bas/cargoSpace/BasCargoSpaceMapper.xml      |  8 ++++++++
 ruoyi-ui/src/views/bas/cargoSpace/index.vue            |  2 +-
 ruoyi-ui/src/views/kpi/spacePlan/index.vue             |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java
index 8358230..22238e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java
@@ -84,4 +84,6 @@ public interface BasCargoSpaceMapper extends BaseMapper<BasCargoSpace>
      * @return 库存信息集合
      */
     public List<BasCargoSpace> selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace);
+
+    void lockedCargoSpace(BasCargoSpace basCargoSpace);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
index 65ff0bd..925fc64 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
@@ -67,8 +67,14 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl<BasCargoSpaceMapper,Ba
      * @return 结果
      */
     @Override
-    public int updateBasCargoSpace(BasCargoSpace basCargoSpace)
-    {
+    public int updateBasCargoSpace(BasCargoSpace basCargoSpace) {
+
+        BasCargoSpace oldBasCargoSpace = basCargoSpaceMapper.selectBasCargoSpaceByCargoSpaceId(basCargoSpace.getCargoSpaceId());
+        if (!oldBasCargoSpace.getLocked().equals(basCargoSpace.getLocked())){
+            //修改同一通道货位锁
+            basCargoSpaceMapper.lockedCargoSpace(basCargoSpace);
+        }
+        //修改货位信息
         return basCargoSpaceMapper.updateBasCargoSpace(basCargoSpace);
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index 2fe6427..551cd11 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -158,6 +158,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where cargo_space_id = #{cargoSpaceId}
     </update>
+    <update id="lockedCargoSpace">
+        update bas_cargo_space
+        set locked = #{locked}
+        where group_coding_no in (
+            select group_coding_no from bas_cargo_space where cargo_space_id = #{cargoSpaceId}
+            )
+        and group_coding > #{groupCoding}
+    </update>
 
     <delete id="deleteBasCargoSpaceByCargoSpaceId" parameterType="String">
         delete from bas_cargo_space where cargo_space_id = #{cargoSpaceId}
diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
index 3758c5e..d3a6d45 100644
--- a/ruoyi-ui/src/views/bas/cargoSpace/index.vue
+++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
@@ -159,7 +159,7 @@
       <el-table-column label="货位编号" align="left" prop="cargoSpaceId" />
       <!-- 仓库名称 -->
       <!--      <el-table-column label="仓库名称" align="left" prop="warehouseName" />-->
-            <el-table-column label="巷道ID" align="left" prop="roadwayId" />
+            <!-- <el-table-column label="巷道ID" align="left" prop="roadwayId" /> -->
       <!-- 货位名称 -->
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
       <!-- 排 -->
diff --git a/ruoyi-ui/src/views/kpi/spacePlan/index.vue b/ruoyi-ui/src/views/kpi/spacePlan/index.vue
index 72d1876..0ee0eb2 100644
--- a/ruoyi-ui/src/views/kpi/spacePlan/index.vue
+++ b/ruoyi-ui/src/views/kpi/spacePlan/index.vue
@@ -227,7 +227,7 @@ this.getWarehouseList()
             {
               // 图例：出库分配
               name: '出库分配',
-              itemStyle: { color: '#FF0000' }
+              itemStyle: { color: '#00cc00' }
             },
             {
               // 图例：入库需盘点