From 84f45fcd6c1221b19bcd2a03bf306f74a223c8c7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 三月 2025 10:53:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ForkLiftController.java | 6 +++++-
1 files changed, 5 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 95625b5..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);
}
--
Gitblit v1.9.1