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

rev：输送机和堆垛机业务

Browse Source
This commit is contained in:
gengby
2024-06-20 09:00:28 +08:00
parent 804ef3a786
commit 0694fb53fd
6 changed files with 476 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

333
nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue
View File

@@ -65,103 +65,255 @@
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="关联设备：" prop="getLinkDeviceCode" label-width="150px">
<el-select
v-model="form.getLinkDeviceCode"
filterable
clearable
reserve-keyword
placeholder="请选择输送线设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="自动申请AGV任务:" label-width="150px">
<el-switch v-model="form.applyTask"/>
<el-col :span="6">
<el-form-item label="堆垛机对接位：" label-width="110px" prop="stackerDock">
<el-switch v-model="form.stackerDock" />
</el-form-item>
</el-col>
<span v-if="form.stackerDock">
<el-col :span="6">
<el-form-item label="当前排：" label-width="110px" prop="currentX">
<el-input v-model.number="form.currentX" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前列：" label-width="150px" prop="currentY">
<el-input v-model.number="form.currentY" style="width: 130px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前层：" label-width="110px" prop="currentZ">
<el-input v-model.number="form.currentZ" style="width: 170px" />
</el-form-item>
</el-col>
</span>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="当前排：" label-width="150px" prop="currentX">
<el-input v-model.number="form.currentX" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="当前列：" label-width="150px" prop="currentY">
<el-input v-model.number="form.currentY" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="当前层：" label-width="150px" prop="currentZ">
<el-input v-model.number="form.currentZ" />
<el-col :span="6">
<el-form-item label="堆垛机双任务：" label-width="110px" prop="stackerDoubleTask">
<el-switch v-model="form.stackerDoubleTask" />
</el-form-item>
</el-col>
<span v-if="form.stackerDoubleTask">
<el-col :span="6">
<el-form-item label="关联设备：" prop="getLinkDeviceCode" label-width="110px">
<el-select
v-model="form.getLinkDeviceCode"
filterable
clearable
reserve-keyword
placeholder="请选择输送线设备"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</span>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="出库缓存设备：" prop="cacheDeviceCode" label-width="150px">
<el-select
v-model="form.cacheDeviceCode"
filterable
clearable
reserve-keyword
placeholder="出库缓存设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
<el-col :span="6">
<el-form-item label="输送指令起点：" label-width="110px" prop="conveyorStartPoint">
<el-switch v-model="form.conveyorStartPoint" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出库禁止查找设备：" prop="checkoutStartDeviceCode" label-width="150px">
<el-select
v-model="form.checkoutStartDeviceCode"
filterable
clearable
multiple
reserve-keyword
placeholder="出库禁止查找设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
<span v-if="form.conveyorStartPoint">
<el-col :span="6">
<el-form-item label="目标设备：" prop="targetDeviceCode" label-width="110px">
<el-select
v-model="form.targetDeviceCode"
filterable
clearable
multiple
reserve-keyword
placeholder="请选择输送线设备"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="关联拣选台：" label-width="150px" prop="linkPinkDevice">
<el-switch v-model="form.linkPinkDevice" />
</el-form-item>
</el-col>
<span v-if="form.linkPinkDevice">
<el-col :span="6">
<el-form-item label="关联拣选设备：" prop="pinkDeviceCode" label-width="110px">
<el-select
v-model="form.pinkDeviceCode"
filterable
clearable
reserve-keyword
placeholder="拣选关联设备"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</span>
</span>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="输送指令终点：" label-width="110px" prop="conveyorEndPoint">
<el-switch v-model="form.conveyorEndPoint" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联拣选台设备：" prop="pinkDeviceCode" label-width="150px">
<el-select
v-model="form.pinkDeviceCode"
filterable
clearable
reserve-keyword
placeholder="拣选关联设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
<span v-if="form.conveyorEndPoint">
<el-col :span="6">
<el-form-item label="禁止查找起点：" prop="checkoutStartDeviceCode" label-width="110px">
<el-select
v-model="form.checkoutStartDeviceCode"
filterable
clearable
multiple
reserve-keyword
placeholder="禁止查找起点"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自动申请AGV任务:" label-width="150px">
<el-switch v-model="form.applyTask" />
</el-form-item>
</el-col>
</span>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="输送缓存设备：" label-width="110px" prop="conveyorCachePoint">
<el-switch v-model="form.conveyorCachePoint" />
</el-form-item>
</el-col>
<span v-if="form.conveyorCachePoint">
<el-col :span="6">
<el-form-item label="关联指令终点：" prop="cacheDeviceCode" label-width="110px">
<el-select
v-model="form.cacheDeviceCode"
filterable
clearable
reserve-keyword
placeholder="请选择要查询的指令终点"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</span>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="拣选台设备：" label-width="110px" prop="pinkDevicePoint">
<el-switch v-model="form.pinkDevicePoint" />
</el-form-item>
</el-col>
<span v-if="form.pinkDevicePoint">
<el-col :span="6">
<el-form-item label="关联拣选设备：" prop="pinkDeviceCode" label-width="110px">
<el-select
v-model="form.pinkDeviceCode"
filterable
clearable
reserve-keyword
placeholder="拣选关联设备"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</span>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="双向点位：" label-width="110px" prop="toWay">
<el-switch v-model="form.toWay" />
</el-form-item>
</el-col>
<span v-if="form.toWay">
<el-col :span="6">
<el-form-item label="所属输送线：" prop="belongToConveyor" label-width="110px">
<el-select
v-model="form.belongToConveyor"
filterable
clearable
reserve-keyword
placeholder="所属输送线"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</span>
<el-col :span="6">
<el-form-item label="同一出入点：" label-width="110px" prop="samePoint">
<el-switch v-model="form.samePoint" />
</el-form-item>
</el-col>
<span v-if="!form.samePoint">
<el-col :span="6">
<el-form-item label="关联出入点：" prop="linkInOutDevice" label-width="110px">
<el-select
v-model="form.linkInOutDevice"
filterable
clearable
reserve-keyword
placeholder="所属输送线"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</span>
</el-row>
</el-form>
</el-card>
@@ -198,7 +350,6 @@
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
@@ -334,7 +485,19 @@ export default {
address: '',
cacheDeviceCode: '',
pinkDeviceCode: '',
checkoutStartDeviceCode: null
checkoutStartDeviceCode: null,
targetDeviceCode: null,
stackerDock: false,
stackerDoubleTask: false,
conveyorStartPoint: false,
linkPinkDevice: false,
conveyorEndPoint: false,
conveyorCachePoint: false,
pinkDevicePoint: false,
toWay: false,
belongToConveyor: null,
linkInOutDevice: '',
samePoint: false
},
rules: {}
}

2
nladmin-ui/src/views/acs/device/index.vue
View File

@@ -160,7 +160,7 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="device_id" :label="$t('device.device_table_title.device_identification')" />
<el-table-column sortable prop="device_code" :label="$t('device.device_table_title.device_encoding')" :min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))" />
<el-table-column sortable :label="$t('device.device_table_title.device_name')" :prop="$langPre.computedProp('device_name')" :min-width="flexWidth($langPre.computedProp('device_name'),crud.data,$t('device.device_table_title.device_name'))" />
<el-table-column sortable :label="$t('device.device_table_title.device_name')" prop="device_name" :min-width="flexWidth($langPre.computedProp('device_name'),crud.data,$t('device.device_table_title.device_name'))" />
<el-table-column prop="device_type_name" :label="$t('device.device_table_title.device_type')" :min-width="flexWidth('device_type_name',crud.data,$t('device.device_table_title.device_type'))">
<template slot-scope="scope">
<div>{{ scope.row.device_type_name }}</div>