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

物料同步修改 工单同步添加 工单完成反馈

Browse Source
This commit is contained in:
张江玮
2022-12-17 13:55:15 +08:00
parent 9065015d95
commit c09bd74254
10 changed files with 353 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-ui/src/api/wms/pdm/workorder.js
View File

@@ -96,4 +96,12 @@ export function getDtl(data) {
})
}
export default { add, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl }
export function synchronize(data) {
return request({
url: 'api/workorder/synchronize',
method: 'post',
data
})
}
export default { add, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl, synchronize }

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

@@ -218,6 +218,8 @@
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-value="default_date_show"
:picker-options="disabled_time"
/>
</el-form-item>
</el-form>
@@ -305,6 +307,12 @@ export default {
permission: {},
show_sync_dialog: false,
sync_time: '',
default_date_show: '',
disabled_time: {
disabledDate(time) {
return time.getTime() > Date.now() // 可选历史天、可选当前天、不可选未来天
}
},
rules: {
material_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
@@ -331,6 +339,8 @@ export default {
}
},
created() {
this.default_date_show = new Date()
this.default_date_show.setMonth(new Date().getMonth() - 1)
this.initClass1()
this.initClass2()
this.initClass3()
@@ -408,7 +418,6 @@ export default {
}).catch(() => {
this.show_sync_dialog = false
})
console.log(this.sync_time)
},
queryClassId() {
const param = {

2
lms/nladmin-ui/src/views/wms/pdm/device/index.vue
View File

@@ -40,7 +40,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>

309
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -53,7 +53,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="工序名称">
<el-form-item v-if="false" label="工序名称">
<el-select
v-model="query.workorder_procedure"
clearable
@@ -65,12 +65,13 @@
>
<el-option
v-for="item in dict.workorder_procedure"
:key="item.detail_id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产日期">
<el-form-item v-if="false" label="生产日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
@@ -108,6 +109,16 @@
>
强制完成
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="show_sync_dialog = true"
>
同步
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog
@@ -115,76 +126,109 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px"
width="400px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="生产日期" prop="produce_date">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="16">
<el-form-item label="工单编号" prop="workorder_code">
<el-input v-model="form.workorder_code" :disabled="crud.status.edit" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="物料编码" prop="material_code">
<el-input
v-model="form.material_code"
:disabled="crud.status.edit"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="物料名称" prop="material_name">
<el-input
v-model="form.material_name"
style="width: 200px;"
disabled
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" :disabled="crud.status.edit" style="width: 200px;">
<span slot="suffix">盅</span>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="生产设备" prop="device_code">
<el-input
v-model="form.device_code"
:disabled="crud.status.edit"
style="width: 200px;"
clearable
@focus="deviceShow=true"
@clear="form.device_id='', form.device_code=''"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="工单状态">
<el-select
v-model="form.order_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 200px"
>
<el-option
v-for="item in dict.pdm_workorder_status"
:key="item.detail_id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item v-if="false" label="生产日期" prop="produce_date">
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="false" label="物料标识" prop="material_id">
<el-input v-model="form.material_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="生产设备">
<el-input
v-model="form.device_code"
style="width: 200px;"
clearable
@focus="deviceShow=true"
@clear="form.device_id='', form.device_code=''"
/>
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input
v-model="form.material_code"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input
v-model="form.material_name"
style="width: 200px;"
disabled
/>
</el-form-item>
<!-- <el-form-item label="物料规格" prop="material_spec">-->
<!-- <el-input-->
<!-- v-model="form.material_spec"-->
<!-- style="width: 200px;"-->
<!-- disabled-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具类型" prop="vehicle_type">
<!-- <el-form-item label="物料规格" prop="material_spec">-->
<!-- <el-input-->
<!-- v-model="form.material_spec"-->
<!-- style="width: 200px;"-->
<!-- disabled-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item v-if="false" label="载具类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" style="width: 200px" filterable placeholder="请选择">
<el-option
v-for="item in dict.vehicle_type"
:key="item.detail_id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="工单状态">
<el-select
v-model="form.order_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 200px"
>
<el-option
v-for="item in dict.pdm_workorder_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属工序" prop="workorder_procedure">
<el-form-item v-if="false" label="所属工序" prop="workorder_procedure">
<el-select
v-model="form.workorder_procedure"
clearable
@@ -195,12 +239,13 @@
>
<el-option
v-for="item in dict.workorder_procedure"
:key="item.detail_id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
<el-form-item v-if="false" label="计划开始时间" prop="planproducestart_date">
<el-date-picker
v-model="form.planproducestart_date"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -208,7 +253,7 @@
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="计划结束时间" prop="planproduceend_date">
<el-form-item v-if="false" label="计划结束时间" prop="planproduceend_date">
<el-date-picker
v-model="form.planproduceend_date"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -216,7 +261,7 @@
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="是否搬运" prop="is_needmove">
<el-form-item v-if="false" label="是否搬运" prop="is_needmove">
<el-radio
v-for="item in dict.is_or_not"
:key="item.id"
@@ -248,37 +293,37 @@
<!-- <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="device_name" label="生产设备" width="100" show-overflow-tooltip />
<el-table-column prop="order_status" label="工单状态">
<template slot-scope="scope">
{{ dict.label.pdm_workorder_status[scope.row.order_status] }}
</template>
</el-table-column>
<el-table-column prop="produce_date" label="生产日期" width="100px" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column v-if="false" prop="produce_date" label="生产日期" width="100px" />
<el-table-column v-if="false" prop="real_qty" label="实际数量" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<!-- <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />-->
<el-table-column prop="planproducestart_date" label="计划开始时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="planproduceend_date" label="计划结束时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="realproduceend_date" label="实际结束时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
<!-- <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />-->
<el-table-column v-if="false" prop="planproducestart_date" label="计划开始时间" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="planproduceend_date" label="计划结束时间" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="realproducestart_date" label="实际开始时间" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="realproduceend_date" label="实际结束时间" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="is_needmove" label="是否搬运">
<el-table-column v-if="false" prop="is_needmove" label="是否搬运">
<template slot-scope="scope">
{{ dict.label.is_or_not[scope.row.is_needmove] }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column v-if="false" prop="update_optname" label="修改人" />
<el-table-column v-if="false" prop="update_time" label="修改时间" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -288,6 +333,35 @@
</template>
</el-table-column>
</el-table>
<!--同步对话框-->
<el-dialog
:visible.sync="show_sync_dialog"
width="400px"
>
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="同步时间">
<el-date-picker
v-model="sync_time"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-value="default_date_show"
:picker-options="disabled_time"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="show_sync_dialog = false">取 消</el-button>
<el-button type="primary" @click="synchronize()">确 定</el-button>
</div>
</el-dialog>
<!--分页组件-->
<pagination />
</div>
@@ -343,7 +417,8 @@ const defaultForm = {
is_canupdate_update: '1',
material_spec: null,
sale_id: null,
workorder_procedure: ''
workorder_procedure: '',
workorder_code: null
}
export default {
name: 'Produceshiftorder',
@@ -375,47 +450,66 @@ export default {
workprocedureList: [],
order_status: ['-1'],
permission: {},
show_sync_dialog: false,
sync_time: '',
default_date_show: '',
disabled_time: {
disabledDate(time) {
return time.getTime() > Date.now() // 可选历史天、可选当前天、不可选未来天
}
},
rules: {
produceorder_code: [
{ required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
],
producedeviceorder_code: [
{ required: true, message: '机台工单号不能为空', trigger: 'blur' }
],
produce_date: [
{ required: true, message: '生产日期不能为空', trigger: 'blur' }
// produceorder_code: [
// { required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
// ],
// producedeviceorder_code: [
// { required: true, message: '机台工单号不能为空', trigger: 'blur' }
// ],
// produce_date: [
// { required: true, message: '生产日期不能为空', trigger: 'blur' }
// ],
workorder_code: [
{ required: true, message: '工单编号不能为空', trigger: 'change' }
],
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
{ required: true, message: '计划数量不能为空', trigger: 'change' }
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
],
planproducestart_date: [
{ required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
],
planproduceend_date: [
{ required: true, message: '计划生产结束时间不能为空', trigger: 'blur' }
material_name: [
{ required: true, message: '物料名称不能为空', trigger: 'change' }
],
// planproducestart_date: [
// { required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
// ],
// planproduceend_date: [
// { required: true, message: '计划生产结束时间不能为空', trigger: 'blur' }
// ],
order_status: [
{ required: true, message: '工单状态不能为空', trigger: 'blur' }
{ required: true, message: '工单状态不能为空', trigger: 'change' }
],
is_needmove: [
{ required: true, message: '是否搬运不能为空', trigger: 'blur' }
],
order_type_scode: [
{ required: true, message: '工单类型不能为空', trigger: 'blur' }
],
is_canupdate_update: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
workorder_procedure: [
{ required: true, message: '所属工序不能为空', trigger: 'blur' }
device_code: [
{ required: true, message: '生产设备不能为空', trigger: 'change' }
]
// is_needmove: [
// { required: true, message: '是否搬运不能为空', trigger: 'blur' }
// ],
// order_type_scode: [
// { required: true, message: '工单类型不能为空', trigger: 'blur' }
// ],
// is_canupdate_update: [
// { required: true, message: '不能为空', trigger: 'blur' }
// ],
// workorder_procedure: [
// { required: true, message: '所属工序不能为空', trigger: 'blur' }
// ]
}
}
},
created() {
this.default_date_show = new Date()
this.default_date_show.setMonth(new Date().getMonth() - 1)
},
methods: {
// 工单状态多选搜索
@@ -470,6 +564,15 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
synchronize() {
crudWorkorder.synchronize({ start_time: this.sync_time[0], end_time: this.sync_time[1] }).then(res => {
this.show_sync_dialog = false
this.sync_time = ''
this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.show_sync_dialog = false
})
}
}
}