From df407d0f867f5063895be21fde14963b0ae4776e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 10 三月 2026 15:01:20 +0800
Subject: [PATCH] 电视机显示出库运行状态；空托盘入库
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 269b9bb..39bfd98 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
@@ -7,8 +8,10 @@
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.LocMastService;
import com.zy.common.model.annotations.RateLimit;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
@@ -45,6 +48,8 @@
private SlaveProperties slaveProperties;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private LocMastService locMastService;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -212,6 +217,7 @@
List<Map<String, Object>> pie = new ArrayList<>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ int i = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
@@ -229,8 +235,8 @@
pie.add(map2);
Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤");
- map3.put("value", locUseRate.getXqty());
+ map3.put("name", "绌烘澘");
+ map3.put("value", i);
pie.add(map3);
}
@@ -244,9 +250,9 @@
return R.ok(
Cools.add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
+ .add("stockCunt", locUseRate.getFqty() - i)
.add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
+ .add("noneCount", i)
.add("total", total)
.add("used", used)
.add("usedPr", usedPr)
--
Gitblit v1.9.1