From 0b1f97c5dfeedee8dac2b1498a1cafefbd2b2a9c Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Wed, 3 Sep 2025 09:37:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E8=B0=83=E6=95=B4=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在出库详情页面中隐藏物料大类列
- 在出库订单复制页面中移除工单类型选择和物料大类列
- 更新出库数量相关列的显示
- 在 API 类型中添加新字段并调整现有字段
---
 src/api/wms/outstockDetail/types.ts       |   3 +
 src/api/wms/wmsPurchaseOrder/types.ts     |  18 ++++
 src/views/wms/outstockDetail/index.vue    |   2 +-
 src/views/wms/outstockOrder/index.vue     |   6 +-
 src/views/wms/outstockOrderCopy/index.vue | 115 +++++++++++-----------
 5 files changed, 83 insertions(+), 61 deletions(-)

diff --git a/src/api/wms/outstockDetail/types.ts b/src/api/wms/outstockDetail/types.ts
index 6d4a494..622f828 100644
--- a/src/api/wms/outstockDetail/types.ts
+++ b/src/api/wms/outstockDetail/types.ts
@@ -23,6 +23,7 @@ export interface OutstockDetailVO {
    * 出库数量
    */
   outstockQty: number;
+  outSum: number;
 
   /**
    * 物料大类
@@ -85,6 +86,7 @@ export interface OutstockDetailForm extends BaseEntity {
    * 出库数量
    */
   outstockQty?: number;
+  outSum: number;
 
   /**
    * 物料大类
@@ -142,6 +144,7 @@ export interface OutstockDetailQuery extends PageQuery {
    * 出库数量
    */
   outstockQty?: number;
+  outSum: number;
 
   /**
    * 物料大类
diff --git a/src/api/wms/wmsPurchaseOrder/types.ts b/src/api/wms/wmsPurchaseOrder/types.ts
index 0baea19..554eb0d 100644
--- a/src/api/wms/wmsPurchaseOrder/types.ts
+++ b/src/api/wms/wmsPurchaseOrder/types.ts
@@ -92,6 +92,11 @@ export interface WmsPurchaseOrderVO {
    */
   auditComments: string;
 
+  /**
+   * 供应商名称
+   */
+  supplierName:string;
+
 }
 
 export interface WmsPurchaseOrderForm extends BaseEntity {
@@ -160,6 +165,12 @@ export interface WmsPurchaseOrderForm extends BaseEntity {
    */
   auditComments?: string;
 
+
+  /**
+   * 供应商名称
+   */
+  supplierName:string;
+
 }
 
 export interface WmsPurchaseOrderQuery extends PageQuery {
@@ -219,6 +230,13 @@ export interface WmsPurchaseOrderQuery extends PageQuery {
    */
   auditComments?: string;
 
+
+  /**
+   * 供应商名称
+   */
+  supplierName:string;
+
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/wms/outstockDetail/index.vue b/src/views/wms/outstockDetail/index.vue
index 4b25521..0890409 100644
--- a/src/views/wms/outstockDetail/index.vue
+++ b/src/views/wms/outstockDetail/index.vue
@@ -162,7 +162,7 @@ const columns = ref<FieldOption[]>([
         { key: 3, label: `创建时间`, visible: true },
         { key: 4, label: `物料id`, visible: true },
         { key: 5, label: `出库数量`, visible: true },
-        { key: 6, label: `物料大类`, visible: true },
+        { key: 6, label: `物料大类`, visible: false },
         { key: 7, label: `完成数量`, visible: true },
         { key: 8, label: `AGV状态`, visible: true },
 ]);
diff --git a/src/views/wms/outstockOrder/index.vue b/src/views/wms/outstockOrder/index.vue
index 6696aff..30c28a4 100644
--- a/src/views/wms/outstockOrder/index.vue
+++ b/src/views/wms/outstockOrder/index.vue
@@ -256,12 +256,12 @@ const columns = ref<FieldOption[]>([
         { key: 6, label: `创建时间`, visible: true },
         { key: 7, label: `更新人`, visible: true },
         { key: 8, label: `更新时间`, visible: true },
-        { key: 9, label: `物料大类`, visible: true },
-        { key: 10, label: `工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)`, visible: true },
+        { key: 9, label: `物料大类`, visible: false },
+        { key: 10, label: `工单类型`, visible: true },
         { key: 11, label: `订单编号`, visible: true },
         { key: 12, label: `审核人`, visible: true },
         { key: 13, label: `审核时间`, visible: true },
-        { key: 14, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
+        { key: 14, label: `审核状态`, visible: true },
         { key: 15, label: `审核意见`, visible: true },
 ]);
 
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 84f2ac7..2fdf5ed 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -57,11 +57,11 @@
             <dict-tag :options="material_mategories" :value="scope.row.materialCategoryId"/>
           </template>
         </el-table-column>-->
-        <el-table-column label="工单类型" align="center" prop="orderType">
-          <template #default="scope">
-            <dict-tag :options="wms_instock_type" :value="scope.row.orderType"/>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="工单类型" align="center" prop="orderType">-->
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="wms_instock_type" :value="scope.row.orderType"/>-->
+<!--          </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">
@@ -116,9 +116,10 @@
         <el-table-column label="出库单号" align="center" prop="outstockCode"/>
         <!-- <el-table-column label="出库单 主键" align="center" prop="outstockId" v-if="columns[2].visible"/> -->
         <el-table-column label="物料" align="center" prop="materialCode"/>
-        <el-table-column label="出库数量" align="center" prop="outstockQty"/>
-        <el-table-column label="物料大类" align="center" prop="materialCategoryName">
-        </el-table-column>
+        <el-table-column label="计划数量" align="center" prop="outstockQty"/>
+        <el-table-column label="实出数量" align="center" prop="outSum"/>
+<!--        <el-table-column label="物料大类" align="center" prop="materialCategoryName">-->
+<!--        </el-table-column>-->
         <el-table-column label="是否高价值" align="center" prop="isHighValue">
         </el-table-column>
         <el-table-column label="操作" fixed="right" width="200">
@@ -164,25 +165,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物料大类" prop="materialCategoryId">
-          <el-select v-model="dialogForm.materialCategoryId" placeholder="请选择物料大类" @change="setMaterialList">
-                                   <el-option v-for="item in mategoryOptions"
-                           :key="item.materialCategoryId"
-                           :label="item.materialCategoryName"
-                           :value="item.materialCategoryId"
-                />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工单类型" prop="orderType">
-          <el-select v-model="dialogForm.orderType" placeholder="请选择工单类型">
-            <el-option
-                v-for="dict in wms_instock_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--          <el-select v-model="dialogForm.materialCategoryId" placeholder="请选择物料大类" @change="setMaterialList">-->
+<!--                                   <el-option v-for="item in mategoryOptions"-->
+<!--                           :key="item.materialCategoryId"-->
+<!--                           :label="item.materialCategoryName"-->
+<!--                           :value="item.materialCategoryId"-->
+<!--                />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="工单类型" prop="orderType">-->
+<!--          <el-select v-model="dialogForm.orderType" placeholder="请选择工单类型">-->
+<!--            <el-option-->
+<!--                v-for="dict in wms_instock_type"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="审核人" prop="auditBy">-->
 <!--          <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">-->
 <!--            <el-option-->
@@ -307,9 +308,9 @@
 
 
 
-          <el-table-column label="出库数量" prop="outstockQty">
+          <el-table-column label="计划出库数量" prop="outstockQty">
             <template #default="scope">
-              <el-input v-model="scope.row.outstockQty" placeholder="请输入出库数量" style="width: 200px;"/>
+              <el-input v-model="scope.row.outstockQty" placeholder="请输入计划数量" style="width: 200px;"/>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="200">
@@ -402,25 +403,25 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="物料大类" prop="materialCategoryId">
-          <el-select v-model="parentTableInfoForm.materialCategoryId" placeholder="请选择物料大类">
-                                   <el-option v-for="item in mategoryOptions"
-                           :key="item.materialCategoryId"
-                           :label="item.materialCategoryName"
-                           :value="item.materialCategoryId"
-                />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工单类型" prop="orderType">
-          <el-select v-model="parentTableInfoForm.orderType" placeholder="请选择工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)" :disabled="true">
-            <el-option
-                v-for="dict in wms_instock_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--          <el-select v-model="parentTableInfoForm.materialCategoryId" placeholder="请选择物料大类">-->
+<!--                                   <el-option v-for="item in mategoryOptions"-->
+<!--                           :key="item.materialCategoryId"-->
+<!--                           :label="item.materialCategoryName"-->
+<!--                           :value="item.materialCategoryId"-->
+<!--                />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="工单类型" prop="orderType">-->
+<!--          <el-select v-model="parentTableInfoForm.orderType" placeholder="请选择工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)" :disabled="true">-->
+<!--            <el-option-->
+<!--                v-for="dict in wms_instock_type"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="审核人" prop="auditBy">
           <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人" :disabled="true">
             <el-option
@@ -457,15 +458,15 @@
         <el-form-item label="入库数量" prop="instockQty">
           <el-input v-model="childrenTableInfoForm.instockQty" placeholder="请输入入库数量" />
         </el-form-item>
-        <el-form-item label="有无条码" prop="codeYesNo">
-          <el-radio-group v-model="childrenTableInfoForm.codeYesNo">
-            <el-radio
-              v-for="dict in wms_barcode_if"
-              :key="dict.value"
-              :value="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="有无条码" prop="codeYesNo">-->
+<!--          <el-radio-group v-model="childrenTableInfoForm.codeYesNo">-->
+<!--            <el-radio-->
+<!--              v-for="dict in wms_barcode_if"-->
+<!--              :key="dict.value"-->
+<!--              :value="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label="已包数量" prop="printedNum">
           <el-input v-model="childrenTableInfoForm.printedNum" placeholder="" />
         </el-form-item>