From 7651031603c09dbf7300bdbb571cf968406ee1e7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 12:10:11 +0800
Subject: [PATCH] =?UTF-8?q?11/7=20=E5=8F=96=E8=B4=A7=E6=9E=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/basic/SysWorkplaceFreightService.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java
index a3a49a0c2..48d6053d6 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.SysWorkplaceFreightMapper;
 import com.glxp.api.entity.basic.SysWorkplaceFreight;
+import com.glxp.api.entity.basic.SysWorkplaceLayer;
 import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
@@ -29,6 +30,9 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
     @Resource
     private SysWorkplaceQueueService sysWorkplaceQueueService;
 
+    @Resource
+    private SysWorkplaceLayerService  sysWorkplaceLayerService;
+
     public boolean WorkplaceFreight(SysWorkplaceFreight workplaceFreight) {
         SysWorkplaceFreight sysWorkplaceFreight = sysWorkplaceFreightMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceFreight>().eq(SysWorkplaceFreight::getName, workplaceFreight.getName()));
         if (sysWorkplaceFreight != null) {
@@ -52,10 +56,11 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
     }
 
     public boolean removeFreight(SysWorkplaceFreight workplaceFreight) {
-        //如果有货位 是直接删除下面货位 还是不让删除
-        List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getFreightCode, workplaceFreight.getCode()));
+        //如果有摆货层 不可以删除
+        List<SysWorkplaceLayer> list = sysWorkplaceLayerService.list(new LambdaQueryWrapper<SysWorkplaceLayer>().eq(SysWorkplaceLayer::getFreightCode, workplaceFreight.getCode()));
+//        List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getFreightCode, workplaceFreight.getCode()));
         if (list.size() > 0 ){
-            throw new JsonException(500,"当前货架已有货位,请先移除货位!");
+            throw new JsonException(500,"删除失败,请先删除摆货层!");
         }
         int i = sysWorkplaceFreightMapper.deleteById(workplaceFreight);
         return true;