器械扫码拆零问题

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

@@ -297,29 +297,41 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                     .findFirst();
                             if (firstMatch1.isPresent()) {
                                 result = firstMatch1.get();
+                                if (result != null) {
+                                    IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
+                                            .errUdiCode(result.getUdiCode())
+                                            .orderId(result.getOrderIdFk())
+                                            .action(collectOrder.getBusType())
+                                            .relId(result.getRelId())
+                                            .nameCode(result.getNameCode())
+                                            .batchNo(result.getBatchNo())
+                                            .produceDate(result.getProductDate())
+                                            .expireDate(result.getExpireDate())
+                                            .serialNo(result.getSerialNo())
+                                            .scanCount(result.getScanCount())
+                                            .totalCount(result.getScanCount())
+                                            .workPlaceCode(putWorkPlaceCode)
+                                            .status(2)
+                                            .fifoSplit(1)
+                                            .createTime(new Date()).updateTime(new Date())
+                                            .remainCount(-unTagCount).build();
+                                    this.decorateUnpackExpireTime(ioSplitCodeEntity);
+                                    splitCodeService.save(ioSplitCodeEntity);
+                                }
+                            } else {
+                                firstMatch1 = collectOrderCodeMEN.stream()
+                                        .filter(item ->
+                                                IntUtil.value(item.getSplitFlag()) && item.getBizIdFk().equals(collectOrderBiz.getId()))
+                                        .findFirst();
+                                if (firstMatch1.isPresent()) {
+                                    result = firstMatch1.get();
+                                    IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(result.getUdiCode(), putWorkPlaceCode);
+                                    splitCodeEntity.setRemainCount(-unTagCount);
+                                    splitCodeService.updateById(splitCodeEntity);
+                                }
                             }
                         }
-                        if (result != null) {
-                            IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
-                                    .errUdiCode(result.getUdiCode())
-                                    .orderId(result.getOrderIdFk())
-                                    .action(collectOrder.getBusType())
-                                    .relId(result.getRelId())
-                                    .nameCode(result.getNameCode())
-                                    .batchNo(result.getBatchNo())
-                                    .produceDate(result.getProductDate())
-                                    .expireDate(result.getExpireDate())
-                                    .serialNo(result.getSerialNo())
-                                    .scanCount(result.getScanCount())
-                                    .totalCount(result.getScanCount())
-                                    .workPlaceCode(putWorkPlaceCode)
-                                    .status(2)
-                                    .fifoSplit(1)
-                                    .createTime(new Date()).updateTime(new Date())
-                                    .remainCount(-unTagCount).build();
-                            this.decorateUnpackExpireTime(ioSplitCodeEntity);
-                            splitCodeService.save(ioSplitCodeEntity);
-                        }
+
 
                     }