From a17257382b733190906c8d485e9f6d176ffd60a3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 11:48:31 +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/erp/sale/order/index.ts | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/api/erp/sale/order/index.ts b/src/api/erp/sale/order/index.ts
index 077ca9a..5468cab 100644
--- a/src/api/erp/sale/order/index.ts
+++ b/src/api/erp/sale/order/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';
@@ -16,7 +16,8 @@
status: number; // 鐘舵��
remark: string; // 澶囨敞
outCount: number; // 閿�鍞嚭搴撴暟閲�
- fileUrl?: string; // 闄勪欢鍦板潃
+ outStatus?: number; // 鍑哄簱鐘舵�侊細0-鏈嚭搴擄紝1-閮ㄥ垎鍑哄簱锛�2-鍏ㄩ儴鍑哄簱
+ attachmentList?: { id: number; name?: string; url?: string }[]; // 闄勪欢鍒楄〃
inCount?: number; // 閲囪喘鍏ュ簱鏁伴噺
returnCount: number; // 閿�鍞��璐ф暟閲�
totalProductPrice?: number; // 浜у搧閲戦锛屽崟浣嶏細鍏�
@@ -25,6 +26,11 @@
depositPrice?: number; // 瀹氶噾閲戦锛屽崟浣嶏細鍏�
contractId?: number; // 鍏宠仈 CRM 鍚堝悓缂栧彿
contractNo?: string; // CRM 鍚堝悓鍗曞彿
+ needProduction?: number; // 鏄惁闇�瑕佺敓浜э細0-涓嶉渶瑕侊紝1-闇�瑕�
+ productionStatus?: number; // 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+ productionFinishTime?: Date; // 鐢熶骇瀹屾垚鏃堕棿
+ hasSalesNotice?: boolean; // 鏄惁宸茬敓鎴愬彂璐ч�氱煡鍗�
+ canCreateSalesNotice?: boolean; // 鏄惁鍙互鐢熸垚鍙戣揣閫氱煡鍗�
items?: SaleOrderItem[]; // 閿�鍞鍗曚骇鍝佹槑缁嗗垪琛�
}
@@ -47,6 +53,9 @@
totalTaxPrice?: number; // 鍚◣鎬讳环锛屽崟浣嶏細鍏�
remark?: string; // 澶囨敞
stockCount?: number; // 搴撳瓨鏁伴噺锛堟樉绀哄瓧娈碉級
+ needProduction?: number; // 鏄惁闇�瑕佺敓浜э細0-涓嶉渶瑕侊紝1-闇�瑕�
+ mpsId?: number; // MPS缂栧彿
+ batchCode?: string; // 鎵规鍙�
}
}
@@ -100,3 +109,17 @@
export function exportSaleOrder(params: any) {
return requestClient.download('/erp/sale-order/export-excel', { params });
}
+
+/** 浣滃簾閿�鍞鍗� */
+export function cancelSaleOrder(id: number) {
+ return requestClient.put('/erp/sale-order/cancel', null, {
+ params: { id },
+ });
+}
+
+/** 鍚敤閿�鍞鍗曪紙鎭㈠宸蹭綔搴熻鍗曪級 */
+export function enableSaleOrder(id: number) {
+ return requestClient.put('/erp/sale-order/enable', null, {
+ params: { id },
+ });
+}
--
Gitblit v1.9.3