From dca06cb013a8312dc37feec69a79165e11ffea63 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期五, 18 七月 2025 10:48:58 +0800
Subject: [PATCH] 空闲10秒有入库任务回原点,空闲两分钟回原点

---
 src/main/java/com/zy/controller/SiteController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index 80b54bd..0728e2c 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -78,8 +78,8 @@
             vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 鏈夌墿
             vo.setInEnable(staProtocol.isInEnable()?"Y":"N");   // 鍙叆
             vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
-            vo.setPakMk(staProtocol.isPakMk()?"Y":"N");       // 鍏ュ簱鏍囪
-            vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N");     // 绌烘澘淇″彿
+            vo.setPakMk(String.valueOf(staProtocol.getWantBucketFlag()));       // 鍏ュ簱鏍囪 -> 瑕佹《淇″彿
+            vo.setEmptyMk(String.valueOf(staProtocol.getWantBucketCount()));     // 绌烘澘淇″彿 -> 瑕佹《鏁�
             vo.setStaNo(staProtocol.getStaNo());                // 鐩爣绔�
             vo.setWorkNo(staProtocol.getWorkNo());
 //            vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�");     //楂樹綆搴撲綅

--
Gitblit v1.9.1