#

yxFwq

2025-04-01 74fd6eb7fb0322078f7946f51073f20e90231df1

 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 {