From 98d2aecd3899b1b8419aca65a4f899b9dc9c5b3a Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 04 十一月 2023 10:02:17 +0800
Subject: [PATCH] 显示器显示拣料全板信息
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 7ed35f3..d2f0e51 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -7,6 +7,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.domain.param.ShuttleOperatorParam;
import com.zy.asrs.domain.vo.*;
@@ -100,6 +101,12 @@
}
}
+ Integer chargeLine = basShuttleService.selectById(slave.getId()).getChargeLine();
+ String lowerPower = "N";
+ if (chargeLine != null && shuttleProtocol.getPowerPercent() != null) {
+ lowerPower = shuttleProtocol.getPowerPercent() <= chargeLine ? "Y" : "N";
+ }
+ shuttleData.put("lowerPower", lowerPower);//鏄惁浣庣數閲�
baseObj.putAll(shuttleData);
}
return R.ok().add(list);
--
Gitblit v1.9.1