导入模板下载+导入功能完成

This commit is contained in:
2024-11-03 13:40:44 +08:00
parent bbd40afd52
commit 8f95164c28
10 changed files with 617 additions and 14 deletions

View File

@@ -1,13 +1,17 @@
package com.ruoyi.oa.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.oa.listener.SysOaWarehouseListener;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -24,6 +28,7 @@ import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
import com.ruoyi.oa.service.ISysOaWarehouseService;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
* 仓库管理
@@ -106,4 +111,28 @@ public class SysOaWarehouseController extends BaseController {
@PathVariable Long[] ids) {
return toAjax(iSysOaWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true));
}
/**
* 导入数据
*
* @param file 导入文件
* @param updateSupport 是否更新已存在数据
*/
@Log(title = "投诉工单导入", businessType = BusinessType.IMPORT)
@SaCheckPermission("complaint:complaint:import")
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
ExcelResult<SysOaWarehouseVo> result = ExcelUtil.importExcel(file.getInputStream(), SysOaWarehouseVo.class,
new SysOaWarehouseListener(true));
return R.ok(result.getAnalysis());
}
/**
* 获取导入模板
*/
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil.exportExcel(new ArrayList<>(), "投诉工单", SysOaWarehouseVo.class, response);
}
}

View File

@@ -25,7 +25,7 @@ public class SysOaOutWarehouse extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 出库后对应的项目id

View File

@@ -25,7 +25,7 @@ public class SysOaWarehouse extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 库存数量

View File

@@ -1,5 +1,7 @@
package com.ruoyi.oa.domain.bo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -24,6 +26,7 @@ public class SysOaOutWarehouseBo extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;

View File

@@ -1,5 +1,7 @@
package com.ruoyi.oa.domain.bo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -24,6 +26,7 @@ public class SysOaWarehouseBo extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**

View File

