Browse Source

feat(automatedWarehouse): 栈板操作功能增强与逻辑优化

- 新增根据 soreType 自动勾选强制整托出库功能- 实现栈板类型 A0103 选择时自动勾选强制整托出库
- 扫描接口增加 sortFlag 参数区分是否为分拣操作
- 优化 palletAssembly、palletPacking 和 palletSorting 页面逻辑一致性
dev
常熟吴彦祖 1 year ago
parent
commit
f78cfcab95
  1. 18
      src/views/modules/automatedWarehouse/palletAssembly.vue
  2. 18
      src/views/modules/automatedWarehouse/palletPacking.vue
  3. 18
      src/views/modules/automatedWarehouse/palletSorting.vue

18
src/views/modules/automatedWarehouse/palletAssembly.vue

@ -718,6 +718,15 @@ export default {
this.currentPalletType = palletInfo.palletType || ''; this.currentPalletType = palletInfo.palletType || '';
this.currentAutoSort = palletInfo.autoSort || 'N'; this.currentAutoSort = palletInfo.autoSort || 'N';
// 第一次进页面扫描栈板查询的时候,如果sore_Type=3,那么也要显示勾选 - rqrq
const soreType = palletInfo.soreType;
if (soreType === 3) {
this.forceFullPalletOut = true;
console.log('soreType=3,自动勾选强制整托出库 - rqrq');
} else {
this.forceFullPalletOut = false;
}
// 加载托盘类型列表(根据palletFamily过滤) // 加载托盘类型列表(根据palletFamily过滤)
this.loadPalletTypeList(); this.loadPalletTypeList();
} else { } else {
@ -789,6 +798,12 @@ export default {
// 默认值:从托盘类型表取 // 默认值:从托盘类型表取
this.currentAutoSort = this.currentWcsAutoSort; this.currentAutoSort = this.currentWcsAutoSort;
// 如果栈板类型选择了A0103(手工选择后触发),那么自动勾选强制整托出库 - rqrq
if (this.currentPalletType === 'A0103') {
this.forceFullPalletOut = true;
console.log('栈板类型选择了A0103,自动勾选强制整托出库 - rqrq');
}
// 更新自动分拣控制 // 更新自动分拣控制
this.updateAutoSortControl(); this.updateAutoSortControl();
@ -1178,7 +1193,8 @@ export default {
palletId: this.palletCode, palletId: this.palletCode,
position: this.scanPosition, position: this.scanPosition,
layer: this.scanLayer, layer: this.scanLayer,
serialNo: this.scanCode
serialNo: this.scanCode,
sortFlag:0,//不是分拣
}).then(({ data }) => { }).then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
this.$message.success('扫进成功'); this.$message.success('扫进成功');

18
src/views/modules/automatedWarehouse/palletPacking.vue

@ -794,6 +794,15 @@ export default {
this.currentPalletType = palletInfo.palletType || ''; this.currentPalletType = palletInfo.palletType || '';
this.currentAutoSort = palletInfo.autoSort || 'N'; this.currentAutoSort = palletInfo.autoSort || 'N';
// 第一次进页面扫描栈板查询的时候,如果sore_Type=3,那么也要显示勾选 - rqrq
const soreType = palletInfo.soreType;
if (soreType === 3) {
this.forceFullPalletOut = true;
console.log('soreType=3,自动勾选强制整托出库 - rqrq');
} else {
this.forceFullPalletOut = false;
}
// 加载托盘类型列表(根据palletFamily过滤) // 加载托盘类型列表(根据palletFamily过滤)
this.loadPalletTypeList(); this.loadPalletTypeList();
} else { } else {
@ -865,6 +874,12 @@ export default {
// 默认值:从托盘类型表取 // 默认值:从托盘类型表取
this.currentAutoSort = this.currentWcsAutoSort; this.currentAutoSort = this.currentWcsAutoSort;
// 如果栈板类型选择了A0103(手工选择后触发),那么自动勾选强制整托出库 - rqrq
if (this.currentPalletType === 'A0103') {
this.forceFullPalletOut = true;
console.log('栈板类型选择了A0103,自动勾选强制整托出库 - rqrq');
}
// 更新自动分拣控制 // 更新自动分拣控制
this.updateAutoSortControl(); this.updateAutoSortControl();
@ -1254,7 +1269,8 @@ export default {
palletId: this.palletCode, palletId: this.palletCode,
position: this.scanPosition, position: this.scanPosition,
layer: this.scanLayer, layer: this.scanLayer,
serialNo: this.scanCode
serialNo: this.scanCode,
sortFlag:0,//不是分拣
}).then(({ data }) => { }).then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
this.$message.success('扫进成功'); this.$message.success('扫进成功');

18
src/views/modules/automatedWarehouse/palletSorting.vue

@ -651,6 +651,15 @@ export default {
this.currentPalletType = palletInfo.palletType || ''; this.currentPalletType = palletInfo.palletType || '';
this.currentAutoSort = palletInfo.autoSort || 'N'; this.currentAutoSort = palletInfo.autoSort || 'N';
// 第一次进页面扫描栈板查询的时候,如果sore_Type=3,那么也要显示勾选 - rqrq
const soreType = palletInfo.soreType;
if (soreType === 3) {
this.forceFullPalletOut = true;
console.log('soreType=3,自动勾选强制整托出库 - rqrq');
} else {
this.forceFullPalletOut = false;
}
// 加载托盘类型列表(根据palletFamily过滤) // 加载托盘类型列表(根据palletFamily过滤)
this.loadPalletTypeList(); this.loadPalletTypeList();
} else { } else {
@ -722,6 +731,12 @@ export default {
// 默认值:从托盘类型表取 // 默认值:从托盘类型表取
this.currentAutoSort = this.currentWcsAutoSort; this.currentAutoSort = this.currentWcsAutoSort;
// 如果栈板类型选择了A0103(手工选择后触发),那么自动勾选强制整托出库 - rqrq
if (this.currentPalletType === 'A0103') {
this.forceFullPalletOut = true;
console.log('栈板类型选择了A0103,自动勾选强制整托出库 - rqrq');
}
// 更新自动分拣控制 // 更新自动分拣控制
this.updateAutoSortControl(); this.updateAutoSortControl();
@ -1090,7 +1105,8 @@ export default {
palletId: this.palletCode, palletId: this.palletCode,
position: this.scanPosition, position: this.scanPosition,
layer: this.scanLayer, layer: this.scanLayer,
serialNo: this.scanCode
serialNo: this.scanCode,
sortFlag:1,//是分拣
}).then(({ data }) => { }).then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
// 扫进成功后,缓存原始数据 - rqrq // 扫进成功后,缓存原始数据 - rqrq

Loading…
Cancel
Save