From 2c38ccf9592a3d44e35ecc6b145adb763c63c287 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 21 八月 2026 13:37:08 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/api/mes/wm/salesnotice/index.ts | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/api/mes/wm/salesnotice/index.ts b/src/api/mes/wm/salesnotice/index.ts
index ab0ab44..66fe8af 100644
--- a/src/api/mes/wm/salesnotice/index.ts
+++ b/src/api/mes/wm/salesnotice/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '..\..\..\..\packages\effects\request\src';
+import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@@ -8,7 +8,8 @@
id?: number; // 閫氱煡鍗曠紪鍙�
code?: string; // 閫氱煡鍗曠紪鍙�
name?: string; // 閫氱煡鍗曞悕绉�
- salesOrderCode?: string; // 閿�鍞鍗曠紪鍙�
+ saleOrderId?: number; // 閿�鍞鍗曠紪鍙�
+ saleOrderCode?: string; // 閿�鍞鍗曠紪鍙�
clientId?: number; // 瀹㈡埛缂栧彿
clientCode?: string; // 瀹㈡埛缂栫爜
clientName?: string; // 瀹㈡埛鍚嶇О
@@ -17,6 +18,7 @@
recipientTelephone?: string; // 鑱旂郴鏂瑰紡
recipientAddress?: string; // 鏀惰揣鍦板潃
status?: number; // 鍗曟嵁鐘舵��
+ outStatus?: number; // 鍑哄簱鐘舵�侊細0-鏈嚭搴擄紝1-閮ㄥ垎鍑哄簱锛�2-鍏ㄩ儴鍑哄簱
remark?: string; // 澶囨敞
createTime?: Date; // 鍒涘缓鏃堕棿
}
@@ -63,3 +65,17 @@
params,
});
}
+
+/** 浠庨攢鍞鍗曠敓鎴愬彂璐ч�氱煡鍗� */
+export function generateFromSaleOrder(saleOrderId: number) {
+ return requestClient.post<number>('/mes/wm/sales-notice/generate-from-sale-order', {
+ saleOrderId,
+ });
+}
+
+/** 浠庡彂璐ч�氱煡鍗曠敓鎴愰攢鍞嚭搴撳崟 */
+export function generateProductSales(id: number) {
+ return requestClient.post<number>('/mes/wm/sales-notice/generate-product-sales', null, {
+ params: { id },
+ });
+}
--
Gitblit v1.9.3