zy-asrs.git - Gitblit

parent: 26392fe5 | 补丁 | 提交 | show whitespace

yxFwq

2025-01-03 0afba31001bcc9cc05af2b9061aa32bf7bd83b0b

3个文件已修改

	src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java	90 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java	64 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -101,15 +101,15 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){
        for(Integer staNo : CRN_WORK_CU) {
            try{
                for(Integer staNo1 : CRN_WORK_CU_SMA) {
                    RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+staNo1));
                    trunSma.setRgvOneSign(0);
                    rgvOneSignService.updateById(trunSma);
                }
            } catch (Exception e){

            }
//            try{
//                for(Integer staNo1 : CRN_WORK_CU_SMA) {
//                    RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+staNo1));
//                    trunSma.setRgvOneSign(0);
//                    rgvOneSignService.updateById(trunSma);
//                }
//            } catch (Exception e){
//
//            }
            List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("source_sta_no",staNo));
            if (Cools.isEmpty(wrkMastCrnList)){
                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
@@ -123,43 +123,43 @@
//                        continue;
//                    }
                    boolean sign = true;
                    if ((wrkMast.getIoType()==101 || wrkMast.getIoType() == 110) && wrkMast.booleanStaNoSign()){
                        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
                        if (Cools.isEmpty(rgvOneSign)){
                            continue;
                        }
                        RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
                        if (Cools.isEmpty(trunSma)){
                            continue;
                        }
                        int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
                        int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
                        if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
                            continue;
                        }
                        int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
                        if (wrkCountGt > 1){
                            continue;
                        }
                        sign = false;
//                        BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
//                        if (basDevp.getLoading().equals("Y")
//                                || !basDevp.getAutoing().equals("Y")
//                                || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
//                            continue;
//                    if ((wrkMast.getIoType()==101 || wrkMast.getIoType() == 110) && wrkMast.booleanStaNoSign()){
////                        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
////                        if (Cools.isEmpty(rgvOneSign)){
////                            continue;
////                        }
////                        RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
////                        if (Cools.isEmpty(trunSma)){
////                            continue;
////                        }
////                        int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
////                        int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
////                        if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
////                            continue;
////                        }
////                        int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
////                        if (wrkCountGt > 1){
////                            continue;
////                        }
////                        sign = false;
////                        BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
////                        if (basDevp.getLoading().equals("Y")
////                                || !basDevp.getAutoing().equals("Y")
////                                || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
////                            continue;
////                        }
////                        int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
////                        if (loadIngCount>8){
////                            continue;
////                        }
////                        RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn"));
////                        if (Cools.isEmpty(smallTurn)){
////                            continue;
////                        }
////                        if (smallTurn.getRgvOneSign()>15){
////                            continue;
////                        }
//                        }
//                        int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
//                        if (loadIngCount>8){
//                            continue;
//                        }
//                        RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn"));
//                        if (Cools.isEmpty(smallTurn)){
//                            continue;
//                        }
//                        if (smallTurn.getRgvOneSign()>15){
//                            continue;
//                        }
                    }
                    try{
                        int row = Utils.getRow(wrkMast.getSourceLocNo());
                        if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){

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

@@ -117,37 +117,37 @@
//                                            if (wrkMast.getStaNoSign().equals(signBigTurn)){
//                                                continue;
//                                            }
                                            if (wrkMast.booleanStaNoSign() && wrkMast.booleanStaNoSign()){
                                                RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
                                                if (Cools.isEmpty(rgvOneSign)){
                                                    continue;
                                                }
                                                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
                                                if (wrkCount+rgvOneSign.getRgvOneSign()>2){
                                                    continue;
                                                }
                                                int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
                                                if (wrkCountGt > 2){
                                                    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){
//                                            if (wrkMast.booleanStaNoSign() && 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)){
//                                                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
//                                                if (wrkCount+rgvOneSign.getRgvOneSign()>2){
//                                                    continue;
//                                                }
//                                                if (bigTurn.getRgvOneSign()>13){
//                                                int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
//                                                if (wrkCountGt > 2){
//                                                    continue;
//                                                }
//                                                BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
//                                                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){

 src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java

@@ -122,38 +122,38 @@
            }
            WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
            if (!Cools.isEmpty(wrkMastOther)){
                if (!sign) {
                    RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
                    trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
                    rgvOneSignService.updateById(trunSma);
                }
                if ((wrkMastOther.getIoType()==101 || wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
                    if (sign){
                        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
                        if (Cools.isEmpty(rgvOneSign)){
                            return FAIL;
                        }
                        RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
                        if (Cools.isEmpty(trunSma)){
                            return FAIL;
                        }
                        int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
                        int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMastOther.getStaNo()));
                        if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
                            return FAIL;
                        }
                        int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).gt("wrk_sts",11L));
                        if (wrkCountGt > 1){
                            return FAIL;
                        }
                        trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
                        rgvOneSignService.updateById(trunSma);
                    } else {
                        RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
                        trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
                        rgvOneSignService.updateById(trunSma);
                    }
                }
