From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 02945a2..59e273e 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -24,7 +24,7 @@
@RequestMapping("/monitor")
public class MonitorController {
- private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
+ private static final String[] WEEK = {"response.sunday","response.monday","response.tuesday","response.wednesday","response.thursday","response.friday","response.saturday"};
@Autowired
@@ -99,12 +99,12 @@
}
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("response.inbound_qty");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("response.outbound_qty");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -123,22 +123,22 @@
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
- map.put("name", "鍦ㄥ簱");
+ map.put("name", "response.loc_in_store");
map.put("value", locUseRate.getFqty());
pie.add(map);
Map<String, Object> map1 = new HashMap<>();
- map1.put("name", "绌�");
+ map1.put("name", "response.loc_empty");
map1.put("value", locUseRate.getOqty());
pie.add(map1);
Map<String, Object> map2 = new HashMap<>();
- map2.put("name", "浣跨敤");
+ map2.put("name", "response.loc_used");
map2.put("value", locUseRate.getUqty());
pie.add(map2);
Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤");
+ map3.put("name", "response.loc_disabled");
map3.put("value", locUseRate.getXqty());
pie.add(map3);
}
@@ -172,7 +172,7 @@
List<MatDto> matDtoList = new ArrayList<>();
MatDto matDto = new MatDto(
"001",
- "鍘熸潗鏂�",
+ "response.raw_material",
100.0,
150.0,
100.0,
@@ -181,8 +181,8 @@
"ZGDW890",
"80000001",
"DWT01",
- "涓浗鐢电綉",
- "涓浗鐢电綉",
+ "response.china_grid",
+ "response.china_grid",
"ZGDW4396",
"ZGDW-9945"
@@ -190,7 +190,7 @@
matDtoList.add(matDto);
if (ledId == 100){
LedCommand command = new LedCommand(
- "鍏ㄦ澘鍏ュ簱",
+ "response.full_pallet_inbound",
9527,
100,
100,
@@ -203,7 +203,9 @@
);
commandList.add(command);
}
- return R.ok().add(commandList);
+ R r = R.ok();
+ r.put("data", commandList);
+ return r;
}
/**
@@ -215,7 +217,9 @@
if (ledId == 100){
// errorMsg = "楹﹀綋鍔砎S鑲痉鍩�";
}
- return R.ok().add(errorMsg);
+ R r = R.ok();
+ r.put("data",errorMsg);
+ return r;
}
@GetMapping("/getLedInfos")
--
Gitblit v1.9.1