From 6c5963052282dfe4ae2f20d2e18012d1cff93c85 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 23 六月 2025 08:54:51 +0800
Subject: [PATCH] rgv调度优化
---
src/main/java/com/zy/asrs/controller/RgvController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 8e951c1..35fe0b3 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -430,7 +430,8 @@
// @ManagerAuth(memo = "浣滀笟淇℃伅")
public R ringThroughTaskWrkMast(){
List<RgvWrkMastParam> result = new ArrayList<>();
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts",9,10));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts",9,10).orderBy("wrk_sts",false)
+ .orderBy("rgv_no",true));
for (WrkMast wrkMast : wrkMasts){
RgvWrkMastParam rgvWrkMastParam = new RgvWrkMastParam(wrkMast);
if (Cools.isEmpty(rgvWrkMastParam.getRgvNo())){
@@ -466,6 +467,7 @@
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol != null) {
rgvCircularShuttleParam.setPosition(rgvProtocol.getRgvPos());
+ rgvCircularShuttleParam.setTaskNo(rgvProtocol.taskNo1);
if (rgvCircularShuttleParam.getStatus()==0){
rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
}
--
Gitblit v1.9.1