//                if (!sign) {
//                    RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
//                    trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
//                    rgvOneSignService.updateById(trunSma);
//                }
//                if ((wrkMastOther.getIoType()==101 || wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
//                    if (sign){
//                        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
//                        if (Cools.isEmpty(rgvOneSign)){
//                            return FAIL;
//                        }
//                        RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
//                        if (Cools.isEmpty(trunSma)){
//                            return FAIL;
//                        }
//                        int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
//                        int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMastOther.getStaNo()));
//                        if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
//                            return FAIL;
//                        }
//                        int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).gt("wrk_sts",11L));
//                        if (wrkCountGt > 1){
//                            return FAIL;
//                        }
//                        trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
//                        rgvOneSignService.updateById(trunSma);
//                    } else {
//                        RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
//                        trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
//                        rgvOneSignService.updateById(trunSma);
//                    }
//                }
                WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
                wrkMastCrnService.insert(wrkMastCrn);
            }else {

			@@ -101,15 +101,15 @@
			@Scheduled(cron = "0/3 * * * * ? ")
			private void execute2(){
			for(Integer staNo : CRN_WORK_CU) {
			try{
			for(Integer staNo1 : CRN_WORK_CU_SMA) {
			RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+staNo1));
			trunSma.setRgvOneSign(0);
			rgvOneSignService.updateById(trunSma);
			}
			} catch (Exception e){

			}
			// try{
			// for(Integer staNo1 : CRN_WORK_CU_SMA) {
			// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+staNo1));
			// trunSma.setRgvOneSign(0);
			// rgvOneSignService.updateById(trunSma);
			// }
			// } catch (Exception e){
			//
			// }
			List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("source_sta_no",staNo));
			if (Cools.isEmpty(wrkMastCrnList)){
			List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
			@@ -123,43 +123,43 @@
			// continue;
			// }
			boolean sign = true;
			if ((wrkMast.getIoType()==101 \|\| wrkMast.getIoType() == 110) && wrkMast.booleanStaNoSign()){
			RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
			if (Cools.isEmpty(rgvOneSign)){
			continue;
			}
			RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
			if (Cools.isEmpty(trunSma)){
			continue;
			}
			int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
			int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
			if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
			continue;
			}
			int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
			if (wrkCountGt > 1){
			continue;
			}
			sign = false;
			// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
			// if (basDevp.getLoading().equals("Y")
			// \|\| !basDevp.getAutoing().equals("Y")
			// \|\| (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
			// continue;
			// if ((wrkMast.getIoType()==101 \|\| wrkMast.getIoType() == 110) && wrkMast.booleanStaNoSign()){
			//// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
			//// if (Cools.isEmpty(rgvOneSign)){
			//// continue;
			//// }
			//// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
			//// if (Cools.isEmpty(trunSma)){
			//// continue;
			//// }
			//// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
			//// int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
			//// if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
			//// continue;
			//// }
			//// int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
			//// if (wrkCountGt > 1){
			//// continue;
			//// }
			//// sign = false;
			//// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
			//// if (basDevp.getLoading().equals("Y")
			//// \|\| !basDevp.getAutoing().equals("Y")
			//// \|\| (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
			//// continue;
			//// }
			//// int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
			//// if (loadIngCount>8){
			//// continue;
			//// }
			//// RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn"));
			//// if (Cools.isEmpty(smallTurn)){
			//// continue;
			//// }
			//// if (smallTurn.getRgvOneSign()>15){
			//// continue;
			//// }
			// }
			// int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
			// if (loadIngCount>8){
			// continue;
			// }
			// RgvOneSign smallTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallTurn"));
			// if (Cools.isEmpty(smallTurn)){
			// continue;
			// }
			// if (smallTurn.getRgvOneSign()>15){
			// continue;
			// }
			}
			try{
			int row = Utils.getRow(wrkMast.getSourceLocNo());
			if (row == wrkMast.getCrnNo()4 \|\| row == wrkMast.getCrnNo()4-3){

			@@ -117,37 +117,37 @@
			// if (wrkMast.getStaNoSign().equals(signBigTurn)){
			// continue;
			// }
			if (wrkMast.booleanStaNoSign() && wrkMast.booleanStaNoSign()){
			RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo()));
			if (Cools.isEmpty(rgvOneSign)){
			continue;
			}
			int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
			if (wrkCount+rgvOneSign.getRgvOneSign()>2){
			continue;
			}
			int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
			if (wrkCountGt > 2){
			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){
			// if (wrkMast.booleanStaNoSign() && 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)){
			// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
			// if (wrkCount+rgvOneSign.getRgvOneSign()>2){
			// continue;
			// }
			// if (bigTurn.getRgvOneSign()>13){
			// int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
			// if (wrkCountGt > 2){
			// continue;
			// }
			// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
			// 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){

			@@ -122,38 +122,38 @@
			}
			WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
			if (!Cools.isEmpty(wrkMastOther)){
			if (!sign) {
			RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
			trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
			rgvOneSignService.updateById(trunSma);
			}
			if ((wrkMastOther.getIoType()==101 \|\| wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
			if (sign){
			RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
			if (Cools.isEmpty(rgvOneSign)){
			return FAIL;
			}
			RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
			if (Cools.isEmpty(trunSma)){
			return FAIL;
			}
			int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
			int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMastOther.getStaNo()));
			if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
			return FAIL;
			}
			int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).gt("wrk_sts",11L));
			if (wrkCountGt > 1){
			return FAIL;
			}
			trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
			rgvOneSignService.updateById(trunSma);
			} else {
			RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
			trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
			rgvOneSignService.updateById(trunSma);
			}
			}
			// if (!sign) {
			// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
			// trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
			// rgvOneSignService.updateById(trunSma);
			// }
			// if ((wrkMastOther.getIoType()==101 \|\| wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
			// if (sign){
			// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
			// if (Cools.isEmpty(rgvOneSign)){
			// return FAIL;
			// }
			// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
			// if (Cools.isEmpty(trunSma)){
			// return FAIL;
			// }
			// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
			// int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMastOther.getStaNo()));
			// if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
			// return FAIL;
			// }
			// int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).gt("wrk_sts",11L));
			// if (wrkCountGt > 1){
			// return FAIL;
			// }
			// trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
			// rgvOneSignService.updateById(trunSma);
			// } else {
			// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
			// trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
			// rgvOneSignService.updateById(trunSma);
			// }
			// }
			WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
			wrkMastCrnService.insert(wrkMastCrn);
			}else {