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