From f5a6d4be5334f706ae73a08943a6667cd196bb78 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 08:22:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 ++++++++++++++++++++------------------
src/main/java/com/zy/core/enums/SteChargeType.java | 4 ++--
src/main/java/com/zy/core/MainProcess.java | 4 ++--
3 files changed, 24 insertions(+), 22 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 e54a137..e562e1c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2561,24 +2561,24 @@
break;
}
}
- if (!devpThread.charge1) {
- SteChargeType second = SteChargeType.SECOND;
- locNo = second.locNo;
- if (basSteService.hasCarOfLocNo(locNo) == null
- && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
- steCharge = second;
- break;
- }
- }
- if (!devpThread.charge2) {
- SteChargeType third = SteChargeType.THIRD;
- locNo = third.locNo;
- if (basSteService.hasCarOfLocNo(locNo) == null
- && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
- steCharge = third;
- break;
- }
- }
+// if (!devpThread.charge1) {
+// SteChargeType second = SteChargeType.SECOND;
+// locNo = second.locNo;
+// if (basSteService.hasCarOfLocNo(locNo) == null
+// && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
+// steCharge = second;
+// break;
+// }
+// }
+// if (!devpThread.charge2) {
+// SteChargeType third = SteChargeType.THIRD;
+// locNo = third.locNo;
+// if (basSteService.hasCarOfLocNo(locNo) == null
+// && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
+// steCharge = third;
+// break;
+// }
+// }
break;
} while (false);
@@ -2839,6 +2839,7 @@
/**
* 杞鍏呯數妗╂槸鍚︽湁绌洪棽灏忚溅
*/
+ @Deprecated
public synchronized void queryChargeLocOfComplete() {
// 涓庡厖鐢典换鍔′笉鍚屾杩涜
if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
@@ -2915,6 +2916,7 @@
/**
* 灏忚溅浠庡厖鐢垫々 鑷� 寰呮満搴撲綅
*/
+ @Deprecated
public synchronized void steFromChargeToIdleLoc() {
WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
if (wrkCharge == null) { return; }
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2408d5b..a54f050 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -73,8 +73,8 @@
// 闂撮殧
Thread.sleep(200);
// 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣�
- mainService.queryChargeLocOfComplete();
- mainService.steFromChargeToIdleLoc();
+// mainService.queryChargeLocOfComplete();
+// mainService.steFromChargeToIdleLoc();
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/enums/SteChargeType.java b/src/main/java/com/zy/core/enums/SteChargeType.java
index e486852..1635cd2 100644
--- a/src/main/java/com/zy/core/enums/SteChargeType.java
+++ b/src/main/java/com/zy/core/enums/SteChargeType.java
@@ -5,8 +5,8 @@
public enum SteChargeType {
FIRST(1, "0100101"),
- SECOND(2, "0100201"),
- THIRD(3, "0100301"),
+// SECOND(2, "0100201"),
+// THIRD(3, "0100301"),
;
SteChargeType(int ssbm, String locNo) {
--
Gitblit v1.9.1