From 428ca4bbc6513fe07454e4223f1db76c358a1341 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 07 四月 2024 14:08:10 +0800
Subject: [PATCH] #
---
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/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 | 43 +++++--------------------------------------
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 7 +++++++
5 files changed, 21 insertions(+), 38 deletions(-)
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 7a76b9f..2f74a3c 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
@@ -26,6 +26,8 @@
Task selectMoveWorking(Integer shuttleNo);
+ List<Task> selectWorkingByShuttle(Integer shuttleNo);
+
Task selectChargeWorking(Integer shuttleNo);
}
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 e620f49..ef8f451 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
@@ -24,6 +24,8 @@
Task selectMoveWorking(Integer shuttleNo);
+ List<Task> selectWorkingByShuttle(Integer shuttleNo);
+
Task selectChargeWorking(Integer shuttleNo);
}
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 344d5c4..3964219 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
@@ -86,6 +86,11 @@
}
@Override
+ public List<Task> selectWorkingByShuttle(Integer shuttleNo) {
+ return this.baseMapper.selectWorkingByShuttle(shuttleNo);
+ }
+
+ @Override
public Task selectChargeWorking(Integer shuttleNo) {
return this.baseMapper.selectChargeWorking(shuttleNo);
}
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 cac25e6..5634cd4 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
@@ -128,11 +128,11 @@
currDistance += WEIGHT;
}
-// // 鎸傝浇浠诲姟鏉冮噸
-// List<Task> tasks = taskService.selectWorkingByShuttle(shuttle.getId());
-// if (!Cools.isEmpty(tasks)) {
-// currDistance += tasks.size() * WEIGHT;
-// }
+ // 鎸傝浇浠诲姟鏉冮噸
+ List<Task> tasks = taskService.selectWorkingByShuttle(Integer.valueOf(device.getDeviceNo()));
+ if (!Cools.isEmpty(tasks)) {
+ currDistance += tasks.size() * WEIGHT;
+ }
if (currDistance < finalDistance) {
finalDistance = currDistance;
@@ -142,39 +142,6 @@
return resThread;
}
-
-// /**
-// * 鐢熸垚绌挎杞﹁縼绉讳换鍔�
-// */
-// public WrkCharge generateShuttleChargeWrkComplete(Integer shuttleNo, String locNo) {
-// WrkCharge wrkCharge = new WrkCharge();
-// wrkCharge.setShuttleNo(shuttleNo);
-// wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
-// wrkCharge.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
-// wrkCharge.setWrkSts(WrkMastStsType.NEW_MOVE.sts); // 杩佺Щ浠诲姟
-// wrkCharge.setIoType(WrkIoTypeType.MOVE.sts);
-// wrkCharge.setIoPri((double) 10);
-// wrkCharge.setLocNo(locNo);
-// wrkCharge.setMemo("reset");
-// wrkCharge.setAppeTime(new Date());
-//
-// // generate motion list
-// List<Motion> motionList = analyzeService.generateShuttleChargeWrkComplete(wrkCharge);
-// if (Cools.isEmpty(motionList)) {
-// News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅杩佺Щ浠诲姟澶辫触!!!", shuttleNo);
-// return null;
-// }
-// motionService.batchInsert(motionList, wrkCharge.getUuid(), wrkCharge.getWrkNo());
-//
-// wrkCharge.setWrkSts(WrkMastStsType.ANALYZE_MOVE.sts);
-//
-// if (!wrkChargeService.insert(wrkCharge)) {
-// News.error("淇濆瓨{}鍙峰洓鍚戠┛姊溅杩佺Щ浠诲姟澶辫触!!!", shuttleNo);
-// return null;
-// }
-//
-// return wrkCharge;
-// }
/**
* 鎼滅储閬胯搴撲綅锛岄�氳繃灏忚溅鍙峰拰鐩爣搴撲綅
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 c152bd4..7467945 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -49,6 +49,13 @@
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,201,202,203,204,301,302,303,401,402,403)
+ and shuttle_no = #{shuttleNo}
+ order by priority desc,start_time,task_no asc
+ </select>
+
<select id="selectChargeWorking" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
where task_sts in (201,202,203,204)
--
Gitblit v1.9.1