From a3109f5e4a005287b8e0d146359f1137dd98c092 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 14:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81wcs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/haianWarehouse/palletMergeQuery.js | 2 +- .../guardPalletManualMerge54.vue | 4 ++-- .../warehouse/wcsCallBackSearch54.vue | 18 +++++++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/api/haianWarehouse/palletMergeQuery.js b/src/api/haianWarehouse/palletMergeQuery.js index a41883a..db45b41 100644 --- a/src/api/haianWarehouse/palletMergeQuery.js +++ b/src/api/haianWarehouse/palletMergeQuery.js @@ -15,5 +15,5 @@ export const haiAnGetGuardPalletTypeOptions = data => createAPI('/autoWareHource // 海安围托盘手工合托：分页查询候选托盘（仅 calling_flag=N，返回标签数）- rqrq export const haiAnSearchGuardPalletManualMergeList = data => createAPI('/autoWareHourceHaian/haiAnPalletMergeQuery/searchGuardPalletManualMergeList', 'post', data) -// 海安围托盘手工合托：批量下达（主流程无事务，逐托盘独立事务）- rqrq +// 海安围托盘手工合托：批量下达到整托出库口（与 Call料同一出口，逐托盘独立事务）- rqrq export const haiAnSubmitGuardPalletManualMerge = data => createAPI('/autoWareHourceHaian/haiAnPalletMergeQuery/submitGuardPalletManualMerge', 'post', data) diff --git a/src/views/modules/haianWarehouse/automatedWarehouse/guardPalletManualMerge54.vue b/src/views/modules/haianWarehouse/automatedWarehouse/guardPalletManualMerge54.vue index 966db84..b9c7e2e 100644 --- a/src/views/modules/haianWarehouse/automatedWarehouse/guardPalletManualMerge54.vue +++ b/src/views/modules/haianWarehouse/automatedWarehouse/guardPalletManualMerge54.vue @@ -43,7 +43,7 @@ {{ submitLoading ? '提交中...' : '提交围托盘手工合托' }} - 已选择 {{ selectedRows.length }} 条，单次最多 {{ maxSubmitCount }} 条 + 已选择 {{ selectedRows.length }} 条，单次最多 {{ maxSubmitCount }} 条；下达目标固定为整托出库口 @@ -257,7 +257,7 @@ export default { return } const palletIdList = this.selectedRows.map(item => item.palletId).filter(item => !!item) - this.$confirm('确定提交围托盘手工合托出库？', '提示', { + this.$confirm('确定提交围托盘手工合托出库到整托出库口？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue b/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue index a52c05a..63fe456 100644 --- a/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue +++ b/src/views/modules/haianWarehouse/warehouse/wcsCallBackSearch54.vue @@ -11,12 +11,15 @@ - + + - - - - + + + + + + @@ -98,7 +101,8 @@ {{ scope.row.status }} - + + {{ scope.row.transTypeDesc }} @@ -157,7 +161,7 @@ export default { { columnProp: 'palletId', headerAlign: 'center', align: 'center', columnLabel: '栈板ID', columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: '' }, { columnProp: 'taskNo', headerAlign: 'center', align: 'center', columnLabel: '任务号', columnWidth: 150, columnSortable: false, showOverflowTooltip: true, fixed: '' }, { columnProp: 'itemNo', headerAlign: 'center', align: 'center', columnLabel: '明细行号', columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: '' }, - { columnProp: 'transTypeDesc', headerAlign: 'center', align: 'center', columnLabel: '事务类型', columnWidth: 100, columnSortable: false, showOverflowTooltip: true, fixed: '' }, + { columnProp: 'transTypeDesc', headerAlign: 'center', align: 'center', columnLabel: '事务类型', columnWidth: 140, columnSortable: false, showOverflowTooltip: true, fixed: '' }, { columnProp: 'toWarehouseId', headerAlign: 'center', align: 'center', columnLabel: '目标仓库', columnWidth: 100, columnSortable: false, showOverflowTooltip: true, fixed: '' }, { columnProp: 'toLocationId', headerAlign: 'center', align: 'center', columnLabel: '目标库位', columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: '' }, { columnProp: 'toStation', headerAlign: 'center', align: 'center', columnLabel: '目标站点', columnWidth: 100, columnSortable: false, showOverflowTooltip: true, fixed: '' },