From 190589f5b186e338f707804527985db623c1084f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 28 七月 2025 17:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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..ec8ecae 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
@@ -2,11 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.mm.BasicWarehouseType;
-import com.example.erp.entity.sd.BasicData;
-import com.example.erp.entity.sd.Customer;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
-import com.example.erp.mapper.sd.BasicDateMapper;
-import com.example.erp.mapper.sd.CustomerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,8 +23,7 @@
List<BasicWarehouseType> basicWarehouseType=basicWarehouseTypeMapper.getBasicWarehouseType(type);
for (BasicWarehouseType item : basicWarehouseType){
Map<String, Object> map = new HashMap<>();
-
- map.put("OperateTypeId",item.getOperateTypeId());
+ map.put("id",item.getId());
map.put("OperateTypeName",item.getOperateTypeName());
map.put("OperateType",item.getOperateType());
map.put("Type","");
@@ -42,5 +37,54 @@
}
+ 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;
+ }
+
+ public List<BasicWarehouseType> getBasicWarehouse() {
+ return basicWarehouseTypeMapper.getBasicWarehouseTypeAll();
+ }
+
+
+ public boolean addBasicWarehouse(Map<String, Object> map) {
+ List<String> basicTypeList = (List<String>) map.get("operateType");
+ basicWarehouseTypeMapper.insertBasicWarehouse(map.get("input").toString(),basicTypeList.get(0),map.get("type").toString());
+ return true;
+ }
+
+ public boolean deleteBasicWarehouse(BasicWarehouseType basicWarehouseType) {
+ return basicWarehouseTypeMapper.deleteBasicWarehouse(basicWarehouseType.getId());
+ }
+
+ public boolean updateBasicWarehouse(BasicWarehouseType basicWarehouseType) {
+ return basicWarehouseTypeMapper.updateBasicWarehouse(basicWarehouseType.getId(),basicWarehouseType.getOperateTypeName());
+ }
+
+
+ public Map<String, Object> BasicWarehouseTypeUser(String type){
+ Map<String, Object> map = new HashMap<>();
+ map.put("userName",basicWarehouseTypeMapper.getBasicWarehouseUser(type));
+ return map;
+ }
+
}
--
Gitblit v1.8.0