#cs1

yxFwq

2024-11-24 f3de21a928fd73a1c9f66a7fe4d24afb1c9916af

#cs1

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -529,13 +529,44 @@
        } else {
            switch (this.staNo){
                case 310:
                    return 1;
                    return 2;
                case 312:
                    return 2;
                case 126:
                    return 1;
                case 131:
                case 126:
                    return 2;
                case 131:
                    return 1;
            }
        }
        return 0;
    }

    public boolean booleanStaNoSign(){
        if (this.staNo == null){
            return false;
        } else {
            switch (this.staNo){
                case 310:
                case 312:
                case 126:
                case 131:
                    return true;
            }
        }
        return false;
    }

    public Integer getStaNoBying(){
        if (this.staNo == null){
            return 0;
        } else {
            switch (this.staNo){
                case 310:
                case 312:
                    return 212;
                case 126:
                case 131:
                    return 119;
            }
        }
        return 0;

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

@@ -61,8 +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  Integer signBigTurn = 0;
//    private static  Integer signSmallTurn = 0;
    private static final Float jarTemperature = 50F;
    @Autowired
    private CommonService commonService;
@@ -3100,9 +3100,11 @@
            if (wrkMast == null) {
                continue;
            }
            if (wrkMast.getStaNoSign().equals(signBigTurn)){
                continue;
            }
//            if (wrkMast.getStaNoSign().equals(signBigTurn)){
//                continue;
//            }


            crnStation = crnStation1;

            CrnSlave.CrnStn crnStn = null;
@@ -3116,23 +3118,30 @@
                continue;
            }

            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){
            if (wrkMast.booleanStaNoSign()){
                RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("LineUp"+wrkMast.getStaNo());
                if (Cools.isEmpty(rgvOneSign)){
                    continue;
                }
                RgvOneSign bigTurn = rgvOneSignMapper.selectOneSign("bigTurn");
                if (Cools.isEmpty(bigTurn)){
                if (rgvOneSign.getRgvOneSign()>=2){
                    continue;
                }
                if (bigTurn.getRgvOneSign()>13){
                    continue;
                }
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
                StaProtocol staProtocolEnt = devpThread.getStation().get(212);
                if (staProtocolEnt.isLoading() || staProtocolEnt.getWorkNo()!=0){
                    continue;
                }
//                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);
//                StaProtocol staProtocolEnt = devpThread.getStation().get(wrkMast.getStaNoBying());
//                if (staProtocolEnt.isLoading() || staProtocolEnt.getWorkNo()!=0){
//                    continue;
//                }
            }

            // 工作档状态判断
@@ -3353,10 +3362,10 @@
//                }
            }
        }
        signBigTurn++;
        if (signBigTurn > 2){
            signBigTurn = 0;
        }
//        signBigTurn++;
//        if (signBigTurn > 2){
//            signBigTurn = 0;
//        }

    }