Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

skyouc

4 天以前 4bf0426314e8eb19b632861603206c4c288647bf

 src/main/java/com/zy/core/plugin/XiaosongProcess.java

@@ -139,6 +139,17 @@
                            continue;
                        }

                        if (stationProtocol.getError() > 0) {
                            StationObjModel backStation = entity.getBackStation();
                            StationCommand command = stationThread.getCommand(StationCommandType.MOVE, 9998, stationId, backStation.getStationId(), 0);
                            if (command == null) {
                                News.taskInfo(stationProtocol.getTaskNo(), "{}工作,获取输送线命令失败", stationProtocol.getTaskNo());
                                continue;
                            }
                            MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                            News.taskInfo(stationProtocol.getTaskNo(), "{}扫码异常，已退回至{}", backStation.getStationId());
                        }

                        // 检测任务是否生成
                        List<WrkMast> wrkMasts = wrkMastService
                                .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));