diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
index e35e34f29..744fed32d 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
@@ -95,10 +95,14 @@ public class IoCollectOrderBackupController extends BaseController {
                 response.setGgxh(response.getSpec());
             }
         }
+
+        List<CollectOrderBizResponse> collectOrderBizResponses1 = collectOrderBizResponses.stream().skip((collectOrderBizRequest.getPage()-1)*collectOrderBizRequest.getLimit()).limit(collectOrderBizRequest.getLimit()).
+                collect(Collectors.toList());
+
         PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(collectOrderBizResponses);
         PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(collectOrderBizResponses);
+        pageSimpleResponse.setList(collectOrderBizResponses1);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index e62509c2a..ab42d523d 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -448,9 +448,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     }
 
 
-    public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
-        List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest);
-
+    public List<CollectOrderBizResponse>  setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
+        List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
         List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());;
         List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
         for (CollectOrderBizResponse collectOrderBiz : list) {
@@ -469,6 +468,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             }
             collectOrderBizResponses.add(collectOrderBizResponse);
         }
+
         return collectOrderBizResponses;
     }
 }
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java
index 64650e1f9..71276fc73 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java
@@ -163,5 +163,10 @@ public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBi
         return list;
     }
 
+    public List<CollectOrderBizResponse> filterListByBillNo(CollectOrderBizRequest collectOrderRequest) {
+        List<CollectOrderBizResponse> data = ioCollectOrderBizBackupMapper.filterList(collectOrderRequest);
+        return data;
+    }
+
 
 }
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 65a33e008..db6f3d3da 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -341,42 +341,46 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 if (ioSplitFifoCodeEntities.size() < quotient) {
                     if (isAuto)
                         throw new JsonException(500, "提交失败，工位库存数量不足！");
-                    else return;
+//                    else return;
                 }
-                for (int i = 0; i < quotient; i++) {
-                    IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i);
-                    collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl()));
-                    collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
-                            .codeIdFk(splitFifoCodeEntity.getId())
-                            .udiCode(splitFifoCodeEntity.getCode())
-                            .orderIdFk(collectOrder.getBillNo())
-                            .batchNo(splitFifoCodeEntity.getBatchNo())
-                            .productDate(splitFifoCodeEntity.getProduceDate())
-                            .expireDate(splitFifoCodeEntity.getExpireDate())
-                            .serialNo(splitFifoCodeEntity.getSerialNo())
-                            .relId(collectOrderBiz.getRelId())
-                            .bizIdFk(collectOrderBiz.getId())
-                            .fifoSplit(splitFifoCodeEntity.getFifoSplit())
-                            .createTime(new Date())
-                            .updateTime(new Date())
-                            .build());
-                    splitFifoCodeService.removeById(splitFifoCodeEntity.getId());
-                    IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity);
-                    if (splitFifoInv != null) {
-                        splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount()));
-                        int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount());
-                        splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
-                        splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
-                        splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount()));
-                        splitFifoInvService.updateById(splitFifoInv);
-                    }
+                if (ioSplitFifoCodeEntities.size() > 0){
+                    for (int i = 0; i < quotient; i++) {
+                        IoSplitFifoCodeEntity splitFifoCodeEntity = ioSplitFifoCodeEntities.get(i);
+                        collectOrderBiz.setUnTagCount(IntUtil.value(collectOrderBiz.getUnTagCount()) - IntUtil.value(udiRelevanceResponse.getBhxjsl()));
+                        collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
+                                .codeIdFk(splitFifoCodeEntity.getId())
+                                .udiCode(splitFifoCodeEntity.getCode())
+                                .orderIdFk(collectOrder.getBillNo())
+                                .batchNo(splitFifoCodeEntity.getBatchNo())
+                                .productDate(splitFifoCodeEntity.getProduceDate())
+                                .expireDate(splitFifoCodeEntity.getExpireDate())
+                                .serialNo(splitFifoCodeEntity.getSerialNo())
+                                .relId(collectOrderBiz.getRelId())
+                                .bizIdFk(collectOrderBiz.getId())
+                                .fifoSplit(splitFifoCodeEntity.getFifoSplit())
+                                .createTime(new Date())
+                                .updateTime(new Date())
+                                .build());
+                        splitFifoCodeService.removeById(splitFifoCodeEntity.getId());
+                        IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity);
+                        if (splitFifoInv != null) {
+                            splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount()));
+                            int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount());
+                            splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
+                            splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                            splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                            splitFifoInvService.updateById(splitFifoInv);
+                        }
 
+                    }
                 }
+
             }
             //.如果拆零，拆零表扣除
             if (remainder > 0) {
                 splitRemove(collectOrderBiz, collectOrder, putWorkPlaceCode, isAuto);
             }
+
         }
         ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
         for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {