Merge branch 'dev_product_scan' into 'dev'

Dev product scan See merge request !211

Merge branch 'dev_product_scan' into 'dev'
Dev product scan See merge request !211
3bbd5f32 · qinjianhui · 20b5f95f · 086a2552 · 3bbd5f32 · 3bbd5f32
Commit 3bbd5f32 authored Jun 11, 2026 by qinjianhui
Showing with 367 additions and 29 deletions

components.d.ts
+0 -1

src/api/factoryOrderNew.ts
+15 -0

src/views/order/components/FastProduction.vue
+149 -20

src/views/order/factoryOrderNew/index.vue
+182 -6

src/views/order/podUs/PodMakeOrder.vue
+21 -2

No files found.
--- a/components.d.ts
+++ b/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']

--- a/src/api/factoryOrderNew.ts
+++ b/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

--- a/src/views/order/components/FastProduction.vue
+++ b/src/views/order/components/FastProduction.vue
--- a/src/views/order/factoryOrderNew/index.vue
+++ b/src/views/order/factoryOrderNew/index.vue
 <template>
  <div class="page card h-100 flex-gap-10 overflow-hidden flex">
+    <div
+      class="order-status-wrapper"
+      :class="{ 'is-collapsed': statusSidebarCollapsed }"
+    >
      <div class="order-status">
        <ElTree
          ref="treeRef"
@@ -40,6 +44,17 @@
          </template>
        </ElTree>
      </div>
+      <div
+        class="sidebar-toggle"
+        title="收起/展开"
+        @click="toggleStatusSidebar"
+      >
+        <span
+          class="sidebar-toggle-icon"
+          :class="{ 'is-collapsed': statusSidebarCollapsed }"
+        />
+      </div>
+    </div>
    <div class="order-content flex-1 flex-column overflow-hidden">
      <div v-if="!isSpecialLayout" class="header">
        <div class="header-filter-form">
@@ -551,6 +566,7 @@
            >拣胚完成</ElButton
          >
        </span>
        <span v-if="status === 'PENDING_PICK'" class="item">
          <ElButton type="danger" @click="handlePickFail">拣胚失败</ElButton>
        </span>
@@ -566,7 +582,7 @@
        </span>
        <span v-if="status === 'PENDING_PACKING'" class="item">
          <ElButton type="success" @click="handleSeedingWall"
-            >播种墙配货</ElButton
+            >配货打单</ElButton
          >
        </span>
        <span v-if="status === 'PENDING_PACKING'" class="item">
@@ -583,8 +599,8 @@
            >申请补胚</ElButton
          >
        </span>
-        <span v-if="status === 'IN_PRODUCTION'" class="item">
+        <span v-if="['IN_PRODUCTION'].includes(status)" class="item">
-          <ElButton type="success" @click="handleQuickProduction"
+          <ElButton type="success" @click="handleQuickProduction()"
            >快捷生产</ElButton
          >
        </span>
@@ -992,12 +1008,14 @@
      :fast-key="fastKey"
      :default-auto-sure="true"
      :show-operation-no-row="true"
+      :is-limit-scan="isLimitScan"
+      limit-scan-message="G和CB类的操作单无效操作"
      not-found-message="操作单不存在"
      pending-order-label="操作单号"
      please-scan-tip="请扫码操作单号"
      search-input-audio-tip="请录入操作单号"
      history-storage-key="historyFactoryOrderNewData"
-      tracking-placeholder="扫描枪输入操作单号，录入下一单本单自动生产完成，最后一单扫两次完成生产"
+      tracking-placeholder="扫描枪输入操作单号"
      :query-api="getOperationByNo"
      :complete-api="completeOperationById"
      :download-api="downloadOperationById"
