feat: 工厂订单（NEW）配货分拣功能重复扫码提示优化 #1010127

src/api/axios.ts

@@ -32,12 +32,12 @@ axios.interceptors.request.use(
       config.headers['jwt-token'] = token
       config.headers['jwt-token'] = token
     }
     }
     config.headers.timestamp = new Date().getTime()
     config.headers.timestamp = new Date().getTime()
-    config.headers.uuid =  uuidv4().replace(/-/g, '')
+    config.headers.uuid = uuidv4().replace(/-/g, '')
     addRequestItem({
     addRequestItem({
       url: config.url || '',
       url: config.url || '',
       method: config.method || '',
       method: config.method || '',
       startTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss.SSS'),
       startTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss.SSS'),
-      uuid: config.headers.uuid
+      uuid: config.headers.uuid,
     })
     })
     return config
     return config
   },
   },
@@ -51,31 +51,39 @@ axios.interceptors.response.use(
     const data = response.data
     const data = response.data
     const uuid = response.config?.headers?.uuid
     const uuid = response.config?.headers?.uuid
     const item = findRequestItemByUUID(uuid)
     const item = findRequestItemByUUID(uuid)
-    if(response.config.url){
+    if (response.config.url) {
       if (response.config.url.startsWith('/')) {
       if (response.config.url.startsWith('/')) {
         item.url = `${import.meta.env.VITE_API_BASE}${response.config.url}`
         item.url = `${import.meta.env.VITE_API_BASE}${response.config.url}`
       } else {
       } else {
-        item.url = `${import.meta.env.VITE_API_BASE}${`/${response.config.url}`}`
+        item.url = `${
+          import.meta.env.VITE_API_BASE
+        }${`/${response.config.url}`}`
       }
       }
     }
     }
 
 
     const fm = new FormData()
     const fm = new FormData()
     const processTime = response.headers['processtime']
     const processTime = response.headers['processtime']
     const endTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss.SSS')
     const endTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss.SSS')
-    const clientResponseTime = getTimeDifferenceInMilliseconds(item.startTime, endTime)
+    const clientResponseTime = getTimeDifferenceInMilliseconds(
+      item.startTime,
+      endTime,
+    )
     console.log(item)
     console.log(item)
-    if((clientResponseTime as number)>=3000){
+    if ((clientResponseTime as number) >= 3000) {
       const user = localStorage.getItem('user')
       const user = localStorage.getItem('user')
       if (user) {
       if (user) {
-        const userJson:UserJson = JSON.parse(user)
+        const userJson: UserJson = JSON.parse(user)
         fm.append('factoryCode', userJson?.factoryCode)
         fm.append('factoryCode', userJson?.factoryCode)
       }
       }
       fm.append('processTime', processTime)
       fm.append('processTime', processTime)
       fm.append('url', item.url)
       fm.append('url', item.url)
       fm.append('method', item.method)
       fm.append('method', item.method)
       fm.append('requestId', response.data.requestId)
       fm.append('requestId', response.data.requestId)
-      fm.append('clientResponseTime', String(clientResponseTime)+'ms')
-      navigator.sendBeacon(`${import.meta.env.VITE_API_BASE}/factory/ops/report-data`, fm)
+      fm.append('clientResponseTime', String(clientResponseTime) + 'ms')
+      navigator.sendBeacon(
+        `${import.meta.env.VITE_API_BASE}/factory/ops/report-data`,
+        fm,
+      )
     }
     }
     deleteRequestByUUID(uuid)
     deleteRequestByUUID(uuid)
     if (data && typeof data === 'object' && typeof data.code === 'number') {
     if (data && typeof data === 'object' && typeof data.code === 'number') {
@@ -85,14 +93,18 @@ axios.interceptors.response.use(
         return Promise.reject(data)
         return Promise.reject(data)
       }
       }
       if (data.code !== 200) {
       if (data.code !== 200) {
-        showError(data.message)
+        if (!response.config.skipGlobalError) {
+          showError(data.message)
+        }
         return Promise.reject(data)
         return Promise.reject(data)
       }
       }
     }
     }
     return data
     return data
   },
   },
   (error) => {
   (error) => {
-    showError(error.message)
+    if (!error.config?.skipGlobalError) {
+      showError(error.message)
+    }
     return Promise.reject(error)
     return Promise.reject(error)
   },
   },
 )
 )

src/api/podUsOrder.ts

@@ -257,6 +257,7 @@ export function getPackingDataApi(
 ) {
 ) {
   return axios.get<never, BaseRespData<PodMakeOrderData>>(url, {
   return axios.get<never, BaseRespData<PodMakeOrderData>>(url, {
     params,
     params,
+    skipGlobalError: true,
   })
   })
 }
 }
 export function getPodBoxListApi(
 export function getPodBoxListApi(

src/types/axios.d.ts

+import 'axios'
+
+declare module 'axios' {
+  export interface AxiosRequestConfig {
+    /** 为 true 时跳过全局响应拦截器的默认错误提示，由调用方自行处理 */
+    skipGlobalError?: boolean
+  }
+  export interface InternalAxiosRequestConfig {
+    skipGlobalError?: boolean
+  }
+}

src/views/order/podUs/PodMakeOrder.vue

@@ -342,6 +342,7 @@ import { filePath } from '@/api/axios.ts'
 import { ElButton, ElIcon, ElTag } from 'element-plus'
 import { ElButton, ElIcon, ElTag } from 'element-plus'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 import type { SortingList } from '@/types/api/order'
 import type { SortingList } from '@/types/api/order'
+import { showError } from '@/utils/ui.ts'
 
 
 const { getCLodop } = useLodop()
 const { getCLodop } = useLodop()
 
 
@@ -988,7 +989,24 @@ const getPackingData = async (code: string) => {
       producingQuantity: number
       producingQuantity: number
       availableInventory: number
       availableInventory: number
       thirdSkuCode?: string
       thirdSkuCode?: string
+      packingId?: number
+      box?: number
     }>
     }>
+    if (err.code === 208) {
+      loading.close()
+      const { packingId, box } = err.data
+      const area = sortingAreaList.value.find((item) => item.id === packingId)
+      await ElMessageBox.alert(
+        `重复扫码！该操作单已在仓库：${area?.warehouseName}，<br/>
+        配货区：${area?.areaName}，箱子：${box}中存在！`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          dangerouslyUseHTMLString: true,
+        },
+      )
+      return
+    }
     if (props.wallType !== 'us' && err?.code === 301) {
     if (props.wallType !== 'us' && err?.code === 301) {
       loading.close()
       loading.close()
       await ElMessageBox.alert(
       await ElMessageBox.alert(
@@ -1000,7 +1018,9 @@ const getPackingData = async (code: string) => {
           dangerouslyUseHTMLString: true,
           dangerouslyUseHTMLString: true,
         },
         },
       )
       )
+      return
     }
     }
+    showError(err.message)
   } finally {
   } finally {
     isLock.value = false
     isLock.value = false
     productionOrder.value = ''
     productionOrder.value = ''