From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/api/business/rawMaterialOrder.js | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index c463090..a37df10 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -44,7 +44,7 @@
// 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
export function getUserNow(query) {
return request({
- url: '/user/getUserNow',
+ url: '/system/newUser/getUserNow',
method: 'get',
})
}
@@ -95,6 +95,14 @@
params: query
})
}
+// 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇�
+export function selectRawMaterOrderTemplate(query) {
+ return request({
+ url: '/rawMaterialOrder/selectRawMaterOrderTemplate',
+ method: 'get',
+ params: query
+ })
+}
// 鍘熸潗鏂欐柊澧炴ā鏉�
export function addRawMaterOrderTemplate(query) {
return request({
@@ -138,7 +146,7 @@
// 閾滃崟涓濅笅鍗�
export function addRawCopperOrder(query) {
return request({
- url: '/insOrder/addRawCopperOrder',
+ url: '/rawMaterialOrder/addRawCopperOrder',
method: 'post',
data: query
})
@@ -206,12 +214,13 @@
data: query
})
}
-// 鍘熸潗鏂欎笅鍗曞嚭鍘傛挙閿�
+// 鍘熸潗鏂欐姤妫�鍏ㄩ儴瀵煎嚭
export function rawAllExport(query) {
return request({
url: '/rawMaterialOrder/rawAllExport',
- method: 'post',
- data: query
+ method: 'get',
+ params: query,
+ responseType: "blob"
})
}
// 鍘熸潗鏂欎笅鍗曞嚭鍘傛挙閿�
@@ -263,7 +272,7 @@
})
}
// 妫�楠屽崟涓嬬殑闄勪欢鍒楄〃-鍒犻櫎
-export function delfile(query) {
+export function delFile(query) {
return request({
url: '/insOrderPlan/delfile',
method: 'delete',
@@ -278,3 +287,11 @@
params: query
})
}
+// 淇濆瓨涓嶅悎鏍煎娴嬫暟鎹�
+export function saveUnqualifiedContext(query) {
+ return request({
+ url: '/insOrderPlan/saveUnqualifiedContext',
+ method: 'post',
+ data: query
+ })
+}
--
Gitblit v1.9.3