#

yxFwq

2024-11-19 64bb911eb7d77fb4a910360e795d5abf2827612f

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -5125,7 +5125,7 @@
                            if (jarMaxLoc == 0 || basJarOther.getJarCount() == 0) {
                                break;
                            }
                            int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 11));
                            int count = basJarMastService.selectCount(new EntityWrapper<BasJarMast>().eq("jar_regin", basJar.getRegion()).lt("status", 17).gt("status", 6));
                            if (count>0){
                                break;
                            }
@@ -7893,26 +7893,18 @@
        try{
            switch (sign){
                case 1:
                case 5:
                case 9:
                    if (jarWrkMastExecuteGenerateSteComplete(sign)){
                        break;
                    }
                case 2:
                case 6:
                case 10:
                    if (jarWrkMastExecuteGenerateJarComplete(sign)){
                        break;
                    }
                case 3:
                case 7:
                case 11:
                    if (jarWrkMastExecuteGenerateRgvComplete1(sign)){
                        break;
                    }
                case 4:
                case 8:
                case 12:
                    if (jarWrkMastExecuteGenerateRgvComplete2(sign)){
                        break;
                    }

 src/main/java/com/zy/core/MainProcess.java

@@ -40,15 +40,15 @@
                    i++; if (i>5) i=0;
                    j++; if (j>5) j=0;
                    k++;
                    if (k>13) {
                    if (k>6) {
                        k=0;
                        l++;
                        if (l>3) l=0;
                        if (l>=3) l=0;
                    }


                    // 间隔
                    Thread.sleep(1000);
                    Thread.sleep(200);

                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -113,7 +113,7 @@
                    //JarWrkMastExecute任务创建   //硫化罐
                    mainService.jarWrkMastExecuteGenerate(k);
                    //JarWrkMastExecute任务执行
                    mainService.jarWrkMastExecuteAction(k,j);
                    mainService.jarWrkMastExecuteAction(k,l);
                    //Jar任务创建
                    mainService.jarMastGenerate();
                    //Jar任务完成