From 82fd2711ad9e1edb40490c1f107e5a50b2369e6a Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 21 十一月 2022 15:44:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 ++---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 6 ++++++
src/main/resources/application.yml | 10 +++++-----
3 files changed, 13 insertions(+), 8 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 46ff835..3788231 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -778,9 +778,8 @@
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
- if (wrkMast.getStaNo() == 204 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
- continue;
- }
+// if (wrkMast.getStaNo() == 204 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {continue;}
+// if (wrkMast.getStaNo() == 402 && devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) {continue;}
// 鏌ヨ绔欑偣璇︾粏淇℃伅
BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a8bde3c..0bf2be1 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -311,6 +311,12 @@
log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
+ if (this.ioModeOf4F != IoModeType.NONE) {
+ if (!siemensS7Net.Write("DB100.170", this.ioModeOf4F.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎4F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ log.error("鍐欏叆杈撻�佺嚎4F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ }
+ }
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 00f3463..03438c7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
username: sa
password: sa@123
mvc:
@@ -146,7 +146,7 @@
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.121
+ ip: 10.10.10.200
port: 102
rack: 0
slot: 0
@@ -239,8 +239,8 @@
barcode: ${wcs-slave.barcode[3].id}
devp[1]:
- id: 1
- ip: 10.10.10.60
+ id: 2
+ ip: 10.10.10.93
port: 102
rack: 0
slot: 0
@@ -274,7 +274,7 @@
port: 51236
barcode[3]:
id: 4
- ip: 10.10.10.52
+ ip: 10.10.10.93
port: 51236
# LED1
led[0]:
--
Gitblit v1.9.1