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/finishedProduct.js | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/api/quality/finishedProduct.js b/src/api/quality/finishedProduct.js
index 0badd57..7b464d1 100644
--- a/src/api/quality/finishedProduct.js
+++ b/src/api/quality/finishedProduct.js
@@ -16,6 +16,14 @@
})
}
+export function selectDeviceAPI(query) {
+ return request({
+ url: '/mes/qualityFinishedInsProduct/selectDevice',
+ method: 'get',
+ params: query
+ })
+}
+
export function addFinish(obj) {
return request({
url: '/mes/qualityFinishedInspect/addFinish',
@@ -54,10 +62,44 @@
})
}
+export function updateFinishedInsProduct2(obj) {
+ return request({
+ url: '/mes/qualityFinishedInsProduct/updatefinishedInsProduct2',
+ method: 'post',
+ data: obj
+ })
+ }
+
export function updateFinishedInspectById(obj) {
return request({
- url: '/mes/qualityFinishedInspect/updateFinishedInspectById',
+ url: '/mes/qualityFinishedInspect/updateFinishedInspectById2',
method: 'post',
params: obj
})
-}
\ No newline at end of file
+}
+
+export function exportExaminationProducts(query) {
+ return request({
+ url: '/mes/qualityFinishedInspect/exportExcel',
+ method: 'get',
+ responseType : 'blob',
+ params: query
+ })
+}
+
+export function updateLocationIdById(obj) {
+ return request({
+ url: '/mes/qualityFinishedInspect/'+obj.id,
+ method: 'post',
+ params: obj
+ })
+}
+
+export function downloadReport(data) {
+ return request({
+ url: '/mes/qualityFinishedInspect/downloadReport',
+ method: 'post',
+ data: data,
+ responseType: 'blob',
+ })
+ }
--
Gitblit v1.9.3