root/XuGongHanYunWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：优化修改

Browse Source
This commit is contained in:
liuxy
2025-12-12 17:12:00 +08:00
parent 8023245412
commit 33583fa15c
25 changed files with 533 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -27,7 +27,7 @@ export default {
data() {
return {
title: '徐工汉云WMS系统',
logo: Logo,
logo: '',
title_param: 'platform'
}
},

10
wms/nladmin-ui/src/views/wms/basedata/deviceInfo/deviceinfo.js
View File

@@ -32,4 +32,12 @@ export function changeActive(data) {
})
}
export default { add, edit, del, changeActive }
export function getDevice(data) {
return request({
url: 'api/deviceinfo/getDevice',
method: 'post',
data
})
}
export default { add, edit, del, changeActive, getDevice }

113
wms/nladmin-ui/src/views/wms/basedata/group/UploadDialog.vue Normal file
View File

@@ -0,0 +1,113 @@
<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 crudGroup from '@/views/wms/basedata/group/group'
import CRUD, { crud } from '@crud/crud'
export default {
name: 'UploadDialog',
mixins: [crud()],
components: {},
props: {
dialogShow: {
type: Boolean,
default: false
}
},
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：传递参数
crudGroup.excelImport(formdata).then((res) => {
this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.$emit('tableChanged', res)
this.$emit('update:dialogShow', false)
})
} else {
this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
}
}
}
}
</script>

10
wms/nladmin-ui/src/views/wms/basedata/group/group.js
View File

@@ -72,4 +72,12 @@ export function printDelete(data) {
})
}
export default { add, edit, del, queryMater, queryMaterList, checkVehicle, querySupp, copySave, printDelete }
export function excelImport(data) {
return request({
url: 'api/group/importExcel',
method: 'post',
data
})
}
export default { add, edit, del, queryMater, queryMaterList, checkVehicle, querySupp, copySave, printDelete, excelImport }

149
wms/nladmin-ui/src/views/wms/basedata/group/index.vue
View File

@@ -77,10 +77,20 @@
icon="el-icon-printer"
size="mini"
:disabled="crud.selections.length !== 1"
@click="printTable"
@click="printVisible = true"
>
物料标签
</el-button>
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-arrow-down"
size="mini"
@click="Import"
>
组盘信息导入
</el-button>-->
</crudOperation>
<el-dialog
:close-on-click-modal="false"
@@ -215,6 +225,25 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="机台编码" prop="device_code">
<el-select
v-model="form.device_code"
size="mini"
style="width: 200px;"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
@@ -238,6 +267,29 @@
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<el-dialog
title="打印次数"
append-to-body
:visible.sync="printVisible"
width="500px"
destroy-on-close
>
<el-form ref="form3" :model="formPrint" :rules="rules" size="mini" label-width="130px">
<el-form-item label="打印次数" prop="print_num">
<el-input-number v-model="formPrint.print_num" :precision="0" :controls="false" :min="0" :max="3" style="width: 200px" />
</el-form-item>
</el-form>
<el-row :gutter="18">
<el-col :span="18" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="6">
<span>
<el-button icon="el-icon-check" size="mini" type="primary" @click="printTable">打印</el-button>
</span>
</el-col>
</el-row>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
@@ -261,6 +313,7 @@
<el-table-column prop="bake_num" label="烘干次数" :min-width="flexWidth('bake_num',crud.data,'烘干次数')" />
<el-table-column prop="quality_type" label="品质类型" :formatter="formattQuality" :min-width="flexWidth('quality_type',crud.data,'品质类型')" />
<el-table-column prop="box_type" label="料箱类型" :formatter="formattBoxType" :min-width="flexWidth('box_type',crud.data,'料箱类型')" />
<el-table-column prop="device_code" label="机台编码" :min-width="flexWidth('device_code',crud.data,'机台编码')" />
<el-table-column prop="execution_stand" label="执行标准" :min-width="flexWidth('execution_stand',crud.data,'执行标准')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="组盘人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
@@ -286,18 +339,21 @@
<pagination />
</div>
<AddDtl :dialog-show.sync="openAddDtlDialog" :open-param="openParam" />
<UploadDialog :dialog-show.sync="viewShow" />
</div>
</template>
<script>
import crudGroup from '@/views/wms/basedata/group/group'
import AddDtl from '@/views/wms/basedata/group/AddDtl'
import UploadDialog from '@/views/wms/basedata/group/UploadDialog'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo'
const defaultForm = {
group_id: null,
@@ -324,7 +380,7 @@ const defaultForm = {
}
export default {
name: 'Group',
components: { pagination, crudOperation, rrOperation, udOperation, AddDtl },
components: { pagination, crudOperation, rrOperation, udOperation, AddDtl, UploadDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典
dicts: ['is_used', 'GROUP_STATUS', 'storagevehicle_type', 'QUALITY_TYPE'],
@@ -349,8 +405,14 @@ export default {
permission: {},
openParam: {},
openAddDtlDialog: false,
printVisible: false,
viewShow: false,
suppList: [],
deviceList: [],
materList: [],
formPrint: {
print_num: 1
},
rules: {
material_code: [
{ required: true, message: '物料不能为空', trigger: 'blur' }
@@ -380,6 +442,9 @@ export default {
crudGroup.queryMaterList({}).then(res => {
this.materList = res
})
crudDeviceinfo.getDevice({}).then(res => {
this.deviceList = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -423,63 +488,45 @@ export default {
if (row.out_type === '1004') {
bake_num += 1
}
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
/* LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '100mm', '80mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '94mm', '74mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 11)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('5mm', '5mm', '40mm', '40mm', 'QRCode', row.material_code + '##' + row.material_name + '##' +
row.material_spec + '##' + row.material_model + '##' + row.quality_time_day + '##' + row.produce_time + '##' +
row.supp_name + '##' + row.bake_num + '##' + row.supp_code + '##' + row.pcsn + '##' + row.execution_stand
)
LODOP.ADD_PRINT_TEXT('7mm', '48mm', '80mm', '15mm', '物料编码：' + row.material_code + '')
LODOP.ADD_PRINT_TEXT('16mm', '48mm', '80mm', '15mm', '物料名称：' + row.material_name + '')
LODOP.ADD_PRINT_TEXT('25mm', '48mm', '80mm', '15mm', '规格：' + row.material_spec + '')
LODOP.ADD_PRINT_TEXT('34mm', '48mm', '80mm', '15mm', '型号：' + row.material_model + '')
LODOP.ADD_PRINT_TEXT('43mm', '48mm', '80mm', '15mm', '有效期(天)：' + row.quality_time_day + '')
LODOP.ADD_PRINT_TEXT('52mm', '48mm', '80mm', '15mm', '生产日期：' + row.produce_time + '')
LODOP.ADD_PRINT_TEXT('61mm', '48mm', '80mm', '15mm', '供应商名称：' + row.supp_name + '')
LODOP.ADD_PRINT_TEXT('43mm', '5mm', '80mm', '15mm', '烘干次数：' + bake_num + '')
LODOP.ADD_PRINT_TEXT('52mm', '5mm', '80mm', '15mm', '供应商编码：' + row.supp_code + '')
LODOP.ADD_PRINT_TEXT('61mm', '5mm', '80mm', '15mm', '批号：' + row.pcsn + '')
LODOP.ADD_PRINT_TEXT('69mm', '5mm', '80mm', '15mm', '执行标准：' + row.execution_stand + '')*/
LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 8)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', row.material_code + '##' + row.material_name + '##' +
row.material_spec + '##' + row.material_model + '##' + row.quality_time_day + '##' + row.produce_time + '##' +
row.supp_name + '##' + row.bake_num + '##' + row.supp_code + '##' + row.pcsn + '##' + row.execution_stand
)
LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + row.material_code + '')
LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + row.material_name + '')
LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + row.material_spec + '')
LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + row.material_model + '')
LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + row.quality_time_day + '')
LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + row.produce_time + '')
LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + row.supp_name + '')
LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + bake_num + '')
LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + row.pcsn + '')
LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + row.execution_stand + '')
LODOP.SET_PRINT_MODE('PRINT_SCALE', 0)
LODOP.PRINT()// 打印
// LODOP.PREVIEW()// 预览
for (let i = 0; i < this.formPrint.print_num; i++) {
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 8)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('5mm', '7mm', '30mm', '30mm', 'QRCode', row.material_code + '##' + row.material_name + '##' +
row.material_spec + '##' + row.material_model + '##' + row.quality_time_day + '##' + row.produce_time + '##' +
row.supp_name + '##' + row.bake_num + '##' + row.supp_code + '##' + row.pcsn + '##' + row.execution_stand
)
LODOP.ADD_PRINT_TEXT('5mm', '38mm', '60mm', '10mm', '物料编码：' + row.material_code + '')
LODOP.ADD_PRINT_TEXT('12mm', '38mm', '60mm', '10mm', '物料名称：' + row.material_name + '')
LODOP.ADD_PRINT_TEXT('19mm', '38mm', '60mm', '10mm', '规格：' + row.material_spec + '')
LODOP.ADD_PRINT_TEXT('26mm', '38mm', '60mm', '10mm', '型号：' + row.material_model + '')
LODOP.ADD_PRINT_TEXT('33mm', '38mm', '60mm', '10mm', '有效期(天)：' + row.quality_time_day + '')
LODOP.ADD_PRINT_TEXT('40mm', '38mm', '60mm', '10mm', '生产日期：' + row.produce_time + '')
LODOP.ADD_PRINT_TEXT('47mm', '38mm', '60mm', '10mm', '供应商：' + row.supp_name + '')
LODOP.ADD_PRINT_TEXT('33mm', '7mm', '60mm', '10mm', '烘干次数：' + bake_num + '')
LODOP.ADD_PRINT_TEXT('40mm', '7mm', '60mm', '10mm', '批号：' + row.pcsn + '')
LODOP.ADD_PRINT_TEXT('47mm', '7mm', '60mm', '10mm', '执行标准：' + row.execution_stand + '')
LODOP.SET_PRINT_MODE('PRINT_SCALE', 0)
LODOP.PRINT()// 打印
// LODOP.PREVIEW()// 预览
}
// 烘干出库且需要删除的 调用删除接口
if (row.out_type === '1004' && row.is_need_delete === '1') {
crudGroup.printDelete(row).then(res => {
})
}
this.printVisible = false
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
},
Import() {
this.viewShow = true
}
}
}

