From c77086ad2d7949ab36dd0c4e0b59907e672dd64f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 18 九月 2026 15:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_pro2.0' into dev_宁夏_九泓化工
---
src/api/erp/sale/order/index.ts | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/api/erp/sale/order/index.ts b/src/api/erp/sale/order/index.ts
index 5468cab..069fc90 100644
--- a/src/api/erp/sale/order/index.ts
+++ b/src/api/erp/sale/order/index.ts
@@ -10,11 +10,13 @@
customerId: number; // 瀹㈡埛缂栧彿
customerName?: string; // 瀹㈡埛鍚嶇О
accountId?: number; // 鏀舵璐︽埛缂栧彿
+ saleUserId?: number; // 閿�鍞汉鍛樼紪鍙�
orderTime: Date; // 璁㈠崟鏃堕棿
totalCount: number; // 鍚堣鏁伴噺
totalPrice: number; // 鍚堣閲戦锛屽崟浣嶏細鍏�
status: number; // 鐘舵��
remark: string; // 澶囨敞
+ processInstanceId?: string; // BPM 娴佺▼瀹炰緥缂栧彿锛堟彁浜ゅ崗鍚屽姙鍏鎵瑰悗鐢熸垚锛�
outCount: number; // 閿�鍞嚭搴撴暟閲�
outStatus?: number; // 鍑哄簱鐘舵�侊細0-鏈嚭搴擄紝1-閮ㄥ垎鍑哄簱锛�2-鍏ㄩ儴鍑哄簱
attachmentList?: { id: number; name?: string; url?: string }[]; // 闄勪欢鍒楄〃
@@ -31,6 +33,9 @@
productionFinishTime?: Date; // 鐢熶骇瀹屾垚鏃堕棿
hasSalesNotice?: boolean; // 鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�
canCreateSalesNotice?: boolean; // 鏄惁鍙互鐢熸垚鍙戣揣閫氱煡鍗�
+ creator?: string; // 鍒涘缓浜虹紪鍙凤紙瀛楃涓诧級
+ creatorName?: string; // 鍒涘缓浜哄悕绉�
+ createTime?: Date; // 鍒涘缓鏃堕棿
items?: SaleOrderItem[]; // 閿�鍞鍗曚骇鍝佹槑缁嗗垪琛�
}
@@ -53,10 +58,21 @@
totalTaxPrice?: number; // 鍚◣鎬讳环锛屽崟浣嶏細鍏�
remark?: string; // 澶囨敞
stockCount?: number; // 搴撳瓨鏁伴噺锛堟樉绀哄瓧娈碉級
+ productSpecification?: string; // 瑙勬牸鍨嬪彿锛堟樉绀哄瓧娈碉級
needProduction?: number; // 鏄惁闇�瑕佺敓浜э細0-涓嶉渶瑕侊紝1-闇�瑕�
mpsId?: number; // MPS缂栧彿
batchCode?: string; // 鎵规鍙�
}
+}
+
+/** 閿�鍞鍗曞鍏ョ粨鏋� */
+export interface ImportResult {
+ /** 鍒涘缓鎴愬姛鐨勯攢鍞崟缂栧彿 */
+ createList?: string[];
+ /** 鏇存柊鎴愬姛鐨勯攢鍞崟缂栧彿 */
+ updateList?: string[];
+ /** 瀵煎叆澶辫触闆嗗悎锛宬ey 涓洪攢鍞崟缂栧彿鎴栬鍙凤紝value 涓哄け璐ュ師鍥� */
+ failureList?: Record<string, string>;
}
/** 鏌ヨ閿�鍞鍗曞垎椤� */
@@ -91,11 +107,18 @@
return requestClient.put('/erp/sale-order/update', data);
}
-/** 鏇存柊閿�鍞鍗曠殑鐘舵�� */
-export function updateSaleOrderStatus(id: number, status: number) {
- return requestClient.put('/erp/sale-order/update-status', null, {
- params: { id, status },
+/** 鎻愪氦閿�鍞鍗曞鎵癸紙鍗忓悓鍔炲叕锛� */
+export function submitSaleOrder(id: number, processDefinitionKey: string) {
+ return requestClient.post('/erp/sale-order/submit', null, {
+ params: { id, processDefinitionKey },
});
+}
+
+/** 鑾峰彇閿�鍞鍗曞鎵规祦绋嬪畾涔夊垪琛� */
+export function getSaleOrderApproveProcessList() {
+ return requestClient.get<
+ { id: string; key: string; name: string }[]
+ >('/erp/sale-order/approve-process-list');
}
/** 鍒犻櫎閿�鍞鍗� */
@@ -123,3 +146,13 @@
params: { id },
});
}
+
+/** 涓嬭浇閿�鍞鍗曞鍏ユā鏉� */
+export function importSaleOrderTemplate() {
+ return requestClient.download('/erp/sale-order/get-import-template');
+}
+
+/** 瀵煎叆閿�鍞鍗� */
+export function importSaleOrder(file: File) {
+ return requestClient.upload<ImportResult>('/erp/sale-order/import', { file });
+}
--
Gitblit v1.9.3