From bdb0416fa00e9f336f7f640808d2b3e8951347db Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 14 三月 2025 14:42:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ForkLiftController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ForkLiftController.java b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
index 7214275..e37f1aa 100644
--- a/src/main/java/com/zy/asrs/controller/ForkLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/ForkLiftController.java
@@ -27,6 +27,7 @@
import com.zy.core.model.Task;
import com.zy.core.model.command.*;
import com.zy.core.model.protocol.ForkLiftProtocol;
+import com.zy.core.model.protocol.ForkLiftStaProtocol;
import com.zy.core.model.protocol.LiftStaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ForkLiftThread;
@@ -75,6 +76,8 @@
continue;
}
JSONObject data = JSON.parseObject(JSON.toJSONString(forkLiftProtocol));
+ List<ForkLiftStaProtocol> forkLiftStaProtocols = forkLiftThread.getForkLiftStaProtocols();
+ data.put("forkLiftStaProtocols", forkLiftStaProtocols);
baseObj.putAll(data);
}
return R.ok().add(list);
@@ -99,8 +102,9 @@
continue;
}
- vo.setWorkNo(forkLiftProtocol.getTaskNo().intValue());//浠诲姟鍙�
+ vo.setWorkNo(forkLiftProtocol.getTaskNo());//浠诲姟鍙�
vo.setPakMk(forkLiftProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
+ vo.setForkLiftStaProtocols(forkLiftThread.getForkLiftStaProtocols());
}
return R.ok().add(list);
}
@@ -319,6 +323,10 @@
forkLiftAction.assignWork(forkLiftProtocol.getLiftNo(), assignCommand);
return R.ok();
+ } else if (param.getLiftTaskMode() == 3) {
+ //浠诲姟纭
+ forkLiftThread.reset();
+ return R.ok();
} else if (param.getLiftTaskMode() == 0) {
//鎻愬崌鏈哄浣�
forkLiftThread.setSyncTaskNo(0);
--
Gitblit v1.9.1