From 79498222e62c7bfb0ad545ec8e1edb5e9b953955 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 15 五月 2024 16:49:26 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/device/shuttle/index.jsx | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskMapper.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 45 +++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java | 5 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 56 ++++++++++++++++++
zy-asrs-flow/src/pages/map/drawer/shuttle/handle.jsx | 3
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 7 ++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 1
9 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-flow/src/pages/device/shuttle/index.jsx b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
index 969ea35..360d421 100644
--- a/zy-asrs-flow/src/pages/device/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
@@ -297,7 +297,7 @@
defaultValue="0"
onChange={moveLocTypeChange}
style={{ width: 120 }}
- options={[{ value: '0', label: '璺戣建閬�' }, { value: '1', label: '璺戝簱浣�' }, { value: '2', label: '姣嶈建閬撳惊鐜窇' }, { value: '3', label: '瀛愯建閬撳惊鐜窇' }]}
+ options={[{ value: '0', label: '璺戣建閬�' }, { value: '1', label: '璺戝簱浣�' }, { value: '2', label: '姣嶈建閬撳惊鐜窇' }, { value: '3', label: '瀛愯建閬撳惊鐜窇' }, { value: '4', label: '鍙栨斁璐�' }]}
/>
</div>
<Button onClick={() => shuttleMoveLoc()}>璺戝簱</Button>
diff --git a/zy-asrs-flow/src/pages/map/drawer/shuttle/handle.jsx b/zy-asrs-flow/src/pages/map/drawer/shuttle/handle.jsx
index d485bfd..8ec4f2c 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shuttle/handle.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shuttle/handle.jsx
@@ -160,7 +160,8 @@
{ value: '0', label: '璺戣建閬�' },
{ value: '1', label: '璺戝簱浣�' },
{ value: '2', label: '姣嶈建閬撳惊鐜窇' },
- { value: '3', label: '瀛愯建閬撳惊鐜窇' }
+ { value: '3', label: '瀛愯建閬撳惊鐜窇' },
+ { value: '4', label: '鍙栨斁璐�' }
]}
/>
</div>
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 9ca36f9..a426fce 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -11,6 +11,7 @@
import com.zy.asrs.wcs.core.model.command.ShuttleAssignCommand;
import com.zy.asrs.wcs.core.model.command.ShuttleCommand;
import com.zy.asrs.wcs.core.model.command.ShuttleRedisCommand;
+import com.zy.asrs.wcs.core.model.enums.LocStsType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.ShuttleCommandModeType;
import com.zy.asrs.wcs.core.model.enums.ShuttleTaskModeType;
@@ -382,6 +383,50 @@
}
}
}
+ } else if (shuttleProtocol.getMoveType() == 4) {//鍙栨斁璐�
+ Integer xCurrent = shuttleProtocol.getXCurrent();
+ if (xCurrent > shuttleProtocol.getXTarget()) {//褰揦鍊煎ぇ浜嶺鐩爣鍊硷紝杩涜褰掗浂涓擸鏂瑰悜+1
+ shuttleProtocol.setXCurrent(shuttleProtocol.getXStart());
+ shuttleProtocol.setYCurrent(shuttleProtocol.getYCurrent() + 1);
+ return;
+ }
+
+ //鎼滅储鏈夎揣搴撲綅
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getLocSts, LocStsType.F.val())
+ .eq(Loc::getHostId, device.getHostId())
+ .eq(Loc::getStatus, 1));
+ if (list.isEmpty()) {
+ return;
+ }
+
+ Loc start = list.get(0);
+
+ Integer yCurrent = shuttleProtocol.getYCurrent();
+ String locNo = Utils.getLocNo(xCurrent, yCurrent, lev);
+ Loc target = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getLocNo, locNo)
+ .eq(Loc::getHostId, device.getHostId())
+ .eq(Loc::getStatus, 1));
+ if (target == null) {
+ shuttleProtocol.setXCurrent(shuttleProtocol.getXCurrent() + 1);
+ return;
+ }
+
+ if (target.getLocSts() != LocStsType.O.val()) {
+ shuttleProtocol.setXCurrent(shuttleProtocol.getXCurrent() + 1);
+ return;
+ }
+
+ //璋冨害鍘荤洰鏍囦綅缃�
+ if (shuttleProtocol.getCurrentLocNo().equals(target.getLocNo())) {
+ shuttleProtocol.setXCurrent(shuttleProtocol.getXCurrent() + 1);//灏忚溅鍜岀洰鏍囦綅缃竴鑷达紝璺宠繃
+ } else {
+ Task task = shuttleDispatcher.generateManuaTakeMoveTask(device, start.getLocNo(), target.getLocNo());
+ if(task != null) {//璋冨害鎴愬姛
+ shuttleProtocol.setXCurrent(shuttleProtocol.getXCurrent() + 1);
+ }
+ }
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskMapper.java
index e560ada..46318d6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskMapper.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskMapper.java
@@ -38,6 +38,8 @@
Task selectMoveWorking(Integer shuttleNo);
+ Task selectManualWorking(Integer shuttleNo);
+
List<Task> selectWorkingByShuttle(Integer shuttleNo);
List<Task> selectWorkingByLift(Integer liftNo);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java
index 47ecd7a..38ba46e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java
@@ -36,6 +36,8 @@
Task selectMoveWorking(Integer shuttleNo);
+ Task selectManualWorking(Integer shuttleNo);
+
List<Task> selectWorkingByShuttle(Integer shuttleNo);
List<Task> selectWorkingByLift(Integer liftNo);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java
index 8004414..cb3a328 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java
@@ -117,6 +117,11 @@
}
@Override
+ public Task selectManualWorking(Integer shuttleNo) {
+ return this.baseMapper.selectManualWorking(shuttleNo);
+ }
+
+ @Override
public List<Task> selectWorkingByShuttle(Integer shuttleNo) {
return this.baseMapper.selectWorkingByShuttle(shuttleNo);
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index 7b2b14d..cf5f724 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -70,6 +70,7 @@
locService.updateById(destLoc);
}
} else if (task.getRecordLoc().equals("record-dest")) {//鍙褰曠洰鏍囧簱浣嶄俊鎭�
+ //鐩爣搴撲綅 => 鍦ㄥ簱
Loc destLoc = locService.selectByLocNo(task.getDestLoc());
if (destLoc != null) {
destLoc.setLocSts(LocStsType.F.val());
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 19b2732..e21bc77 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
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.framework.common.SnowflakeIdWorker;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.entity.*;
@@ -198,6 +199,61 @@
return task;
}
+ //鐢熸垚鎵嬪姩鍙栨斁璐т换鍔�
+ public synchronized Task generateManuaTakeMoveTask(Device device, String sourceLocNo, String locNo) {
+ // 宸叉湁鎵嬪姩浠诲姟
+ if (taskService.selectManualWorking(Integer.valueOf(device.getDeviceNo())) != null) {
+ return null;
+ }
+
+ //鑾峰彇鎵嬪姩浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .eq(TaskCtg::getFlag, "MANUAL")
+ .eq(TaskCtg::getStatus, 1));
+ if (taskCtg == null) {
+ return null;
+ }
+
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ if (shuttleThread == null) {
+ return null;
+ }
+
+ Task task = new Task();
+ task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ task.setTaskNo(String.valueOf(Utils.getTaskNo("MANUAL")));
+ task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
+ task.setTaskCtg(taskCtg.getId());
+ task.setPriority(10);
+ task.setOriginSite(null);
+ task.setOriginLoc(sourceLocNo);
+ task.setDestSite(null);
+ task.setDestLoc(locNo);
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("manual");
+ task.setShuttleNo(Integer.valueOf(device.getDeviceNo()));
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+
+ // generate motion list
+ List<Motion> motionList = analyzeService.generateShuttleManualMotion(task);
+ if (Cools.isEmpty(motionList)) {
+ News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅鎵嬪姩浠诲姟澶辫触!!!", device.getDeviceNo());
+ return null;
+ }
+ motionService.batchInsert(motionList, task.getUuid(), Integer.valueOf(task.getTaskNo()), device.getHostId());
+
+ task.setTaskSts(TaskStsType.ANALYZE_MANUAL.sts);
+
+ if (!taskService.save(task)) {
+ News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅鎵嬪姩浠诲姟澶辫触!!!", device.getDeviceNo());
+ return null;
+ }
+
+ return task;
+ }
+
/**
* 鎼滅储閬胯搴撲綅锛岄�氳繃灏忚溅鍙峰拰鐩爣搴撲綅
*/
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
index 4558156..a4df9e5 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -91,6 +91,13 @@
order by priority desc,start_time,task_no asc
</select>
+ <select id="selectManualWorking" resultType="com.zy.asrs.wcs.core.entity.Task">
+ select * from wcs_task
+ where task_sts in (401,402,403)
+ and shuttle_no = #{shuttleNo}
+ order by priority desc,start_time,task_no asc
+ </select>
+
<select id="selectWorkingByShuttle" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403)
--
Gitblit v1.9.1