@@ -24,32 +24,41 @@ public class SysOaWarehouseVo {
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 序号
*/
@ExcelProperty(value = "序号")
private Long temp;
/**
* 物料名称
*/
@ExcelProperty(value = "物料名称")
private String name;
/**
* 型号
*/
@ExcelProperty(value = "型号")
private String model;
/**
* 库存数量
*/
@ExcelProperty(value = "库存数量")
private Long inventory;
/**
* 型号
*/
@ExcelProperty(value = "型号")
private String model;
/**
* 单位
*/
@ExcelProperty(value = "单位")
private String unit;
/**
* 物料名称
*/
@ExcelProperty(value = "物料名称")
private String name;
/**
* 品牌
@@ -70,4 +79,6 @@ public class SysOaWarehouseVo {
private String remark;
}

View File

@@ -0,0 +1,108 @@
package com.ruoyi.oa.listener;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.excel.ExcelListener;
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.ValidatorUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
import com.ruoyi.oa.service.ISysOaArticleService;
import com.ruoyi.oa.service.ISysOaWarehouseService;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Objects;
@Slf4j
public class SysOaWarehouseListener extends AnalysisEventListener<SysOaWarehouseVo> implements ExcelListener<SysOaWarehouseVo> {
private final ISysOaWarehouseService sysOaWarehouseService;
private final Boolean isUpdateSupport;
private int successNum = 0;
private int failureNum = 0;
private final StringBuilder successMsg = new StringBuilder();
private final StringBuilder failureMsg = new StringBuilder();
public SysOaWarehouseListener(Boolean isUpdateSupport) {
// String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
this.sysOaWarehouseService = SpringUtils.getBean(ISysOaWarehouseService.class);
this.isUpdateSupport = isUpdateSupport;
}
@Override
public void invoke(SysOaWarehouseVo sysOaWarehouseVo, AnalysisContext context) {
SysOaWarehouseBo bo = new SysOaWarehouseBo();
bo.setName(sysOaWarehouseVo.getName());
if (Objects.nonNull(sysOaWarehouseVo.getModel())){
bo.setModel(sysOaWarehouseVo.getModel());
}
List<SysOaWarehouseVo> complaintVo = this.sysOaWarehouseService.queryList(bo);
try {
// 验证是否存在这个用户
if (complaintVo.size()<=0) {
SysOaWarehouseBo add = BeanUtil.toBean(sysOaWarehouseVo, SysOaWarehouseBo.class);
ValidatorUtils.validate(complaintVo);
sysOaWarehouseService.insertByBo(add);
successNum++;
successMsg.append("<br/>").append(successNum).append("、物料名称: ").append(add.getName()).append(" 导入成功");
} else if (isUpdateSupport) {
// 这里是将现有的进行更新
SysOaWarehouseVo warehouseVo = complaintVo.get(0);
SysOaWarehouseBo update = BeanUtil.toBean(sysOaWarehouseVo, SysOaWarehouseBo.class);
update.setId(warehouseVo.getId());
update.setInventory(warehouseVo.getInventory()+sysOaWarehouseVo.getInventory());
ValidatorUtils.validate(complaintVo);
sysOaWarehouseService.updateByBo(update);
successNum++;
successMsg.append("<br/>").append(successNum).append("、物料名称: ").append(update.getName()).append(" 更新成功");
}
} catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "、物料名称: " + sysOaWarehouseVo.getName() + " 导入失败:";
failureMsg.append(msg).append(e.getMessage());
log.error(msg, e);
}
}
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
}
@Override
public ExcelResult<SysOaWarehouseVo> getExcelResult() {
return new ExcelResult<SysOaWarehouseVo>() {
@Override
public String getAnalysis() {
if (failureNum > 0) {
failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:");
throw new ServiceException(failureMsg.toString());
} else {
successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
}
return successMsg.toString();
}
@Override
public List<SysOaWarehouseVo> getList() {
return null;
}
@Override
public List<String> getErrorList() {
return null;
}
};
}
}

View File

@@ -32,6 +32,7 @@ import java.util.Collection;
public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
private final SysOaOutWarehouseMapper baseMapper;
private final SysOaWarehouseMapper baseMapper2;
/**

View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询库存管理列表
export function listOaWarehouse(query) {
return request({
url: '/oa/oaWarehouse/list',
method: 'get',
params: query
})
}
// 查询库存管理详细
export function getOaWarehouse(id) {
return request({
url: '/oa/oaWarehouse/' + id,
method: 'get'
})
}
// 新增库存管理
export function addOaWarehouse(data) {
return request({
url: '/oa/oaWarehouse',
method: 'post',
data: data
})
}
// 修改库存管理
export function updateOaWarehouse(data) {
return request({
url: '/oa/oaWarehouse',
method: 'put',
data: data
})
}
// 删除库存管理
export function delOaWarehouse(id) {
return request({
url: '/oa/oaWarehouse/' + id,
method: 'delete'
})
}

View File

@@ -0,0 +1,404 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="型号" prop="model">
<el-input
v-model="queryParams.model"
placeholder="请输入型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input
v-model="queryParams.brand"
placeholder="请输入品牌"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['oa:oaWarehouse:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['oa:oaWarehouse:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['oa:oaWarehouse:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['oa:oaWarehouse:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['complaint:complaint:import']"
>导入</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="oaWarehouseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index"/>
<el-table-column label="物料名称" align="center" prop="name" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="库存数量" align="center" prop="inventory" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="规格" align="center" prop="specifications" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['oa:oaWarehouse:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['oa:oaWarehouse:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改库存管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="物料名称" prop="name">
<el-input v-model="form.name" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="型号" prop="model">
<el-input v-model="form.model" placeholder="请输入型号" />
</el-form-item>
<el-form-item label="库存数量" prop="inventory">
<el-input v-model="form.inventory" placeholder="请输入库存数量" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input v-model="form.brand" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="规格" prop="specifications">
<el-input v-model="form.specifications" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xlsxlsx格式文件</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button @click="upload.open = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listOaWarehouse, getOaWarehouse, delOaWarehouse, addOaWarehouse, updateOaWarehouse } from "@/api/oa/oaWarehouse";
import { getToken } from "@/utils/auth";
export default {
name: "OaWarehouse",
data() {
return {
// 用户导入参数
upload: {
// 是否显示弹出层(用户导入)
open: false,
// 弹出层标题(用户导入)
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/oa/oaWarehouse/importData"
},
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 库存管理表格数据
oaWarehouseList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
inventory: undefined,
model: undefined,
unit: undefined,
name: undefined,
brand: undefined,
specifications: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
inventory: [
{ required: true, message: "库存数量不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询库存管理列表 */
getList() {
this.loading = true;
listOaWarehouse(this.queryParams).then(response => {
this.oaWarehouseList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
inventory: undefined,
model: undefined,
unit: undefined,
name: undefined,
brand: undefined,
specifications: undefined,
remark: undefined,
createTime: undefined,
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
delFlag: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加库存管理";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const id = row.id || this.ids
getOaWarehouse(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改库存管理";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateOaWarehouse(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addOaWarehouse(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除库存管理编号为"' + ids + '"的数据项?').then(() => {
this.loading = true;
return delOaWarehouse(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('oa/oaWarehouse/export', {
...this.queryParams
}, `oaWarehouse_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "用户导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
this.download('oa/oaWarehouse/importTemplate', {
}, `ware_template_${new Date().getTime()}.xlsx`)
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
}
}
};
</script>