From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/api/mes/wm/batch/index.ts |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/mes/wm/batch/index.ts b/src/api/mes/wm/batch/index.ts
index 5b9f256..7ed63bc 100644
--- a/src/api/mes/wm/batch/index.ts
+++ b/src/api/mes/wm/batch/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '../../../../packages/effects/request/src';
+锘縤mport type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -23,8 +23,8 @@
     clientName?: string; // 瀹㈡埛鍚嶇О
     purchaseOrderCode?: string; // 閲囪喘璁㈠崟缂栧彿
     salesOrderCode?: string; // 閿�鍞鍗曠紪鍙�
-    workOrderId?: number; // 鐢熶骇宸ュ崟 ID
-    workOrderCode?: string; // 鐢熶骇宸ュ崟缂栧彿
+    workOrderId?: number; // 鐢熶骇璁㈠崟 ID
+    workOrderCode?: string; // 鐢熶骇璁㈠崟缂栧彿
     taskId?: number; // 鐢熶骇浠诲姟 ID
     taskCode?: string; // 鐢熶骇浠诲姟缂栧彿
     workstationId?: number; // 宸ヤ綔绔� ID
@@ -43,7 +43,7 @@
     itemId?: number; // 鐗╂枡缂栧彿
     vendorId?: number; // 渚涘簲鍟嗙紪鍙�
     clientId?: number; // 瀹㈡埛缂栧彿
-    workOrderId?: number; // 宸ュ崟缂栧彿
+    workOrderId?: number; // 璁㈠崟缂栧彿
     taskId?: number; // 鐢熶骇浠诲姟缂栧彿
     workstationId?: number; // 宸ヤ綔绔欑紪鍙�
     toolId?: number; // 宸ュ叿缂栧彿

--
Gitblit v1.9.3