From 1bc6c7319ccc3a84caa351ea4e6ca05568ad849e Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 11:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E6=9E=B6code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/SysWorkplaceLayerController.java           |  6 ++++++
 .../api/service/basic/SysWorkplaceLayerService.java | 13 +++++++++++++
 .../api/service/basic/SysWorkplaceQueueService.java | 12 ++++++++++++
 src/main/resources/schemas/schema_v2.4.sql          |  5 +++++
 4 files changed, 36 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java
index e813e1474..074c1fabb 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java
@@ -55,4 +55,10 @@ public class SysWorkplaceLayerController  extends BaseController {
         Boolean save = sysWorkplaceLayerService.addSysWorkplaceLayer(request,getUserId());
         return ResultVOUtils.success();
     }
+
+    @PostMapping("/udiwms/WorkplaceLayer/deleteLayer")
+    public BaseResponse deleteLayer(@RequestBody SysWorkplaceLayerRequest request){
+        Boolean save = sysWorkplaceLayerService.deleteLayer(request);
+        return ResultVOUtils.success();
+    }
 }
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
index b4de7fd89..1dd3770e5 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
@@ -7,6 +7,7 @@ import com.glxp.api.dao.basic.SysWorkplaceLayerMapper;
 import com.glxp.api.dao.basic.SysWorkplaceQueueMapper;
 import com.glxp.api.entity.basic.SysWorkplaceFreight;
 import com.glxp.api.entity.basic.SysWorkplaceLayer;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.SysWorkplaceLayerRequest;
 import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
 import com.glxp.api.res.basic.SysWorkplaceLayerResponse;
@@ -122,4 +123,16 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
         }
         return sysWorkplaceLayerMapper.filterList(request);
     }
+
+    public Boolean deleteLayer(SysWorkplaceLayerRequest request) {
+        SysWorkplaceLayer layer = this.getOne(new LambdaQueryWrapper<SysWorkplaceLayer>().eq(SysWorkplaceLayer::getCode, request.getCode()));
+        if (layer == null){
+            throw new JsonException(500,"摆货层不存在");
+        }
+        Boolean delete = sysWorkplaceQueueService.deleteByLayerCode(layer.getCode());
+        if (!delete){
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
index cf4fa29e1..c290cef39 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
@@ -2,7 +2,9 @@ package com.glxp.api.service.basic;
 
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.basic.SysWorkplaceLayer;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
 import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
@@ -165,4 +167,14 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
             sysWorkplaceQueueMapper.deleteById(workplaceQueue);
         }
     }
+
+    public Boolean deleteByLayerCode(String layerCode) {
+        QueryWrapper<SysWorkplaceQueue> ew = new QueryWrapper<>();
+        ew.eq("layerCode",layerCode);
+        int delete = sysWorkplaceQueueMapper.delete(ew);
+        if (delete == 0){
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index e682817c6..919b0aba6 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4659,3 +4659,8 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'layerCode',
 CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'layerNum',
                          'int NULL DEFAULT NULL COMMENT ''摆货层数量''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'freightCode',
+                         'varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''货架code''',
+                         1)