From 49374eb9866b206baaf89c0d85c297dc76cec7d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 16:36:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++----
src/main/java/com/zy/core/thread/DevpThread.java | 33 ++++++++++++++++++++++++++++++++-
3 files changed, 40 insertions(+), 5 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 2aa80f7..1236cfc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -127,7 +127,11 @@
}
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol
+ barcodeThread.setBarcode("");
+ staProtocol.setWorkNO(workNo);
+ staProtocol.setStaNo(startupDto.getStaNo());
+ staProtocol.setPakMk(false);
+ staProtocol.setInreq1(false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task<>(4, staProtocol));
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
@@ -141,8 +145,5 @@
}
- public static void main(String[] args) {
-
- }
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 7113a2c..53f11ec 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -36,5 +36,8 @@
// 宸ヤ綔鍙�
private Integer workNO;
+ // 鐩爣绔�
+ private Integer staNo;
+
}
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index b8cfd82..1e57bfc 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,6 +1,7 @@
package com.zy.core.thread;
import com.zy.common.HslCommunication.Core.Types.OperateResult;
+import com.zy.common.HslCommunication.Core.Types.OperateResultExOne;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensPLCS;
import com.zy.common.HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.core.Slave;
@@ -52,6 +53,10 @@
break;
case 2:
break;
+ case 3:
+ break;
+ case 4:
+ break;
default:
break;
}
@@ -82,14 +87,35 @@
* 璇诲彇宸ヤ綔鍙�
*/
private void readWorkNo(){
-
+ OperateResultExOne<int[]> read = siemensS7Net.ReadInt32("DB100", (short) 8);
+ if (read.IsSuccess) {
+ int staNo1 = read.Content[0];
+ int staNo2 = read.Content[1];
+ int staNo3 = read.Content[2];
+ int staNo4 = read.Content[3];
+ int staNo5 = read.Content[4];
+ int staNo6 = read.Content[5];
+ int staNo7 = read.Content[6];
+ int staNo8 = read.Content[7];
+ }
}
/**
* 璇诲彇鐩爣绔�
*/
private void readStaDest(){
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101", (short) 8);
+ if (read.IsSuccess) {
+ int staNo1 = siemensS7Net.getByteTransform().TransInt32(read.Content, 0);
+ int staNo2 = siemensS7Net.getByteTransform().TransInt32(read.Content, 4);
+ int staNo3 = siemensS7Net.getByteTransform().TransInt32(read.Content, 8);
+ int staNo4 = siemensS7Net.getByteTransform().TransInt32(read.Content, 12);
+ int staNo5 = siemensS7Net.getByteTransform().TransInt32(read.Content, 16);
+ int staNo6 = siemensS7Net.getByteTransform().TransInt32(read.Content, 20);
+ int staNo7 = siemensS7Net.getByteTransform().TransInt32(read.Content, 24);
+ int staNo8 = siemensS7Net.getByteTransform().TransInt32(read.Content, 28);
+ }
}
/**
@@ -106,6 +132,11 @@
}
+ private void writeWorkNo(){
+
+
+
+ }
@Override
public void close() {
--
Gitblit v1.9.1