diff --git a/src/api/warehouse/crossSiteHuTransfer.js b/src/api/warehouse/crossSiteHuTransfer.js new file mode 100644 index 0000000..948f26b --- /dev/null +++ b/src/api/warehouse/crossSiteHuTransfer.js @@ -0,0 +1,22 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +/** + * 分页查询可跨小site调拨的在库未预留标签 - rqrq + * @param {Object} data 查询参数：site=登录大site，searchSite=可选小site，page/limit + * @returns {Promise} + */ +export const searchHandlingUnitList = data => createAPI('/warehouse/crossSiteHuTransfer/searchHandlingUnitList', 'POST', data) + +/** + * 查询目标小site下拉，排除当前标签来源site - rqrq + * @param {Object} data site=登录大site，excludeSite=来源小site + * @returns {Promise} + */ +export const listTargetSubSites = data => createAPI('/warehouse/crossSiteHuTransfer/listTargetSubSites', 'POST', data) + +/** + * 提交跨小site调拨：后台二次校验后写STO/STI并改标签site - rqrq + * @param {Object} data site/fromSite/toSite/createdBy/selectedItems + * @returns {Promise} + */ +export const transferHuSite = data => createAPI('/warehouse/crossSiteHuTransfer/transferHuSite', 'POST', data) diff --git a/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue b/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue index 69b3553..95ca3fc 100644 --- a/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue +++ b/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue @@ -113,6 +113,8 @@ + + diff --git a/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue b/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue index 19421f3..bf22414 100644 --- a/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue +++ b/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue @@ -1686,6 +1686,13 @@ export default { 'itemNo', buildColumn('444002Table6', '海安无单预留标签清单表', 'SubSite', 'subSite', '子站点', 90) ) + // 领料栈板固定放预留标签清单最后一格，来源 haian_SOIssueNotifyOrderMaterialList_detail.pallet_id - rqrq + const palletIndex = this.columnList6.findIndex(col => col.columnProp === 'palletId') + const palletColumn = buildColumn('444002Table6', '海安无单预留标签清单表', 'PalletId', 'palletId', '领料栈板', 120) + if (palletIndex >= 0) { + this.columnList6.splice(palletIndex, 1) + } + this.columnList6.push(palletColumn) }, // 获取数据列表 getDataList() { diff --git a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue index ad0af92..5b54043 100644 --- a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue +++ b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue @@ -2034,7 +2034,7 @@ export default { } }, /** - * 海安标签页签增加subsite/allocSeq/palletId/taskSeq列，便于追踪标签流向 - rqrq + * 海安标签页签补充追踪列，领料栈板固定放最后一列便于对账 - rqrq */ haiAnEnsureLabelColumns () { if (!Array.isArray(this.columnList6)) { @@ -2066,7 +2066,35 @@ export default { appendColumn('taskSeq', '立库任务序号', 110, 'right') appendColumn('subSite', '子站点', 110, 'left') appendColumn('allocSeq', '分配序号', 100, 'right') - appendColumn('palletId', '栈板号', 120, 'left') + // 领料栈板必须在预留标签表最后一格，已存在则改标题并挪到末尾 - rqrq + const palletIndex = this.columnList6.findIndex(col => col.columnProp === 'palletId') + let palletColumn = null + if (palletIndex >= 0) { + palletColumn = this.columnList6.splice(palletIndex, 1)[0] + palletColumn.columnLabel = '领料栈板' + palletColumn.columnWidth = 120 + palletColumn.align = 'left' + } else { + palletColumn = { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table6palletId', + tableId: '701002Table6', + tableName: '海安预留标签清单表', + columnProp: 'palletId', + headerAlign: 'center', + align: 'left', + columnLabel: '领料栈板', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + } + } + this.columnList6.push(palletColumn) }, /** * 海安页签刷新逻辑，四个页签均改为海安接口并保留原交互语义 - rqrq diff --git a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue index 97bed82..3ffcf71 100644 --- a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue +++ b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue @@ -2034,7 +2034,7 @@ export default { } }, /** - * 海安标签页签增加subsite/allocSeq/palletId/taskSeq列，便于追踪标签流向 - rqrq + * 海安标签页签补充追踪列，领料栈板固定放最后一列便于对账 - rqrq */ haiAnEnsureLabelColumns () { if (!Array.isArray(this.columnList6)) { @@ -2066,7 +2066,35 @@ export default { appendColumn('taskSeq', '立库任务序号', 110, 'right') appendColumn('subSite', '子站点', 110, 'left') appendColumn('allocSeq', '分配序号', 100, 'right') - appendColumn('palletId', '栈板号', 120, 'left') + // 领料栈板必须在预留标签表最后一格，已存在则改标题并挪到末尾 - rqrq + const palletIndex = this.columnList6.findIndex(col => col.columnProp === 'palletId') + let palletColumn = null + if (palletIndex >= 0) { + palletColumn = this.columnList6.splice(palletIndex, 1)[0] + palletColumn.columnLabel = '领料栈板' + palletColumn.columnWidth = 120 + palletColumn.align = 'left' + } else { + palletColumn = { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table6palletId', + tableId: '701002Table6', + tableName: '海安预留标签清单表', + columnProp: 'palletId', + headerAlign: 'center', + align: 'left', + columnLabel: '领料栈板', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + } + } + this.columnList6.push(palletColumn) }, /** * 海安页签刷新逻辑，四个页签均改为海安接口并保留原交互语义 - rqrq diff --git a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue index 5b74172..ee168b0 100644 --- a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue +++ b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue @@ -2046,7 +2046,7 @@ export default { } }, /** - * 海安标签页签增加subsite/allocSeq/palletId/taskSeq列，便于追踪标签流向 - rqrq + * 海安标签页签补充追踪列，领料栈板固定放最后一列便于对账 - rqrq */ haiAnEnsureLabelColumns () { if (!Array.isArray(this.columnList6)) { @@ -2078,7 +2078,35 @@ export default { appendColumn('taskSeq', '立库任务序号', 110, 'right') appendColumn('subSite', '子站点', 110, 'left') appendColumn('allocSeq', '分配序号', 100, 'right') - appendColumn('palletId', '栈板号', 120, 'left') + // 领料栈板必须在预留标签表最后一格，已存在则改标题并挪到末尾 - rqrq + const palletIndex = this.columnList6.findIndex(col => col.columnProp === 'palletId') + let palletColumn = null + if (palletIndex >= 0) { + palletColumn = this.columnList6.splice(palletIndex, 1)[0] + palletColumn.columnLabel = '领料栈板' + palletColumn.columnWidth = 120 + palletColumn.align = 'left' + } else { + palletColumn = { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table6palletId', + tableId: '701002Table6', + tableName: '海安预留标签清单表', + columnProp: 'palletId', + headerAlign: 'center', + align: 'left', + columnLabel: '领料栈板', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + } + } + this.columnList6.push(palletColumn) }, /** * 海安页签刷新逻辑，四个页签均改为海安接口并保留原交互语义 - rqrq diff --git a/src/views/modules/warehouse/crossSiteHuTransfer.vue b/src/views/modules/warehouse/crossSiteHuTransfer.vue new file mode 100644 index 0000000..767acf3 --- /dev/null +++ b/src/views/modules/warehouse/crossSiteHuTransfer.vue @@ -0,0 +1,662 @@ + + + + +