From 9247ea3d414c528ff2210c4b1ccdb38741f52101 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 五月 2024 16:50:36 +0800
Subject: [PATCH] 添加新磨边任务表，添加上车宽度判断
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 95 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index ab589a7..476151f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -1,67 +1,60 @@
package com.mes.job;
-
-import cn.hutool.json.JSONObject;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.mes.common.S7object;
+import com.mes.device.PlcParameterObject;
import com.mes.edgstoragetask.service.TaskCacheService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.menu.service.SysMenuService;
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.util.List;
@Component
@Slf4j
public class PlcStorageCageTask {
- @Autowired
+ @Resource
private BigStorageCageService bigStorageCageService;
- @Autowired
+ @Resource
private BigStorageCageDetailsService bigStorageCageDetailsService;
- @Autowired
+ @Resource
private GlassInfoService glassInfoService;
- @Autowired
+ @Resource
private BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
- @Autowired
+ @Resource
private BigStorageCageOutTaskService bigStorageCageOutTaskService;
- @Autowired
+ @Resource
private TaskCacheService taskCacheService;
- @Autowired
- private SysMenuService sysMenuService;
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ public static boolean bigStorageCageFullAlarm = false;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 5000)
public void plcStorageCageTask() throws InterruptedException {
- JSONObject jsonObject = new JSONObject();
try {
- Thread.sleep(300);
- boolean bigStorageCageFullAlarm = false;
- String plcD01FeedReq = "0";
- String plcD04FeedReq = "0";
- String plcFeedGlassid = "111";
+ String plcFeedGlassid = "";
String plcFeedReqLine = "0";
- if ("1".equals(plcD01FeedReq)) {
+ if ("1".equals(plcParameterObject.getPlcParameter("D01Request").getValue())) {
plcFeedReqLine = "1";
- } else {
- //plc浠诲姟鍙戦�佸瓧0
+ plcFeedGlassid=plcParameterObject.getPlcParameter("D01ID1").getValue();
}
- if ("1".equals(plcD04FeedReq)) {
+ if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) {
plcFeedReqLine = "2";
- } else {
- //plc浠诲姟鍙戦�佸瓧0
+ plcFeedGlassid=plcParameterObject.getPlcParameter("D04ID1").getValue();
}
if (!("0".equals(plcFeedReqLine))) {
@@ -69,17 +62,24 @@
BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
log.info("2銆佹牴鎹幓鐠僫d鑾峰彇鐜荤拑淇℃伅" + glassInfo);
- BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
- if (slotInfo != null) {
- int taskType = taskCacheService.judgeTasktype();
- log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
- bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType);
- log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
- //plc浠诲姟鍙戦�佸瓧1
- bigStorageCageFullAlarm = false;
- } else {
- //鐞嗙墖绗肩垎绗兼姤璀�
- bigStorageCageFullAlarm = true;
+ if(bigStorageCageDetailsService.selectGetBoard(glassInfo,plcFeedReqLine)){
+ BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
+ if (slotInfo != null) {
+ int taskType = taskCacheService.judgeTasktype();
+ log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
+ bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType);
+ log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
+ bigStorageCageFullAlarm = false;
+ } else {
+ bigStorageCageFullAlarm = true;
+ }
+ }else{
+ log.info("褰撳墠鐜荤拑瀹藉害涓嶅涓婅溅" + glassInfo);
+ if(!("1".equals(plcFeedReqLine))){
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
+ }else{
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
+ }
}
} else {
List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1);
@@ -96,24 +96,17 @@
}
}
- //鍑虹墖璇锋眰
- String plcOutReq = "0";
- boolean result = false;
- if ("1".equals(plcOutReq)) {
- result = bigStorageCageService.outGlass();
- log.info("8銆佸嚭鐗囪姹傛椂璋冪敤鍑虹墖鎺ュ彛" + result);
- if (result) {
- //plc浠诲姟鍙戦�佸瓧1
- }
- } else {
- bigStorageCageOutTaskService.updateOutTask();
- //plc浠诲姟鍙戦�佸瓧0
+ //鏌ヨ鍑虹墖琛ㄦ槸鍚︽湁浠诲姟鏈畬鎴愮殑浠诲姟
+ List<BigStorageCageOutTask> bigStorageCageOutTask=bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
+ if(bigStorageCageOutTask.size()==0){
+ bigStorageCageService.outGlass();
+ log.info("8銆佹病鏈夋湭瀹屾垚浠诲姟鏃惰皟鐢ㄥ嚭鐗囨帴鍙�");
}
+ bigStorageCageOutTaskService.updateOutTask();
+ log.info("9銆佹牴鎹换鍔¤〃鐘舵�佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
- //鏄剧ず鍓╀綑绌烘牸瀛�
- //鎶ヨ淇℃伅
- jsonObject.append("bigStorageCageFullAlarm", bigStorageCageFullAlarm);
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0