From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/api/mes/wm/materialstock/index.ts |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/src/api/mes/wm/materialstock/index.ts b/src/api/mes/wm/materialstock/index.ts
index 97f95b1..06a2911 100644
--- a/src/api/mes/wm/materialstock/index.ts
+++ b/src/api/mes/wm/materialstock/index.ts
@@ -64,6 +64,29 @@
   });
 }
 
+/** 搴撳瓨鐜版湁閲忓鍏ョ粨鏋� */
+export interface ImportResult {
+  /** 鏂板缓搴撳瓨璁板綍鎴愬姛鐨勮锛屽厓绱犳牸寮忋�岀墿鏂欑紪鐮�-浠撳簱銆� */
+  createNames?: string[];
+  /** 宸插瓨鍦ㄥ簱瀛樿褰曡皟鏁存垚鍔熺殑琛岋紝鍏冪礌鏍煎紡銆岀墿鏂欑紪鐮�-浠撳簱銆� */
+  updateNames?: string[];
+  /** 瀵煎叆澶辫触鐨勮褰曪紝key 涓恒�岀墿鏂欑紪鐮�-浠撳簱銆嶏紝value 涓哄け璐ュ師鍥� */
+  failureNames?: Record<string, string>;
+}
+
+/** 涓嬭浇搴撳瓨鐜版湁閲忓鍏ユā鏉� */
+export function importMaterialStockTemplate() {
+  return requestClient.download('/mes/wm/material-stock/import-template');
+}
+
+/** 瀵煎叆搴撳瓨鐜版湁閲� */
+export function importMaterialStock(file: File) {
+  return requestClient.upload<MesWmMaterialStockApi.ImportResult>(
+    '/mes/wm/material-stock/import',
+    { file },
+  );
+}
+
 /** 搴撳瓨璋冩暣锛堣嚜瀹氫箟鍑哄叆搴擄級- 鍏ュ簱 */
 export interface MaterialStockAdjustInParams {
   itemId: number; // 鐗╂枡ID
@@ -106,6 +129,21 @@
   return requestClient.post<number>('/mes/wm/material-stock/adjust-out', data);
 }
 
+/** 搴撳瓨绉诲簱 */
+export interface MaterialStockMoveParams {
+  materialStockId: number; // 搴撳瓨璁板綍ID
+  toWarehouseId: number; // 鐩爣浠撳簱ID
+  toLocationId: number; // 鐩爣搴撳尯ID
+  toAreaId: number; // 鐩爣搴撲綅ID
+  quantity: number; // 绉诲簱鏁伴噺
+  remark?: string; // 澶囨敞
+}
+
+/** 搴撳瓨绉诲簱 */
+export function moveMaterialStock(data: MaterialStockMoveParams) {
+  return requestClient.post<boolean>('/mes/wm/material-stock/move', data);
+}
+
 /** 搴撳瓨璋冩暣锛堟鏁�=鍏ュ簱锛岃礋鏁�=鍑哄簱锛�- 鏃ф帴鍙o紝淇濈暀鍏煎 */
 export interface MaterialStockAdjustParams {
   itemId: number; // 鐗╂枡ID

--
Gitblit v1.9.3