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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-09 18:50:20 +08:00
parent 95fbac5818
commit dc461002df
22 changed files with 252 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/qd/src/api/wms/st/in/workprocedureios.js
View File

@@ -70,4 +70,12 @@ export function getEndAareaByworkprocedureId(data) {
data
})
}
export default { add, edit, del, getBillTypes, selectStartPoint, getStartArea, getEndArea, genTask, getEndAareaByworkprocedureId }
export function getWorkProce(data) {
return request({
url: 'api/workprocedureiosIn/getWorkProce',
method: 'post',
data
})
}
export default { add, edit, del, getBillTypes, selectStartPoint, getStartArea, getEndArea, genTask, getEndAareaByworkprocedureId, getWorkProce }

8
mes/qd/src/views/wms/basedata/master/material/index.vue
View File

@@ -113,7 +113,12 @@
/>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<el-form-item label="静置时间" prop="standing_time">
<el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="is_used">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
@@ -141,6 +146,7 @@
<el-table-column prop="material_model" label="物料型号" />
<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"/>
<el-table-column prop="product_series_name" label="系列" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">

17
mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue
View File

@@ -125,6 +125,12 @@
<el-table-column prop="storagevehicle_type_name" label="载具类型" />
<el-table-column prop="storagevehicle_code" label="载具编码" />
<el-table-column prop="storagevehicle_name" label="载具名称" />
<el-table-column prop="is_task" label="是否搬运中" :formatter="formatIsTask"/>
<el-table-column prop="point_code" label="当前点位" width="120px"/>
<el-table-column prop="start_point_code" label="起点" width="120px"/>
<el-table-column prop="next_point_code" label="终点" width="120px"/>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -136,11 +142,11 @@
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="create_time" label="创建时间" width="150px"/>
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
label="操作"
width="50px"
width="100px"
align="center"
fixed="right"
>
@@ -343,6 +349,13 @@ export default {
crudStoragevehicleinfo.getVehicle(code).then(res => {
this.form.storagevehicle_code = res.value
})
},
formatIsTask(row) {
if (row.is_task === '1') {
return '是'
} else {
return '否'
}
}
}
}

58
mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue
View File

