From 33320b92e60422bfc7c93ee90ba7ed976403457c Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 19 七月 2024 14:39:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 5830912..97c0c6d 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -59,6 +59,7 @@ // private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}}; private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}}; + private static final Integer jarMaxLoc = 6; @Autowired private CommonService commonService; @Autowired @@ -4815,10 +4816,10 @@ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),3)!=0){ break; } - if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>=14){ + if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>=jarMaxLoc*2){ break; } - if (basJarMastService.selectJarMastOperation(jarSlave.getId(),0,9)>=7){ + if (basJarMastService.selectJarMastOperation(jarSlave.getId(),0,9)>=jarMaxLoc){ break; } if (!Objects.equals @@ -4837,7 +4838,7 @@ break; } jarLocDigit = 1; - } else if (jarMastByJarIdMax.getJarLocDigit()<7){ + } else if (jarMastByJarIdMax.getJarLocDigit()<jarMaxLoc){ jarLocDigit = jarMastByJarIdMax.getJarLocDigit()+1; } else { continue; -- Gitblit v1.9.1