12/19 界面优化1.0

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

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

@@ -449,8 +449,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
 
     public List<CollectOrderBizResponse>  setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
-        List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterList(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;
     }
 }

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;
+    }
+
 
 }

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

@@ -341,8 +341,9 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 if (ioSplitFifoCodeEntities.size() < quotient) {
                     if (isAuto)
                         throw new JsonException(500, "提交失败，工位库存数量不足！");
-                    else return;
+//                    else return;
                 }
+                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()));
@@ -373,10 +374,13 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
                     }
                 }
+
+            }
             //.如果拆零，拆零表扣除
             if (remainder > 0) {
                 splitRemove(collectOrderBiz, collectOrder, putWorkPlaceCode, isAuto);
             }
+
         }
         ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
         for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {