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

opt:ctu功能优化；

Browse Source
This commit is contained in:
gongbaoxiong
2026-01-14 16:32:00 +08:00
parent b873a9f64f
commit b0ce90c187
57 changed files with 1464 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-ui/src/views/system/notice/locale/zh.js
View File

@@ -2,7 +2,7 @@ export default {
'Notice': {
'title': '消息通知',
'table': {
'notice_title': '信息标题',
'notice_title': '信息',
'notice_content': '信息内容',
'notice_type': '信息类型',
'have_read': '读取状态',
@@ -11,7 +11,7 @@ export default {
'create_time': '创建时间',
'see': '查看',
'deal': '处理',
'input_tip': '请输入标题',
'input_tip': '请输入内容',
'batch_reader': '批量已读'
},
'reader': {

172
nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -48,7 +48,7 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px"
width="1000px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
@@ -57,6 +57,22 @@
<el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属货架区域" prop="stor_code">
<el-select
v-model="form.placement_type"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in stors1"
:key="item.font_direction_scode"
:label="item.struct_name"
:value="item.font_direction_scode"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 200px;" />
@@ -77,10 +93,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外部标识" prop="ext_id">
<el-form-item label="外部标识1" prop="ext_id">
<el-input v-model="form.ext_id" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="8">-->
@@ -103,7 +120,68 @@
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
<el-dialog
title="用户绑定货架"
:visible.sync="uploadShow"
width="1200px"
>
<el-form ref="form" :model="form" :rules="rules1" size="mini" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="用户" prop="user_id">
<el-select
v-model="form.user_id"
placeholder=""
style="width: 200px"
@change="handleUserChange"
>
<el-option
v-for="item in users"
:key="item.user_id"
:label="item.person_name"
:value="item.user_id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="可绑定货架" prop="ext_id">
<el-select
v-model="form.ext_id"
multiple
clearable
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in stors"
:key="item.placement_type"
:label="item.struct_name"
:value="item.placement_type"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户已绑定货架" prop="struct_id">
<el-input v-model="form.struct_id" style="width: 400px;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button @click="uploadShow = false">取消</el-button>
<el-button type="primary" @click="updateUser(form)">确认</el-button>
</div>
</el-dialog>
<el-button
type="success"
size="mini"
icon="el-icon-upload2"
@click="openBindDialog"
>
用户绑定货架
</el-button>
<!--表格渲染-->
<el-table
ref="table"
@@ -115,9 +193,16 @@
>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('material_spec',crud.data,'物料规格')" label="物料规格" />
<el-table-column
prop="material_spec"
show-overflow-tooltip
show-tooltip-when-overflow
:min-width="flexWidth('material_spec',crud.data,'物料规格')"
label="物料规格"
/>
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="ext_id" label="外部标识" />
<el-table-column prop="placement_type" label="所属货架区域" width="100" />
<!-- <el-table-column prop="class_name" label="物料分类" width="140"/>-->
<!-- <el-table-column prop="unit_name" label="计量单位"/>-->
<!-- <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px"/>-->
@@ -136,6 +221,7 @@
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="ext_id" label="外部标识" />
<el-table-column
v-permission="['admin','Materialbase:edit','Materialbase:del']"
fixed="right"
@@ -158,7 +244,13 @@
</template>
<script>
import crudMaterial from '@/views/wms/basedata/material/material'
import crudMaterial, {
getStruct,
getUser,
updateUser,
handleUserChange,
getAllStruct
} from '@/views/wms/basedata/material/material'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -172,6 +264,7 @@ const defaultForm = {
material_code: null,
material_name: null,
material_spec: null,
struct_id: null,
material_model: null,
english_name: null,
base_unit_id: null,
@@ -217,6 +310,9 @@ export default {
},
data() {
return {
stors: [],
stors1: [],
users: [],
classes1: [],
classes2: [],
classes3: [],
@@ -225,6 +321,14 @@ export default {
measure_unit: [],
productSeries: [],
permission: {},
rules1: {
user_id: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
],
ext_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
]
},
rules: {
material_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
@@ -250,6 +354,12 @@ export default {
}
}
},
created() {
crudMaterial.getUser().then(res => {
this.users = res
})
this.loadBindableStructs()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -257,6 +367,56 @@ export default {
},
[CRUD.HOOK.beforeToCU](crud, form) {
},
// 改变状态
updateUser(data) {
debugger
if (!data.ext_id || (Array.isArray(data.ext_id) && data.ext_id.length === 0)) {
this.$confirm('请注意，未选中货架号，此操作将清空用户绑定的所有货架，是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudMaterial.updateUser(data).then(res => {
this.crud.toQuery()
this.uploadShow = false
this.crud.notify('清除成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
})
}).catch(() => {
})
} else {
crudMaterial.updateUser(data).then(res => {
this.crud.toQuery()
this.uploadShow = false
this.crud.notify('绑定成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}
},
openBindDialog() {
this.form.struct_id = ''
this.uploadShow = true
this.loadBindableStructs()
},
loadBindableStructs() {
crudMaterial.getStruct().then(res => {
this.stors = res
})
crudMaterial.getAllStruct().then(res => {
this.stors1 = res
})
},
handleUserChange(userId) {
this.form.struct_id = ''
this.form.ext_id = []
if (!userId) {
return
}
crudMaterial.getUserBindStruct({ user_id: userId }).then(res => {
this.form.struct_id = res || ''
}).catch(() => {
this.form.struct_id = ''
})
},
materialSync() {
crudMaterial.materialSync({}).then(res => {
this.crud.toQuery()

40
nladmin-ui/src/views/wms/basedata/material/material.js
View File

@@ -1,4 +1,5 @@
import request from '@/utils/request'
import { getStor } from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
export function add(data) {
return request({
@@ -55,6 +56,14 @@ export function materialSync(data) {
})
}
export function updateUser(data) {
return request({
url: 'api/Materia/updateUser',
method: 'post',
data
})
}
export function excelImport(data) {
return request({
url: '/api/Materia/excelImport',
@@ -70,4 +79,33 @@ export function excelImport1(data) {
})
}
export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries, materialSync, excelImport, excelImport1 }
export function getStruct(params) {
return request({
url: 'api/Materia/getStruct',
method: 'post',
params
})
}
export function getAllStruct(params) {
return request({
url: 'api/Materia/getAllStruct',
method: 'post',
params
})
}
export function getUser(params) {
return request({
url: 'api/Materia/getUser',
method: 'post',
params
})
}
export function getUserBindStruct(params) {
return request({
url: 'api/Materia/getUserBindStruct',
method: 'post',
params
})
}
export default { add, edit, del, getUserBindStruct, updateUser, getStruct, getAllStruct, getUser, getMaterOptType, isAlongMaterType, getProductSeries, materialSync, excelImport, excelImport1 }

90
nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -246,29 +246,29 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="父类编码" prop="vehicle_code">
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具类型" prop="vehicle_code">
<el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="可放载具类型" prop="can_vehicle_types">
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="父类编码" prop="vehicle_code">-->
<!-- <el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.point_status !== '1'" label="载具类型" prop="vehicle_code">-->
<!-- <el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">-->
<!-- <el-option-->
<!-- v-for="item in dict.vehicle_type"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">-->
<!-- <el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">-->
<!-- <el-option-->
<!-- v-for="item in dict.vehicle_type"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number
v-model="form.vehicle_qty"
@@ -287,11 +287,11 @@
{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item label="是否自动">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_auto" :label="item.value">
{{ item.label }}
</el-radio>
</el-form-item>
<!-- <el-form-item label="是否自动">-->
<!-- <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_auto" :label="item.value">-->
<!-- {{ item.label }}-->
<!-- </el-radio>-->
<!-- </el-form-item>-->
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
@@ -352,6 +352,26 @@
label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
/>
<el-table-column
prop="material_code"
label="物料编码"
width="160"
/>
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('vehicle_code',crud.data,'物料名称')"
/>
<el-table-column
prop="material_qty"
label="物料数量"
:min-width="flexWidth('vehicle_code',crud.data,'物料数量')"
/>
<el-table-column
prop="pcsn"
label="物料批次"
:min-width="flexWidth('vehicle_code',crud.data,'物料批次')"
/>
<!-- <el-table-column-->
<!-- prop="vehicle_qty"-->
<!-- label="载具数量"-->
@@ -383,11 +403,6 @@
<!-- label="物料编码"-->
<!-- :min-width="flexWidth('material_code',crud.data,'物料编码')"-->
<!-- />-->
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料名称')"
/>
<!-- <el-table-column-->
<!-- prop="material_spec"-->
<!-- label="物料规格"-->
@@ -398,11 +413,6 @@
<!-- label="物料型号"-->
<!-- :min-width="flexWidth('material_model',crud.data,'物料型号')"-->
<!-- />-->
<el-table-column
prop="material_qty"
label="物料数量"
:min-width="flexWidth('material_qty',crud.data,'物料数量')"
/>
<el-table-column
prop="parent_point_code"
label="父点位编码"
@@ -492,8 +502,8 @@ const defaultForm = {
out_empty_seq: null,
parent_point_code: null,
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'true',
ing_task_code: '0',
is_has_workder: 'false',
workshop_code: null,
is_auto: 'true',
remark: null,

19
nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -30,6 +30,16 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料信息">
<label slot="label">物料信息:</label>
<el-input
v-model="query.ext_group_data"
clearable
style="width: 240px"
placeholder="物料信息"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务名称">
<label slot="label">任务名称:</label>
<el-select v-model="query.config_code" placeholder="请选择" style="width: 240px" clearable @change="crud.toQuery">
@@ -196,6 +206,10 @@
<el-table-column prop="task_name" label="配置名称" :min-width="flexWidth('task_name',crud.data,'任务名称')" />
<el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'起点')" />
<el-table-column prop="point_code2" label="终点" :min-width="flexWidth('point_code2',crud.data,'终点')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<!-- <el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />-->
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
@@ -222,14 +236,11 @@
</template>
</el-table-column>
<el-table-column prop="acs_trace_id" label="链路标识" :min-width="flexWidth('acs_trace_id',crud.data,'链路标识')" />
<el-table-column prop="ext_group_data" label="物料信息" :min-width="flexWidth('ext_group_data',crud.data,'物料信息')" />
<el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
<el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<!-- <el-table-column prop="ext_group_data" label="额外组盘信息" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />-->
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-button-->

2
nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -257,7 +257,7 @@ export default {
crudBsrealstorattr.getStor().then(res => {
this.storlist = res
if (this.storlist && this.storlist.length > 0) {
this.form.stor_id = this.storlist[0].stor_id
this.form.stor_id = this.storlist[1].stor_id
this.storChange()
}
})

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

@@ -91,6 +91,7 @@
<el-table-column show-overflow-tooltip prop="sect_name" label="库区" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘编码" align="center" width="250px" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<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="qty" label="可出数量" :formatter="crud.formatNum3" align="center">
@@ -204,7 +205,12 @@ export default {
}
row.edit = !row.edit
if (row.edit) {
debugger
this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) - parseFloat(row.qty)
if (this.queryrow.unassign_qty < 0) {
this.crud.notify('分配数量超出库存数量，请重新输入！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + parseFloat(row.qty)
} else {
this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.qty)
@@ -249,26 +255,23 @@ export default {
this.fullscreenLoading = false
})
} else {
this.$confirm('未分配数量不为0,是否继续提交？')
.then(_ => {
const rows = []
this.tableDtl.forEach((item) => {
if (item.edit) {
rows.push(item)
}
})
this.fullscreenLoading = true
checkoutbill.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
this.$emit('update:dialogShow', false)
this.$emit('StructIvtClosed')
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false
})
})
.catch(_ => {
})
const rows = []
this.tableDtl.forEach(item => {
if (item.edit) {
rows.push(item)
}
})
this.fullscreenLoading = true
checkoutbill.manualDiv({
row: this.queryrow,
rows: rows
}).then(res => {
this.$emit('update:dialogShow', false)
this.$emit('StructIvtClosed')
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false
})
}
}
}

51
nladmin-ui/src/views/wms/statement/structivt/index.vue
View File

@@ -32,6 +32,16 @@
class="filter-item"
/>
</el-form-item>
<el-form-item label="货架区域">
<el-input
v-model="query.placement_type"
clearable
size="small"
placeholder="货架区域"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
v-model="query.material_code"
@@ -75,7 +85,7 @@
size="mini"
@click="uploadShow = true"
>
库存导入
增量库存导入
</el-button>
<el-button
slot="right"
@@ -85,7 +95,17 @@
size="mini"
@click="uploadShow1 = true"
>
分区信息导入
库存变动导入
</el-button>
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-upload2"
size="mini"
@click="downloadMethod"
>
库存导出
</el-button>
</crudOperation>
<!--表格渲染-->
@@ -103,6 +123,7 @@
<el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
<el-table-column prop="sect_name" label="库区" :min-width="flexWidth('sect_name',crud.data,'库区')" />
<el-table-column prop="placement_type" label="货架区域" :min-width="flexWidth('placement_type',crud.data,'货架区域')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
@@ -115,8 +136,8 @@
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="计量单位" :min-width="flexWidth('qty_unit_name',crud.data,'计量单位')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_time" label="入库时间" :min-width="flexWidth('create_time',crud.data,'入库时间')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
</el-table>
<!--分页组件-->
<pagination />
@@ -205,6 +226,30 @@ export default {
this.showDtlLoading = false
})
}
},
downloadMethod() {
debugger
if (this.query.datepick) {
this.query.start_time = this.query.datepick[0]
if (this.query.datepick.length > 1) {
this.query.end_time = this.query.datepick[1]
}
} else {
this.query.start_time = ''
this.query.end_time = ''
}
crudStructivt.exportFile(this.query).then(res => {
const url = window.URL.createObjectURL(new Blob([res]))
const link = document.createElement('a')
link.style.display = 'none'
link.href = url
const fileName = new Date() + '-' + '库存' + '.xlsx'
link.setAttribute('download', fileName)
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
this.crud.notify('导出成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}
}
}

11
nladmin-ui/src/views/wms/statement/structivt/structivt.js
View File

@@ -61,5 +61,12 @@ export function excelImport(data) {
data
})
}
export default { add, edit, del, getStruct, getStructById, getUnits, save, excelImport }
export function exportFile(data) {
return request({
url: '/api/structattr/exportFile',
method: 'post',
responseType: 'blob',
data
})
}
export default { add, edit, del, getStruct, getStructById, getUnits, save, excelImport, exportFile }