afdfc60107245516aba35a74f7f49eee64f483ad..1d22483b110889e12bec172111d622b10762f9fa
2025-06-14 ytfl
#
1d2248 对比 | 目录
2025-06-14 Junjie
#
a959de 对比 | 目录
2个文件已修改
67 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -235,21 +235,21 @@
                                throw new CoolException("更新plc站点信息失败");
                            }
                            // led 入库信息显示
                            if (ledThread != null) {
                                // 命令集合
                                List<LedCommand> commands = new ArrayList<>();
                                // 组装命令
                                LedCommand ledCommand = new LedCommand();
                                ledCommand.setWorkNo(dto.getWorkNo());
                                ledCommand.setIoType(1);
                                ledCommand.setTitle("全板入库");
                                ledCommand.setLocNo(dto.getLocNo());
                                ledCommand.setStaNo(dto.getStaNo());
                                commands.add(ledCommand);
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands));
//                                ledThread.errorReset();
                            }
//                            // led 入库信息显示
//                            if (ledThread != null) {
//                                // 命令集合
//                                List<LedCommand> commands = new ArrayList<>();
//                                // 组装命令
//                                LedCommand ledCommand = new LedCommand();
//                                ledCommand.setWorkNo(dto.getWorkNo());
//                                ledCommand.setIoType(1);
//                                ledCommand.setTitle("全板入库");
//                                ledCommand.setLocNo(dto.getLocNo());
//                                ledCommand.setStaNo(dto.getStaNo());
//                                commands.add(ledCommand);
//                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands));
////                                ledThread.errorReset();
//                            }
                        } else {
                            News.error(""+mark+" - 5"+" - 请求接口失败!!!url:{};request:{};response:{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
//                            staProtocol.setWorkNo((short)9992);
src/main/resources/application.yml
@@ -284,4 +284,39 @@
    ip: 10.10.11.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1075
    staArr: 1075
  # LED3
  led[2]:
    id: 3
    ip: 10.10.11.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1058
  # LED4
  led[3]:
    id: 4
    ip: 10.10.11.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1064
  # LED5
  led[4]:
    id: 5
    ip: 10.10.11.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1068
  # LED6
  led[5]:
    id: 6
    ip: 10.10.11.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1071
  # LED7
  led[6]:
    id: 7
    ip: 10.10.11.210
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 1074