Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-04-12 b922fe4d80f7e278b1ff958c4c95626b27cf8266

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

@@ -130,7 +130,7 @@
                    //检测当前工作任务中的站点是否已有有作业中的任务
                    AgvWrkMast agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                            .eq("loc_no", agvWrkMast.getLocNo())
                            .ge("loc_sts", 202L));
                            .ge("wrk_sts", 202L));

                    if(!Cools.isEmpty(agvWrkMastWorking)){
                        return;