diff --git a/src/api/haianAutoWarehouse/labelWriteOff.js b/src/api/haianAutoWarehouse/labelWriteOff.js new file mode 100644 index 0000000..c8d50f8 --- /dev/null +++ b/src/api/haianAutoWarehouse/labelWriteOff.js @@ -0,0 +1,13 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +/** + * 海安标签特殊销账：扫描标签查询库存信息，不改业务数据 - rqrq + * @param {Object} data 必须包含 site、serialNo - rqrq + */ +export const queryLabelForWriteOff = data => createAPI(`/haiAnWcsIntegration/queryLabelForWriteOff`, 'post', data) + +/** + * 海安标签特殊销账：确认后把 in_stock_flag 改成 N；标签仍在托盘明细时由后端拒绝 - rqrq + * @param {Object} data 必须包含 site、serialNo - rqrq + */ +export const writeOffLabel = data => createAPI(`/haiAnWcsIntegration/writeOffLabel`, 'post', data) diff --git a/src/router/index.js b/src/router/index.js index b4846c2..46157a4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -166,6 +166,8 @@ const globalRoutes = [ {path: "/haianPalletManualMove",name: "haianPalletManualMove", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianPalletManualMove.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/haianPalletRelocate",name: "haianPalletRelocate", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianPalletRelocate.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/haianPalletSpecialEdit",name: "haianPalletSpecialEdit", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianPalletSpecialEdit.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + // 海安标签特殊销账：每次进入清空缓存并重新校验密码，禁止 keepAlive 残留上一张标签 - rqrq + {path: "/haianLabelWriteOff",name: "haianLabelWriteOff", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianLabelWriteOff.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: false}}, {path: "/haianWmsCancelReserve",name: "haianWmsCancelReserve", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianWmsCancelReserve.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/haianCallOutForHetuo",name: "haianCallOutForHetuo", component: resolve => require(["@/views/modules/haianAutoWarehouse/haianCallOutForHetuo.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // 海安立库手工盘点页面（固定工厂54）- rqrq diff --git a/src/views/main.vue b/src/views/main.vue index 5519123..c668d72 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -233,6 +233,13 @@
栈板特殊修改
+ +
+
+ +
+
标签特殊销账
+
diff --git a/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue b/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue index d511d2d..4fda382 100644 --- a/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue +++ b/src/views/modules/automatedWarehouse/palletSortingNoAgv.vue @@ -30,7 +30,7 @@ spellcheck="false" ref="palletInput" /> - diff --git a/src/views/modules/haianAutoWarehouse/haianLabelWriteOff.vue b/src/views/modules/haianAutoWarehouse/haianLabelWriteOff.vue new file mode 100644 index 0000000..9b560ef --- /dev/null +++ b/src/views/modules/haianAutoWarehouse/haianLabelWriteOff.vue @@ -0,0 +1,578 @@ + + + + + diff --git a/src/views/modules/haianAutoWarehouse/haianPalletRelocate.vue b/src/views/modules/haianAutoWarehouse/haianPalletRelocate.vue index fd0ccf6..b1ab531 100644 --- a/src/views/modules/haianAutoWarehouse/haianPalletRelocate.vue +++ b/src/views/modules/haianAutoWarehouse/haianPalletRelocate.vue @@ -93,7 +93,9 @@ export default { mismatchRows: [] }, // 重移库成功后的5秒、10秒刷新句柄，离开页面或改扫栈板时必须清掉 - rqrq - relocateRefreshTimers: [] + relocateRefreshTimers: [], + // 离开或重置时递增，避免已发出的扫描/刷新回填到空页面 - rqrq + scanRequestSeq: 0 } }, computed: { @@ -106,32 +108,53 @@ export default { } }, mounted() { - this.$nextTick(() => { - if (this.$refs.palletInput) { - this.$refs.palletInput.focus() - } - }) + this.resetPage(true) + }, + // keep-alive 再次进入时清空上次栈板和差异列表，避免残留 - rqrq + activated() { + this.resetPage(true) }, // 页面被缓存切走或真正销毁时都停掉定时刷新，避免回到首页后还在打扫描接口 - rqrq deactivated() { - this.clearRelocateRefreshTimers() + this.resetPage(false) }, beforeDestroy() { - this.clearRelocateRefreshTimers() + this.resetPage(false) + }, + beforeRouteLeave(to, from, next) { + this.resetPage(false) + next() }, methods: { handleBack() { if (this.pageBusy) { return } + this.resetPage(false) this.$router.back() }, goHome() { if (this.pageBusy) { return } + this.resetPage(false) this.$router.push({ path: '/' }) }, + /** + * 统一清空扫描结果、加载态和延迟刷新，避免 keep-alive 再次进入看到上一盘 - rqrq + */ + resetPage(needFocus = true) { + this.clearRelocateRefreshTimers() + this.scanRequestSeq += 1 + this.site = this.$store.state.user.site + this.palletCode = '' + this.scanLoading = false + this.retryLoading = false + this.clearScan() + if (needFocus) { + this.focusPalletInput() + } + }, // 数量去尾零，空值显示0，避免固定小数位 - rqrq formatQty(qty) { if (qty === null || qty === undefined || qty === '') { @@ -157,11 +180,16 @@ export default { // 改扫其他栈板时取消上一盘的延迟刷新，避免旧结果覆盖新扫描 - rqrq this.clearRelocateRefreshTimers() this.site = this.$store.state.user.site + this.scanRequestSeq += 1 + const requestSeq = this.scanRequestSeq this.scanLoading = true scanPalletForRelocate({ site: this.site, palletId: scannedCode }).then(({ data }) => { + if (requestSeq !== this.scanRequestSeq) { + return + } if (data && data.code === 0 && data.row) { this.scanResult = data.row this.palletCode = data.row.palletId || scannedCode @@ -172,11 +200,16 @@ export default { this.focusPalletInput() } }).catch(error => { + if (requestSeq !== this.scanRequestSeq) { + return + } this.clearScan() this.$message.error((error && error.message) || '栈板扫描失败') this.focusPalletInput() }).finally(() => { - this.scanLoading = false + if (requestSeq === this.scanRequestSeq) { + this.scanLoading = false + } }) }, // 重新移库前确认；成功后按同一栈板再查一次，看差异是否还在 - rqrq @@ -190,11 +223,15 @@ export default { { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } ).then(() => { this.site = this.$store.state.user.site + const requestSeq = this.scanRequestSeq this.retryLoading = true retryPalletRelocate({ site: this.site, palletId: this.scanResult.palletId }).then(({ data }) => { + if (requestSeq !== this.scanRequestSeq) { + return + } if (data && data.code === 0) { this.$message.success(data.msg || '重新移库已提交') this.palletCode = this.scanResult.palletId @@ -205,9 +242,14 @@ export default { this.$alert((data && data.msg) || '重新移库失败', '错误', { confirmButtonText: '确定' }) } }).catch(error => { + if (requestSeq !== this.scanRequestSeq) { + return + } this.$message.error((error && error.message) || '重新移库失败') }).finally(() => { - this.retryLoading = false + if (requestSeq === this.scanRequestSeq) { + this.retryLoading = false + } }) }).catch(() => {}) }, @@ -232,33 +274,49 @@ export default { }, // 定时刷新不占用扫描按钮，失败只提示，不把已展示的差异列表清掉 - rqrq refreshMismatchQuiet(palletId) { + const requestSeq = this.scanRequestSeq scanPalletForRelocate({ site: this.site, palletId: palletId }).then(({ data }) => { + if (requestSeq !== this.scanRequestSeq) { + return + } if (data && data.code === 0 && data.row && this.scanResult.palletId === palletId) { this.scanResult = data.row this.scanned = true } }).catch(() => { + if (requestSeq !== this.scanRequestSeq) { + return + } this.$message.error('移库后刷新差异标签失败') }) }, // 移库入队后先立即重查一次，5秒和10秒的刷新另外预约 - rqrq refreshAfterRetry() { + const requestSeq = this.scanRequestSeq this.scanLoading = true scanPalletForRelocate({ site: this.site, palletId: this.scanResult.palletId }).then(({ data }) => { + if (requestSeq !== this.scanRequestSeq) { + return + } if (data && data.code === 0 && data.row) { this.scanResult = data.row this.scanned = true } }).catch(() => { + if (requestSeq !== this.scanRequestSeq) { + return + } this.$message.error('移库后刷新差异标签失败') }).finally(() => { - this.scanLoading = false + if (requestSeq === this.scanRequestSeq) { + this.scanLoading = false + } }) }, clearScan() { diff --git a/src/views/modules/inventory/label-query.vue b/src/views/modules/inventory/label-query.vue index 3e3cfda..c08fe87 100644 --- a/src/views/modules/inventory/label-query.vue +++ b/src/views/modules/inventory/label-query.vue @@ -7,7 +7,7 @@ 标签查询
-
+
首页
@@ -216,7 +216,9 @@ export default { printLoading: false, splitDialogVisible: false, splitQty: '', - splitLoading: false + splitLoading: false, + // 离开或重置时递增，避免已发出的查询回填到空页面 - rqrq + scanRequestSeq: 0 }; }, @@ -250,12 +252,39 @@ export default { methods: { /** - * 返回上一页 + * 返回上一页前清空扫描结果，避免 keep-alive 再次进入残留上一张标签 - rqrq */ handleBack() { + this.resetPage(false); this.$router.back(); }, + /** + * 回首页前同样清空，避免下次从菜单进来还带着上次标签 - rqrq + */ + goHome() { + this.resetPage(false); + this.$router.push({ path: '/' }); + }, + + /** + * 统一清空标签、拆分弹窗和加载态，避免缓存页带回上次查询结果 - rqrq + */ + resetPage(needFocus = true) { + this.scanRequestSeq += 1; + this.site = localStorage.getItem('site'); + this.labelCode = ''; + this.labelInfo = null; + this.loading = false; + this.printLoading = false; + this.splitDialogVisible = false; + this.splitQty = ''; + this.splitLoading = false; + if (needFocus) { + this.focusLabelInput(); + } + }, + /** * 处理标签扫描 */ @@ -266,11 +295,16 @@ export default { } this.loading = true; + this.scanRequestSeq += 1; + const requestSeq = this.scanRequestSeq; queryLabelInfo({ site: this.site, labelCode: this.labelCode.trim() }).then(({ data }) => { + if (requestSeq !== this.scanRequestSeq) { + return; + } this.loading = false; if (data && data.code === 0) { @@ -283,6 +317,9 @@ export default { this.focusLabelInput(); } }).catch(error => { + if (requestSeq !== this.scanRequestSeq) { + return; + } this.loading = false; console.error('查询标签失败:', error); this.$message.error('查询异常'); @@ -492,8 +529,15 @@ export default { }, mounted() { - // 页面加载后自动聚焦标签输入框 - this.focusLabelInput(); + this.resetPage(true); + }, + // keep-alive 再次进入时清空上次标签，回到待扫描 - rqrq + activated() { + this.resetPage(true); + }, + beforeRouteLeave(to, from, next) { + this.resetPage(false); + next(); } };