@@ -1177,6 +1195,7 @@ import {
  updateReceiverAddressApi,
  updateRemarkApi,
  completeDeliveryApi,
+  productionScanApi,
  getByOperationNoLogApi,
  listByNoPodOrderApi,
  orderWeighingPodOrderApi,
@@ -1228,6 +1247,11 @@ import { ElTag } from 'element-plus'
 const resultInfo = ref<ResultInfoDataItem[]>([])
 const resultRefs = ref()
+const statusSidebarCollapsed = ref(false)
+const toggleStatusSidebar = () => {
+  statusSidebarCollapsed.value = !statusSidebarCollapsed.value
+}
 const batchManageRef = ref<InstanceType<typeof BatchManageTable>>()
 const waitingRestockRef = ref<InstanceType<typeof WaitingRestockTable>>()
 const cardLayoutRef = ref<InstanceType<typeof CardLayout>>()
@@ -2857,10 +2881,25 @@ const handleReplenishFail = () => {
 }
 const getOperationByNo = (operationNo: string) =>
  getByOperationNoLogApi(operationNo) as Promise<{ data?: unknown }>
-const completeOperationById = (ids: number[]) => completeDeliveryApi(ids)
+const completeOperationById = (
+  ids: number[],
+  detailData?: Record<string, unknown>,
+  trigger: 'manual' | 'auto' = 'manual',
+) => {
+  if (trigger === 'auto') {
+    const detailStatus = String(detailData?.status ?? '')
+    return productionScanApi(ids[0], detailStatus)
+  }
+  return completeDeliveryApi(ids)
+}
 const downloadOperationById = (ids: number[]) =>
  downloadOperationMaterialApi(ids)
 const handleFastProductionSuccess = (data: ResultInfoDataItem[]) => {
+  if (fastKey.value === 'productionScan') {
+    ElMessage.success('操作成功')
+    return
+  }
  const result = data[0]
  if (!result.status) {
    ElMessageBox.alert(
@@ -2871,6 +2910,8 @@ const handleFastProductionSuccess = (data: ResultInfoDataItem[]) => {
      },
    )
    return
+  } else {
+    ElMessage.success('操作成功')
  }
 }
 const createLogisticsSuccess = (data: ResultInfoDataItem[]) => {
@@ -2889,6 +2930,7 @@ const fastClose = () => {
  refreshCurrentView({ isRefreshTree: true })
 }
 const handleViewDetail = async (item: operateOrderListData) => {
+  isLimitScan.value = false
  const loading = ElLoading.service({
    fullscreen: true,
    text: '加载中...',
@@ -2906,9 +2948,11 @@ const handleViewDetail = async (item: operateOrderListData) => {
    loading.close()
  }
 }
+const isLimitScan = ref(false)
 const handleQuickProduction = () => {
  detailVisible.value = true
-  fastKey.value = 'fastProduction'
+  fastKey.value = 'productionScan'
+  isLimitScan.value = true
  detailData.value = {}
 }
 const handleSinglePrint = () => {
@@ -3033,8 +3077,140 @@ onMounted(() => {
  flex-direction: column;
  gap: 2px;
 }
+.order-status-wrapper {
+  position: relative;
+  flex-shrink: 0;
+  width: 180px;
+  transition: width 0.3s ease;
+  &.is-collapsed {
+    width: 0;
+    .order-status {
+      opacity: 0;
+      visibility: hidden;
+    }
+  }
+}
+.sidebar-toggle {
+  position: absolute;
+  top: 50%;
+  right: -12px;
+  transform: translateY(-50%);
+  z-index: 10;
+  width: 12px;
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-left: none;
+  border-radius: 0 4px 4px 0;
+  cursor: pointer;
+  box-shadow: 1px 0 4px rgba(0, 0, 0, 0.06);
+  user-select: none;
+  &:hover {
+    background: #f5f7fa;
+    .sidebar-toggle-icon {
+      border-right-color: #409eff;
+      &.is-collapsed {
+        border-right-color: transparent;
+        border-left-color: #409eff;
+      }
+    }
+  }
+}
+.sidebar-toggle-icon {
+  display: block;
+  width: 0;
+  height: 0;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 6px solid #909399;
+  transition: border-color 0.2s;
+  &.is-collapsed {
+    border-right: none;
+    border-left: 6px solid #909399;
+  }
+}
+.order-status-wrapper {
+  position: relative;
+  flex-shrink: 0;
+  width: 180px;
+  transition: width 0.3s ease;
+  &.is-collapsed {
+    width: 0;
+    .order-status {
+      opacity: 0;
+      visibility: hidden;
+    }
+  }
+}
+.sidebar-toggle {
+  position: absolute;
+  top: 50%;
+  right: -12px;
+  transform: translateY(-50%);
+  z-index: 10;
+  width: 12px;
+  height: 48px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-left: none;
+  border-radius: 0 4px 4px 0;
+  cursor: pointer;
+  box-shadow: 1px 0 4px rgba(0, 0, 0, 0.06);
+  user-select: none;
+  &:hover {
+    background: #f5f7fa;
+    .sidebar-toggle-icon {
+      border-right-color: #409eff;
+      &.is-collapsed {
+        border-right-color: transparent;
+        border-left-color: #409eff;
+      }
+    }
+  }
+}
+.sidebar-toggle-icon {
+  display: block;
+  width: 0;
+  height: 0;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 6px solid #909399;
+  transition: border-color 0.2s;
+  &.is-collapsed {
+    border-right: none;
+    border-left: 6px solid #909399;
+  }
+}
 .order-status {
  width: 180px;
+  height: 100%;
+  overflow: auto;
+  transition: opacity 0.3s ease;
  :deep(.el-tree-node__content) {
    height: 30px;

--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/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 = ''