From 86239b4529726fda2d462e79495dd5eb59f4c3e2 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期六, 08 十月 2022 19:11:40 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 +++++++++++- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 7672a11..dff3e8f 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -2086,7 +2086,17 @@ devpThread.startSignal[i] = newSingle; } }else if (devpThread.startSignal[i] == 8){ - + //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被 + StaProtocol staProtocol = new StaProtocol(); + staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧� + staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0 + boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol)); + if(!result){ +// log.error("鏇存柊搴撲綅绱ф�ュ嚭搴撲俊鍙峰け璐�===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode()); +// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i); + } else { + devpThread.startSignal[i] = newSingle; + } } } diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index d80a469..ea0e6b9 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -82,7 +82,7 @@ //澶嶄綅娴嬭瘯淇″彿 case 3: StaProtocol staProtocol = (StaProtocol)task.getData(); - siemensS7Net.Write("DB200." + staProtocol.getSiteId(), staProtocol.getStaNo()); + siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo()); break; default: break; -- Gitblit v1.9.1