From e3bf21cf9206197ab78ae1483af0fdad1f57fd38 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 二月 2023 09:05:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 98 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 48 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..68d8186 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -952,36 +952,36 @@
wrkMastMapper.updateById(wrkMast);
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
- if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
- // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
- if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
- WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
- if (null == waitWrkMast) {
- News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
- } else {
- if(waitWrkMast.getWrkSts() == 11) {
- waitWrkMast.setIoPri(wrkMast.getIoPri() + 1);
- waitWrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(waitWrkMast) == 0) {
- News.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
- }
- }
- continue;
- }
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
- // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
- if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
- wrkMast.setUpdMk("Y");
- wrkMastMapper.updateById(wrkMast);
- // 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
- moveLocForDeepLoc(slave, shallowLoc);
- }
- News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
- continue;
- }
- }
+// if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
+// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+// // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
+// if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
+// WrkMast waitWrkMast = wrkMastMapper.selectBySourceLocNo(shallowLocNo);
+// if (null == waitWrkMast) {
+// News.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
+// } else {
+// if(waitWrkMast.getWrkSts() == 11) {
+// waitWrkMast.setIoPri(wrkMast.getIoPri() + 1);
+// waitWrkMast.setModiTime(new Date());
+// if (wrkMastMapper.updateById(waitWrkMast) == 0) {
+// News.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
+// }
+// }
+// continue;
+// }
+// } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+// // 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
+// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
+// wrkMast.setUpdMk("Y");
+// wrkMastMapper.updateById(wrkMast);
+// // 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
+// moveLocForDeepLoc(slave, shallowLoc);
+// }
+// News.error("{}浠诲姟鍑哄簱澶辫触锛屾祬搴撲綅鍫靛锛�", wrkMast.getWrkNo());
+// continue;
+// }
+// }
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (wrkMastMapper.selectWorking(slave.getId()) != null) {
@@ -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; }
--
Gitblit v1.9.1