Merge remote-tracking branch 'origin/dev'

src/views/order/podUs/FastProduction.vue

@@ -6,7 +6,12 @@
     :fullscreen="true"
     :close-on-click-modal="false"
     @opened="onOpened"
-    @close="emit('close')"
+    @close="
+      () => {
+        emit('onSuccess')
+        emit('close')
+      }
+    "
   >
     <div class="detail-div">
       <div class="detail-content">
@@ -313,22 +318,27 @@ const confirmQuery = (len: HistoryDataItem[], i: number) => {
     type: 'warning',
   })
     .then(async () => {
-      TrackingNumber.value = el.orderNumber
-      await trackCodeInput()
-      await setData(el.orderNumber)
-      ElMessage.success('生产完成')
-      if (len[i + 1]) {
-        confirmQuery(len, i + 1)
+      try {
+        TrackingNumber.value = el.orderNumber
+        await trackCodeInput()
+
+        await setData(el.orderNumber)
+
+        // ElMessage.success('生产完成')
+      } catch (error) {
+        console.log(777)
+        console.log(error)
+
+        removeFromHistory()
+      } finally {
+        if (len[i + 1]) {
+          confirmQuery(len, i + 1)
+        }
       }
     })
     .catch(() => {
-      const index = historyData.value.findIndex(
-        (item: HistoryDataItem) => item.orderNumber === el.orderNumber,
-      )
-      if (index >= 0) {
-        historyData.value.splice(index, 1)
-        localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
-      }
+      removeFromHistory()
+
       if (len[i + 1]) {
         confirmQuery(len, i + 1)
       }
@@ -336,6 +346,11 @@ const confirmQuery = (len: HistoryDataItem[], i: number) => {
     })
 }
 
+const removeFromHistory = () => {
+  historyData.value = []
+  localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
+}
+
 const changeStatus = async () => {
   if (!detail.value || Object.keys(detail.value).length <= 1) {
     return ElMessage.warning('请扫码生产单号')
@@ -353,19 +368,46 @@ const setData = async (orderNumber: string) => {
   try {
     const id = detail.value.id
     const podJomallOrderUsId = detail.value.podJomallOrderUsId
-    await productionQueryApi(id, podJomallOrderUsId)
+    if (
+      detail.value?.num !== undefined &&
+      detail.value?.passNum !== undefined
+    ) {
+      const { num, passNum } = detail.value
+      if (num == passNum) {
+        await showConfirm('该生产单已经完成生产，请勿重复生产', {
+          confirmButtonText: '确定',
+
+          type: 'warning',
+        })
+        TrackingNumber.value = ''
+        isDownloadImage.value = false
+        trackingNumberRef.value && trackingNumberRef.value.focus()
+        throw new Error()
+      } else if (num < passNum) {
+        await showConfirm(
+          `生产单号:${detail.value.factorySubOrderNumber} 已经重复生产${
+            passNum - num
+          }件,请检查！`,
+          {
+            confirmButtonText: '确定',
+
+            type: 'warning',
+          },
+        )
+        TrackingNumber.value = ''
+        isDownloadImage.value = false
+        trackingNumberRef.value && trackingNumberRef.value.focus()
+        throw new Error()
+      } else {
+        await productionQueryApi(id, podJomallOrderUsId)
+        ElMessage.success('生产完成')
+      }
+    }
+    console.log(999)
 
     if (orderNumber) {
-      const index = historyData.value.findIndex(
-        (el: HistoryDataItem) => el.orderNumber === orderNumber,
-      )
-      if (index >= 0) {
-        // 扫单完成删除
-        historyData.value.splice(index, 1)
-        localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
-      }
+      removeFromHistory()
     }
-    emit('onSuccess')
     playAudio('weight_success')
     detail.value = {
       id: -1,
@@ -377,13 +419,19 @@ const setData = async (orderNumber: string) => {
     trackingNumberRef.value && trackingNumberRef.value.focus()
   } catch (e) {
     console.error(e)
+    if (orderNumber) {
+      removeFromHistory()
+    }
     detail.value = {
       id: -1,
       podJomallOrderUsId: -1,
       imgList: [] as cardImages[],
     }
+
     trackingNumberRef.value && trackingNumberRef.value.focus()
-    playAudio('weight_search_error')
+    throw e
+
+    // playAudio('weight_search_error')
   }
 }
 
@@ -453,29 +501,32 @@ const trackCodeInput = async () => {
     trackingNumberRef.value && trackingNumberRef.value.focus()
     return
   }
-  const item = historyData.value.find(
-    (el: HistoryDataItem) => el.orderNumber === TrackingNumber.value,
-  )
-  if (!item) {
-    // 记录扫单
-    historyData.value.push({
-      orderNumber: TrackingNumber.value,
-      finished: false,
-    })
-    localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
-  }
 
   const orderNumber = TrackingNumber.value
 
-  if (isAutoSure.value) {
-    await setData(
-      historyData.value[historyData.value.length - 1].orderNumber || '',
-    )
+  try {
+    if (isAutoSure.value) {
+      await setData(
+        historyData.value[historyData.value.length - 1]?.orderNumber || '',
+      )
+    }
+  } catch (error) {
+    console.log(error)
   }
 
+  // 记录扫单
+  historyData.value = [
+    {
+      orderNumber,
+      finished: false,
+    },
+  ]
+  localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
+
   try {
     const res = await getSubOrderBySubOrderNumber(orderNumber)
     if (!res.data) {
+      removeFromHistory()
       return ElMessage.error('生产单不存在')
     }
     const d = JSON.parse(JSON.stringify(res.data))
@@ -496,11 +547,11 @@ const trackCodeInput = async () => {
       download()
     }
     playAudio('weight_search_success')
-
     trackingNumberRef.value && trackingNumberRef.value.focus()
     TrackingNumber.value = ''
   } catch (e) {
-    console.error(e)
+    console.error(549, e)
+
     trackingNumberRef.value && trackingNumberRef.value.focus()
     TrackingNumber.value = ''
   }

src/views/order/podUs/index.vue

@@ -2255,7 +2255,7 @@ import {
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from '@/utils/hooks/useValue'
 import { showConfirm } from '@/utils/ui'
-// import { DocumentCopy, EditPen } from '@element-plus/icons-vue'
+import { DocumentCopy, EditPen } from '@element-plus/icons-vue'
 import { Column, ElFormItem } from 'element-plus'
 import { computed, onMounted, ref, nextTick, reactive } from 'vue'
 import FastProduction from './FastProduction.vue'
@@ -2841,7 +2841,8 @@ const loadTabData = async () => {
     tabsNav.value = res.data
 
     // 获取拦截数量
-    const statusRes = await getgetInterceptStateGroupList()
+    // const statusRes = await getgetInterceptStateGroupList()
+    const statusRes = { data: {} }
     interceptionStatus.value = statusRes.data as {
       shipment: Record<string, number>
       production: Record<string, number>