扫码货位:先弹窗显示识别内容,点击搜索后请求后端查询

pages/upload/upload.vue

@@ -1546,6 +1546,14 @@ export default {
 						const whCode = scanned.substring(0, sepIdx).trim()
 						const locCode = scanned.substring(sepIdx + 2).trim()
 						if (whCode && locCode) {
+							// 弹窗显示识别内容，让用户确认后搜索
+							uni.showModal({
+								title: '扫码结果',
+								content: '仓库编码：' + whCode + '\n货位号：' + locCode + '\n\n点击"搜索"查询货位',
+								confirmText: '搜索',
+								cancelText: '取消',
+								success: async (modalRes) => {
+									if (!modalRes.confirm) return
 									// 按仓库编码查找匹配的仓库
 									const whIdx = this.popupWarehouseList.findIndex(w => {
 										const code = (w.code || '').toLowerCase()
@@ -1566,23 +1574,30 @@ export default {
 										} else {
 											uni.showToast({ title: '已切换仓库' + whCode + '，但未找到货位' + locCode, icon: 'none' })
 										}
+									} else {
+										uni.showToast({ title: '未找到仓库: ' + whCode, icon: 'none' })
+									}
+								}
+							})
 							return
 						}
 					}
-					}
 
-					// 无仓库编码格式，在当前仓库的货位列表中查找匹配的货位
-					let matched = null
-					for (const loc of this.popupAllLocationList) {
-						const code = (loc.code || '').toLowerCase()
-						const name = (loc.name || '').toLowerCase()
+					// 无##格式，在当前仓库的货位列表中查找匹配的货位
+					uni.showModal({
+						title: '扫码结果',
+						content: '条码内容：' + scanned + '\n\n点击"搜索"在当前仓库中查询货位',
+						confirmText: '搜索',
+						cancelText: '取消',
+						success: async (modalRes) => {
+							if (!modalRes.confirm) return
 							const search = scanned.toLowerCase()
-						if (code === search || name === search ||
-							code.includes(search) || search.includes(code)) {
-							matched = loc
-							break
-						}
-					}
+							const matched = this.popupAllLocationList.find(l => {
+								const code = (l.code || '').toLowerCase()
+								const name = (l.name || '').toLowerCase()
+								return code === search || name === search ||
+									code.includes(search) || search.includes(code)
+							})
 							if (matched) {
 								this.popupSelectedLoc = matched
 								this.popupLocationSearch = ''
@@ -1591,6 +1606,8 @@ export default {
 							} else {
 								uni.showToast({ title: '未找到匹配货位', icon: 'none' })
 							}
+						}
+					})
 				},
 				fail: () => {}
 			})