#

yxFwq

2024-11-19 fe198a9143ad5a6840f664a2f6c2cfa1beff0e57

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

@@ -61,6 +61,8 @@

//    private static final Integer jarMaxLoc1 = 7;
    private static  Integer jarMaxLoc = 0;
    private static  Integer signBigTurn = 0;
    private static  Integer signSmallTurn = 0;
    private static final Float jarTemperature = 50F;
    @Autowired
    private CommonService commonService;
@@ -3098,7 +3100,9 @@
            if (wrkMast == null) {
                continue;
            }

            if (wrkMast.getStaNoSign().equals(signBigTurn)){
                continue;
            }
            crnStation = crnStation1;

            CrnSlave.CrnStn crnStn = null;
@@ -3115,6 +3119,13 @@
            if (wrkMast.getStaNo()>309){
                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
                if (wrkCount>=12){
                    continue;
                }
                RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
                if (Cools.isEmpty(bigTurn)){
                    continue;
                }
                if (bigTurn.getRgvOneSign()>13){
                    continue;
                }
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -3341,6 +3352,10 @@
//                    }
//                }
            }
        }
        signBigTurn++;
        if (signBigTurn > 2){
            signBigTurn = 0;
        }

    }
@@ -5125,7 +5140,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 +7908,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;
                    }