From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/api/quality/processInspect.js | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/api/quality/processInspect.js b/src/api/quality/processInspect.js
index b1c3692..447d7c2 100644
--- a/src/api/quality/processInspect.js
+++ b/src/api/quality/processInspect.js
@@ -27,7 +27,7 @@
export function updateProcessInspectsById(query) {
return request({
- url: '/mes/qualityProcessInspect/updateProcessInspectsById',
+ url: '/mes/qualityProcessInspect/updateProcessInspectsById2',
method: 'post',
params: query
})
@@ -79,9 +79,26 @@
})
}
+export function updateProcessInsProduct2(obj) {
+ return request({
+ url: '/mes/qualityProcessInsProduct/updateprocessInsProduct2',
+ method: 'post',
+ data: obj
+ })
+}
+
export function selectDevice() {
return request({
url: '/mes/qualityProcessInsProduct/selectDevice',
method: 'get',
})
}
+
+export function exportProcessInsProduct(query) {
+ return request({
+ url: '/mes/qualityProcessInspect/exportExcel',
+ method: 'get',
+ responseType : 'blob',
+ params: query
+ })
+}
--
Gitblit v1.9.3