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

add:三线清洗功能

Browse Source
This commit is contained in:
zhangzq
2024-02-26 09:11:47 +08:00
parent cde116d4f0
commit 45377df88e
45 changed files with 1090 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/storagevehicleinfo.js
View File

@@ -45,6 +45,13 @@ export function vehileInfo(data) {
})
}
export function vehicleext(data) {
return request({
url: 'api/storagevehicleinfo/vehicleext?vehicle_code='+data,
method: 'get',
})
}
export function updateVehicleMaterial(data) {
return request({
url: 'api/storagevehicleinfo/updateVehicleMaterial',
@@ -53,4 +60,4 @@ export function updateVehicleMaterial(data) {
})
}
export default { add, edit, del, changeActive, getVehicle, vehileInfo, updateVehicleMaterial }
export default { add, edit, del, changeActive, getVehicle, vehileInfo, vehicleext, updateVehicleMaterial }

0
mes/qd/src/views/wms/staging_manage/staging/kzStaging/ViewDialog.vue → mes/qd/src/views/wms/staging_manage/fhstaging/ViewDialog.vue
View File

11
mes/qd/src/views/wms/staging_manage/staging/kzStaging/kzStaging.js → mes/qd/src/views/wms/staging_manage/fhstaging/fhstaging.js
View File

@@ -66,12 +66,19 @@ export function vehileInfo(data) {
method: 'get',
})
}
export function editvehicle(data) {
return request({
url: '/api/pda/fhwash/vechileRelease',
method: 'post',
data
})
}
export function setEmp(data) {
return request({
url: 'api/point/setEmp',
url: '/api/pda/fhwash/release',
method: 'post',
data
})
}
export default { add, edit, del, changeActive, setEmp, getPoint, getRegion, changeUsed, vehileInfo }
export default { add, edit, del, changeActive, setEmp, getPoint, getRegion, changeUsed, editvehicle }

65
mes/qd/src/views/wms/staging_manage/staging/kzStaging/index.vue → mes/qd/src/views/wms/staging_manage/fhstaging/index.vue
View File

@@ -14,32 +14,18 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产车间">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="设备编号">
<el-form-item label="点位编码">
<el-input
v-model="query.search"
v-model="query.point_code"
clearable
size="mini"
placeholder="设备编号模糊查询"
placeholder="点位编码"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="设备编号">
<el-form-item >
<rrOperation :permission="permission" />
</el-form-item>
</el-form>
@@ -79,8 +65,8 @@
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="materialForm.material_spec" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料数量" prop="storage_qty">
<el-input v-model="materialForm.storage_qty" clearable style="width: 370px;" />
<el-form-item label="物料数量" prop="qty">
<el-input v-model="materialForm.qty" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="物料重量" prop="weight">
<el-input v-model="materialForm.weight" clearable style="width: 370px;" />
@@ -113,7 +99,7 @@
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="materialForm.material_spec" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料数量" prop="storage_qty">
<el-form-item label=" " prop="storage_qty">
<el-input v-model="materialForm.qty" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="锁定类型" prop="lock_type">
@@ -163,32 +149,25 @@
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="120" show-overflow-tooltip>
<!-- <template slot-scope="scope">-->
<!-- <el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_status" label="点位状态">
<template slot-scope="scope">
{{ scope.row.point_status == '2' ? '有料' : scope.row.point_status == '3'?'空载具':'空位' }}
</template>
</el-table-column>
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="region_code" label="region_code" min-width="120" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" min-width="100">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row.vehicle_code)">{{ scope.row.vehicle_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="material_spec" label="物料规格" />
<el-table-column prop="workprocedure_id" label="工序" />
<el-table-column prop="qty" label="数量" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<el-table-column prop="weight" label="重量" />
<el-table-column prop="point_status" label="点位状态">
<template slot-scope="scope">
{{ scope.row.is_used == '1' ? '是' : '否' }}
{{ scope.row.point_status == '2' ? '有料' : scope.row.point_status == '3'?'空载具':'空位' }}
</template>
</el-table-column>
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column v-permission="[]" label="操作" width="100px" align="center" fixed="right">
<template slot-scope="scope">
@@ -217,7 +196,7 @@
</template>
<script>
import crudDevice from '@/views/wms/staging_manage/staging/kzStaging/kzStaging.js'
import crudDevice from '@/views/wms/staging_manage/fhstaging/fhstaging.js'
import CRUD, { crud, presenter, header, form } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
@@ -227,15 +206,15 @@ import ViewDialog from '@/views/wms/staging_manage/staging/kzStaging/ViewDialog'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudStoragevehicleinfo from '@/views/wms/masterdata_manage/master/storagevehicleinfo/storagevehicleinfo'
const defaultForm = { product_area: 'A1', region_code: 'A1_KZHC', workprocedure_id: '1535144552481034240', device_code: null, material_id: null, material_name: null, material_spec: null, deviceinstor_qty: null, deviceinstor_weight: null, remark: null }
const defaultForm = {region_code: 'A3_FHHC'}
export default {
name: 'SKdevice',
name: 'fhstaging',
components: { crudOperation, pagination, udOperation, rrOperation, ViewDialog, MaterDtl },
dicts: ['product_area', 'd_lock_type', 'point_status'],
dicts: [],
cruds() {
return [
CRUD({ title: '刻字缓存区', url: 'api/point/queryVehicle', query: { product_area: 'A1', region_code: 'A1_KZHC' }, idField: 'device_code', crudMethod: { ...crudDevice }, optShow: {
CRUD({ title: '退火缓存区', url: '/api/pda/fhwash/staging', query: { region_code: 'A3_FHHC' }, idField: 'point_id', crudMethod: { ...crudDevice }, optShow: {
add: false,
edit: false,
del: false,
@@ -307,7 +286,7 @@ export default {
})
},
pointMateriSubmit() {
crudDevice.edit(this.materialForm).then(res => {
crudDevice.editvehicle(this.materialForm).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.materiValueCancel()
this.crud.refresh()
@@ -316,7 +295,7 @@ export default {
})
},
toView(row) {
crudStoragevehicleinfo.vehileInfo(row).then(data => {
crudStoragevehicleinfo.vehicleext(row).then(data => {
this.dialogVisible = true
this.materialForm = data
})