From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java
index 5d02f01..5c8f60f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java
@@ -27,7 +27,7 @@
List<BasicWarehouseType> basicWarehouseType=basicWarehouseTypeMapper.getBasicWarehouseType(type);
for (BasicWarehouseType item : basicWarehouseType){
Map<String, Object> map = new HashMap<>();
-
+ map.put("id",item.getId());
map.put("OperateTypeId",item.getOperateTypeId());
map.put("OperateTypeName",item.getOperateTypeName());
map.put("OperateType",item.getOperateType());
@@ -42,5 +42,28 @@
}
+ public Map<String, List<Object>> getBasicWarehouseTypes(String type){
+ //杩斿洖鍩虹鏁版嵁閲岀殑鎵�鏈夌被鍨�
+ List<String> orderBasicDataType = basicWarehouseTypeMapper.getBasicWarehouse(type);
+ //杩斿洖姝ょ被鍨嬪熀纭�鏁版嵁鎵�鏈夋暟鎹�
+ List<BasicWarehouseType> orderBasicData = basicWarehouseTypeMapper.getBasicWarehouseType(type);
+ Map<String, List<Object>> BasicDataMap = new HashMap<>();
+ //鍒涘缓List瀵硅薄
+
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁绫诲瀷
+ for(String item :orderBasicDataType){
+ List<Object> orderBasicDataList = new ArrayList<>();
+ //灏嗙被鍨嬪拰List瀵硅薄鏀惧叆Map涓�
+ BasicDataMap.put(item,orderBasicDataList);
+ }
+ //閬嶅巻璁㈠崟鍩烘湰鏁版嵁
+
+ for (BasicWarehouseType item : orderBasicData){
+ //灏嗘暟鎹斁鍏ist涓�
+ BasicDataMap.get(item.getOperateType()).add(item);
+ }
+ return BasicDataMap;
+ }
+
}
--
Gitblit v1.8.0