From 7b37edd97c007abcec6a59f4ccc387c10ec8a86e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 九月 2022 13:31:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 18 ++++++++++--------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +---
2 files changed, 11 insertions(+), 11 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 41f0586..2b5acf0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1943,7 +1943,7 @@
}
/**
- * 灏忚溅鐢甸噺妫�娴�
+ * 灏忚溅鐢甸噺妫�娴� ===>> 鍙戣捣鍏呯數
*/
public void loopSteCharge() {
for (SteSlave ste : slaveProperties.getSte()) {
@@ -1955,8 +1955,6 @@
if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
continue;
}
-
-
} catch (Exception e) {
log.error("fail", e);
}
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 726504c..c2c8f60 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -229,14 +229,16 @@
basSte.setSteErr(alarm.longValue());
}
basSte.setWrkNo(taskNo.intValue());
- if (!Cools.isEmpty(row)) {
- basSte.setRow(row.intValue());
- }
- if (!Cools.isEmpty(bay)) {
- basSte.setBay(bay.intValue());
- }
- if (!Cools.isEmpty(lev)) {
- basSte.setLev(lev.intValue());
+ if (basSte.getPakMk().equals("N")) {
+// if (!Cools.isEmpty(row)) {
+// basSte.setRow(row.intValue());
+// }
+// if (!Cools.isEmpty(bay)) {
+// basSte.setBay(bay.intValue());
+// }
+// if (!Cools.isEmpty(lev)) {
+// basSte.setLev(lev.intValue());
+// }
}
return basSte;
}
--
Gitblit v1.9.1