Browse Source

J托盘

master
常熟吴彦祖 1 week ago
parent
commit
0e54f9a131
  1. 47
      src/views/modules/haianWarehouse/automatedWarehouse/agvTask54.vue
  2. 2
      src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue
  3. 9
      src/views/modules/haianWarehouse/wcsSystem/emptyPalletType54.vue

47
src/views/modules/haianWarehouse/automatedWarehouse/agvTask54.vue

@ -41,9 +41,21 @@
<el-form-item label="托盘编码"> <el-form-item label="托盘编码">
<el-input style="width: 150px;" v-model="queryHeaderData.palletId" placeholder="请输入托盘编码" clearable @keyup.enter.native="getDataList()"></el-input> <el-input style="width: 150px;" v-model="queryHeaderData.palletId" placeholder="请输入托盘编码" clearable @keyup.enter.native="getDataList()"></el-input>
</el-form-item> </el-form-item>
<!-- 目标站点按输入片段模糊查询 - rqrq -->
<el-form-item label="目标站点"> <el-form-item label="目标站点">
<el-input style="width: 150px;" v-model="queryHeaderData.toLocation" placeholder="请输入目标站点" clearable @keyup.enter.native="getDataList()"></el-input> <el-input style="width: 150px;" v-model="queryHeaderData.toLocation" placeholder="请输入目标站点" clearable @keyup.enter.native="getDataList()"></el-input>
</el-form-item> </el-form-item>
<!-- 目标区域下拉取当前工厂全部 haian_area,提交 areaId 做精确筛选 - rqrq -->
<el-form-item label="目标区域">
<el-select v-model="queryHeaderData.toArea" placeholder="请选择" style="width: 150px;" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.areaId"
:label="item.areaDesc || item.areaId"
:value="item.areaId"
/>
</el-select>
</el-form-item>
<el-form-item label="任务状态"> <el-form-item label="任务状态">
<el-select v-model="queryHeaderData.status" placeholder="请选择" style="width: 150px;" clearable> <el-select v-model="queryHeaderData.status" placeholder="请选择" style="width: 150px;" clearable>
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -174,6 +186,7 @@ import {
haiAnGetTransportTaskList, haiAnGetTransportTaskList,
haiAnGetTransportTaskDetails haiAnGetTransportTaskDetails
} from '@/api/haianWarehouse/agvTask.js' } from '@/api/haianWarehouse/agvTask.js'
import { haiAnGetAreaList } from '@/api/haianWarehouse/warehousePallet.js'
export default { export default {
name: 'agvTask54', name: 'agvTask54',
@ -187,6 +200,10 @@ export default {
partNo: '', partNo: '',
agvCode: '', agvCode: '',
palletId: '', palletId: '',
// 空值不筛选;有值时后端按站点编码片段模糊匹配 - rqrq
toLocation: '',
// 空值不筛选;下拉值为 haian_area.area_id - rqrq
toArea: '',
status: '', status: '',
startDate: '', startDate: '',
endDate: '', endDate: '',
@ -197,6 +214,8 @@ export default {
height: 450, height: 450,
dataList: [], dataList: [],
dataListLoading: false, dataListLoading: false,
// 当前工厂全部区域,供目标区域下拉展示名称 - rqrq
areaOptions: [],
exportData: [], exportData: [],
exportName: '海安AGV任务管理', exportName: '海安AGV任务管理',
exportHeader: ['海安AGV任务管理'], exportHeader: ['海安AGV任务管理'],
@ -210,6 +229,8 @@ export default {
}) })
}, },
activated() { activated() {
this.queryHeaderData.site = this.$store.state.user.site
this.loadAreaOptions()
this.getDataList() this.getDataList()
}, },
filters: { filters: {
@ -227,6 +248,32 @@ export default {
} }
}, },
methods: { methods: {
// 加载当前工厂全部区域;失败只清空下拉,不阻断任务列表 - rqrq
loadAreaOptions() {
const site = this.$store.state.user.site
if (!site) {
this.areaOptions = []
return
}
haiAnGetAreaList({ site }).then(({ data }) => {
if (site !== this.$store.state.user.site) {
return
}
if (data && data.code === 0) {
this.areaOptions = data.rows || []
} else {
this.areaOptions = []
this.$alert((data && data.msg) || '获取区域失败', '提示', { confirmButtonText: '确定' })
}
}).catch(() => {
if (site !== this.$store.state.user.site) {
return
}
this.areaOptions = []
this.$message.error('获取区域失败')
})
},
// 主列表查询 - rqrq // 主列表查询 - rqrq
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true

2
src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue

@ -954,6 +954,8 @@ export default {
const { data } = await haiAnBatchGeneratePallet({ const { data } = await haiAnBatchGeneratePallet({
site: this.batchGenerateDialog.site, site: this.batchGenerateDialog.site,
palletFamily: item.palletFamily, palletFamily: item.palletFamily,
// G 生成一宫格,J 生成四九宫格号段,两条流水分开 - rqrq
prefix: item.prefix,
count: item.generateCount, count: item.generateCount,
username: this.$store.state.user.name username: this.$store.state.user.name
}) })

9
src/views/modules/haianWarehouse/wcsSystem/emptyPalletType54.vue

@ -252,14 +252,15 @@ export default {
} }
this.palletTypeOptions = [] this.palletTypeOptions = []
this.editDialogVisible = true this.editDialogVisible = true
this.loadPalletTypeOptions(row.palletFamily)
this.loadPalletTypeOptions(row.palletFamily, row.palletId)
}, },
// 修改前必须重新读取类型下拉,防止使用过期配置导致WCS映射错误 - rqrq
loadPalletTypeOptions(palletFamily) {
// 修改前按托盘号重新读取类型:G 只有一宫格,J 只有四宫格和九宫格 - rqrq
loadPalletTypeOptions(palletFamily, palletId) {
this.typeOptionsLoading = true this.typeOptionsLoading = true
haiAnGetPalletTypesByFamily({ haiAnGetPalletTypesByFamily({
site: this.$store.state.user.site, site: this.$store.state.user.site,
palletFamily: palletFamily
palletFamily: palletFamily,
palletId: palletId
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.palletTypeOptions = data.rows || [] this.palletTypeOptions = data.rows || []

Loading…
Cancel
Save