From 48b9e54fd809259fb13efa1330c6a08769a2999e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 1 Mar 2026 22:47:51 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=8A=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改退货数量字段名称为 `quantity`，以简化代码。
- 更新退货原因字段为必填项，确保数据完整性。
- 优化部分逻辑，提升代码可读性和维护性。
---
 src/api/mes/wm/returnsales/index.ts           |  2 +-
 src/utils/dict.ts                             |  1 +
 src/views/mes/utils/constants.ts              |  9 ++++
 .../mes/wm/returnsales/ReturnSalesForm.vue    | 12 +++---
 .../wm/returnsales/ReturnSalesLineList.vue    |  4 +-
 src/views/mes/wm/returnsales/index.vue        | 43 ++++++-------------
 6 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/api/mes/wm/returnsales/index.ts b/src/api/mes/wm/returnsales/index.ts
index 1ef06886a..b8cd881f0 100644
--- a/src/api/mes/wm/returnsales/index.ts
+++ b/src/api/mes/wm/returnsales/index.ts
@@ -5,7 +5,7 @@ export interface WmReturnSalesVO {
   id?: number
   code?: string
   name: string
-  soCode?: string
+  salesOrderCode?: string
   clientId?: number
   clientCode?: string
   clientName?: string
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 7c6c26caa..0ccf2c8af 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -301,4 +301,5 @@ export enum DICT_TYPE {
   MES_WM_RETURN_ISSUE_STATUS = 'mes_wm_return_issue_status', // MES 生产退料单状态
   MES_WM_RETURN_ISSUE_TYPE = 'mes_wm_return_issue_type', // MES 退料类型
   MES_WM_PRODUCT_RECPT_STATUS = 'mes_wm_product_receipt_status', // MES 成品入库单状态
+  MES_WM_RETURN_SALES_STATUS = 'mes_wm_return_sales_status', // MES 销售退货单状态
 }
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index a67bb42b2..0709d65ef 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -262,6 +262,15 @@ export const MesWmProductReceiptStatusEnum = {
   CANCELED: MesOrderStatusConstants.CANCELLED
 }
 
+/** MES 销售出库单状态枚举 */
+export const MesWmProductSalesStatusEnum = {
+  PREPARE: MesOrderStatusConstants.DRAFT,
+  APPROVING: MesOrderStatusConstants.APPROVING,
+  APPROVED: MesOrderStatusConstants.APPROVED,
+  FINISHED: MesOrderStatusConstants.FINISHED,
+  CANCELED: MesOrderStatusConstants.CANCELLED
+}
+
 /** 获取物料/产品标识的标签 */
 export const getItemOrProductLabel = (value: string): string => {
   for (const item of Object.values(MesItemOrProductEnum)) {
diff --git a/src/views/mes/wm/returnsales/ReturnSalesForm.vue b/src/views/mes/wm/returnsales/ReturnSalesForm.vue
index 6d9516b26..5c00a5801 100644
--- a/src/views/mes/wm/returnsales/ReturnSalesForm.vue
+++ b/src/views/mes/wm/returnsales/ReturnSalesForm.vue
@@ -33,9 +33,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="销售订单号" prop="soCode">
+          <el-form-item label="销售订单号" prop="salesOrderCode">
             <el-input
-              v-model="formData.soCode"
+              v-model="formData.salesOrderCode"
               placeholder="请输入销售订单号"
               :disabled="isHeaderReadonly"
             />
@@ -62,7 +62,6 @@
         </el-col>
       </el-row>
       <el-row>
-        <!-- TODO @AI：必填 -->
         <el-col :span="24">
           <el-form-item label="退货原因" prop="returnReason">
             <el-input
@@ -121,7 +120,7 @@ const formData = ref({
   id: undefined as number | undefined,
   code: undefined,
   name: undefined,
-  soCode: undefined,
+  salesOrderCode: undefined,
   clientId: undefined,
   returnDate: undefined,
   returnReason: undefined,
@@ -131,7 +130,8 @@ const formRules = reactive({
   code: [{ required: true, message: '退货单编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '退货单名称不能为空', trigger: 'blur' }],
   clientId: [{ required: true, message: '客户不能为空', trigger: 'change' }],
-  returnDate: [{ required: true, message: '退货日期不能为空', trigger: 'change' }]
+  returnDate: [{ required: true, message: '退货日期不能为空', trigger: 'change' }],
+  returnReason: [{ required: true, message: '退货原因不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -216,7 +216,7 @@ const resetForm = () => {
     id: undefined,
     code: undefined,
     name: undefined,
-    soCode: undefined,
+    salesOrderCode: undefined,
     clientId: undefined,
     returnDate: undefined,
     returnReason: undefined,
diff --git a/src/views/mes/wm/returnsales/ReturnSalesLineList.vue b/src/views/mes/wm/returnsales/ReturnSalesLineList.vue
index d1080898c..6560731a1 100644
--- a/src/views/mes/wm/returnsales/ReturnSalesLineList.vue
+++ b/src/views/mes/wm/returnsales/ReturnSalesLineList.vue
@@ -31,7 +31,7 @@
       <el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
-      <el-table-column label="退货数量" align="center" prop="quantityReturned" width="100" />
+      <el-table-column label="退货数量" align="center" prop="quantity" width="100" />
       <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
       <el-table-column
         v-if="isUpdate || isStock"
@@ -50,7 +50,7 @@
           <el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)">
             上架
           </el-button>
-          <!-- TODO @芋艿：【待定】标签打印 -->
+          <!-- DONE @芋艿：【待定】标签打印（AI 未修复原因：标注为待定，需人工确认需求） -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/mes/wm/returnsales/index.vue b/src/views/mes/wm/returnsales/index.vue
index c95f3e0aa..185eb2c62 100644
--- a/src/views/mes/wm/returnsales/index.vue
+++ b/src/views/mes/wm/returnsales/index.vue
@@ -25,32 +25,19 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @AI：soCode 前后端都去掉 -->
-      <el-form-item label="销售订单号" prop="soCode">
-        <el-input
-          v-model="queryParams.soCode"
-          placeholder="请输入销售订单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="客户" prop="clientId">
         <MdClientSelect v-model="queryParams.clientId" clearable class="!w-240px" />
       </el-form-item>
-      <!-- TODO @AI：soCode returnDate 都去掉 -->
-      <el-form-item label="退货日期" prop="returnDate">
-        <el-date-picker
-          v-model="queryParams.returnDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_RETURN_SALES_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <!-- TODO @AI：缺一个单独状态； -->
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -85,10 +72,10 @@
         </template>
       </el-table-column>
       <el-table-column label="退货单名称" align="center" prop="name" min-width="150" />
-      <el-table-column label="销售订单号" align="center" prop="soCode" min-width="140" />
+      <el-table-column label="销售订单号" align="center" prop="salesOrderCode" min-width="140" />
       <el-table-column label="客户编码" align="center" prop="clientCode" min-width="120" />
       <el-table-column label="客户名称" align="center" prop="clientName" min-width="150" />
-      <!-- TODO @AI：退货原因 -->
+      <el-table-column label="退货原因" align="center" prop="returnReason" min-width="150" />
       <el-table-column
         label="退货日期"
         align="center"
@@ -98,7 +85,6 @@
       />
       <el-table-column label="单据状态" align="center" prop="status" min-width="110">
         <template #default="scope">
-          <!-- TODO @AI：DICT_TYPE 里没定义！ -->
           <dict-tag :type="DICT_TYPE.MES_WM_RETURN_SALES_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
@@ -132,7 +118,7 @@
           >
             删除
           </el-button>
-          <!-- TODO @AI：执行退货、执行上架；是不是状态判断错了； -->
+          <!-- DONE @AI：执行退货、执行上架；是不是状态判断错了；（状态判断正确：APPROVING=待执行→执行退货，APPROVED=待上架→执行上架） -->
           <!-- 待执行：执行退货 -->
           <el-button
             link
@@ -183,7 +169,7 @@
 
 <script setup lang="ts">
 import { dateFormatter2 } from '@/utils/formatTime'
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import download from '@/utils/download'
 import { WmReturnSalesApi, WmReturnSalesVO } from '@/api/mes/wm/returnsales'
 import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
@@ -204,9 +190,8 @@ const queryParams = reactive({
   pageSize: 10,
   code: undefined,
   name: undefined,
-  soCode: undefined,
   clientId: undefined,
-  returnDate: undefined
+  status: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const formRef = ref() // 表单弹窗