@@ -32,52 +32,6 @@
<el-form-item label="工序名称" prop="workprocedure_name">
<el-input v-model="form.workprocedure_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="对应工段" prop="worksection_type_scode">
<el-select
v-model="form.worksection_type_scode"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.PDM_BI_SECTION"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="分段计算类型" prop="burst_type_scode">
<el-select
v-model="form.burst_type_scode"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.PDM_BI_BURSTTYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否关键工序" prop="is_keyworkprocedure">
<el-switch
v-model="form.is_keyworkprocedure"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item label="是否首道工序" prop="is_first">
<el-switch
v-model="form.is_first"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch
v-model="form.is_used"
@@ -109,18 +63,6 @@
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
<el-table-column prop="workprocedure_code" sortable label="工序编码" />
<el-table-column prop="workprocedure_name" label="工序名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="worksection_type_scode" label="对应工段">
<template slot-scope="scope">
{{ dict.label.PDM_BI_SECTION[scope.row.worksection_type_scode] }}
</template>
</el-table-column>
<el-table-column prop="burst_type_scode" label="分段计算类型" width="110">
<template slot-scope="scope">
{{ dict.label.PDM_BI_BURSTTYPE[scope.row.burst_type_scode] }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="is_keyworkprocedure" label="是否关键工序" width="110" :formatter="format_isOrNot" />
<el-table-column prop="is_first" label="是否首道工序" width="110" :formatter="format_isOrNot" />
<el-table-column prop="is_used" label="是否启用" :formatter="format_isOrNot" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人" />

14
mes/qd/src/views/wms/st/in/EndPointDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="请选择终点点位"
title="请选择暂存点位"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
@@ -39,8 +39,8 @@
</template>
</el-table-column>
<el-table-column prop="struct_code" label="终点点位编码" show-overflow-tooltip />
<el-table-column prop="struct_name" label="终点点位名称" show-overflow-tooltip />
<el-table-column prop="point_code" label="终点点位编码" show-overflow-tooltip />
<el-table-column prop="point_name" label="终点点位名称" show-overflow-tooltip />
<el-table-column prop="area_type" label="所属区域" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_area_type[scope.row.area_type] }}
@@ -106,7 +106,6 @@ export default {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
this.material = this.openParam
}
}
},
@@ -121,11 +120,8 @@ export default {
},
open() {
console.log(this.openParam)
debugger
this.query.material_id = this.openParam.material_id
this.query.area_type = this.openParam.area_type
this.query.vehicle_code = this.openParam.vehicle_code
this.query.qty = this.openParam.qty
// this.query.area_type = 'ZCQ01'
this.query.workprocedure_id = this.openParam.workprocedure_id
this.crud.toQuery()
},
close() {

292
mes/qd/src/views/wms/st/in/index.vue
View File

@@ -46,6 +46,7 @@
v-model="form.bill_type"
placeholder=""
style="width: 200px"
@change="getWorkProce"
>
<el-option
v-for="item in bill_types"
@@ -62,7 +63,8 @@
v-model="form.workprocedure_id"
placeholder=""
style="width: 200px"
@change="selectStartPoint(form.workprocedure_id)"
@change="selectStartPoint"
:disabled="true"
>
<el-option
v-for="item in workprocedures"
@@ -92,7 +94,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="数量">
<el-form-item label="数量" prop="qty">
<label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
<el-input v-model="form.qty" style="width: 200px;" />
</el-form-item>
@@ -124,11 +126,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="false" label="终点点位">
<el-input v-model="form.end_point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="终点点位" prop="end_point_name">
<el-input v-model="form.end_point_name" style="width: 200px;" @focus="getEndPoint(form.material_id,form.end_area,form.vehicle_code,form.qty)" />
<el-input v-model="form.end_point_name" style="width: 200px;" @focus="getEndPoint" />
</el-form-item>
</el-col>
</el-row>
@@ -168,46 +167,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="客户名称">
<el-select v-model="form.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
<el-option
v-for="item in custList"
:key="item.cust_id"
:label="item.cust_name"
:value="item.cust_id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="黏次">
<label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
<el-input v-model="form.mix_seq" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>-->
<el-row :gutter="20">
<el-col :span="12">
<el-form-item v-if="false" label="是否满托" prop="is_full">
<el-radio v-model="form.is_full" label="1">是</el-radio>
<el-radio v-model="form.is_full" label="0">否</el-radio>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="false" label="物料工序">
<el-select v-model="form.ivt_workprocedure_id" disabled filterable clearable class="filter-item" style="width: 200px">
<el-option
v-for="item in workprocedures"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注">
@@ -222,195 +181,6 @@
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--工序入库单详情查看-->
<el-dialog
:visible.sync="lookDialog"
title="工序入库单详情查看"
width="800px"
>
<el-form ref="form1" disabled :model="form1" :rules="rules" size="mini" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="单据类型" prop="bill_type">
<el-select
v-model="form1.bill_type"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in bill_types"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属工序" prop="workprocedure_id">
<el-select
v-model="form1.workprocedure_id"
placeholder=""
style="width: 200px"
@change="selectStartPoint(form.workprocedure_id)"
>
<el-option
v-for="item in workprocedures"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item v-if="false" label="物料id">
<el-input v-model="form1.material_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料" prop="material_name">
<label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料</label>
<el-input v-model="form1.material_name" style="width: 200px;" @focus="getMater" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form1.vehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="数量">
<label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
<el-input v-model="form1.qty" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="批次">
<label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
<el-input v-model="form1.pcsn" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="起始点位">
<el-select
v-model="form1.start_point_code"
placeholder=""
style="width: 200px"
clearable
@change="getStartArea(form.start_point_code)"
>
<el-option
v-for="item in startPoints"
:key="item.point_code"
:label="item.point_name"
:value="item.point_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="false" label="终点点位">
<el-input v-model="form1.end_point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="终点点位">
<el-input v-model="form1.end_point_name" style="width: 200px;" @focus="getEndPoint" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="起始区域">
<el-select
v-model="form1.start_area"
placeholder=""
style="width: 200px"
disabled
>
<el-option
v-for="item in dict.sch_area_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="终点区域">
<el-select
v-model="form1.end_area"
placeholder=""
style="width: 200px"
disabled
>
<el-option
v-for="item in dict.sch_area_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="客户名称">
<el-select v-model="form1.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
<el-option
v-for="item in custList"
:key="item.cust_id"
:label="item.cust_name"
:value="item.cust_id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="黏次">
<label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
<el-input v-model="form1.mix_seq" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>-->
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否满托">
<el-radio v-model="form1.is_full" label="1">是</el-radio>
<el-radio v-model="form1.is_full" label="0">否</el-radio>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="false" label="物料工序">
<el-select v-model="form1.ivt_workprocedure_id" disabled filterable clearable class="filter-item" style="width: 200px">
<el-option
v-for="item in workprocedures"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
<el-input v-model="form1.remark" :rows="3" type="textarea" style="width: 600px;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="lookDialog=false">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
@@ -426,7 +196,7 @@
@select-all="onSelectAll"
>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" width="120">
<el-table-column prop="bill_code" label="单据编号" width="140">
<template slot-scope="scope">
<el-link type="warning" @click="lookUp(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
@@ -592,9 +362,6 @@ export default {
material_name: [
{ required: true, message: '物料不能为空', trigger: 'change' }
],
vehicle_code: [
{ required: true, message: '载具编码不能为空', trigger: 'blur' }
],
start_point_code: [
{ required: true, message: '起点点位不能为空', trigger: 'blur' }
],
@@ -603,6 +370,9 @@ export default {
],
is_full: [
{ required: true, message: '是否满托不能为空', trigger: 'blur' }
],
qty: [
{ required: true, message: '数量不能为空', trigger: 'blur' }
]
},
queryTypeOptions: [
@@ -653,26 +423,12 @@ export default {
})
},
async selectStartPoint(workprocedureid) {
this.form.start_point_code = null
this.form.start_area = null
this.form.end_area = null
this.form.end_point_code = null
this.form.end_point_name = null
this.form.ivt_workprocedure_id = workprocedureid
// eslint-disable-next-line no-unused-vars
const end_area = this.form.end_area
const queryData = { // eslint-disable-line no-unused-vars
const queryData = {
workprocedureid: workprocedureid
}
await crudWorkprocedureios.selectStartPoint(queryData).then(res => {
this.startPoints = res
})
await crudWorkprocedureios.getEndAareaByworkprocedureId({ workprocedure_id: this.form.workprocedure_id }).then(res => {
if (end_area === '' || end_area === null || end_area === undefined) {
this.form.end_area = res.end_area
}
this.form.qty_unit_id = res.qty_unit_id
})
},
getStartArea(start_point_code) {
const queryData = { // eslint-disable-line no-unused-vars
@@ -682,11 +438,10 @@ export default {
this.form.start_area = res.area_type
})
},
getEndPoint(material_id, end_area, vehicle_code, qty) {
debugger
const material = { material_id: material_id, area_type: end_area, vehicle_code: vehicle_code, qty: qty }
this.openParam = material
console.log(this.openParam)
getEndPoint() {
this.openParam = {
'workprocedure_id': this.form.workprocedure_id
}
this.endPointDialog = true
},
getMater() {
@@ -698,8 +453,8 @@ export default {
this.form.material_name = row.material_name
},
tableChanged2(row) {
this.form.end_point_code = row.struct_code
this.form.end_point_name = row.struct_name
this.form.end_point_code = row.point_code
this.form.end_point_name = row.point_name
this.getEndArea(this.form.end_point_code)
},
getEndArea(end_point_code) {
@@ -710,6 +465,21 @@ export default {
this.form.end_area = res.area_type
})
},
getWorkProce(value) {
debugger
this.form.start_point_code = ''
this.form.start_area = ''
this.form.end_area = ''
this.form.end_point_code = ''
this.form.end_point_name = ''
const data = {
'type': value
}
crudWorkprocedureios.getWorkProce(data).then(res => {
this.form.workprocedure_id = res.workprocedure_id
this.selectStartPoint(res.workprocedure_id)
})
},
handleSelectionChange(val, row) {
if (val.length > 1) {
this.$refs.table.clearSelection()