#

yxFwq

2024-11-29 afb5071cedaee8c6db2f3bdd3fef6a3b1713f09e

#

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

@@ -51,6 +51,9 @@
    public static final List<Integer> CRN_WORK_CU = new ArrayList<Integer>() {{
        add(100);add(148);
    }};
    public static final List<Integer> CRN_WORK_CU_SMA = new ArrayList<Integer>() {{
        add(126);add(131);
    }};


    @Scheduled(cron = "0/3 * * * * ? ")
@@ -98,6 +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){

            }
            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>()
@@ -110,15 +122,22 @@
//                    if (wrkMast.booleanStaNoSignOther()){
//                        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;
                        }
                        int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
                        if (wrkCount+rgvOneSign.getRgvOneSign()>2){
                        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+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
                            continue;
                        }
                        sign = false;
//                        BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
//                        if (basDevp.getLoading().equals("Y")
//                                || !basDevp.getAutoing().equals("Y")
@@ -142,7 +161,7 @@
                        if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){
                            WrkMastCrn wrkMastCrn = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("wrk_no", wrkMast.getWrkNo()));
                            if (Cools.isEmpty(wrkMastCrn)){
                                ReturnT<String> result = wrkMastCrnHandler.start(wrkMast);
                                ReturnT<String> result = wrkMastCrnHandler.start(wrkMast,sign);
                                if (result.isSuccess()) {
//                                    signSmallTurn++;
//                                    if (signSmallTurn > 2){

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

@@ -110,7 +110,7 @@
        return SUCCESS;
    }

    public ReturnT<String> start(WrkMast wrkMast) {
    public ReturnT<String> start(WrkMast wrkMast,boolean sign) {
        try {
            Date now = new Date();
            LocTypeDto locTypeDto = new LocTypeDto();
@@ -122,15 +122,27 @@
            }
            WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
            if (!Cools.isEmpty(wrkMastOther)){
                if ((wrkMastOther.getIoType()==101 || wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
                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 (sign && (wrkMastOther.getIoType()==101 || wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
                    RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
                    if (Cools.isEmpty(rgvOneSign)){
                        return FAIL;
                    }
                    int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
                    if (wrkCount+rgvOneSign.getRgvOneSign()>2){
                    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+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
                        return FAIL;
                    }
                    trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
                    rgvOneSignService.updateById(trunSma);
                }
                WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
                wrkMastCrnService.insert(wrkMastCrn);