手动扫码拆零整取标志问题

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

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);
                     //替换已完成单据的码