From 1fdb2ee8b5482b53825815fb4f73a5bb0fd33b22 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 22 六月 2024 14:55:55 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 43aae13..04ba1a8 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
@@ -2,27 +2,23 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
-import com.zy.asrs.wcs.core.entity.BasConveyorPath;
-import com.zy.asrs.wcs.core.entity.ShuttleStandby;
-import com.zy.asrs.wcs.core.entity.Task;
+import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
+import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
-import com.zy.asrs.wcs.core.service.BasConveyorPathService;
-import com.zy.asrs.wcs.core.service.ShuttleStandbyService;
-import com.zy.asrs.wcs.core.service.TaskService;
+import com.zy.asrs.wcs.core.service.*;
import com.zy.asrs.wcs.core.utils.ConveyorDispatcher;
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.cache.SlaveConnection;
-import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.rcs.entity.Device;
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.core.service.MotionService;
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
@@ -57,6 +53,8 @@
private ShuttleStandbyService shuttleStandbyService;
@Autowired
private BasConveyorPathService basConveyorPathService;
+ @Autowired
+ private TaskCtgService taskCtgService;
public List<Motion> generateMotion(Task task) {
List<Motion> motionList = new ArrayList<>();
@@ -496,10 +494,18 @@
//绌挎杞﹀嚭鎻愬崌鏈哄悗灏忚溅寰呮満浣�
String shuttleFromLiftStandbyLoc = shuttleStandbyFrom.getStandbyLoc();
+ //鑾峰彇鍑哄簱浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
+ .eq(TaskCtg::getStatus, 1));
+ if (taskCtg == null) {
+ return motionList;
+ }
//鑾峰彇杈撻�佺嚎璺緞
BasConveyorPath basConveyorPath = basConveyorPathService.getOne(new LambdaQueryWrapper<BasConveyorPath>()
.eq(BasConveyorPath::getDeviceStn, task.getOriginSite())
- .eq(BasConveyorPath::getDeviceNo, liftProtocol.getLiftNo()));
+ .eq(BasConveyorPath::getDeviceNo, liftProtocol.getLiftNo())
+ .eq(BasConveyorPath::getTypeNo, taskCtg.getId()));
if (basConveyorPath == null) {
return motionList;
}
@@ -628,6 +634,7 @@
dto.setLiftNo(transferLiftDevice.getId().intValue());
dto.setLev(5);//绱㈢墝椤圭洰5灞傛槸杈撻�佺嚎灞�
dto.setStaNo(1);//鎻愬崌鏈哄乏渚�
+ dto.setSync(0);//寮傛鎵ц
}))
));
@@ -886,6 +893,7 @@
dto.setLiftNo(transferLiftDevice.getId().intValue());
dto.setLev(5);//绱㈢墝椤圭洰5灞傛槸杈撻�佺嚎灞�
dto.setStaNo(1);//鎻愬崌鏈哄乏渚�
+ dto.setSync(0);//寮傛鎵ц
}))
));
--
Gitblit v1.9.1