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

rev:刻字包装调度代码/半成品入库数量改重量

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-11 09:26:57 +08:00
parent 7ea3d22904
commit 35f70da133
28 changed files with 177 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/qd/src/views/wms/product_manage/workorder/AddDialog.vue
View File

@@ -77,9 +77,9 @@
</template>
</el-table-column>
<el-table-column v-if="false" prop="material_id" label="物料标识" align="center"/>
<el-table-column prop="material_code" label="物料编码" align="center" width="190px">
<el-table-column prop="materialCode" label="物料编码" align="center" width="190px">
<template scope="scope">
<el-input v-model="scope.row.material_code" disabled class="input-with-select">
<el-input v-model="scope.row.materialCode" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)"/>
</el-input>
</template>
@@ -230,7 +230,7 @@ export default {
is_used_fxx: false,
report_qty: '',
material_id: '',
material_code: '',
materialCode: '',
material_weight: '',
planproducestart_date: date,
planproduceend_date: formatter1,
@@ -252,6 +252,7 @@ export default {
crudWorkProcedure.downSelect({}).then(res => {
this.workprocedureList = res
})
console(this.form)
},
copyAdd() {
if (!this.current_row) {
@@ -290,7 +291,7 @@ export default {
},
setMaterValue(row) {
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
this.nowrow.materialCode = row.material_code
this.nowrow.material_name = row.material_name
this.nowrow.material_spec = row.material_spec
this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新

40
mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
View File

@@ -20,11 +20,11 @@
</el-form-item>
<el-form-item label="物料编码">
<el-input
v-model="form.material_code"
v-model="form.materialCode"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
@clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item label="物料名称">
@@ -148,16 +148,32 @@
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="包装模版" prop="package_model">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
<el-select
v-model="form.package_ext.auto_confirm" style="width: 200px" >
<el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
<el-input-number
v-model="form.package_ext.time"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
<el-input v-model="form.package_ext.package_model" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱数量" prop="demol_num">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
<el-input v-model="form.package_ext.demol_num" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
<el-input v-model="form.package_ext.order_bag_num" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="码盘模版" prop="stack_model">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
<el-input v-model="form.package_ext.one_bag_weight" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
<el-input v-model="form.package_ext.stack_model" style="width: 200px;" />
</el-form-item>
@@ -239,6 +255,7 @@ export default {
data() {
return {
dialogVisible: false,
auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
trueorfalse:[{value: true, label: '是' }, {value: false, label: '否'}],
reportStatus:[{value: '1', label: '创建记录' }, {value: '2', label: '报工完成'}, {value: '3', label: '审核完成'}],
form: {
@@ -297,10 +314,18 @@ export default {
crudProduceshiftorder.reportQuery3({ workorder_code: this.form.workorder_code }).then(res => {
this.tableData = res.content
})
if (this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.parse(this.form.package_ext)
}
},
close() {
this.$emit('AddChanged')
if (JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.stringify(this.form.package_ext)
}else {
this.form.package_ext = ''
}
},
formatBoolean: function(row, column) {
alert(row)
var ret = ''
@@ -325,9 +350,6 @@ export default {
this.workprocedureList = res
})
},
close() {
this.$emit('AddChanged')
},
setForm(row) {
this.dialogVisible = true
this.form = row

54
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -290,13 +290,13 @@
<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="物料编码" prop="material_code">
<el-form-item label="物料编码" prop="materialCode">
<el-input
v-model="form.material_code"
v-model="form.materialCode"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
@clear="form.material_id='',form.materialCode='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
@@ -370,7 +370,7 @@
<el-option v-for="item in trueorfalse" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否启用封箱线" prop="is_used_fxx">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
@@ -379,19 +379,19 @@
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="拆箱机" prop="unboxing_device_code">
<el-select
v-model="form.package_ext.unboxing_device_code" style="width: 200px" >
<el-option v-for="item in cxj" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机" prop="ealing_device_code">
<el-select
v-model="form.package_ext.ealing_device_code" style="width: 200px" >
<el-option v-for="item in zxj" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="是否翻转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
@@ -400,28 +400,48 @@
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="包装模版" prop="package_model">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
<el-select
v-model="form.package_ext.auto_confirm" style="width: 200px" >
<el-option v-for="item in auto_confirm" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机确认时间" prop="time">
<el-input-number
v-model="form.package_ext.time"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱模版" prop="package_model">
<el-input-number
v-model="form.package_ext.package_model"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="拆箱数量" prop="demol_num">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总箱数" prop="demol_num">
<el-input-number
v-model="form.package_ext.demol_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="总袋量" prop="order_bag_num">
<el-input-number
v-model="form.package_ext.order_bag_num"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-show="form.workprocedure_id == '1535144822984282112'" label="码盘模版" prop="stack_model">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="每袋重量(g)" prop="one_bag_weight">
<el-input-number
v-model="form.package_ext.one_bag_weight"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="巷道码盘模版" prop="stack_model">
<el-input-number
v-model="form.package_ext.stack_model"
style="width: 200px;"
@@ -462,7 +482,7 @@
<el-table-column prop="outupperlimit_qty" label="满筐数量" />
<el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
<el-table-column prop="real_qty" label="报工总数" />
<el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="materialCode" label="物料编码" :min-width="flexWidth('materialCode',crud.data,'物料编码')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
<el-table-column
@@ -578,7 +598,7 @@ const defaultForm = {
person_real_qty: null,
dq_real_qty: null,
material_id: null,
material_code: null,
materialCode: null,
material_weight: null,
material_name: null,
material_spec: null,
@@ -643,6 +663,7 @@ export default {
data() {
return {
zxj: [ { value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
auto_confirm: [ { value: '1', label: '自动确认' }, { value: '2', label: '定时确认' }, { value: '3', label: '人工确认' }],
cxj: [ { value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_1', label: '一线2号拆箱机' }],
trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
deviceList: [],
@@ -672,7 +693,7 @@ export default {
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
material_code: [
materialCode: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
],
order_status: [
@@ -820,7 +841,6 @@ export default {
},
// 查看
toView(row) {
console.log(row)
if (row !== null) {
this.$refs.child3.setForm(row)
}
@@ -907,7 +927,7 @@ export default {
// 新增编辑给form表单物料相关信息赋值
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.materialCode = row.material_code
this.form.material_name = row.material_name
this.form.material_spec = row.material_spec
},
@@ -961,7 +981,7 @@ export default {
[CRUD.HOOK.beforeToEdit]() {
console.log(this.form.package_ext)
console.log(this.form)
if (this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
if (this.form.package_ext != undefined && this.form.package_ext != null && JSON.stringify(this.form.package_ext).length>3){
this.form.package_ext = JSON.parse(this.form.package_ext)
}