Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

2025-10-22 7b6329313ca3a5e6ff96246eeaf96f839df7760b

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

@@ -37,7 +37,7 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000){
            if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
                if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
                    continue;
                }