器械扫码拆零问题

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -414,7 +414,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         collectOrderBizService.saveOrUpdate(collectOrderBiz);
 
 
-
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
             exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + scanCount);
             exitCode.setBizIdFk(collectOrderBiz.getId());
@@ -436,6 +435,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             .updateTime(new Date())
                             .updateUser(userId)
                             .scanCount(scanCount)
+                            .scanActCount(scanCount)
                             .build();
             this.save(collectOrderCodeMan);
         }

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -255,7 +255,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 //判断拆零表里是否存在，如果存在则剔除
                 IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(collectOrderCodeMan.getUdiCode(), putWorkPlaceCode);
                 if (splitCodeEntity != null && IntUtil.value(splitCodeEntity.getRemainCount()) > 0) {
-                    if (IntUtil.value(splitCodeEntity.getRemainCount()) > IntUtil.value(collectOrderCodeMan.getScanCount())) {
+                    if (IntUtil.value(splitCodeEntity.getRemainCount()) > IntUtil.value(collectOrderCodeMan.getScanActCount())) {
                         splitCodeEntity.setRemainCount(IntUtil.value(splitCodeEntity.getRemainCount()) - IntUtil.value(collectOrderCodeMan.getScanActCount()));
                     } else {
                         splitCodeEntity.setRemainCount(0);
@@ -299,6 +299,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 result = firstMatch1.get();
                             }
                         }
+                        if (result != null) {
                             IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
                                     .errUdiCode(result.getUdiCode())
                                     .orderId(result.getOrderIdFk())
@@ -321,6 +322,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                         }
 
                     }
+
+                }
                 continue;
             }