From 15047d62d27fbe4f99b7f93292c2cf9709b7cc97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:53:39 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index ae54ee7..4f7ef93 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -3,7 +3,6 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.entity.Task;
-import com.zy.asrs.wcs.core.model.enums.LiftCodeType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.model.enums.WorkZoneType;
@@ -11,11 +10,11 @@
import com.zy.asrs.wcs.core.utils.LiftDispatcher;
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
-import com.zy.asrs.wcs.rcs.entity.Motion;
-import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
+import com.zy.asrs.wcs.core.entity.Motion;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
-import com.zy.asrs.wcs.rcs.service.MotionService;
-import com.zy.asrs.wcs.rcs.thread.LiftThread;
+import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,18 +69,21 @@
* 5.绌挎杞﹀叆搴撹嚦鐩爣搴撲綅
*/
if (task.getTaskSts() == TaskStsType.NEW_INBOUND.sts) {
- // lift
- LiftThread liftThread = liftDispatcher.queryLiftForTransport(task.getOriginSite());
- LiftProtocol liftProtocol = liftThread.getStatus();
- if (liftProtocol == null) {
- return motionList;
- }
+// // lift
+// LiftThread liftThread = liftDispatcher.queryLiftForTransport(task.getOriginSite());
+// LiftProtocol liftProtocol = liftThread.getStatus();
+// if (liftProtocol == null) {
+// return motionList;
+// }
// shuttle
- ShuttleThread shuttleThread = shuttleDispatcher.queryShuttleWhichConvenient(task, Integer.parseInt(liftThread.getStatus().getLiftNo()));
+// ShuttleThread shuttleThread = shuttleDispatcher.queryShuttleWhichConvenient(task, Integer.parseInt(liftThread.getStatus().getLiftNo()));
+// ShuttleThread shuttleThread = shuttleDispatcher.queryShuttleWhichConvenient(task, 1);
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, 6);
if (Cools.isEmpty(shuttleThread)) { return motionList; }
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
- String shuttleLocNo = shuttleProtocol.getCurrentLocNo();
+// String shuttleLocNo = shuttleProtocol.getCurrentLocNo();
+ String shuttleLocNo = "0100201";
// // conveyor
// DevpSlave devpSlave = conveyorDispatcher.queryByInBound(task.getSourceStaNo());
@@ -101,20 +103,20 @@
// return motionList;
// }
- //绌挎杞﹀埌鎻愬崌鏈哄簱浣嶅彿
- String liftLocNoTo = LiftCodeType.getLocNo(Integer.parseInt(liftNo), Utils.getLev(shuttleLocNo), task.getHostId());
-
- //绌挎杞﹀嚭鎻愬崌鏈哄簱浣嶅彿
- String liftLocNoFrom = LiftCodeType.getLocNo(Integer.parseInt(liftNo), Utils.getLev(task.getDestLoc()), task.getHostId());
-
- //绌挎杞﹀埌鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙�
- String standbyLocNoTo = LiftCodeType.getStandbyLocNo(Integer.parseInt(liftNo), Utils.getLev(shuttleLocNo));
-
- //绌挎杞﹀嚭鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙�
- String standbyLocNoFrom = LiftCodeType.getStandbyLocNo(Integer.parseInt(liftNo), Utils.getLev(task.getDestLoc()));
+// //绌挎杞﹀埌鎻愬崌鏈哄簱浣嶅彿
+// String liftLocNoTo = LiftCodeType.getLocNo(Integer.parseInt(liftNo), Utils.getLev(shuttleLocNo), task.getHostId());
+//
+// //绌挎杞﹀嚭鎻愬崌鏈哄簱浣嶅彿
+// String liftLocNoFrom = LiftCodeType.getLocNo(Integer.parseInt(liftNo), Utils.getLev(task.getDestLoc()), task.getHostId());
+//
+// //绌挎杞﹀埌鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙�
+// String standbyLocNoTo = LiftCodeType.getStandbyLocNo(Integer.parseInt(liftNo), Utils.getLev(shuttleLocNo));
+//
+// //绌挎杞﹀嚭鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙�
+// String standbyLocNoFrom = LiftCodeType.getStandbyLocNo(Integer.parseInt(liftNo), Utils.getLev(task.getDestLoc()));
// 鍏ュ簱鐩爣灞傛湁绌挎杞�
- if (Utils.getLev(shuttleLocNo) == Utils.getLev(task.getOriginLoc())) {
+ if (Utils.getLev(shuttleLocNo) == Utils.getLev(task.getDestLoc())) {
// 绌挎杞﹁蛋琛岃嚦搴撲綅
motionList.addAll(kernelService.shuttleMove(
@@ -353,7 +355,7 @@
}
shuttleNo = String.valueOf(shuttleProtocol.getShuttleNo());
- liftNo = String.valueOf(liftProtocol.getLiftNo());
+// liftNo = String.valueOf(liftProtocol.getLiftNo());
}
/**
--
Gitblit v1.9.1