From e9f1f19692be75391999b2c963b79b4dc3667a2e 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: Thu, 10 Sep 2026 10:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9+=E5=85=B6=E4=BB=96=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/haianAutoWarehouse/palletAssembly.js | 2 +- .../haianEmptyPalletAssembly.vue | 65 +------------- .../haianPalletAssembly.vue | 87 +++++-------------- 3 files changed, 26 insertions(+), 128 deletions(-) diff --git a/src/api/haianAutoWarehouse/palletAssembly.js b/src/api/haianAutoWarehouse/palletAssembly.js index c3aee5a..04256c5 100644 --- a/src/api/haianAutoWarehouse/palletAssembly.js +++ b/src/api/haianAutoWarehouse/palletAssembly.js @@ -33,5 +33,5 @@ export const getAreaOptionsForChange = data => createAPI(`/haiAnWcsIntegration/g // 海安-直接组盘页：调用空托盘 - rqrq export const callEmptyPalletToStation = data => createAPI(`/haiAnWcsIntegration/callEmptyPalletToStation`, 'post', data) -// 海安-直接组盘页：推送组盘到入库口（入库口1/2）- rqrq +// 海安-直接组盘页：推送组盘到固定入库口 - rqrq export const pushPalletAssemblyToInboundPort = data => createAPI(`/haiAnWcsIntegration/pushPalletAssemblyToInboundPort`, 'post', data) diff --git a/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue b/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue index d302316..ae71c1c 100644 --- a/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue +++ b/src/views/modules/haianAutoWarehouse/haianEmptyPalletAssembly.vue @@ -91,32 +91,6 @@ - - - -
- - - - -
-
- - -
- @@ -148,13 +122,6 @@ export default { currentPalletType: '', palletTypeOptions: [], count: 1, - // 通知入库口选择：待确认站点实际编码，当前仍用旧入库口1/2 - rqrq - inboundPortDialogVisible: false, - selectedInboundPort: '', - inboundPortOptions: [ - { label: '入库口1', value: 'INBOUND_PORT_1' }, - { label: '入库口2', value: 'INBOUND_PORT_2' } - ], // 加载状态 - rqrq notifyLoading: false, transportLoading: false @@ -298,30 +265,8 @@ export default { if (!this.validateNotifyInboundPalletStatus()) { return; } - // 左按钮“通知入库”必须先选入库口，后端再把入库口映射为固定站点号 - rqrq - this.selectedInboundPort = ''; - this.inboundPortDialogVisible = true; - }, - - // 关闭入库口弹窗并清理选择状态，避免上次选择串到本次提交 - rqrq - cancelInboundPortDialog() { - this.inboundPortDialogVisible = false; - this.selectedInboundPort = ''; - }, - - // 确认通知入库：先校验入库口，再调用通知入库接口 - rqrq - confirmNotifyInbound() { - if (!this.selectedInboundPort) { - this.$alert('请选择入库口', '提示', { - confirmButtonText: '确定' - }); - return; - } - if (!this.validateNotifyInboundPalletStatus()) { - return; - } - this.inboundPortDialogVisible = false; - this.$confirm('确定要执行通知入库操作吗？', '确认操作', { + // 通知入库：海安只有一个入库口，后端固定下发，页面只做确认 - rqrq + this.$confirm('确定要执行通知入库操作吗？目标点位固定为入库口。', '确认操作', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -332,12 +277,10 @@ export default { site: this.site, palletId: this.palletCode, transportFlag: 'N', - count: Number(this.count), - inboundPort: this.selectedInboundPort, + count: Number(this.count) }).then(({ data }) => { if (data && data.code === 0) { this.$message.success('通知入库成功'); - // 清空页面重新扫描 - rqrq this.resetPage(true); } else { this.$alert(data.msg || '通知入库失败', '错误', { @@ -421,8 +364,6 @@ export default { this.currentPalletType = ''; this.palletTypeOptions = []; this.count = 1; - this.inboundPortDialogVisible = false; - this.selectedInboundPort = ''; if (needFocus) { this.$nextTick(() => { diff --git a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue index ffb0eeb..d98cc5e 100644 --- a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue +++ b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue @@ -304,30 +304,6 @@ - - - -
- - - - - -
-
- - -
- @@ -397,9 +373,6 @@ export default { stationCode: '', palletType: '' }, - // 推送组盘弹窗状态 - rqrq - pushAssemblyDialogVisible: false, - selectedInboundPort: '', // 接口锁状态：推送组盘时要禁用页面所有按钮 - rqrq palletScanLoading: false, palletConfigLoading: false, @@ -514,8 +487,6 @@ export default { stationCode: '', palletType: '' } - this.pushAssemblyDialogVisible = false - this.selectedInboundPort = '' this.palletScanLoading = false this.palletConfigLoading = false this.scanRequestLoading = false @@ -983,7 +954,7 @@ export default { this.callEmptyLoading = false }) }, - // 推送组盘前校验：area/location任何一个有值都必须阻断 - rqrq + // 推送组盘：海安只有一个入库口，后端固定下发，页面只做确认 - rqrq openPushAssemblyDialog() { if (!this.ensureSite() || this.interfaceBusy) { return @@ -1000,48 +971,34 @@ export default { this.$alert('推送组盘仅允许未绑定站点的栈板，当前栈板area或location_code存在值', '提示', { confirmButtonText: '确定' }) return } - this.selectedInboundPort = '' - this.pushAssemblyDialogVisible = true - }, - closePushAssemblyDialog() { - if (this.interfaceBusy) { - return - } - this.pushAssemblyDialogVisible = false - this.selectedInboundPort = '' - }, - // 推送组盘：确认入库口后调用海安专用后端方法，调用期间保持全页面按钮锁定 - rqrq - submitPushAssembly() { - if (!this.selectedInboundPort) { - this.$alert('请选择入库口', '提示', { confirmButtonText: '确定' }) - return - } - this.$confirm('确认推送组盘数据吗？', '提示', { + this.$confirm('确认推送组盘到入库口吗？', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => { - this.pushAssemblyLoading = true - pushPalletAssemblyToInboundPort({ - site: this.site, - palletId: this.palletCode, - inboundPort: this.selectedInboundPort - }).then(({ data }) => { - if (data && data.code === 0) { - this.$message.success('推送组盘成功') - this.pushAssemblyDialogVisible = false - this.resetPage(true) - } else { - this.$alert((data && data.msg) || '推送组盘失败', '错误', { confirmButtonText: '确定' }) - } - }).catch((error) => { - this.$alert(error.message || '推送组盘失败', '错误', { confirmButtonText: '确定' }) - }).finally(() => { - this.pushAssemblyLoading = false - }) + this.submitPushAssembly() }).catch(() => { // 用户取消确认时不清空数据，便于继续核对后再提交 - rqrq }) + }, + // 推送组盘：调用海安专用后端方法，调用期间保持全页面按钮锁定 - rqrq + submitPushAssembly() { + this.pushAssemblyLoading = true + pushPalletAssemblyToInboundPort({ + site: this.site, + palletId: this.palletCode + }).then(({ data }) => { + if (data && data.code === 0) { + this.$message.success('推送组盘成功') + this.resetPage(true) + } else { + this.$alert((data && data.msg) || '推送组盘失败', '错误', { confirmButtonText: '确定' }) + } + }).catch((error) => { + this.$alert(error.message || '推送组盘失败', '错误', { confirmButtonText: '确定' }) + }).finally(() => { + this.pushAssemblyLoading = false + }) } }, activated() {