From 4ccbacee614305267a3b185e01cc4816f83daa90 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期五, 13 六月 2025 15:18:05 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/taskWrk/taskWrk.html | 2 ++
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 2 ++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 9 ++++++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d6f126c..84925f2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -541,10 +541,11 @@
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
while (writeCount < 5) {
- OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo()); // 鐩爣绔�
if (!Cools.isEmpty(staProtocol.getHeight()) && heightAddress != null) {
- OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight())); // 鐩爣绔�
+ OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+ writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+ writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
+ writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
log.info("鍐欏叆楂樺害鍦板潃锛歿},{}", heightAddress, writeResult3);
if (!writeResult3.IsSuccess) {
//fangzhi xierukushibai,jiu duoxiejici,meixunhuan
@@ -554,6 +555,8 @@
}
}
}
+ OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo()); // 鐩爣绔�
if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
Thread.sleep(200);
OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 2);
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index 0fe0b23..ba46faa 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -86,6 +86,8 @@
</el-table-column>
<el-table-column property="ioPri" label="浼樺厛绾�">
</el-table-column>
+ <el-table-column property="type" label="涓嬮檷楂樺害">
+ </el-table-column>
<el-table-column property="memo" label="澶囨敞">
</el-table-column>
</el-table>
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index 7c4b892..12757f6 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -71,6 +71,8 @@
</el-table-column>
<el-table-column property="barcode" label="鏉＄爜">
</el-table-column>
+ <el-table-column property="type" label="涓嬮檷楂樺害">
+ </el-table-column>
</el-table>
<div style="margin-top: 10px;">
--
Gitblit v1.9.1