feat: 拣胚失败创建出库单

src/views/order/factoryOrderNew/component/CreateOutboundDialog.vue

@@ -376,10 +376,6 @@ const open = async (params: OpenParams) => {
   const skuList = params.items
     .map((item) => item.thirdSkuCode)
     .filter((sku) => !!sku)
-  if (!skuList.length) {
-    newDialogVisible.value = true
-    return
-  }
 
   const skuToSuggestQuantity = new Map<string, number>()
   params.items.forEach((item) => {
@@ -394,7 +390,7 @@ const open = async (params: OpenParams) => {
   try {
     const res = await getBySkuAndWarehouseIdApi(
       params.warehouseId,
-      'JM240915008_LBU_L',
+      skuList.join(','),
     )
     if (res.code !== 200) return
     await fetchWarehouseList()

src/views/order/factoryOrderNew/component/PickFailDialog.vue

@@ -261,21 +261,28 @@ const handleCreateOutbound = () => {
   }
   const warehouseName = firstSelection.warehouseName
 
-  const items = selections.value.map((item) => {
-    const row = item as operateOrderListData & {
-      thirdSkuCode?: string
-      inventory?: number
-      producingQuantity?: number
-    }
+  const items = selections.value
+    .map((item) => {
+      const row = item as operateOrderListData & {
+        thirdSkuCode?: string
+        inventory?: number
+        producingQuantity?: number
+      }
 
-    return {
-      thirdSkuCode: row.thirdSkuCode || '',
-      suggestOutQuantity: _.subtract(
-        Number(row.inventory ?? 0),
-        Number(row.producingQuantity ?? 0),
-      ),
-    }
-  })
+      return {
+        thirdSkuCode: row.thirdSkuCode || '',
+        suggestOutQuantity: _.subtract(
+          Number(row.inventory ?? 0),
+          Number(row.producingQuantity ?? 0),
+        ),
+      }
+    })
+    .filter((item) => item.suggestOutQuantity !== 0)
+
+  if (items.length === 0) {
+    ElMessage.warning('建议出库数量=0，无法快速创建出库单！')
+    return
+  }
 
   createOutboundDialogRef.value?.open({
     warehouseId,

src/views/order/factoryOrderNew/component/WaitingRestockTable.vue

@@ -109,33 +109,40 @@ const columns = [
     render: (row: RestockData) => {
       return (
         <el-image
-          src={row.skuImage ?? ''}
+          src={row.image ?? ''}
           style={{ width: '50px', height: '50px' }}
-          previewSrcList={[row.skuImage ?? '']}
+          previewSrcList={[row.image ?? '']}
           previewTeleported
         />
       )
     },
   },
   {
-    prop: 'productName',
+    prop: 'skuName',
     label: '商品名称',
     minWidth: 140,
     showOverflowTooltip: true,
   },
   { prop: 'supplierProductNo', label: '款号', width: 130 },
   {
-    key: 'thirdSkuCode',
-    prop: 'thirdSkuCode',
+    prop: 'warehouseSku',
     label: '库存SKU',
-    width: 160,
+    width: 200,
     align: 'center',
   },
   {
-    prop: 'stockOutNum',
+    prop: 'usableInventory',
     label: '缺货数量',
     width: 90,
     align: 'right',
+    render: (row: RestockData) => {
+      const v = row.usableInventory ?? 0
+      return (
+        <span style="color: #f56c6c; font-weight: bold">
+          {Math.abs(v)}
+        </span>
+      )
+    },
   },
   {
     label: '可用数量',
@@ -144,14 +151,13 @@ const columns = [
     align: 'right',
   },
   {
-    key: 'stockQuantity',
-    prop: 'stockQuantity',
+    prop: 'inventory',
     label: '库存数量',
     width: 90,
     align: 'right',
   },
   {
-    prop: 'occupiedQuantity',
+    prop: 'occupyInventory',
     label: '占用数量',
     width: 90,
     align: 'right',
@@ -178,12 +184,21 @@ const handleReset = () => {
 
 const handleRestockCheck = async (row: RestockData) => {
   try {
-    await restockCheckApi(row.id, row.thirdSkuCode ?? '', row.warehouseId)
+    await ElMessageBox.confirm('确定补货校验吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  try {
+    const res = await restockCheckApi(row.id, row.warehouseSku ?? '', row.warehouseId)
+    if (res.code !== 200) return
     ElMessage.success('补货校验成功')
     refresh()
   } catch (e) {
-    const err = e as Error & { message?: string }
-    ElMessage.error(err?.message || '补货校验失败')
+    console.error(e)
   }
 }