From 18dc5959e1946b04eeb0a7b788b5b967a97f7046 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 18 四月 2025 13:31:30 +0800
Subject: [PATCH] 12
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 2060f75..8f7ff4d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -79,7 +79,7 @@
public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
Integer ledId = 0;
for (LedSlave led : slaveProperties.getLed()) {
- for (Integer staNo : led.getStaArr()) {
+ for (Integer staNo : led.getInStaArr()) {
if (staNo.equals(sta)) {
ledId = led.getId();
break;
@@ -246,13 +246,13 @@
// 浣跨敤涓�
Integer used = locUseRate.getFqty() + locUseRate.getUqty();
// 搴撲綅浣跨敤鐜�
- double usedDivides = Arith.divides(3, used, 11200);
+ double usedDivides = Arith.divides(3, used, total);
double usedPr = Arith.multiplys(1, usedDivides, 100);
return R.ok(
Cools.add("pie", pie)
.add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", 11200-used)
+ .add("emptyCount", locUseRate.getOqty())
.add("noneCount", locUseRate.getXqty())
.add("total", total)
.add("used", used)
@@ -268,7 +268,7 @@
String ledContent = "";
List<LedCommand> commandList = null;
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getInStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
ledContent = ledThread.getStringBuffer().toString();
@@ -286,7 +286,7 @@
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
String errorMsg = "";
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getInStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
errorMsg = ledThread.getErrorMsg().toString();
--
Gitblit v1.9.1