From ff1be9fa2dba6eaffc449d09e62998348ea3b830 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 19 九月 2023 08:00:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 d49cd79..099b310 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -783,15 +784,44 @@
public boolean shuttleOutExecuteStep1(WrkMast wrkMast) {
//21.鐢熸垚鍑哄簱浠诲姟 => 22.灏忚溅鎼繍涓�
if (wrkMast.getWrkSts() == 21) {
- //鑾峰彇鐩爣绔欏搴旂殑杈撻�佺珯鐐�
- BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getLiftNo());
- if (targetBasDevp == null) {
- return false;//缂哄皯绔欑偣淇℃伅
+ EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ wrapper.eq("type_no", wrkMast.getIoType());//璺緞绫诲瀷
+ wrapper.eq("stn_no", wrkMast.getStaNo());//鍑哄簱绔欑偣缂栧彿
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (staDesc == null) {
+ return false;//鍑哄簱璺緞涓嶅瓨鍦�
}
- if (targetBasDevp.getOutEnable().equals("N")) {
- return false;//绔欑偣涓嶅彲鍑�
+ //鑾峰彇鍑哄簱绔欑偣
+ BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNo());
+ if (basDevp == null) {
+ return false;//鍑哄簱绔欑偣涓嶅瓨鍦�
}
+
+ if (!basDevp.getOutEnable().equals("Y")) {
+ return false;//鍑哄簱绔欑偣涓嶅彲鍑�
+ }
+
+ //鍒ゆ柇鍚勬ゼ灞傚唴閮ㄨ緭閫佺珯鐐规槸鍚︾┖闂叉棤鐗�
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basDevp.getLiftNo());
+ if (liftThread == null) {
+ return false;
+ }
+ //鑾峰彇鎻愬崌鏈虹珯鐐筶ist
+ List<LiftStaProtocol> liftStaProtocols = liftThread.getLiftStaProtocols();
+ if (liftStaProtocols.isEmpty()) {
+ return false;
+ }
+
+ for (LiftStaProtocol liftStaProtocol : liftStaProtocols) {
+ //鍒ゆ柇褰撳墠鍑哄簱浠诲姟瀵瑰簲妤煎眰鐨勬彁鍗囨満绔欑偣鐘舵��
+ if (liftStaProtocol.getLev() == Utils.getLev(wrkMast.getSourceLocNo())) {
+ if (liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && !liftStaProtocol.getHasTray()) {
+ return false;//绔欑偣蹇呴』鑷姩銆佺┖闂层�佹病鏈夋墭鐩�
+ }
+ }
+ }
+
if (wrkMast.getShuttleNo() == null) {//娌℃湁缁戝畾灏忚溅锛岃繘琛岃皟搴�
shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄥ簱浣嶈繘琛屽彇璐�
@@ -823,7 +853,7 @@
}
//灏忚溅宸叉姷杈捐揣鐗╀綅缃紝杩涜鎼繍璐х墿
- NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getSourceLocNo(), targetBasDevp.getLocNo());
+ NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getSourceLocNo(), null);
if (result == null) {//鍑哄簱璺緞璁＄畻澶辫触
return false;
}
--
Gitblit v1.9.1