From 9d53846856cdd55622b04f88863bc24b77308ac6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 02 十一月 2022 09:17:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 0d9041e..172d9b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2484,7 +2484,7 @@
*/
@SuppressWarnings("serial")
public synchronized void loopSteCharge() {
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset.toString())) {
+ if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
return;
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -2509,7 +2509,7 @@
if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
continue;
}
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge.toString());
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge);
if (wrkCharge == null && steProtocol.getChargeStatus() == 0) {
// 瀵绘壘绌洪棽鍏呯數妗�
@@ -2720,7 +2720,7 @@
*/
public synchronized void queryChargeLocOfComplete() {
// 涓庡厖鐢典换鍔′笉鍚屾杩涜
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge.toString())) { return; }
+ if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
// 妫�绱㈠厖鐢垫々
for (SteChargeType value : SteChargeType.values()) {
@@ -2757,7 +2757,7 @@
continue;
}
- WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset.toString());
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);
if (wrkCharge == null) {
// 寮�濮嬬┛姊溅澶嶄綅浠诲姟
@@ -2783,7 +2783,7 @@
* 灏忚溅浠庡厖鐢垫々 鑷� 寰呮満搴撲綅
*/
public synchronized void steFromChargeToIdleLoc() {
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset.toString());
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
if (wrkCharge == null) { return; }
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
SteProtocol steProtocol = steThread.getSteProtocol();
--
Gitblit v1.9.1