From f9a8e8c4f2b741b479677a448fff210a294151aa Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 10 Jan 2025 14:34:05 +0800
Subject: [PATCH] =?UTF-8?q?1/10=20=E6=A7=BD=E4=BD=8D=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E6=91=86=E8=B4=A7=E5=B1=82DMQ001-01=20=E6=A7=BD=E4=BD=8D:DMQ00?=
 =?UTF-8?q?1-01-01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/SysWorkplaceLayerController.java |  5 +++++
 .../collect/IoCollectCodeBackupController.java       |  6 ------
 .../api/service/basic/SysWorkplaceLayerService.java  |  4 ++--
 .../api/service/basic/SysWorkplaceQueueService.java  | 12 ++++++++----
 4 files changed, 15 insertions(+), 12 deletions(-)

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 28732f63b..1780378bf 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java
@@ -1,5 +1,6 @@
 package com.glxp.api.controller.auth;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -64,6 +65,10 @@ public class SysWorkplaceLayerController  extends BaseController {
 
     @PostMapping("/udiwms/WorkplaceLayer/deleteLayer")
     public BaseResponse deleteLayer(@RequestBody SysWorkplaceLayerRequest request){
+        SysWorkplaceLayer one = sysWorkplaceLayerService.getOne(new LambdaQueryWrapper<SysWorkplaceLayer>().eq(SysWorkplaceLayer::getCode, request.getCode()));
+        if (one == null){
+            return ResultVOUtils.error(501,"摆货层不存在");
+        }
         Boolean save = sysWorkplaceLayerService.deleteLayer(request);
         return ResultVOUtils.success();
     }
diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
index 5e7273ef3..51da6a479 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
@@ -212,11 +212,6 @@ public class IoCollectCodeBackupController extends BaseController {
     @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/deleteCodes")
     public BaseResponse deleteCodes(@RequestBody IoCollectCodeRequest request) {
         IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo());
-        if(request.getSelectType()  == null){
-            //如果是null 正常查询
-            request.setSelectType(1);
-        }
-        if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2) {
             List<IoCollectOrderCheckCode> list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper<IoCollectOrderCheckCode>().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo()));
             if (list.size() > 0) {
                 ioCollectOrderCheckCodeService.removeBatchByIds(list);
@@ -238,7 +233,6 @@ public class IoCollectCodeBackupController extends BaseController {
             }
             order.setCheckCodeConfirm(0);
             ioCollectOrderBackupService.updateByBillNo(order);
-        }
         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 56b0016d7..d40eb46d1 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java
@@ -40,7 +40,7 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
             //该货架没有摆货层
             int result = 1;
             String sixDigitResult = String.format("%02d", result);
-            code = freightCode + sixDigitResult;
+            code = freightCode + "-" + sixDigitResult;
 
         } else {
             String code1 = sysWorkplaceLayer.getCode();
@@ -48,7 +48,7 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
             Integer result = Integer.parseInt(withoutDMQ.trim());
             result += 1;
             String sixDigitResult = String.format("%02d", result);
-            code = freightCode + sixDigitResult;
+            code = freightCode + "-"  + sixDigitResult;
         }
         return code;
     }
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 88a000a70..04ce093df 100644
--- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
+++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
@@ -97,13 +97,17 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
             //该摆货层没有出货槽
             int result = 1;
             String sixDigitResult = String.format("%02d", result);
-            code = layerCode + sixDigitResult;
+            code = layerCode + "-" +  sixDigitResult;
         } else {
-            String withoutDMQ = code.replace(layerCode, "");
-            Integer result = Integer.parseInt(withoutDMQ.trim());
+//            int dashIndex = layerCode.indexOf('-');
+//            String partAfterDash = code.substring(dashIndex + 1);
+
+            int secondDashIndex = code.indexOf('-', code.indexOf('-') + 1);
+            String partAfterSecondDash = code.substring(secondDashIndex + 1); // 截取第二个'-'后面的部分
+            Integer result = Integer.parseInt(partAfterSecondDash);
             result += 1;
             String sixDigitResult = String.format("%02d", result);
-            code = layerCode + sixDigitResult;
+            code = layerCode + "-" +  sixDigitResult;
         }
         return code;
     }