From 9fa55059258bc817d8868bbe6d46c90451f659e1 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 16 三月 2022 13:54:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 ++++++++++----------
src/main/webapp/views/index.html | 3 +++
src/main/resources/mapper/WrkMastMapper.xml | 3 ++-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 ++++++------
4 files changed, 21 insertions(+), 17 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 1c15707..d46dd53 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -123,8 +123,8 @@
staProtocol = staProtocol.clone();
}
- // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
+// // 鍏ュ嚭搴撴ā寮忓垽鏂�
+// if ( inSta.getStaNo()==180 && devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
@@ -278,8 +278,8 @@
staProtocol = staProtocol.clone();
}
- // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
+// // 鍏ュ嚭搴撴ā寮忓垽鏂�
+// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
@@ -346,8 +346,8 @@
staProtocol = staProtocol.clone();
}
- // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
+// // 鍏ュ嚭搴撴ā寮忓垽鏂�
+// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()){
@@ -711,8 +711,8 @@
staProtocol = staProtocol.clone();
}
- // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
+// // 鍏ュ嚭搴撴ā寮忓垽鏂�
+// if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
// 鏌ヨ绔欑偣璇︾粏淇℃伅
@@ -1042,8 +1042,8 @@
staProtocol = staProtocol.clone();
}
- // 鍏ュ嚭搴撴ā寮忓垽鏂�
- if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
+// // 鍏ュ嚭搴撴ā寮忓垽鏂�
+// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6eb8cb3..17a3e4a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -114,8 +114,8 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- // 鏇存柊鍏ュ嚭搴撴ā寮�
- updateIoMode();
+// // 鏇存柊鍏ュ嚭搴撴ā寮�
+// updateIoMode();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
if (result.IsSuccess) {
for (int i = 0; i < 83; i++) {
@@ -165,10 +165,10 @@
}
}
- OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
- if (result2.IsSuccess) {
- this.ioMode = IoModeType.get(result2.Content);
- }
+// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
+// if (result2.IsSuccess) {
+// this.ioMode = IoModeType.get(result2.Content);
+// }
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 5436457..d9d5431 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -121,7 +121,7 @@
<!-- 鍏ュ簱浠诲姟 -->
<select id="selectWorkingPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no
</select>
<!-- 鍑哄簱浠诲姟 -->
@@ -136,6 +136,7 @@
where wrk_no > 0)
))
and io_type != 11
+ and source_sta_no = 180
order by io_time,wrk_no
</select>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index c37f3b0..98c2a29 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -18,6 +18,9 @@
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
</ul>
</div>
+<!--<div style="z-index: 999; position: absolute; top: 250px; left: 900px; width: 200px; height: 200px; opacity: 0.5;background-color: #0000FF">-->
+
+<!--</div>-->
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
--
Gitblit v1.9.1