From cfa65c8f388dafc21fa3687f65d33cb10a2dac81 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 27 十月 2022 09:36:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +++
src/main/java/com/zy/core/enums/SteChargeType.java | 13 +++++--------
2 files changed, 8 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 20bbaa4..18f276f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2410,6 +2410,9 @@
* 灏忚溅鐢甸噺妫�娴� ===>> 鍙戣捣鍏呯數
*/
public synchronized void loopSteCharge() {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SteChargeType steChargeType = SteChargeType.get(wrkCharge.getLocNo());
+
for (SteSlave ste : slaveProperties.getSte()) {
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
SteProtocol steProtocol = steThread.getSteProtocol();
diff --git a/src/main/java/com/zy/core/enums/SteChargeType.java b/src/main/java/com/zy/core/enums/SteChargeType.java
index aa89906..06ff2a0 100644
--- a/src/main/java/com/zy/core/enums/SteChargeType.java
+++ b/src/main/java/com/zy/core/enums/SteChargeType.java
@@ -4,22 +4,19 @@
public enum SteChargeType {
- FIRST(1, "0100101", "0300101"),
- SECOND(2, "1400701", "1200701"),
- THIRD(3, "2100401", "1900401"),
+ FIRST(1, "0100101"),
+ SECOND(2, "0100201"),
+ THIRD(3, "0100301"),
;
- SteChargeType(int ssbm, String locNo, String idleLoc) {
+ SteChargeType(int ssbm, String locNo) {
this.ssbm = ssbm;
this.locNo = locNo;
- this.idleLoc = idleLoc;
}
public int ssbm;
public String locNo;
-
- public String idleLoc;
public static SteChargeType get(String locNo) {
if (Cools.isEmpty(locNo)) {
@@ -27,7 +24,7 @@
}
SteChargeType[] values = SteChargeType.values();
for (SteChargeType value : values) {
- if (value.idleLoc.equals(locNo)) {
+ if (value.locNo.equals(locNo)) {
return value;
}
}
--
Gitblit v1.9.1