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

rev:刻字上料输送线任务顺序

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-11 16:36:16 +08:00
parent dc5031c9fa
commit b345ea5757
7 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/qd/src/api/wms/basedata/pdm/workProcedure.js
View File

@@ -24,9 +24,11 @@ export function edit(data) {
})
}
export function downSelect() {
export function downSelect(params) {
return request({
url: 'api/workProcedure/downSelect'
url: 'api/workProcedure/downSelect',
method: 'get',
params
})
}

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

@@ -256,6 +256,7 @@
v-model="form.product_area"
placeholder=""
style="width: 200px"
@change="getworkprocedureByarea(form.product_area)"
>
<el-option
v-for="item in dict.product_area"
@@ -275,7 +276,7 @@
@change="getNotWorkDeviceByWorkproceduceId(form.workprocedure_id)"
>
<el-option
v-for="item in workprocedureList"
v-for="item in workprocedureListArea"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
@@ -288,6 +289,7 @@
clearable
class="filter-item"
style="width: 200px;"
@change="changeEvent1(form.device_code)"
>
<el-option
v-for="item in deviceList"
@@ -401,14 +403,6 @@
<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-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-if="form.workprocedure_id == '1535144822984282112'" label="拆箱输送正转" prop="is_foreward">
<el-radio
v-for="item in dict.IS_OR_NOT"
@@ -418,7 +412,17 @@
>{{ item.label }}
</el-radio>
</el-form-item>
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="封箱机自动确认" prop="auto_confirm">
<el-form-item v-if="form.workprocedure_id == '1535144822984282112'" disabled label="装箱机" prop="ealing_device_code">
<el-select
disabled
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-if="form.workprocedure_id == '1535144822984282112'" label="装箱机确认" prop="auto_confirm">
<el-select
v-model="form.package_ext.auto_confirm"
style="width: 200px"
@@ -426,7 +430,7 @@
<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-form-item v-if="form.workprocedure_id == '1535144822984282112'" label="装箱机确认时间" prop="time">
<el-input-number
v-model="form.package_ext.time"
style="width: 200px;"
@@ -690,9 +694,10 @@ export default {
data() {
return {
workprocedureList: [],
workprocedureListArea: [],
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号拆箱机' }],
cxj: [{ value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_2', label: '一线2号拆箱机' }],
trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
deviceList: [],
classes3: [],
@@ -748,6 +753,23 @@ export default {
methods: {
databaseUploadApi() {
},
changeEvent1(device){
if (device=='A1_BZJ_1'){
this.form.package_ext.ealing_device_code = 'A1_ZXJ_1'
}
if (device=='A1_BZJ_2'){
this.form.package_ext.ealing_device_code = 'A1_ZXJ_2'
}
},
changeEvent2(form){
if ((form.device_code=='A1_BZJ_1') && (form.package_ext.unboxing_device_code == 'A1_KXJ_1')){
this.form.package_ext.is_foreward = '1'
}
if ((form.device_code=='A1_BZJ_2') && (form.package_ext.unboxing_device_code == 'A1_KXJ_2')){
this.form.package_ext.is_foreward = '1'
}
this.form.package_ext.is_foreward = '0'
},
formatBoolean: function(row, column) {
var ret = ''
@@ -960,10 +982,16 @@ export default {
},
getworkprocedure() {
// 查询工序
crudWorkProcedure.downSelect({}).then(res => {
crudWorkProcedure.downSelect().then(res => {
this.workprocedureList = res
})
},
getworkprocedureByarea(area) {
const params = { product_area: area }
crudWorkProcedure.downSelect(params).then(res => {
this.workprocedureListArea = res
})
},
// 下发
submits(rows) {
var orders = []