From ddf7bfc1a172d3ad52f9ae0a728e91d405f2dd49 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 14:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 84 ++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 48 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 4d3f240..4110f80 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,6 +1,5 @@
package com.mes.job;
-import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
@@ -24,11 +23,12 @@
@Autowired
private UpWorkstationService upWorkstationService;
@Autowired
- private EngineeringService engineeringService;
+ private EngineeringService engineeringService;
@Autowired
private UpPattenUsageService upPattenUsageService;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
@@ -37,47 +37,47 @@
@Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
- log.info("寮�濮嬩笂鐗�");
//鑾峰彇鏄惁鏈変笂鐗囪姹�
String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
//鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
- Engineering engineering=engineeringService.selectInitiate(1);
- if("1".equals(loadRequest)&&engineering!=null){
- 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);
+ 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);
- //鍑忓皯宸ヤ綅鏁伴噺
- upWorkstationService.reduceWorkstationNumber(upwork);
- //瀹屾垚涓婄墖琛ㄧ姸鎬�
- upPattenUsageService.updateupPattenUsageState(upPattenUsage,1);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
+ //鏇存敼涓婄墖琛ㄧ姸鎬�
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
}
}
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
- if (loadStatus!=null) {
+ 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("鏀跺埌姹囨姤鏈畬鎴愪换鍔�");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
+ //鍑忓皯宸ヤ綅鏁伴噺,鎭㈠浠诲姟鐘舵��
+ overTask(loadStatus,0);
} else if ("3".equals(loadStatus)) {
log.info("鏀跺埌姹囨姤鐜荤拑鐮存崯");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
- } else {
- log.info("鏀跺埌姹囨姤娓�0鐘舵��");
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ overTask(loadStatus,0);
+ } else if("0".equals(loadStatus)){
+ log.info("鏀跺埌姹囨姤娓�0鐘舵��");
+ //鍑忓皯宸ヤ綅鏁伴噺,瀹屾垚浠诲姟鐘舵��
+ overTask(loadStatus,1);
}
}
//鎵ц鍚庝紤鐪�300姣
@@ -86,28 +86,16 @@
e.printStackTrace();
}
}
-// @Scheduled(fixedDelay = 300)
-// public void plcLoadGlassOver() throws InterruptedException {
-// try {
-// //鑾峰彇鏄惁鏈夋眹鎶�
-// String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
-// if ("1".equals(loadStatus)){
-// log.info("鏀跺埌姹囨姤浠诲姟瀹屾垚");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),1);
-// }else if ("2".equals(loadStatus)) {
-// log.info("鏀跺埌姹囨姤鏈畬鎴愪换鍔�");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),1);
-// }else if("3".equals(loadStatus)){
-// log.info("鏀跺埌姹囨姤鐜荤拑鐮存崯");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),1);
-// }else {
-// log.info("鏀跺埌姹囨姤娓�0鐘舵��");
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(),0);
-// }
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
+ public void overTask(String loadStatus,int state) throws InterruptedException {
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
+ if (upPattenUsage != null) {
+ log.info("鏀跺埌姹囨姤娓厈}鐘舵��",loadStatus);
+ //鍑忓皯宸ヤ綅鏁伴噺
+ upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
+ //瀹屾垚涓婄墖琛ㄧ姸鎬�
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, 100);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0