Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

 north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java

@@ -27,8 +27,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 +41,47 @@

    }

    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){
            //将数据放入List中
            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());
    }


}