From 3c4d241b9ef0d14a0cea5cd69b7919dfba1d14c5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 24 七月 2026 16:17:15 +0800
Subject: [PATCH] 银川 1.销售订单生产状态不匹配， 2.采购订单中没有退货状态字段，筛选项有退货状态 3.采购申请添加查看订单、查看审批功能 4.物料管理与mes产品管理的联动逻辑修改
---
src/api/erp/purchase/request/index.ts | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/api/erp/purchase/request/index.ts b/src/api/erp/purchase/request/index.ts
index c35f89c..c446da4 100644
--- a/src/api/erp/purchase/request/index.ts
+++ b/src/api/erp/purchase/request/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';
@@ -7,15 +7,25 @@
export interface PurchaseRequest {
id?: number; // 缂栧彿
no?: string; // 鐢宠缂栧彿
+ status?: number; // 鐘舵�侊細0鏈彁浜� 10瀹℃壒涓� 20瀹℃牳閫氳繃 30瀹℃牳涓嶉�氳繃 40宸插彇娑�
+ processInstanceId?: string; // 宸ヤ綔娴佺紪鍙�
+ requestUserId?: number; // 鐢宠浜虹紪鍙�
+ requestUserName?: string; // 鐢宠浜哄悕绉�
+ requestDeptId?: number; // 鐢宠閮ㄩ棬缂栧彿
+ requestDeptName?: string; // 鐢宠閮ㄩ棬鍚嶇О
+ requestTime: string; // 鐢宠鏃堕棿
+ requestReason?: string; // 鐢宠鐞嗙敱
supplierId?: number; // 渚涘簲鍟嗙紪鍙�
supplierName?: string; // 渚涘簲鍟嗗悕绉�
- requestTime: string; // 鐢宠鏃堕棿
- requesterId?: number; // 鐢宠浜虹紪鍙�
- requesterName?: string; // 鐢宠浜哄悕绉�
- reason?: string; // 鐢宠鐞嗙敱
- estimatedAmount?: number; // 棰勪及閲戦
- status?: number; // 鐘舵��
+ discountPercent?: number; // 浼樻儬鐜�
+ attachmentList?: { id: number; name?: string; url?: string }[]; // 闄勪欢鍒楄〃
remark?: string; // 澶囨敞
+ totalCount?: number; // 鎬绘暟閲�
+ totalPrice?: number; // 鎬婚噾棰�
+ productNames?: string; // 浜у搧鍚嶇О鍒楄〃
+ orderId?: number; // 鐢熸垚鐨勯噰璐鍗曠紪鍙�
+ orderNo?: string; // 鐢熸垚鐨勯噰璐鍗曞彿
+ processInstanceId?: number; // 瀹℃壒娴佺▼瀹炰緥缂栧彿
items?: PurchaseRequestItem[]; // 鐢宠鏄庣粏
createTime?: string; // 鍒涘缓鏃堕棿
}
@@ -25,11 +35,13 @@
id?: number; // 缂栧彿
productId: number; // 浜у搧缂栧彿
productName?: string; // 浜у搧鍚嶇О
- productUnitName?: string; // 浜у搧鍗曚綅
+ productUnitId?: number; // 浜у搧鍗曚綅缂栧彿
+ productUnitName?: string; // 浜у搧鍗曚綅鍚嶇О
productBarCode?: string; // 浜у搧鏉＄爜
- requestCount: number; // 鐢宠鏁伴噺
- estimatedPrice?: number; // 棰勪及鍗曚环
- requiredDate?: string; // 闇�姹傛棩鏈�
+ productPrice?: number; // 浜у搧鍗曚环锛堝弬鑰冧环锛�
+ count: number; // 鏁伴噺
+ taxPercent?: number; // 绋庣巼
+ demandTime?: string; // 闇�姹傛棩鏈�
remark?: string; // 澶囨敞
}
}
@@ -44,18 +56,14 @@
return requestClient.put('/erp/purchase-request/update', data);
}
-/** 瀹℃壒閲囪喘鐢宠 */
-export function approvePurchaseRequest(params: {
- id: number;
- status: number;
- remark?: string;
-}) {
- return requestClient.put('/erp/purchase-request/approve', null, { params });
+/** 鎻愪氦閲囪喘鐢宠瀹℃壒 */
+export function submitPurchaseRequest(id: number, processDefinitionKey: string) {
+ return requestClient.put('/erp/purchase-request/submit', null, { params: { id, processDefinitionKey } });
}
-/** 杞负閲囪喘璁㈠崟 */
-export function convertToPurchaseOrder(id: number) {
- return requestClient.put('/erp/purchase-request/convert', null, { params: { id } });
+/** 鐢熸垚閲囪喘璁㈠崟 */
+export function generatePurchaseOrder(id: number, supplierId: number) {
+ return requestClient.post<number>('/erp/purchase-request/generate-order', null, { params: { id, supplierId } });
}
/** 鍒犻櫎閲囪喘鐢宠 */
@@ -82,3 +90,8 @@
export function exportPurchaseRequest(params: any) {
return requestClient.download('/erp/purchase-request/export-excel', { params });
}
+
+/** 鑾峰彇瀹℃壒娴佺▼鍒楄〃 */
+export function getApproveProcessList(id: number) {
+ return requestClient.get(`/erp/purchase-request/approve-process-list`, { params: { id } });
+}
--
Gitblit v1.9.3