未上架拆零

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -398,8 +398,7 @@ public class IoCollectOrderController extends BaseController {
             boolean isAllTag = collectOrderBizResponses.stream()
                     .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
             if (!isAllTag) {
-
-                SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrderRequest.getBusType());
+//                SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrderRequest.getBusType());
 //                if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderFinishVerify()) == 1) {
 //
 //                } else {

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

@@ -267,8 +267,18 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 .filter(item ->
                                         IntUtil.value(item.getRemoveFlag()) && item.getBizIdFk().equals(collectOrderBiz.getId()))
                                 .findFirst();
+                        IoCollectOrderCodeMan result = null;
                         if (firstMatch.isPresent()) {
-                            IoCollectOrderCodeMan result = firstMatch.get();
+                            result = firstMatch.get();
+                        } else {
+                            Optional<IoCollectOrderCodeMan> firstMatch1 = collectOrderCodeMEN.stream()
+                                    .filter(item ->
+                                            item.getBizIdFk().equals(collectOrderBiz.getId()))
+                                    .findFirst();
+                            if (firstMatch1.isPresent()) {
+                                result = firstMatch1.get();
+                            }
+                        }
                         IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
                                 .errUdiCode(result.getUdiCode())
                                 .orderId(result.getOrderIdFk())
@@ -291,7 +301,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                     }
 
                 }
-                }
                 continue;
             }