From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/api/home.js | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 13 deletions(-)
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 7658487..29d0964 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -1,5 +1,22 @@
import request from "../utils/request";
+
+export function SelectPermissionByUserName(username) {
+ return request({
+ url: '/home/SelectPermissionByUserName?username='+username,
+ method: 'get',
+ data:""
+ })
+}
+
+export function currentUsername() {
+ return request({
+ url: '/api/user/currentUsername',
+ method: 'get',
+
+ })
+ }
+
/**
*鐧诲綍
* @param data
@@ -18,13 +35,6 @@
url: '/home/loads',
method: 'get',
data
- })
-}
-
-export function loadtask(type) {
- return request({
- url: '/home/loadinout?types=' + type,
- method: 'get',
})
}
@@ -116,9 +126,9 @@
})
}
-export function Inglassid(cage,cell,tier,data) {
+export function Inglassid(cage, cell, tier, data) {
return request({
- url: '/home/Inglassid?cage=' + cage + '&cell=' + cell+ '&tier=' + tier,
+ url: '/home/Inglassid?cage=' + cage + '&cell=' + cell + '&tier=' + tier,
method: 'post',
data
})
@@ -128,14 +138,95 @@
return request({
url: '/home/SelectGlass?orderid=' + orderid,
method: 'post',
+ data: ""
+ })
+}
+
+export function InsertQueueGlassId(id,data) {
+ return request({
+ url: '/home/InsertQueueGlassId?id=' + id,
+ method: 'post',
+ data
+ })
+}
+
+export function UpdateQueueState() {
+ return request({
+ url: '/home/UpdateQueueState',
+ method: 'post',
+ data: ""
+ })
+}
+
+export function DeleteQueueGlass(id) {
+ return request({
+ url: '/home/DeleteQueueGlass?id=' + id,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function SelectGlassNo(orderid) {
+ return request({
+ url: '/home/SelectGlassNo?orderid=' + orderid,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function SelectAluminumFrameInfoById(FrameBarcode) {
+ return request({
+ url: '/home/SelectAluminumFrameInfoById?FrameBarcode=' + FrameBarcode,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function SelectProductionqueue() {
+ return request({
+ url: '/home/SelectProductionqueue',
+ method: 'post',
+ data: ""
+ })
+}
+
+export function DeleteProductionQueueGlass(FrameNo) {
+ return request({
+ url: '/home/DeleteProductionQueueGlass?FrameNo='+FrameNo,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function AddOutSliceS(data) {
+ return request({
+ url: '/home/AddOutSliceS',
+ method: 'post',
+ data
+ })
+}
+
+export function isAllowQueues(isAllowQueue,data) {
+ return request({
+ url: '/home/isAllowQueues?isAllowQueue=' + isAllowQueue,
+ method: 'post',
+ data
+ })
+}
+
+export function isConfirmStates(isConfirmStates) {
+ return request({
+ url: '/home/isConfirmStates?isConfirmStates=' + isConfirmStates,
+ method: 'post',
data:""
})
}
-export function InsertQueueGlassId(glassid) {
+export function CompleteQueue(id,frameid) {
return request({
- url: '/home/InsertQueueGlassId?glassid=' + glassid,
+ url: '/home/CompleteQueue?id=' + id+'&frameid='+frameid,
method: 'post',
- data: ""
+ data:""
})
-}
\ No newline at end of file
+}
+
--
Gitblit v1.8.0