From 3a1bd5a249d6e479abc8a0415d6fdef80c24b519 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 16 三月 2022 12:33:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 1 -
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 9 +++++----
src/main/resources/application.yml | 10 +++++++++-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0f4eae7..f88821d 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -58,7 +58,7 @@
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
+// mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index a3f1130..ce0f98d 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -198,7 +198,6 @@
}
}
-
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = new BasCrnp();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b4d912f..8880b46 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -47,7 +47,8 @@
add(150);add(151);add(152);add(153);add(154);add(155);add(156);add(157);add(158);add(159);
add(160);add(161);add(162);add(163);add(164);add(165);add(166);add(167);add(168);add(169);
add(170);add(171);add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
- add(180);add(181);add(182);
+ add(180);add(181);add(182);add(183);add(184);add(185);add(186);add(187);add(188);add(189);
+ add(190);add(191);add(192);
}};
public SiemensDevpThread(DevpSlave slave) {
@@ -110,7 +111,7 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 166);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
if (result.IsSuccess) {
for (int i = 0; i < 83; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -124,7 +125,7 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 166);
+ OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
if (result0.IsSuccess) {
for (int i = 0; i < 83; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -138,7 +139,7 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 166);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 186);
if (result1.IsSuccess) {
for (int i = 0; i < 83; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9d1b6d9..e2b441a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,8 @@
# url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
# username: sa
# password: Zoneyung@zy56$
- url: jdbc:sqlserver://10.10.10.238:1433;databasename=xgmasrs
+# url: jdbc:sqlserver://10.10.10.238:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
username: sa
password: sa@123
mvc:
@@ -169,6 +170,9 @@
inSta[0]:
staNo: 176
barcode: ${wcs-slave.barcode[0].id}
+ inSta[1]:
+ staNo: 180
+ barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 176
@@ -187,6 +191,10 @@
id: 1
ip: 10.10.10.52
port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.53
+ port: 51236
# LED1
led[0]:
id: 1
--
Gitblit v1.9.1