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

zjj

2024-06-19 57135c695bc7377d4ccab8162fff6a327fb591a7

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

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2592,6 +2592,9 @@
                                continue;
                            }
                            if (!devNo.getAutoing().equals("Y") || !devNo.getWrkNo().equals(0) || !devNo.getLoading().equals("N")){
                                if (devNo.getDevNo()==113){
                                    wrkEnable = true;
                                }
                                continue;
                            }
                            if (devNo.getDevNo()==113){