From 117b863cd70de111c749a390e0393a038d483aa7 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 5 Aug 2025 09:40:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=85=A5=E5=BA=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=92=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在入库订单查询表单中添加入库方式选择框
- 在入库订单表格中添加入库方式列- 更新入库订单相关接口和类型定义，增加入库方式字段
- 修改物料选择组件的导入路径
---
 src/api/wms/instockOrder/types.ts         | 15 +++++++++++++++
 src/views/wms/instockOrderCopy/index.vue  | 17 ++++++++++++++---
 src/views/wms/linkage/index.vue           |  2 +-
 src/views/wms/outstockOrderCopy/index.vue |  2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/api/wms/instockOrder/types.ts b/src/api/wms/instockOrder/types.ts
index b5d537d..46c932c 100644
--- a/src/api/wms/instockOrder/types.ts
+++ b/src/api/wms/instockOrder/types.ts
@@ -51,6 +51,11 @@ export interface InstockOrderVO {
    */
   warehouseId: string | number;
 
+  /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+  instockMethond: string;
+
 }
 
 export interface InstockOrderForm extends BaseEntity {
@@ -106,6 +111,11 @@ export interface InstockOrderForm extends BaseEntity {
    */
   warehouseId?: string | number;
 
+    /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+    instockMethond?: string;
+
 }
 
 export interface InstockOrderQuery extends PageQuery {
@@ -162,6 +172,11 @@ export interface InstockOrderQuery extends PageQuery {
    */
   warehouseId?: string | number;
 
+  /**
+   * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+   */
+  instockMethond?: string;
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index d09bb41..ee8f1d7 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -10,6 +10,11 @@
                 <el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
+            <el-form-item label="入库方式" prop="instockMethond">
+              <el-select v-model="queryForm.instockMethond" placeholder="请选择入库方式" clearable >
+                <el-option v-for="dict in instock_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
             <el-form-item label="审核状态" prop="auditStatus">
               <el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable >
                 <el-option v-for="dict in approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -67,6 +72,11 @@
             <dict-tag :options="wms_instock_type" :value="scope.row.instockType"/>
           </template>
         </el-table-column>
+        <el-table-column label="入库方式" align="center" prop="instockMethond">
+          <template #default="scope">
+            <dict-tag :options="instock_methond" :value="scope.row.instockMethond"/>
+          </template>
+        </el-table-column>
         <el-table-column label="订单编号" align="center" prop="orderNo"/>
         <el-table-column label="审核人" align="center" prop="auditBy"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
@@ -544,7 +554,7 @@ import {
   getMaterialList, getInstockMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
@@ -558,8 +568,9 @@ const {audit_behave,
   mes_material_categories,
   wms_allocate_status,
   wms_allocate_create,
-  wms_allocate_way
-} = toRefs<any>(proxy?.useDict('audit_behave', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
+  wms_allocate_way,
+  instock_methond
+} = toRefs<any>(proxy?.useDict('audit_behave', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way', 'instock_methond'));
 
 
 interface User {
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index 0767d81..25dc9aa 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -444,7 +444,7 @@ import {
   getMaterialList, viewAllocateOrderDetail, delAllocateOrderDetail, allocateOrderUpdate
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import {reactive} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 502ed38..3aee6d9 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -484,7 +484,7 @@ import {
   getMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
+import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';