From a02069bb8ceeaedfd0ff4bba080e44b26166dd84 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 4 Sep 2025 14:38:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加搜索和重置按钮
- 修改仓库名称显示
- 优化销售客户选择逻辑
- 移除物料大类选择
- 完善表单验证和提交逻辑
- 更新相关类型定义
---
 src/api/wms/outstockOrder/types.ts        | 23 ++++++
 src/views/wms/outstockOrderCopy/index.vue | 95 +++++++++++++++++------
 2 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/src/api/wms/outstockOrder/types.ts b/src/api/wms/outstockOrder/types.ts
index 0689a8d..d9ec1e1 100644
--- a/src/api/wms/outstockOrder/types.ts
+++ b/src/api/wms/outstockOrder/types.ts
@@ -1,3 +1,5 @@
+import type { OutstockDetailForm } from '@/api/wms/outstockDetail/types';
+
 export interface OutstockOrderVO {
   /**
    * 出库单 主键
@@ -62,6 +64,12 @@ export interface OutstockOrderVO {
    */
   customerId: string | number;
 
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
+
 }
 
 export interface OutstockOrderForm extends BaseEntity {
@@ -127,6 +135,16 @@ export interface OutstockOrderForm extends BaseEntity {
    */
   customerId?: string | number;
 
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
+  /**
+   * 出库明细集合（一次性提交）
+   */
+  detailList?: OutstockDetailForm[];
+
 }
 
 export interface OutstockOrderQuery extends PageQuery {
@@ -193,6 +211,11 @@ export interface OutstockOrderQuery extends PageQuery {
    */
   customerId?: string | number;
 
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 2fdf5ed..3850049 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -15,6 +15,10 @@
             <el-form-item label="出库单号" prop="outstockCode">
               <el-input v-model="queryForm.outstockCode" placeholder="请输入出库单号" clearable/>
             </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </el-card>
 
@@ -44,8 +48,7 @@
                 @current-change="parentTableCellClick"
                 @selection-change="selectionChange" ref="parentTableRef">
         <el-table-column type="selection" width="55"/>
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="仓库" align="center" prop="warehouseCode"/>
+        <el-table-column label="仓库" align="center" prop="warehouseName"/>
         <el-table-column label="出库单号" align="center" prop="outstockCode"/>
         <el-table-column label="出库类型" align="center" prop="outstockType">
           <template #default="scope">
@@ -144,7 +147,7 @@
 
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
       <el-card shadow="never">
-        <el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView">
+        <el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView" ref="dialogFormRef">
           <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
             <el-option
@@ -194,7 +197,7 @@
 <!--            />-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
-          <el-form-item label="销售客户" prop="customerId"  v-if ="dialogForm.outstockType === '1' ">
+          <el-form-item label="销售客户" prop="customerId"  v-if =" dialogForm.outstockType === '1' ">
             <el-select v-model="dialogForm.customerId" placeholder="请选择客户">
               <el-option
                 v-for="item in baseCustomerList"
@@ -214,7 +217,7 @@
           </el-col>
         </el-row>
         <el-table :data="dialogtable" style="width: 100%">
-          <el-table-column label="物料大类" prop="materialCategoryId">
+<!--          <el-table-column label="物料大类" prop="materialCategoryId">
             <el-select v-model="dialogForm.materialCategoryId" placeholder="" :disabled="true">
               <el-option v-for="item in mategoryOptions"
                            :key="item.materialCategoryId"
@@ -222,7 +225,7 @@
                            :value="item.materialCategoryId"
                 />
           </el-select>
-          </el-table-column>
+          </el-table-column>-->
 
 
           <el-table-column label="物料编码" prop="materialCode">
@@ -392,8 +395,8 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="销售客户" prop="customerId">
-          <el-select v-model="parentTableInfoForm.customerId" placeholder="请选择客户" v-if="parentTableInfoForm.outstockType == 1">
+        <el-form-item label="销售客户" prop="customerId" v-if="parentTableInfoForm.outstockType === '1'">
+          <el-select v-model="parentTableInfoForm.customerId" placeholder="请选择客户" >
             <el-option
               v-for="item in baseCustomerList"
               :key="item.customerId"
@@ -575,6 +578,7 @@ const childrenTableInfoVisible = ref(false)
 // 审批
 const approveDialogVisible = ref(false)
 const approveForm = ref<Partial<OutstockOrderForm>>({ outstockId: undefined, auditStatus: '', auditComments: '' })
+const dialogFormRef = ref()
 // const childrenTableInfoSubmit = ref(false)
 const updateDialog = ref(false)
 const dialogTitle = ref('添加')
@@ -795,24 +799,55 @@ const addDialogTableCell = () => {
   dialogtable.value.push({})
 }
 
-// 新增提交
-const dialogSubmit = () => {
+const dialogSubmit = async () => {
+  // 首先进行表单验证
+  if (!dialogFormRef.value) {
+    ElMessage.error('表单引用未找到');
+    return;
+  }
 
-  addOutstockOrder(dialogForm.value).then(e => {
-    // addOutstockDetail(dialogtable.value.map(item => {
-    //     return {...item, outstockCode: e.data.outstockCode,outstockId: e.data.outstockId, materialCategoryId: e.data.materialCategoryId}
-    //   }
-    //   )
-    Promise.all(dialogtable.value.map(async (item) => {
-        const detail = {...item, outstockCode: e.data.outstockCode, outstockId: e.data.outstockId, materialCategoryId: e.data.materialCategoryId};
-        return addOutstockDetail(detail);
-      })
-    ).then(v => {
-      dialogVisible.value = false
-      getParentTable()
-    })
+  try {
+    await dialogFormRef.value.validate();
+  } catch (error) {
+    ElMessage.error('请填写完整的表单信息');
+    return;
+  }
 
-  })
+  console.log(dialogtable.value)
+  // 将前端行映射为后端明细字段，并进行基本校验与过滤
+  const detailList = (dialogtable.value || [])
+    .map((item: any) => ({
+      materialId: item.materialId,
+      materialCode: item.materialCode,
+      materialName: item.materialName,
+      materialSpe: item.materialSpe || item.materialSpec, // 前端 materialSpec -> 后端 materialSpe
+      unitName: item.materialUnit,   // 前端 materialUnit -> 后端 unitName
+      outstockQty: Number(item.outstockQty || 0),
+      materialCategoryId: dialogForm.value.materialCategoryId
+    }))
+    .filter(d => d.materialCode && Number(d.outstockQty) > 0);
+
+  console.log(detailList)
+  if (!detailList.length) {
+    ElMessage.error('请添加至少一条物料且数量>0');
+    return;
+  }
+
+  console.log(detailList, dialogtable.value);
+
+  const payload: OutstockOrderForm = {
+    ...dialogForm.value,
+    detailList: detailList
+  };
+
+  console.log(payload)
+  addOutstockOrder(payload).then(() => {
+    ElMessage.success('保存成功');
+    dialogVisible.value = false;
+    getParentTable();
+  }).catch(error => {
+    ElMessage.error('新增失败，请重试');
+  });
 }
 
 const parentTableInfoSubmit = () =>{
@@ -977,6 +1012,18 @@ let baseCustomerList = ref([]);
    baseCustomerList.value = res.data;
  }
 
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryForm.value.pageNum = 1;
+  getParentTable();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  reset();
+  handleQuery();
+}
+
 
 </script>
 <style>