From 2c38a6972692171bb8f43c4d90c62c2bb8315310 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Wed, 3 Sep 2025 11:16:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E8=B0=83=E6=95=B4=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=AE=A2=E5=8D=95=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0=E8=B4=A8=E6=A3=80=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉入库订单复制页面的入库方式列
- 在入库明细 API 中添加质检要求字段
- 在采购订单明细 API 中添加物料 ID 字段
---
 src/api/wms/instockDetail/types.ts          | 15 +++++++++++++++
 src/api/wms/wmsPurchaseOrderDetail/types.ts | 15 +++++++++++++++
 src/views/wms/instockOrderCopy/index.vue    | 12 ++++++------
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/api/wms/instockDetail/types.ts b/src/api/wms/instockDetail/types.ts
index 8caf383..d040a23 100644
--- a/src/api/wms/instockDetail/types.ts
+++ b/src/api/wms/instockDetail/types.ts
@@ -106,6 +106,11 @@ export interface InstockDetailVO {
    */
   packageMode?: string;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest: string;
+
 }
 
 export interface InstockDetailForm extends BaseEntity {
@@ -211,6 +216,11 @@ export interface InstockDetailForm extends BaseEntity {
    */
   packageMode?: string;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest?: string;
+
 }
 
 export interface InstockDetailQuery extends PageQuery {
@@ -292,6 +302,11 @@ export interface InstockDetailQuery extends PageQuery {
    */
   apportionQty?: number;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest?: string;
+
     /**
      * 日期范围参数
      */
diff --git a/src/api/wms/wmsPurchaseOrderDetail/types.ts b/src/api/wms/wmsPurchaseOrderDetail/types.ts
index 45d8b8d..433d95f 100644
--- a/src/api/wms/wmsPurchaseOrderDetail/types.ts
+++ b/src/api/wms/wmsPurchaseOrderDetail/types.ts
@@ -1,4 +1,5 @@
 export interface WmsPurchaseOrderDetailVO {
+
   /**
    * 采购物料表主键
    */
@@ -19,6 +20,11 @@ export interface WmsPurchaseOrderDetailVO {
    */
   materialName: string;
 
+  /**
+   * 物料ID
+   */
+  materialId: string | number;
+
   /**
    * 采购订单编号
    */
@@ -112,6 +118,10 @@ export interface WmsPurchaseOrderDetailForm extends BaseEntity {
    */
   deliveryQty?: number;
 
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
 }
 
 export interface WmsPurchaseOrderDetailQuery extends PageQuery {
@@ -156,6 +166,11 @@ export interface WmsPurchaseOrderDetailQuery extends PageQuery {
    */
   deliveryQty?: number;
 
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 80cb80c..602fecf 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -71,11 +71,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="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">
@@ -1292,7 +1292,7 @@ const handleAssociatePurchaseOrder = async () => {
     });
     dialogtable.value = res.data.map(item => ({
       poDId: item.poDId, // 添加采购订单物料主键
-      // materialId: item.materialId,
+      materialId: item.materialId,
       materialCode: item.materialCode,
       materialName: item.materialName,
       materialSpe: item.materialSpe,