#

yxFwq

2024-11-24 a7f0ee46f5a1b0ec8cf7bd3d0701bde6c09de24f

 src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java

@@ -24,6 +24,7 @@
public class WrkMastSplitTwinInItScheduler {

    private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
//    private static  Integer signBigTurn = 0;

    @Autowired
    private WrkMastSplitTwinInItHandler wrkMastSplitTwinInItHandler;
@@ -110,28 +111,46 @@
                                        break;
                                    }else {
                                        for (WrkMast wrkMast:wrkMasts){
                                            if (wrkMast.getStaNo()>309){
                                                int wrkCount = wrkMastService.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.getStaNoSign().equals(signBigTurn)){
//                                                continue;
//                                            }
                                            if (wrkMast.booleanStaNoSign()){
                                                RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
                                                if (Cools.isEmpty(rgvOneSign)){
                                                    continue;
                                                }
                                                RgvOneSign bigTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn"));
                                                if (Cools.isEmpty(bigTurn)){
                                                if (rgvOneSign.getRgvOneSign()>=2){
                                                    continue;
                                                }
                                                if (bigTurn.getRgvOneSign()>13){
                                                    continue;
                                                }
                                                BasDevp basDevp = basDevpService.selectById(212);
                                                if (basDevp.getLoading().equals("Y")
                                                        || !basDevp.getAutoing().equals("Y")
                                                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
                                                    continue;
                                                }
//                                                int wrkCount = wrkMastService.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 = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn"));
//                                                if (Cools.isEmpty(bigTurn)){
//                                                    continue;
//                                                }
//                                                if (bigTurn.getRgvOneSign()>13){
//                                                    continue;
//                                                }
//                                                BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
//                                                if (basDevp.getLoading().equals("Y")
//                                                        || !basDevp.getAutoing().equals("Y")
//                                                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
//                                                    continue;
//                                                }
                                            }
                                            wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin,wrkMast,2);
//                                            signBigTurn++;
//                                            if (signBigTurn > 2){
//                                                signBigTurn = 0;
//                                            }
                                            break;
                                        }
//                                        signBigTurn++;
//                                        if (signBigTurn > 2){
//                                            signBigTurn = 0;
//                                        }
                                        break;
                                    }
                                }