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 | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 5c8f60f..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;
@@ -28,7 +24,6 @@
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());
map.put("Type","");
@@ -65,5 +60,31 @@
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