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

lty

2025-03-24 cf9fac40a8e39b25ee935a743224ae6c405bbddc

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

@@ -209,7 +209,10 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                TaskWrk taskWrk = taskWrkMapper.selectById(staProtocol.getWorkNo());
                if(staProtocol.getWorkNo() == 0){
                    continue;
                }
                TaskWrk taskWrk = taskWrkMapper.selectStaWorking(Integer.valueOf(staProtocol.getWorkNo()));
                if(taskWrk != null &&  taskWrk.getWrkNo() < 9001 && taskWrk.getWrkNo() > 6000){
                    staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));