From 07685aff7a5b1ef77344b08bd8b2ca51ba270862 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期六, 06 八月 2022 08:13:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/common/model/LocTypeDto.java | 16 ++++++++--------
src/main/resources/application.yml | 14 +++++++-------
3 files changed, 16 insertions(+), 16 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 f528f25..6ce64f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1257,7 +1257,7 @@
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
- && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9990 || staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {
+ && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990 && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index bf782d9..76c51eb 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -23,14 +23,14 @@
}
public LocTypeDto(StaProtocol staProtocol) {
-// if (staProtocol.isHigh() == staProtocol.isLow()) {
-// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-// }
-// if (staProtocol.isLow()) {
-// this.locType1 = 1; // 浣庡簱浣�
-// } else {
-// this.locType1 = 2; // 楂樺簱浣�
-// }
+ if (staProtocol.isHigh() == staProtocol.isLow()) {
+ throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+ }
+ if (staProtocol.isLow()) {
+ this.locType1 = 1; // 浣庡簱浣�
+ } else {
+ this.locType1 = 2; // 楂樺簱浣�
+ }
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a21257d..a440e63 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8080/klswms
+ url: localhost:8081/lywms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -182,42 +182,42 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.60
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 110
# LED2
led[1]:
id: 2
- ip: 10.10.10.61
+ ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 117
# LED3
led[2]:
id: 3
- ip: 10.10.10.61
+ ip: 10.10.10.203
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 124
# LED4
led[3]:
id: 4
- ip: 10.10.10.61
+ ip: 10.10.10.204
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 131
# LED5
led[4]:
id: 5
- ip: 10.10.10.61
+ ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 136
# LED6
led[5]:
id: 5
- ip: 10.10.10.61
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 136
\ No newline at end of file
--
Gitblit v1.9.1