From 80e156f011776cbf4f9feb85b0b809e160359a4c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 七月 2024 08:41:42 +0800
Subject: [PATCH] 原片仓储数据推送
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 49 ++++++++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 10 --
UI-Project/src/utils/api.js | 165 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 212 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/utils/api.js b/UI-Project/src/utils/api.js
index c8674a7..6fce493 100644
--- a/UI-Project/src/utils/api.js
+++ b/UI-Project/src/utils/api.js
@@ -1,14 +1,18 @@
// src/services/api.js
import request from 'request';
+const BASE_URL = 'glassStorage/api/rawUsage'; // Replace with your actual backend base URL
-export const findTasks = (id, newState) => {
+// Function to find list of raw usages
+
+
+export const findTasks = () => {
const url = `glassStorage/api/storageTask/findTasks`;
const options = {
- method: 'POST',
+ method: 'get',
url,
json: true,
- body: { id, enableState: newState }
+
};
return new Promise((resolve, reject) => {
@@ -21,3 +25,158 @@
});
});
};
+
+
+
+export const findList = (params) => {
+ const url = `${BASE_URL}/findList`;
+ const options = {
+ method: 'post',
+ url,
+ json: true,
+ body: params
+ };
+
+ return new Promise((resolve, reject) => {
+ request(options, (error, response, body) => {
+ if (error) {
+ reject(new Error(error.message));
+ } else {
+ resolve(body);
+ }
+ });
+ });
+};
+
+// Function to find raw usage by ID
+export const findById = (id) => {
+ const url = `${BASE_URL}/${id}`;
+ const options = {
+ method: 'get',
+ url,
+ json: true
+ };
+
+ return new Promise((resolve, reject) => {
+ request(options, (error, response, body) => {
+ if (error) {
+ reject(new Error(error.message));
+ } else {
+ resolve(body);
+ }
+ });
+ });
+};
+
+// Function to insert a new raw usage
+export const insertRawUsage = (rawUsage) => {
+ const url = `${BASE_URL}`;
+ const options = {
+ method: 'post',
+ url,
+ json: true,
+ body: rawUsage
+ };
+
+ return new Promise((resolve, reject) => {
+ request(options, (error, response, body) => {
+ if (error) {
+ reject(new Error(error.message));
+ } else {
+ resolve(body);
+ }
+ });
+ });
+};
+
+// Function to update an existing raw usage
+export const updateRawUsage = (rawUsage) => {
+ const url = `${BASE_URL}`;
+ const options = {
+ method: 'put',
+ url,
+ json: true,
+ body: rawUsage
+ };
+
+ return new Promise((resolve, reject) => {
+ request(options, (error, response, body) => {
+ if (error) {
+ reject(new Error(error.message));
+ } else {
+ resolve(body);
+ }
+ });
+ });
+};
+
+// Function to delete a raw usage by ID
+export const deleteRawUsage = (id) => {
+ const url = `${BASE_URL}/${id}`;
+ const options = {
+ method: 'delete',
+ url,
+ json: true
+ };
+
+ return new Promise((resolve, reject) => {
+ request(options, (error, response, body) => {
+ if (error) {
+ reject(new Error(error.message));
+ } else {
+ resolve(body);
+ }
+ });
+ });
+};
+
+
+const API_URL = 'glassStorage/api/shelfRack'; // Adjust this based on your actual API URL
+
+export const shelfRackfindList = (params) => {
+ return request.post(`${API_URL}/findList`, params)
+ .then(response => response.data)
+ .catch(error => {
+ throw error; // Handle errors appropriately in your frontend
+ });
+};
+
+export const shelfRackfindById = (id) => {
+ return request.get(`${API_URL}/${id}`)
+ .then(response => response.data)
+ .catch(error => {
+ throw error;
+ });
+};
+
+export const insertShelfRack = (shelfRack) => {
+ return request.post(`${API_URL}`, shelfRack)
+ .then(response => response.data)
+ .catch(error => {
+ throw error;
+ });
+};
+
+export const updateShelfRack = (shelfRack) => {
+ return request.put(`${API_URL}`, shelfRack)
+ .then(response => response.data)
+ .catch(error => {
+ throw error;
+ });
+};
+
+export const shelfRackdeleteById = (id) => {
+ return request.delete(`${API_URL}/${id}`)
+ .then(response => response.data)
+ .catch(error => {
+ throw error;
+ });
+};
+
+export const findShelfRack = () => {
+ return request.get(`${API_URL}/findshelfrack`)
+ .then(response => response.data)
+ .catch(error => {
+ throw error;
+ });
+};
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
new file mode 100644
index 0000000..934155a
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
@@ -0,0 +1,49 @@
+package com.mes.job;
+
+import cn.hutool.json.JSONObject;
+
+import com.mes.shelfrack.service.ShelfRackService;
+import com.mes.storagetask.service.StorageTaskService;
+import com.mes.tools.WebSocketServer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class push {
+
+ @Autowired
+ private StorageTaskService storageTaskService;
+ @Autowired
+ private ShelfRackService shelfRackService;
+
+
+ @Scheduled(fixedDelay = 2000)
+ public void sendDownWorkstations() {
+ log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
+ JSONObject jsonObject = new JSONObject();
+
+ List<Map<String, Object>> rack = shelfRackService.selectshelf_rack();
+ List<Map<String, Object>> tasks = storageTaskService.Tasks();
+ jsonObject.append("rack",rack);
+ jsonObject.append("tasks",tasks);
+ log.info(jsonObject.toString());
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("storageTask");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null&&webserver.session.isOpen()) {
+ log.info("宸插彂閫�");
+ webserver.sendMessage(jsonObject.toString());
+ }
+ }
+ }
+ }
+
+
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 2c15c6c..f6a69e4 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -77,17 +77,9 @@
// 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
int workstationId = (int) requestData.get("workstationId");
- int totalWorkstations = downWorkstationService.getTotalQuantity(workstationId);
- int downWorkstations = downWorkstationService.getRacksNumber(workstationId);
-
-
- if (downWorkstations == totalWorkstations) {
downWorkstationService.clearFlowCardId(workstationId);
return Result.build(200, "娓呴櫎宸ヤ綅淇℃伅鎴愬姛", 1);
- } else {
- // 濡傛灉鎬绘暟閲忓拰钀芥灦鏁伴噺涓嶄竴鑷达紝杩斿洖閿欒鍝嶅簲
- return Result.build(500, "娓呴櫎宸ヤ綅淇℃伅澶辫触", 1);
- }
+
// 鏋勫缓鍝嶅簲鏁版嵁
--
Gitblit v1.8.0