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

Administrator

2 天以前 f18dee1034da10cdd537f4cef94a6bcbe141c6a8

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

@@ -237,6 +237,9 @@
                                log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                                staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                                staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                        if (!Cools.isEmpty(taskWrk.getType())) {
                            staProtocol.setHeight(taskWrk.getType());
                        }
                                boolean offer = false;
                                try {
                                    offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));