From bda52da89628d1587ab804510f9995c671a318ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 14:49:19 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 158 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 43 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..08280d0 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
@@ -1,9 +1,9 @@
package com.zy.asrs.wcs.core.kernel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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 +11,15 @@
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.entity.Device;
+import com.zy.asrs.wcs.rcs.entity.DeviceType;
+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.service.DeviceService;
+import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,8 +45,12 @@
private ShuttleDispatcher shuttleDispatcher;
@Autowired
private LiftDispatcher liftDispatcher;
-// @Autowired
+ // @Autowired
// private ConveyorDispatcher conveyorDispatcher;
+ @Autowired
+ private DeviceService deviceService;
+ @Autowired
+ private DeviceTypeService deviceTypeService;
public List<Motion> generateMotion(Task task) {
List<Motion> motionList = new ArrayList<>();
@@ -70,18 +78,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 +112,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 +364,7 @@
}
shuttleNo = String.valueOf(shuttleProtocol.getShuttleNo());
- liftNo = String.valueOf(liftProtocol.getLiftNo());
+// liftNo = String.valueOf(liftProtocol.getLiftNo());
}
/**
@@ -701,11 +712,11 @@
}
-// /**
-// * 鐢熸垚鍏呯數鍔ㄤ綔
-// */
-// public List<Motion> generateChargeMotion(WrkCharge wrkCharge) {
-// List<Motion> motionList = new ArrayList<>();
+ /**
+ * 鐢熸垚鍏呯數鍔ㄤ綔
+ */
+ public List<Motion> generateChargeMotion(Task task) {
+ List<Motion> motionList = new ArrayList<>();
// if (wrkCharge.getWrkSts() != WrkMastStsType.NEW_CHARGE.sts || wrkCharge.getIoType() != WrkIoTypeType.CHARGE.sts) {
// return motionList;
// }
@@ -864,15 +875,15 @@
// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
// }))
// ));
-//
-// return motionList;
-// }
-//
-// /**
-// * 鐢熸垚鍏呯數瀹屾垚鍔ㄤ綔
-// */
-// public List<Motion> generateShuttleChargeWrkComplete(WrkCharge wrkCharge) {
-// List<Motion> motionList = new ArrayList<>();
+
+ return motionList;
+ }
+
+ /**
+ * 鐢熸垚鍏呯數瀹屾垚鍔ㄤ綔
+ */
+ public List<Motion> generateShuttleChargeWrkComplete(Task task) {
+ List<Motion> motionList = new ArrayList<>();
// if (wrkCharge.getWrkSts() != WrkMastStsType.NEW_MOVE.sts || wrkCharge.getIoType() != WrkIoTypeType.MOVE.sts) {
// return motionList;
// }
@@ -907,8 +918,69 @@
// ));
//
// }
-// return motionList;
-// }
+ return motionList;
+ }
+
+ /**
+ * 鐢熸垚灏忚溅杩佺Щ鍔ㄤ綔
+ */
+ public List<Motion> generateShuttleMoveMotion(Task task) {
+ List<Motion> motionList = new ArrayList<>();
+ if (task.getTaskSts() != TaskStsType.NEW_MOVE.sts) {
+ return motionList;
+ }
+
+ // locNo
+ String locNo = task.getDestLoc();
+
+ //鑾峰彇绌挎杞︾被鍨�
+ DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
+ .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
+ .eq(DeviceType::getStatus, 1));
+ if (deviceType == null) {
+ return motionList;
+ }
+
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getDeviceNo, task.getShuttleNo())
+ .eq(Device::getDeviceType, deviceType.getId())
+ .eq(Device::getHostId, task.getHostId())
+ .eq(Device::getStatus, 1));
+ if (device == null) {
+ return motionList;
+ }
+
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ if (shuttleThread == null) {
+ return motionList;
+ }
+
+ ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
+ return motionList;
+ }
+
+ String shuttleLocNo = shuttleProtocol.getCurrentLocNo();
+
+ // 鍒ゆ柇绌挎杞︽槸鍚﹀湪鐩爣灞�
+ if (Utils.getLev(shuttleLocNo) == Utils.getLev(locNo)) {
+
+ // 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
+ dto.setLocNo(shuttleLocNo);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
+ dto.setLocNo(locNo);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ }
+ return motionList;
+ }
--
Gitblit v1.9.1