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

cl

19 小时以前 f95a3c836f06078f41389051a9d1c01969a925cb

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

@@ -313,8 +313,12 @@
                                wrkMastService.updateById(wrkMast);
                                Thread.sleep(3000); // 延时3S
                            }else {
                                // 未组托托盘退回 电视机显示请先组托
                                Integer back = 999;

                                if (ledThread != null) {
                                    String errorMsg = jsonObject.getString("msg");
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                                }
                                barcodeThread.setBarcode("");
                                boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, back));
                                if (result) {