From 1bf52275fccebc656fa6deabe9537d2f9c698ecf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 10:45:35 +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 | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 08e117f..357d9c6 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;
@@ -12,12 +11,10 @@
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
-import com.zy.asrs.wcs.rcs.entity.Motion;
+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.LiftProtocol;
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;
@@ -706,11 +703,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;
// }
@@ -869,15 +866,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;
// }
@@ -912,8 +909,8 @@
// ));
//
// }
-// return motionList;
-// }
+ return motionList;
+ }
--
Gitblit v1.9.1