From 37b73c6d8baa4918f1afe270bd245ccde6f24ce5 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 11 Jan 2025 16:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E9=9B=B6=E6=A0=87=E8=AE=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoCollectCodeBackupController.java        | 46 +++++++++----------
 .../api/service/inout/IoSplitCodeService.java |  8 ++--
 2 files changed, 26 insertions(+), 28 deletions(-)

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 51da6a479..5eea38dc3 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
@@ -128,7 +128,7 @@ public class IoCollectCodeBackupController extends BaseController {
     @GetMapping("/udiwms/basic/collect/ioCollectCode/endList")
     public BaseResponse filterList(IoCollectCodeRequest request) {
         IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo());
-        if(request.getSelectType()  == null){
+        if (request.getSelectType() == null) {
             //如果是null 正常查询
             request.setSelectType(1);
         }
@@ -212,31 +212,29 @@ public class IoCollectCodeBackupController extends BaseController {
     @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/deleteCodes")
     public BaseResponse deleteCodes(@RequestBody IoCollectCodeRequest request) {
         IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo());
-            List<IoCollectOrderCheckCode> list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper<IoCollectOrderCheckCode>().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo()));
-            if (list.size() > 0) {
-                ioCollectOrderCheckCodeService.removeBatchByIds(list);
-            }
-            List<IoCollectCodeBackup> list1 = ioCollectCodeBackService.list(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBillNo, request.getBillNo()));
-            List<IoCollectCodeBackup> filteredList = list1.stream()
-                    .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 3)
-                    .collect(Collectors.toList());
-            if (filteredList.size() > 0) {
-                ioCollectCodeBackService.removeBatchByIds(filteredList);
-            }
-            List<IoCollectCodeBackup> filteredList2 = list1.stream()
-                    .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1)
-                    .collect(Collectors.toList());
-            if (filteredList2.size() > 0) {
-                filteredList2.forEach(item -> item.setScanCodeCheckStatus(0));
-                // 调用服务层方法批量更新
-                ioCollectCodeBackService.updateBatchById(filteredList2);
-            }
-            order.setCheckCodeConfirm(0);
-            ioCollectOrderBackupService.updateByBillNo(order);
+        List<IoCollectOrderCheckCode> list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper<IoCollectOrderCheckCode>().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo()));
+        if (list.size() > 0) {
+            ioCollectOrderCheckCodeService.removeBatchByIds(list);
+        }
+        List<IoCollectCodeBackup> list1 = ioCollectCodeBackService.list(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBillNo, request.getBillNo()));
+        List<IoCollectCodeBackup> filteredList = list1.stream()
+                .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 3)
+                .collect(Collectors.toList());
+        if (filteredList.size() > 0) {
+            ioCollectCodeBackService.removeBatchByIds(filteredList);
+        }
+        List<IoCollectCodeBackup> filteredList2 = list1.stream()
+                .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1)
+                .collect(Collectors.toList());
+        if (filteredList2.size() > 0) {
+            filteredList2.forEach(item -> item.setScanCodeCheckStatus(0));
+            // 调用服务层方法批量更新
+            ioCollectCodeBackService.updateBatchById(filteredList2);
+        }
+        order.setCheckCodeConfirm(0);
+        ioCollectOrderBackupService.updateByBillNo(order);
         return ResultVOUtils.success();
     }
 
 
-
-
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 64c4c111e..66d4d12e4 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -140,7 +140,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                     .serialNo(ioSplitCodeEntity.getSerialNo())
                     .relId(collectOrderBiz.getRelId())
                     .bizIdFk(collectOrderBiz.getId())
-                    .fifoSplit(ioSplitCodeEntity.getFifoSplit())
+                    .fifoSplit(1)
                     .createTime(new Date())
                     .updateTime(new Date())
                     .build());
@@ -186,7 +186,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 .serialNo(ioSplitCodeEntity.getSerialNo())
                                 .relId(collectOrderBiz.getRelId())
                                 .bizIdFk(collectOrderBiz.getId())
-                                .fifoSplit(ioSplitCodeEntity.getFifoSplit())
+                                .fifoSplit(1)
                                 .createTime(new Date())
                                 .updateTime(new Date())
                                 .build());
@@ -369,7 +369,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 .serialNo(splitFifoCodeEntity.getSerialNo())
                                 .relId(collectOrderBiz.getRelId())
                                 .bizIdFk(collectOrderBiz.getId())
-                                .fifoSplit(splitFifoCodeEntity.getFifoSplit())
+                                .fifoSplit(2)
                                 .createTime(new Date())
                                 .updateTime(new Date())
                                 .build());
@@ -505,7 +505,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         .serialNo(splitFifoCodeEntity.getSerialNo())
                         .relId(collectOrderBiz.getRelId())
                         .bizIdFk(collectOrderBiz.getId())
-                        .fifoSplit(splitFifoCodeEntity.getFifoSplit())
+                        .fifoSplit(2)
                         .createTime(new Date())
                         .updateTime(new Date())
                         .build());