From 319d16389037609540b3836bc995c4447870ab21 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 4 Apr 2025 18:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=AB=E7=A0=81=E6=8B=86?=
 =?UTF-8?q?=E9=9B=B6=E6=95=B4=E5=8F=96=E6=A0=87=E5=BF=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/collect/IoCollectCodeService.java    | 8 ++------
 .../com/glxp/api/service/inout/IoSplitCodeService.java    | 7 ++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
index 52b191fbd..c484e8764 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
@@ -110,7 +110,6 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
     private IoSplitCodeService splitCodeService;
 
 
-
     public void saveManuCode(List<IoCollectOrderCodeMan> manList, IoCollectOrder collectOrder) {
         if (CollUtil.isEmpty(manList))
             return;
@@ -123,7 +122,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
             //设置扫码次数 ioCollectOrderCodeMan scanActCount的实际数量 根据码查找拆零表
             IoSplitCodeEntity one = splitCodeService.getOne(new LambdaQueryWrapper<IoSplitCodeEntity>().eq(IoSplitCodeEntity::getCode, ioCollectOrderCodeMan.getUdiCode()));
             Integer reCount = 0;
-            if (one != null && one.getRemainCount() != null){
+            if (one != null && one.getRemainCount() != null) {
                 reCount = ioCollectOrderCodeMan.getScanActCount() - one.getRemainCount();
             }
             IoCollectCodeBackup collectCodeBackup = IoCollectCodeBackup.builder().code(ioCollectOrderCodeMan.getUdiCode())
@@ -133,7 +132,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .fromCorp(collectOrder.getFromCorp())
                     .operTime(collectOrder.getUpdateTime())
                     .operUser(collectOrder.getCreateUser())
-                    .fifoSplit(3)
+                    .fifoSplit(IntUtil.value(ioCollectOrderCodeMan.getIsSplitCode()) ? 4 : 3)
                     .workPlaceCode(collectOrder.getWorkPlaceCode())
                     .relId(ioCollectOrderCodeMan.getRelId())
                     .remark(collectOrder.getRemark())
@@ -142,9 +141,6 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .reCount(reCount)
                     .build();
 
-            if (IntUtil.value(ioCollectOrderCodeMan.getIsSplitCode())) {
-                collectCodeBackup.setFifoSplit(4);
-            }
             ioCollectCodes.add(collectCodeBackup);
         }
         collectCodeBackService.saveBatch(ioCollectCodes);
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 ee1962250..9f48b145b 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -298,7 +298,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 this.decorateUnpackExpireTime(ioSplitCodeEntity);
                                 splitCodeService.save(ioSplitCodeEntity);
                             }
-
+                            item.setSplitFlag(true);
+                            collectOrderCodeManService.updateById(item);
                         }
                     }
                 }
@@ -386,7 +387,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                     if (splitFifoCodeEntity == null) {
                         throw new JsonException(500, "工位存量不足！");
                     }
-                    IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(collectOrder.getId()+"").autoCode(splitFifoCodeEntity.getCode()).manuCode(collectOrderCodeMan.getUdiCode()).type(2)    //未上传医保替换码
+                    IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(collectOrder.getId() + "").autoCode(splitFifoCodeEntity.getCode()).manuCode(collectOrderCodeMan.getUdiCode()).type(2)    //未上传医保替换码
                             .updateTime(new Date()).build();
                     collectErrorLogMapper.insert(ioCollectErrorLog);
                     collectCodeBackup.setCode(splitFifoCodeEntity.getCode());
@@ -398,7 +399,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                     if (splitFifoCodeEntity == null) {
                         throw new JsonException(500, "工位存量不足！");
                     }
-                    IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(collectOrder.getId()+"").autoCode(splitFifoCodeEntity.getCode()).manuCode(collectOrderCodeMan.getUdiCode()).type(1)    //未上传医保替换码
+                    IoCollectErrorLog ioCollectErrorLog = IoCollectErrorLog.builder().orderId(collectOrder.getId() + "").autoCode(splitFifoCodeEntity.getCode()).manuCode(collectOrderCodeMan.getUdiCode()).type(1)    //未上传医保替换码
                             .updateTime(new Date()).build();
                     collectErrorLogMapper.insert(ioCollectErrorLog);
                     //替换已完成单据的码