From 5780c58879296cfced72012c8831c1d3cf4dafb2 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 14 十一月 2024 00:33:13 +0800 Subject: [PATCH] 增加任务队列 任务日志,客户名称字段 --- springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java index 0c83048..d53aae7 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java +++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java @@ -14,6 +14,7 @@ import com.example.springboot.entity.Glass; import com.example.springboot.entity.GlassInfo; import com.example.springboot.entity.MeasureSetting; +import com.example.springboot.entity.OutTask; import com.example.springboot.entity.Out_slice; import com.example.springboot.entity.Queue; import com.example.springboot.entity.StorageCage; @@ -206,6 +207,15 @@ List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1); jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut); + // 鏌ヨ褰撳墠鍑虹墖闃熷垪 + List<Map> OutTask = storageCageService.SelectOutTask(); + jsonObject.append("OutTask", OutTask); + + // 鏌ヨ鏈�鍚�6娆″嚭鐗囪褰� + List<Map> OutLog = storageCageService.SelectOutLog(); + jsonObject.append("OutLog", OutLog); + + // 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴 List<GlassInfo> SelectMeasure = storageCageService.SelectMeasure(); jsonObject.append("SelectMeasure", SelectMeasure); -- Gitblit v1.8.0