From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 09:50:47 +0800
Subject: [PATCH] 1、大理片笼新增复位按钮：清除笼内状态为0的玻璃数据，并将格子尺寸恢复到初始状态。 2、历史任务按钮：按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时，仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱，当数量小于总层数时，增加是否同一对玻璃的判断，避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 246 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 207 insertions(+), 39 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index c8bce6f..2cf6ed0 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -1,17 +1,35 @@
package com.mes.job;
+import cn.hutool.json.JSONObject;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.S7object;
+import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
+import com.mes.opctask.entity.LoadGlassDeviceTask;
+import com.mes.opctask.service.LoadGlassDeviceTaskService;
+import com.mes.pp.service.OptimizeProjectService;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.tools.DateUtil;
+import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @author SNG-010
@@ -26,42 +44,62 @@
private EngineeringService engineeringService;
@Autowired
private UpPattenUsageService upPattenUsageService;
+ @Autowired
+ private OptimizeProjectService optimizeProjectService;
+ @Autowired
+ RedisUtil redisUtil;
+ @Resource
+ private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
+ @Resource
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+
+ private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
+
+ private static final String LOAD_GLASS_DEVICE_TWO_TASK = "load_glass_device_two_task";
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+// @Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
+ //鑾峰彇鑱旀満鐘舵��
+ String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
//鑾峰彇鏄惁鏈変笂鐗囪姹�
String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
- //鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
- Engineering engineering = engineeringService.selectInitiate(1);
- if ("1".equals(loadRequest) && engineering != null) {
- log.info("寮�濮嬩笂鐗囦换鍔�");
- UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
- log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}", upPattenUsage);
- UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
- log.info("绗﹀悎鐨勫昂瀵哥殑宸ヤ綅鐜荤拑锛歿}", upwork);
- if (upwork != null) {
- int workId = upwork.getWorkstationId();//宸ヤ綅id
- double width = upwork.getPatternWidth();//瀹藉害
- double height = upwork.getPatternHeight();//楂樺害
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
- //鏇存敼涓婄墖琛ㄧ姸鎬�
- upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
+ //mes鐘舵��
+ String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ if ("1".equals(inkageStatus) && "1".equals(loadRequest)) {
+ //鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ if (engineering != null) {
+ log.info("寮�濮嬩笂鐗囦换鍔�");
+ UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
+ log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}", upPattenUsage);
+ UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
+ log.info("绗﹀悎鐨勫昂瀵哥殑宸ヤ綅鐜荤拑锛歿}", upwork);
+ if (upwork != null) {
+ int workId = upwork.getWorkstationId();//宸ヤ綅id
+ double width = upwork.getPatternWidth();//瀹藉害
+ double height = upwork.getPatternHeight();//楂樺害
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (int) width);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (int) height);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
+ //鏇存敼涓婄墖琛ㄧ姸鎬�
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
+ }
}
- }else {
+
+ }
+ if ("1".equals(mesToPlc) && "0".equals(loadRequest)) {
//璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
}
//鎵ц鍚庝紤鐪�300姣
//Thread.sleep(300);
@@ -70,31 +108,157 @@
}
}
- @Scheduled(fixedDelay = 300)
- public void plcLoadGlassReport(){
+ // @Scheduled(fixedDelay = 300)
+ public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
if (loadStatus != null) {
log.info(loadStatus);
- if ("1".equals(loadStatus)) {
- log.info("鏀跺埌姹囨姤浠诲姟瀹屾垚");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
- } else if ("2".equals(loadStatus)) {
- log.info("鏀跺埌姹囨姤鏈畬鎴愪换鍔�");
- //鍑忓皯宸ヤ綅鏁伴噺,鎭㈠浠诲姟鐘舵��
- overTask(loadStatus,0);
- } else if ("3".equals(loadStatus)) {
- log.info("鏀跺埌姹囨姤鐜荤拑鐮存崯");
- overTask(loadStatus,0);
- } else if("0".equals(loadStatus)){
- log.info("鏀跺埌姹囨姤娓�0鐘舵��");
- //鍑忓皯宸ヤ綅鏁伴噺,瀹屾垚浠诲姟鐘舵��
- overTask(loadStatus,100);
+ switch (loadStatus) {
+ case "1":
+ log.info("鏀跺埌姹囨姤浠诲姟瀹屾垚");
+ //鍑忓皯宸ヤ綅鏁伴噺,瀹屾垚浠诲姟鐘舵��
+ overTask(loadStatus, 100);
+ break;
+ case "2":
+ log.info("鏀跺埌姹囨姤鏈畬鎴愪换鍔�");
+ //鍑忓皯宸ヤ綅鏁伴噺,鎭㈠浠诲姟鐘舵��
+ overTask(loadStatus, 0);
+ break;
+ case "3":
+ log.info("鏀跺埌姹囨姤鐜荤拑鐮存崯");
+ overTask(loadStatus, 0);
+ break;
+ case "0":
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ break;
}
}
}
- public void overTask(String loadStatus, int state) {
+ @Scheduled(fixedDelay = 1000)
+ public void loadGlassHome() {
+ try {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
+ if (upPattenUsages != null) {
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+ //鏌ヨ1鍙风嚎鐨勪换鍔�
+ Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ if (request == null) {
+ request = new Engineering();
+ request.setStationCell(5);
+ }
+ List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
+ jsonObject.append("loadTask1", upPattenUsages1);
+ //鏌ヨ2鍙风嚎鐨勪换鍔�
+ Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
+ if (request2 == null) {
+ request2 = new Engineering();
+ request2.setStationCell(6);
+ }
+ List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
+ jsonObject.append("loadTask2", upPattenUsages2);
+// 鏌ヨ宸ヤ綅浠诲姟
+ //鑱旀満鐘舵��
+ LoadGlassDeviceTask LoadOneState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_ONE_TASK);
+ LoadGlassDeviceTask LoadTwoState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_TWO_TASK);
+ jsonObject.append("LoadOneState", LoadOneState.getInkageState());
+ jsonObject.append("LoadTwoervice", LoadTwoState.getInkageState());
+
+ //宸ヤ綅淇℃伅
+ MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>();
+ wrapper.select(RawGlassStorageStation::getSlot)
+ .select("ifnull(remain_quantity, 0) as remain_quantity")
+ .rightJoin(RawGlassStorageStation.class, on -> on.eq(RawGlassStorageStation::getSlot, RawGlassStorageDetails::getSlot)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN))
+ .in(RawGlassStorageStation::getDeviceId, 5, 6)
+ .orderByAsc(RawGlassStorageStation::getSlot);
+ List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);
+ List<RawGlassStorageDetails> stationOneList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 5).collect(Collectors.toList());
+ List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());
+ jsonObject.append("stationOne", stationOneList);
+ jsonObject.append("stationTwo", stationTwoList);
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+// }
+ } else {
+ log.info("loadGlass is closed");
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void send() {
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mainMes");
+ if (sendwServer != null) {
+ //鎺ㄩ�佹湇鍔″櫒褰撳墠鏃堕棿
+ JSONObject jsonObject = new JSONObject();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ jsonObject.append("globalDate", sdf.format(DateUtil.getEndDate()));
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("mainMes is closed");
+ }
+ }
+ }
+ }
+
+ // @Scheduled(fixedDelay = 5000)
+ public void loadGlassStatus() {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
+// String inkageStatus ="1";
+ jsonObject.append("InkageStatus", inkageStatus);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("loadGlass is closed");
+ }
+ }
+ }
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void loadGlassIsRun() {
+ JSONObject jsonObject = new JSONObject();
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ jsonObject.append("engineering", engineering);
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("loadGlassIsRun is closed");
+ }
+ }
+ }
+ }
+
+ public void overTask(String loadStatus, int state) {
+
UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
if (upPattenUsage != null) {
log.info("鏀跺埌姹囨姤娓厈}鐘舵��", loadStatus);
@@ -102,8 +266,12 @@
upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
//瀹屾垚涓婄墖琛ㄧ姸鎬�
upPattenUsageService.updateUpPattenUsageState(upPattenUsage, state);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ //鍒ゆ柇鏄惁鏄渶鍚庝竴鍧楃幓鐠�
+ UpPattenUsage sequence = upPattenUsageService.selectSequence(upPattenUsage);
+ //濡傛灉鏄渶鍚庝竴鍧楁椂瀹屾垚宸ョ▼浠诲姟
+ optimizeProjectService.overTask(sequence, 300);
}
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
}
}
\ No newline at end of file
--
Gitblit v1.8.0