Browse Source

导入物料

master
张江玮 2 years ago
parent
commit
8a75334053
  1. 9
      lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/MaterialbaseController.java
  2. 2
      lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/MaterialbaseService.java
  3. 55
      lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java
  4. 10
      lms/nladmin-ui/src/api/wms/basedata/materialbase.js
  5. 116
      lms/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue
  6. 28
      lms/nladmin-ui/src/views/wms/basedata/material/index.vue

9
lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/MaterialbaseController.java

@ -16,6 +16,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.Map;
@ -101,4 +102,12 @@ public class MaterialbaseController {
public ResponseEntity<Object> getProductSeries() {
return new ResponseEntity<>(materialBaseService.getProductSeries("1527572574832300032"), HttpStatus.OK);
}
@Log("导入物料信息")
@ApiOperation("导入物料信息")
@PostMapping("/excelImport")
public ResponseEntity<Object> excelImport(@RequestBody MultipartFile file) {
materialBaseService.excelImport(file);
return new ResponseEntity<>(HttpStatus.OK);
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/MaterialbaseService.java

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.basedata.service.dto.MaterialbaseDto;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
@ -94,4 +95,5 @@ public interface MaterialbaseService {
JSONArray getProductSeries(String parent_class_id);
void excelImport(MultipartFile file);
}

55
lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java

@ -7,12 +7,17 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
@ -21,10 +26,15 @@ import org.nl.wms.basedata.eum.MaterOptTypeEnum;
import org.nl.wms.basedata.service.ClassstandardService;
import org.nl.wms.basedata.service.MaterialbaseService;
import org.nl.wms.basedata.service.dto.MaterialbaseDto;
import org.nl.wms.util.CommonUtils;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -240,4 +250,49 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
return newParentArray;
}
@Override
public void excelImport(MultipartFile multipartFile) {
File file = FileUtil.toFile(multipartFile);
String type = FileUtil.getType(file);
if (!"xlsx".equals(type) && !"xls".equals(type)) {
throw new BadRequestException("只能上传 xls 或 xlsx 文件");
}
ExcelReader excelReader = EasyExcel.read(file).build();
List<ReadSheet> sheets = excelReader.excelExecutor().sheetList();
WQLObject materialTable = WQLObject.getWQLObject("md_me_materialbase");
JSONObject material = new JSONObject();
Long userId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
for (ReadSheet sheet : sheets) {
List<Map<Integer, String>> materials = EasyExcel.read(file).sheet(sheet.getSheetNo()).doReadSync();
for (Map<Integer, String> materialMap : materials) {
material.put("material_id", IdUtil.getSnowflake(1L, 1L).nextId());
String material_code = materialMap.get(1);
material.put("material_code", material_code);
material.put("material_name", materialMap.get(2));
material.put("base_unit", materialMap.get(3));
material.put("pack_qty", materialMap.get(4) == null ? 0 : Double.parseDouble(materialMap.get(4)));
material.put("is_used", '1');
material.put("is_delete", '0');
if (ObjectUtil.isNotEmpty(materialTable.query("material_code = '" + material_code + "'").uniqueResult(0))) {
material.put("update_optid", userId);
material.put("update_optname", nickName);
material.put("update_time", now);
materialTable.update(material);
} else {
material.put("create_id", userId);
material.put("create_name", nickName);
material.put("create_time", now);
material.put("update_optid", userId);
material.put("update_optname", nickName);
material.put("update_time", now);
materialTable.insert(material);
}
}
}
}
}

10
lms/nladmin-ui/src/api/wms/basedata/materialbase.js

@ -55,4 +55,12 @@ export function getProductSeries() {
})
}
export default { add, edit, del, getMaterOptType, isAlongMaterType, synchronize, getProductSeries }
export function excelImport(data) {
return request({
url: 'api/Materialbase/excelImport',
method: 'post',
data
})
}
export default { add, edit, del, getMaterOptType, isAlongMaterType, synchronize, getProductSeries, excelImport }

116
lms/nladmin-ui/src/views/wms/basedata/material/UploadDialog.vue

@ -0,0 +1,116 @@
<template>
<el-dialog
title="导入Excel文件"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="400px"
:show-close="true"
@close="close"
@open="open"
>
<el-upload
ref="upload"
class="upload-demo"
action=""
drag
:on-exceed="is_one"
:limit="1"
:auto-upload="false"
:multiple="false"
:show-file-list="true"
:on-change="uploadByJsqd"
:file-list="fileList"
accept=".xlsx,.xls"
>
<i class="el-icon-upload" />
<div class="el-upload__text">
将文件拖到此处
<em>点击上传</em>
</div>
<div slot="tip" class="el-upload__tip">只能上传Excel文件且不超过10MB</div>
</el-upload>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
</span>
</el-dialog>
</template>
<script>
import crudMaterialbase from '@/api/wms/basedata/materialbase'
import CRUD, { crud } from '@crud/crud'
export default {
name: 'UploadDialog',
mixins: [crud()],
components: {},
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: String
}
},
data() {
return {
dialogVisible: false,
fileList: [],
file1: ''
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
},
openParam: {
handler(newValue, oldValue) {
this.opendtlParam = newValue
}
}
},
methods: {
open() {
},
close() {
this.$emit('update:dialogShow', false)
},
is_one() {
this.crud.notify('只能上传一个excel文件!', CRUD.NOTIFICATION_TYPE.WARNING)
},
//
beforeAvatarUpload(file) {
// 2Mb
if (file.size > 10 * 1024 * 1024) {
return false
}
return true
},
//
uploadByJsqd(file) {
this.file1 = file
},
submit() {
if (this.beforeAvatarUpload(this.file1)) {
this.fileList.name = this.file1.name
this.fileList.url = ''
var formdata = new FormData()
formdata.append('file', this.file1.raw)
// excelImport formdata
crudMaterialbase.excelImport(formdata).then((res) => {
this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.$emit('tableChanged3', '')
this.$emit('update:dialogShow', false)
})
} else {
this.crud.notify('文件过大,请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
}
}
}
}
</script>

28
lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@ -58,16 +58,26 @@
</el-row>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<!-- <el-button-->
<!-- v-if="false"-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- type="success"-->
<!-- icon="el-icon-position"-->
<!-- size="mini"-->
<!-- @click="synchronize()"-->
<!-- >-->
<!-- 同步-->
<!-- </el-button>-->
<el-button
v-if="false"
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
type="warning"
icon="el-icon-upload2"
size="mini"
@click="synchronize()"
@click="uploadShow = true"
>
同步
导入
</el-button>
</crudOperation>
<!--表单组件-->
@ -227,6 +237,7 @@
</el-table>
<!--分页组件-->
<pagination />
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
</div>
</div>
</template>
@ -242,6 +253,7 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/classstandard'
import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
import UploadDialog from '@/views/wms/basedata/material/UploadDialog.vue'
const defaultForm = {
material_id: null,
@ -284,7 +296,7 @@ export default {
name: 'Materialbase',
//
dicts: ['is_used'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@ -305,6 +317,7 @@ export default {
measure_unit: [],
productSeries: [],
permission: {},
uploadShow: false,
rules: {
material_id: [
{ required: true, message: '物料号不能为空', trigger: 'blur' }
@ -346,6 +359,9 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
tableChanged3() {
this.crud.toQuery()
},
initClass1() {
const param = {
parent_class_code: '09'

Loading…
Cancel
Save