#

LSH

2024-01-29 9d27188f92d60ac1fd6c1b51105f1f9cf7100bf1

#

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

@@ -158,7 +158,7 @@
                        continue;
                    }
                    BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
                    if (!basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
                    if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
                        continue;
                    }
                    if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
@@ -252,7 +252,7 @@
                    }

                    BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
                    if (sign || !basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
                    if (sign || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
                        for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
                            if (staNoOther.equals(wrkMastStaNo)) continue;

@@ -273,7 +273,7 @@
                                continue;
                            }
                            BasDevp basDevpOther = basDevpService.selectById(staNoOther);
                            if (!basDevpOther.getLoading().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
                            if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
                                continue;
                            }
                            wrkMast.setStaNo(staNoOther);