From 706d57aa682845cf1bc01cbfd1087c4c0f33093f Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 12 十一月 2024 09:46:48 +0800
Subject: [PATCH] 优化
---
jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java b/jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java
index 4094ad0..8bcb9cf 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java
@@ -29,7 +29,8 @@
* **/
@GetMapping("/getOrderInformation")
public AjaxResult getOrderInformation() {
- Map<String,String> resultMap = new HashMap<>();
+ List list = new ArrayList<>();
+ Map<String,Object> resultMap = new HashMap<>();
List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().orderByDesc(OmProductionOrdeInfo::getCreateTime));
OmProductionOrdeInfo order = orderList.get(0); // 鑾峰彇鏈�鏂扮殑涓�鏉¤鍗曚俊鎭�
String workOrderNo = order.getWorkOrderNo();
@@ -37,9 +38,14 @@
.eq(OmProductionOrdeInfo::getOrderStatus,"3")
.eq(OmProductionOrdeInfo::getWorkOrderNo,workOrderNo)
);
+ double percent = (double) finishNum.size() / order.getPlanQty() * 100; // 灏嗙櫨鍒嗘瘮琛ㄧず涓哄皬鏁�
+ int roundedPercent = (int) Math.round(percent); // 鍥涜垗浜斿叆鍒版暣鏁�
+ list.add(roundedPercent);
+ list.add(roundedPercent);
resultMap.put("workOrderNo",workOrderNo);
resultMap.put("planQty",order.getPlanQty().toString());
resultMap.put("actualQty",String.valueOf(finishNum.size()));
+ resultMap.put("waterLevel",list);
return AjaxResult.success(resultMap);
}
@@ -61,7 +67,7 @@
lineData.add(omProductionOrdeInfo.getOrderCount());
}
map.put("category",category);
- map.put("lineData",lineData);
+ map.put("barData",lineData);
return AjaxResult.success(map);
}
@@ -79,7 +85,7 @@
" inbound_time,\n" +
" outbound_time,\n" +
" DATEDIFF(SECOND, inbound_time, outbound_time) AS beatTime");
- queryWrapper.eq("sfc_code","2408270000011");
+ queryWrapper.eq("sfc_code",getLatestCompletedWorkpiece());
queryWrapper.orderByDesc("location_code");
List<DaPassingStationCollection> list = daPassingStationCollectionService.list(queryWrapper);
for (DaPassingStationCollection daPassingStationCollection : list) {
@@ -167,6 +173,16 @@
return AjaxResult.success(resultList);
}
+ // 鑾峰緱鏈�鏂板畬鎴愬伐浠剁姸鎬佷负5
+ public String getLatestCompletedWorkpiece(){
+ QueryWrapper<OmProductionOrdeInfo> wrapper = new QueryWrapper<>();
+ wrapper.select("TOP 1 *");
+ wrapper.eq("order_status","5");
+ wrapper.orderByDesc("actual_end_time");
+ OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(wrapper);
+ return one.getProductNum();
+ }
+
public static int locationPassRate(int passRate,int total) {
double percentage = (double) passRate / total * 100;
long roundedNumber = Math.round(percentage);
--
Gitblit v1.9.3