From f78cfcab953a4bdcd7b13844767407843a72def1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Fri, 24 Oct 2025 13:22:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(automatedWarehouse):=20=E6=A0=88=E6=9D=BF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA=E4=B8=8E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增根据 soreType 自动勾选强制整托出库功能- 实现栈板类型 A0103 选择时自动勾选强制整托出库 - 扫描接口增加 sortFlag 参数区分是否为分拣操作 - 优化 palletAssembly、palletPacking 和 palletSorting 页面逻辑一致性 --- .../automatedWarehouse/palletAssembly.vue | 18 +++++++++++++++++- .../automatedWarehouse/palletPacking.vue | 18 +++++++++++++++++- .../automatedWarehouse/palletSorting.vue | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/views/modules/automatedWarehouse/palletAssembly.vue b/src/views/modules/automatedWarehouse/palletAssembly.vue index 387ad2d..12fc3e6 100644 --- a/src/views/modules/automatedWarehouse/palletAssembly.vue +++ b/src/views/modules/automatedWarehouse/palletAssembly.vue @@ -718,6 +718,15 @@ export default { this.currentPalletType = palletInfo.palletType || ''; 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过滤） this.loadPalletTypeList(); } else { @@ -789,6 +798,12 @@ export default { // 默认值：从托盘类型表取 this.currentAutoSort = this.currentWcsAutoSort; + // 如果栈板类型选择了A0103（手工选择后触发），那么自动勾选强制整托出库 - rqrq + if (this.currentPalletType === 'A0103') { + this.forceFullPalletOut = true; + console.log('栈板类型选择了A0103，自动勾选强制整托出库 - rqrq'); + } + // 更新自动分拣控制 this.updateAutoSortControl(); @@ -1178,7 +1193,8 @@ export default { palletId: this.palletCode, position: this.scanPosition, layer: this.scanLayer, - serialNo: this.scanCode + serialNo: this.scanCode, + sortFlag:0,//不是分拣 }).then(({ data }) => { if (data.code === 0) { this.$message.success('扫进成功'); diff --git a/src/views/modules/automatedWarehouse/palletPacking.vue b/src/views/modules/automatedWarehouse/palletPacking.vue index 5ffe7f4..5266ddd 100644 --- a/src/views/modules/automatedWarehouse/palletPacking.vue +++ b/src/views/modules/automatedWarehouse/palletPacking.vue @@ -794,6 +794,15 @@ export default { this.currentPalletType = palletInfo.palletType || ''; 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过滤） this.loadPalletTypeList(); } else { @@ -865,6 +874,12 @@ export default { // 默认值：从托盘类型表取 this.currentAutoSort = this.currentWcsAutoSort; + // 如果栈板类型选择了A0103（手工选择后触发），那么自动勾选强制整托出库 - rqrq + if (this.currentPalletType === 'A0103') { + this.forceFullPalletOut = true; + console.log('栈板类型选择了A0103，自动勾选强制整托出库 - rqrq'); + } + // 更新自动分拣控制 this.updateAutoSortControl(); @@ -1254,7 +1269,8 @@ export default { palletId: this.palletCode, position: this.scanPosition, layer: this.scanLayer, - serialNo: this.scanCode + serialNo: this.scanCode, + sortFlag:0,//不是分拣 }).then(({ data }) => { if (data.code === 0) { this.$message.success('扫进成功'); diff --git a/src/views/modules/automatedWarehouse/palletSorting.vue b/src/views/modules/automatedWarehouse/palletSorting.vue index 204ace0..23de284 100644 --- a/src/views/modules/automatedWarehouse/palletSorting.vue +++ b/src/views/modules/automatedWarehouse/palletSorting.vue @@ -651,6 +651,15 @@ export default { this.currentPalletType = palletInfo.palletType || ''; 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过滤） this.loadPalletTypeList(); } else { @@ -722,6 +731,12 @@ export default { // 默认值：从托盘类型表取 this.currentAutoSort = this.currentWcsAutoSort; + // 如果栈板类型选择了A0103（手工选择后触发），那么自动勾选强制整托出库 - rqrq + if (this.currentPalletType === 'A0103') { + this.forceFullPalletOut = true; + console.log('栈板类型选择了A0103，自动勾选强制整托出库 - rqrq'); + } + // 更新自动分拣控制 this.updateAutoSortControl(); @@ -1090,7 +1105,8 @@ export default { palletId: this.palletCode, position: this.scanPosition, layer: this.scanLayer, - serialNo: this.scanCode + serialNo: this.scanCode, + sortFlag:1,//是分拣 }).then(({ data }) => { if (data.code === 0) { // 扫进成功后，缓存原始数据 - rqrq