From 57b60cddc00a46425bc10dd7f17c72ad79f11a6f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 27 Nov 2024 15:16:43 +0800
Subject: [PATCH] =?UTF-8?q?11/27=20=E4=B8=8A=E8=B4=A7=E5=B7=A5=E4=BD=8D-?=
 =?UTF-8?q?=E8=B4=A7=E6=9E=B6=E6=89=93=E5=8D=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/SysWorkplaceController.java           | 18 ++++++++++++++----
 .../api/service/auth/SysWorkplaceService.java  |  4 +++-
 .../mapper/basic/SysWorkplaceFreightMapper.xml |  3 +++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
index faa39c06f..eda60cca8 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
@@ -32,15 +32,13 @@ import com.glxp.api.req.auth.FilterAuthUserRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.SysWorkplaceRequest;
 import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.req.dev.DeviceInfoDetailQuery;
 import com.glxp.api.req.purchase.purPlanPrintRequest;
 import com.glxp.api.req.system.PrintLabelRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
-import com.glxp.api.res.basic.SysWorkplaceResponse;
-import com.glxp.api.res.basic.UserWorkResponse;
-import com.glxp.api.res.basic.WorkBindWorkResponse;
+import com.glxp.api.res.basic.*;
 import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.auth.DeptService;
@@ -48,6 +46,7 @@ import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.auth.WarehouseUserService;
 import com.glxp.api.service.basic.BasicCollectUserService;
 import com.glxp.api.service.basic.SysWorkplaceDocumentService;
+import com.glxp.api.service.basic.SysWorkplaceFreightService;
 import com.glxp.api.service.basic.SysWorkplaceQueueService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
@@ -93,6 +92,9 @@ public class SysWorkplaceController extends BaseController {
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
 
+    @Resource
+    SysWorkplaceFreightService sysWorkplaceFreightService;
+
 
     @PostMapping("/udiwms/sysWorkplace/page")
     public BaseResponse page(@RequestBody SysWorkplaceRequest request) {
@@ -173,6 +175,14 @@ public class SysWorkplaceController extends BaseController {
         if (userWorkResponses.size() > 0) {
             return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除");
         }
+        if (sysWorkplace.getWorkPlaceClass() == 2){
+            SysWorkplaceFreightRequest sysWorkplaceFreightRequest = new SysWorkplaceFreightRequest();
+            sysWorkplaceFreightRequest.setWorkPlaceIdFk(sysWorkplace.getWorkplaceId());
+            List<SysWorkplaceFreightResponse> sysWorkplaceFreightResponses = sysWorkplaceFreightService.filterList(sysWorkplaceFreightRequest);
+            if (sysWorkplaceFreightResponses.size() > 0){
+                return ResultVOUtils.error("该工位已绑定取货架");
+            }
+        }
         WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
         workBindBusTypeRequest.setWorkplaceCode(sysWorkplace.getWorkplaceId());
 //        List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java
index 0b6206e30..fd6bf9179 100644
--- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java
+++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java
@@ -122,7 +122,9 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
         if(!save){
             return false;
         }
-        addOneQueue(sysWorkplace,userId);
+        if (sysWorkplace.getWorkPlaceClass() == 2){
+            addOneQueue(sysWorkplace,userId);
+        }
         return true;
     }
 
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
index d33e4aead..2779da013 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
@@ -36,6 +36,9 @@
         left join sys_workplace_layer swl on swl.freightCode = swf.code
         left join sys_workplace_queue swq on swq.layerCode = swl.code
         <where>
+            <if test=" workPlaceIdFk != null and workPlaceIdFk != ''">
+                AND swf.workPlaceIdFk = #{workPlaceIdFk}
+            </if>
             <if test=" layerCode != null and layerCode != ''">
                 AND swl.code = #{layerCode}
             </if>