1/10 槽位优化 摆货层DMQ001-01 槽位:DMQ001-01-01

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();
     }

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();
     }
 

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;
     }

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;
     }