From f356d8015fce0d08652620970898d8dc841f2b16 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 十月 2022 16:06:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 9 +++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +++++--
src/main/java/com/zy/asrs/service/LocMastService.java | 2 ++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 9be06ce..801e405 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -59,4 +59,6 @@
Boolean isOutMost(String locNo);
List<String> getDemoNextLoc(Integer crnNo);
+
+ Boolean isShuttle(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 3c7fb69..fe2fd1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -63,4 +63,13 @@
return this.baseMapper.getDemoNextLoc(crnNo);
}
+ @Override
+ public Boolean isShuttle(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row >= 2 && row <= 30) {
+ return Boolean.TRUE;
+ }
+ return Boolean.FALSE;
+ }
+
}
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 c725877..cf4cc06 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -642,7 +641,7 @@
}
}
// 搴撲綅绉昏浆
- this.locToLoc(crn, crnProtocol);
+// this.locToLoc(crn, crnProtocol);
// 婕旂ず浠诲姟
this.steMoveDemo(crn, crnProtocol);
}
@@ -717,6 +716,10 @@
wrkMast.setIoPri((double) 9999);
wrkMastMapper.updateById(wrkMast);
+ if (!locMastService.isShuttle(wrkMast.getLocNo())) {
+
+ }
+
// 鐩爣搴撲綅 ===>> 鏈�澶栧眰搴撲綅
if (locMastService.isOutMost(wrkMast.getLocNo())) {
// 鍒ゆ柇灏忚溅鏄惁鍦ㄦ渶澶栧眰搴撲綅锛屽鏋滄槸鍒欐惉璧帮紝濡傛灉涓嶆槸锛屽垯鐩存帴鍫嗗灈鏈哄叆搴�
--
Gitblit v1.9.1