Merge branch 'dev_product_scan' into 'dev'

Dev product scan

See merge request !211

components.d.ts

@@ -54,7 +54,6 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']

src/api/factoryOrderNew.ts

@@ -535,6 +535,14 @@ export function completeDeliveryApi(ids: (number | string)[]) {
   )
 }
 
+// 生产扫码
+export function productionScanApi(id: number | string, status: string) {
+  return axios.get<never, BaseRespData<never>>(
+    'factory/podOrderOperation/scan-produce',
+    { params: { id, status } },
+  )
+}
+
 export function applyForProductByIdApi(id: string, url: string) {
   return axios.get<never, BaseRespData<operateOrderListData[]>>(url, {
     params: { podProductId: id },
@@ -550,6 +558,13 @@ export function getByOperationNoLogApi(operationNo: string) {
   )
 }
 
+// 校验库存
+export function checkInventoryApi(id: number | string, status: string) {
+  return axios.get<never, BaseRespData<never>>(
+    'factory/podOrderOperation/check-inventory',
+    { params: { id, status } },
+  )
+}
 export function listByNoPodOrderApi(params: {
   type: string
   no: string

src/views/order/podUs/PodMakeOrder.vue

@@ -13,7 +13,7 @@
   >
     <template #header>
       <div class="title">
-        <span>播种墙配货</span>
+        <span>{{ isNewOrder ? '配货打单' : '播种墙配货' }}</span>
         <span v-if="socketConnect === 'online'" class="online">[在线]</span>
         <span v-else class="offline">[离线]</span>
         <ElButton
@@ -298,6 +298,7 @@ import socket from '@/utils/websocket'
 import { WarehouseListData } from '@/types/index'
 import { filePath } from '@/api/axios.ts'
 import { ElButton, ElIcon, ElTag } from 'element-plus'
+import { BaseRespData } from '@/types/api'
 
 const { getCLodop } = useLodop()
 
@@ -803,6 +804,7 @@ const getPackingData = async (code: string) => {
       }
     }
     const res = await getPackingDataApi(url, params)
+
     if (res.code !== 200) {
       ElMessage.warning(res.message)
       isLock.value = false
@@ -839,7 +841,24 @@ const getPackingData = async (code: string) => {
 
     // }
   } catch (error) {
-    console.log(error)
+    const err = error as BaseRespData<{
+      inventory: number
+      producingQuantity: number
+      availableInventory: number
+      thirdSkuCode?: string
+    }>
+    if (props.isNewOrder && err?.code === 301) {
+      loading.close()
+      await ElMessageBox.alert(
+        `${err.data?.thirdSkuCode}库存不足，无法进入生产！请联系仓库管理人员核对库存。<br/>
+        库存数量：${err.data?.inventory}，生产中的数量：${err.data?.producingQuantity}，<span style="color: red">可调配库存：${err.data?.availableInventory}</span>`,
+        '提示',
+        {
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        },
+      )
+    }
   } finally {
     isLock.value = false
     productionOrder.value = ''