#

yxFwq

2024-11-19 dbc2514aad6b2b70b08e81f33d45f64aae175ccf

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

@@ -56,8 +56,8 @@
    private void execute(){
        try{
            for(Integer staNo : CRN_WORK_RU){
                WrkMastCrn wrkMastCrnAll = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("sta_no",staNo));
                if (Cools.isEmpty(wrkMastCrnAll)){
                List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("sta_no", staNo));
                if (Cools.isEmpty(wrkMastCrnList)){
                    BasDevp basDevp = basDevpService.selectById(staNo);
                    if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y") && basDevp.getInEnable().equals("Y")){
                        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -97,12 +97,24 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){
        for(Integer staNo : CRN_WORK_CU) {
            WrkMastCrn wrkMastCrnAll = wrkMastCrnService.selectOne(new EntityWrapper<WrkMastCrn>().eq("source_sta_no",staNo));
            if (Cools.isEmpty(wrkMastCrnAll)){
            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>()
                        .eq("source_sta_no", staNo).eq("wrk_sts", 11L)
                        .orderBy("io_pri",false));
                for (WrkMast wrkMast:wrkMasts){
                    if (wrkMast.getIoType()==101){
                        BasDevp basDevp = basDevpService.selectById(119);
                        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;
                        }
                    }
                    try{
                        int row = Utils.getRow(wrkMast.getSourceLocNo());
                        if (row == wrkMast.getCrnNo()*4 || row == wrkMast.getCrnNo()*4-3){