From ef45387ac4b65538bb965dd7fe9c40d28bceca64 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:48 +0800
Subject: [PATCH] 1、卧理进出片任务功能初步完成，待调试
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 16a8ff2..08b79ea 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -334,22 +334,22 @@
for (int i = 1; i <= groupBy.keySet().size(); i++) {
String key = i + "";
if (key != null) {
- List<Map<String, Object>> galssInfo=groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
- if(!galssInfo.isEmpty()){
- Map<String, Object> item=new HashMap<>();//鏂版牸寮忕紪鎺�
+ List<Map<String, Object>> galssInfo = groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
+ if (!galssInfo.isEmpty()) {
+ Map<String, Object> item = new HashMap<>();//鏂版牸寮忕紪鎺�
//浠ヤ笅涓哄悓灞� {key:"groupBy.get(key)",olLayoutRate:"灏忕墖闆嗗悎"}
// {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}
- item.put("listGlass",groupBy.get(key));
- item.put("LayoutId",key);
- item.put("olWidth",galssInfo.get(0).get("olWidth").toString());
- item.put("olHeight",galssInfo.get(0).get("olHeight").toString());
- item.put("olLayoutRate",galssInfo.get(0).get("olLayoutRate").toString());
+ item.put("listGlass", groupBy.get(key));
+ item.put("LayoutId", key);
+ item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
+ item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
+ item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
result.add(item);
- }else{
- log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}"+key);
- return null ;
+ } else {
+ log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}" + key);
+ return null;
}
}
}
@@ -523,4 +523,9 @@
}
return false;
}
+
+ @Override
+ public EdgStorageCageDetails queryEdgStorageDetailsBySize(double width, double height) {
+ return baseMapper.queryEdgStorageDetailsBySize(width, height);
+ }
}
--
Gitblit v1.8.0