31
wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue
View File

@@ -147,13 +147,28 @@
<el-row>
<el-col :span="8">
<el-form-item label="机台编码" prop="device_code">
<el-input v-model="form.device_code" style="width: 200px;" />
<el-select
v-model="form.device_code"
size="mini"
placeholder="全部"
style="width: 200px"
class="filter-item"
filterable
@change="queryDevice"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="机台名称" prop="device_name">
<el-input v-model="form.device_name" style="width: 200px;" />
<el-input v-model="form.device_name" disabled style="width: 200px;" />
</el-form-item>
</el-col>
@@ -252,6 +267,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import crudGroup from '@/views/wms/basedata/group/group'
import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo'
const defaultForm = {
bom_code: null,
@@ -299,6 +315,7 @@ export default {
openParam: null,
permission: {},
materList: [],
deviceList: [],
rules: {
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
@@ -319,6 +336,9 @@ export default {
crudGroup.queryMaterList({}).then(res => {
this.materList = res
})
crudDeviceinfo.getDevice({}).then(res => {
this.deviceList = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -337,6 +357,13 @@ export default {
this.form.material_id = ''
})
},
queryDevice(value) {
crudDeviceinfo.getDevice({ 'device_code': value }).then(res => {
this.form.device_name = res[0].device_name
}).catch(() => {
this.form.device_name = ''
})
},
formattStatus(row) {
return this.dict.label.BOM_STATUS[row.bom_status]
},

1
wms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -94,6 +94,7 @@
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip sortable prop="pcsn" label="批次号" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可出数量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip sortable prop="device_code" label="机台编码" align="center" width="150px" />
<el-table-column align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>