From 60823e04a8fdc9a164cbb428f7feceff07965704 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 21 六月 2023 10:15:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 ++++++++++++++++++++++++++++++----------
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
3 files changed, 33 insertions(+), 12 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 79f8526..a293d47 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -993,18 +993,22 @@
}
}
- } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
- News.error("搴撲綅鍑哄簱鍒板爢鍨涙満绔� ===>> 娴呭簱浣嶅簱浣嶇姸鎬佷负鍏ュ簱棰勭害锛佸嚭搴撳簱浣�={},娴呭簱浣嶅彿={}", shallowLoc.getLocNo());
+// } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
+// News.error("搴撲綅鍑哄簱鍒板爢鍨涙満绔� ===>> 娴呭簱浣嶅簱浣嶇姸鎬佷负鍏ュ簱棰勭害锛佸嚭搴撳簱浣�={},娴呭簱浣嶅彿={}", shallowLoc.getLocNo());
+// flag = true;
+// break;
+ } else if (shallowLoc.getLocSts().equals("R") || shallowLoc.getLocSts().equals("P")) {
+ News.error("搴撲綅鍑哄簱鍒板爢鍨涙満绔� ===>> 搴撲綅鐘舵�佸湪搴擄紝浣嗘槸娴呭簱浣嶅凡瀛樺湪宸ヤ綔妗ｄ换鍔★紒鍑哄簱搴撲綅={},娴呭簱浣嶅彿={}", shallowLoc.getLocNo());
flag = true;
break;
}
- //20230307 ADD锛屽啀鍔犱竴娆″垽鏂紝褰撴祬搴撲綅鐘舵�佷笉涓篛鏃讹紝涓嶆墽琛屽綋鍓嶅嚭搴撲换鍔�
- if (shallowLoc != null && !shallowLoc.getLocSts().equals("O")) {
- News.error("鍋氫簡娴呭簱浣嶉樆濉炲鐞嗗悗鍙嶅鍒ゆ柇锛屾祬搴撲綅鐘舵�佷笉涓篛 ===>> 娴呭簱浣嶅簱浣嶇姸鎬佷负鍏ュ簱棰勭害锛佸嚭搴撳簱浣�={},娴呭簱浣嶅彿={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
- flag = true;
- break;
- }
+// //20230307 ADD锛屽啀鍔犱竴娆″垽鏂紝褰撴祬搴撲綅鐘舵�佷笉涓篛鏃讹紝涓嶆墽琛屽綋鍓嶅嚭搴撲换鍔�
+// if (shallowLoc != null && !shallowLoc.getLocSts().equals("O")) {
+// News.error("鍋氫簡娴呭簱浣嶉樆濉炲鐞嗗悗鍙嶅鍒ゆ柇锛屾祬搴撲綅鐘舵�佷笉涓篛 ===>> 娴呭簱浣嶅簱浣嶇姸鎬佷负鍏ュ簱棰勭害锛佸嚭搴撳簱浣�={},娴呭簱浣嶅彿={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
+// flag = true;
+// break;
+// }
}
}
}
@@ -1194,6 +1198,10 @@
}
// 鍫嗗灈鏈烘惉杩愬皬杞�
if (wrkMast.getWrkSts() == 3L) {
+ if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0){
+ News.error("宸ヤ綔鍙�={}鍗冲皢寮�濮嬫惉杩愬皬杞︿絾鏄伐浣滄。娌℃湁灏忚溅鍙�",wrkMast.getWrkNo());
+ return false;
+ }
this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
}
}
@@ -1324,7 +1332,7 @@
if(wrkMast.getIoPri()>=9000.0){
wrkMast.setIoPri(9999d);
}else if (wrkMast.getIoPri()>20.0){
- wrkMast.setIoPri(waitWrkMast.getIoPri()-10.0);
+ wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
}else {
wrkMast.setIoPri(13.0d);
}
@@ -1568,6 +1576,10 @@
}
// 鍫嗗灈鏈烘惉杩愬皬杞�
if (wrkMast.getWrkSts() == 12L) {
+ if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0) {
+ News.error("宸ヤ綔鍙�={}鍗冲皢寮�濮嬫惉杩愬皬杞︿絾鏄伐浣滄。娌℃湁灏忚溅鍙�",wrkMast.getWrkNo());
+ return false;
+ }
this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
}
}
@@ -2466,6 +2478,10 @@
}
// 鍫嗗灈鏈烘惉杩愬皬杞�
if (wrkMast.getWrkSts() == 12L) {
+ if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0) {
+ News.error("宸ヤ綔鍙�={}鍗冲皢寮�濮嬫惉杩愬皬杞︿絾鏄伐浣滄。娌℃湁灏忚溅鍙�",wrkMast.getWrkNo());
+ return;
+ }
this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
}
}
@@ -3410,6 +3426,10 @@
switch (wrkMast.getWrkSts().intValue()) {
case 2:
// 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.灏忚溅寰呮惉
+ if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0){
+ News.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.灏忚溅寰呮惉 澶辫触锛侊紒锛屽伐浣滃彿={} 鍘熷洜锛氬伐浣滃彿娌″皬杞�", wrkMast.getWrkNo());
+ break;
+ }
wrkMast.setWrkSts(3L);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
@@ -4338,7 +4358,7 @@
|| Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
|| Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){
- Integer steNo = this.hasCarOfIdle(one.getLocNo());
+ Integer steNo = this.hasCar(one.getLocNo());
if (steNo != null) {
//鏈夊皬杞�
continue;
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 7afa71a..7793dd3 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -604,7 +604,8 @@
for (LocMast mast : insideLocMast) {
if (!mast.getLocSts().equals("D")
&& !mast.getLocSts().equals("F")
- && !mast.getLocSts().equals("X")) {
+ && !mast.getLocSts().equals("X")
+ && !mast.getLocSts().equals("O")) {
//D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
return true;
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 1a9ac77..e32d850 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -250,7 +250,7 @@
select top 1 *
from dbo.asr_loc_mast
where 1=1
- and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X'
+ and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X' and loc_sts != 'O'
and bay1 = #{bay}
and lev1 = #{lev}
<if test="row <= 3">
--
Gitblit v1.9.1