diff --git a/src/views/modules/haianWarehouse/automatedWarehouse/agvTask54.vue b/src/views/modules/haianWarehouse/automatedWarehouse/agvTask54.vue
index 520a8a2..3bc8670 100644
--- a/src/views/modules/haianWarehouse/automatedWarehouse/agvTask54.vue
+++ b/src/views/modules/haianWarehouse/automatedWarehouse/agvTask54.vue
@@ -41,9 +41,21 @@
+
+
+
+
+
+
+
@@ -174,6 +186,7 @@ import {
haiAnGetTransportTaskList,
haiAnGetTransportTaskDetails
} from '@/api/haianWarehouse/agvTask.js'
+import { haiAnGetAreaList } from '@/api/haianWarehouse/warehousePallet.js'
export default {
name: 'agvTask54',
@@ -187,6 +200,10 @@ export default {
partNo: '',
agvCode: '',
palletId: '',
+ // 空值不筛选;有值时后端按站点编码片段模糊匹配 - rqrq
+ toLocation: '',
+ // 空值不筛选;下拉值为 haian_area.area_id - rqrq
+ toArea: '',
status: '',
startDate: '',
endDate: '',
@@ -197,6 +214,8 @@ export default {
height: 450,
dataList: [],
dataListLoading: false,
+ // 当前工厂全部区域,供目标区域下拉展示名称 - rqrq
+ areaOptions: [],
exportData: [],
exportName: '海安AGV任务管理',
exportHeader: ['海安AGV任务管理'],
@@ -210,6 +229,8 @@ export default {
})
},
activated() {
+ this.queryHeaderData.site = this.$store.state.user.site
+ this.loadAreaOptions()
this.getDataList()
},
filters: {
@@ -227,6 +248,32 @@ export default {
}
},
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
getDataList() {
this.dataListLoading = true
diff --git a/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue b/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue
index 91f1e80..a543568 100644
--- a/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue
+++ b/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue
@@ -954,6 +954,8 @@ export default {
const { data } = await haiAnBatchGeneratePallet({
site: this.batchGenerateDialog.site,
palletFamily: item.palletFamily,
+ // G 生成一宫格,J 生成四九宫格号段,两条流水分开 - rqrq
+ prefix: item.prefix,
count: item.generateCount,
username: this.$store.state.user.name
})
diff --git a/src/views/modules/haianWarehouse/wcsSystem/emptyPalletType54.vue b/src/views/modules/haianWarehouse/wcsSystem/emptyPalletType54.vue
index ea2a4d2..260b94f 100644
--- a/src/views/modules/haianWarehouse/wcsSystem/emptyPalletType54.vue
+++ b/src/views/modules/haianWarehouse/wcsSystem/emptyPalletType54.vue
@@ -252,14 +252,15 @@ export default {
}
this.palletTypeOptions = []
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
haiAnGetPalletTypesByFamily({
site: this.$store.state.user.site,
- palletFamily: palletFamily
+ palletFamily: palletFamily,
+ palletId: palletId
}).then(({ data }) => {
if (data && data.code === 0) {
this.palletTypeOptions = data.rows || []