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 | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index ecdfaef..8f7ff4d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -46,9 +46,10 @@
@GetMapping(value = "/locDetl/pda/statisticalModel")
public R statisticalModel() {
+ //浠撳簱鏁版嵁
EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
- locDetlEntityWrapper.setSqlSelect("model,COUNT(*) as modelCount").groupBy("model");
- List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
+ locDetlEntityWrapper.setSqlSelect("matnr,count(*)as matnrCount").groupBy("matnr");
+ List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
return R.ok(selectMap);
}
@@ -78,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;
@@ -217,10 +218,6 @@
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- // 鎬诲簱浣嶆暟
- Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
- // 浣跨敤涓�
- Integer used = locUseRate.getFqty() + locUseRate.getUqty();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
@@ -229,7 +226,7 @@
Map<String, Object> map1 = new HashMap<>();
map1.put("name", "绌�");
- map1.put("value", 11200-used);
+ map1.put("value", locUseRate.getOqty());
pie.add(map1);
Map<String, Object> map2 = new HashMap<>();
@@ -244,18 +241,22 @@
}
+ // 鎬诲簱浣嶆暟
+ Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ // 浣跨敤涓�
+ 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("noneCount", locUseRate.getXqty())
- .add("total", 11200)
- .add("used", used)
- .add("usedPr", usedPr)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
);
}
@@ -267,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();
@@ -285,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