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

zjj

2024-06-19 c8339858cc25bc142d6b59e9ed08afc1b48b4f2d

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

@@ -2588,7 +2588,7 @@
                        //判断工作结束位置状态
                        BasDevp devNo = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", wrkMastSta.getStaEnd()));
                        if (!Cools.isEmpty(devNo)){
                            if (devNo.getAutoing().equals("Y") && !devNo.getWrkNo().equals(0) && !devNo.getLoading().equals("N")){
                            if (devNo.getAutoing().equals("Y") || !devNo.getWrkNo().equals(0) || !devNo.getLoading().equals("N") || !devNo.getInEnable().equals("Y")){
                                continue;
                            }
                        }