From b4ff04d7dd22f0e48bf386cd422e885aef08fed7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 五月 2025 15:03:10 +0800
Subject: [PATCH] OPC通讯修改为S7通讯
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 349 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 258 insertions(+), 91 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index 2b7be5c..b32a032 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.github.yulichang.toolkit.JoinWrappers;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
@@ -24,12 +25,16 @@
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.s7.entity.S7DataDLPOne;
+import com.mes.s7.entity.S7DataDLPTwo;
+import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.RedisUtil;
@@ -37,7 +42,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -75,6 +80,17 @@
@Autowired(required = false)
MiloService miloService;
+ @Autowired
+ @Qualifier("s7SerializerDLPOne")
+ private S7Serializer s7SerializerDLPOne;
+
+ @Autowired
+ @Qualifier("s7SerializerDLPTwo")
+ private S7Serializer s7SerializerDLPTwo;
+
+ @Resource
+ SysConfigService sysConfigService;
+
/**
* 鐩撮�氭牸瀛�
*/
@@ -83,56 +99,50 @@
@Resource
private RedisUtil redisUtil;
- @Value("${mes.slotWidth}")
- private Integer slotWidth;
-
- @Value("${mes.glassGap}")
- private Integer glassGap;
-
- @Value("${mes.carWidth}")
- private Integer carWidth;
-
- @Value("${mes.outCarMaxSize}")
- private Integer outCarMaxSize;
-
- @Value("${mes.temperingOutTargetPosition}")
- private Integer temperingOutTargetPosition;
- @Value("${mes.artificialOutTargetPosition}")
- private Integer artificialOutTargetPosition;
- @Value("${mes.slotMaxHeight}")
- private Integer slotMaxHeight;
- @Value("${mes.slotMaxthickness}")
- private Integer slotMaxthickness;
-
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataDLPOne.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
- if ("1".equals(mesReplyEntity.getValue() + "")) {
+// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
+// if ("1".equals(mesReplyEntity.getValue() + "")) {
+ String mesReplyEntity = s7DataDLPOne.getMesReply().toString();
+ if (!"1".equals(mesReplyEntity)) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
return;
}
//鑾峰彇杩涚墖浠诲姟淇℃伅
List<BigStorageCageTask> inTaskList = new ArrayList();
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+ String fromOpcUa = s7DataDLPOne.getFrom1().toString();
+
+ List<Short> states = s7DataDLPOne.getStates();
List<String> glassIdList = new ArrayList<>();
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
- if (null != requestWord.getValue()) {
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+ String requestWord = states.get(i).toString();
+// if (null != requestWord.getValue()) {
+ if (null != requestWord) {
BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setGlassId(requestWord.getValue() + "");
+ task.setGlassId(requestWord);
+// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
- glassIdList.add(requestWord.getValue() + "");
+// glassIdList.add(requestWord.getValue() + "");
+ glassIdList.add(requestWord);
continue;
}
}
@@ -141,16 +151,27 @@
return;
}
log.info("鑾峰彇浠诲姟鐨勭幓鐠僫d锛歿}", glassIdList);
- ReadWriteEntity countEntity = miloService.readFromOpcUa("DLP1A.DLP1A.glassCount");
- if (null == countEntity.getValue() || Integer.parseInt(countEntity.getValue() + "") != glassIdList.size()) {
- log.info("褰撳墠澶ц溅杩涚墖鐜荤拑鏁伴噺{}涓巑es璇诲彇鍒扮殑鏁伴噺{}涓嶅尮閰嶏紝缁撴潫杩涚墖浠诲姟", countEntity.getValue(), glassIdList.size());
+// ReadWriteEntity countEntity = miloService.readFromOpcUa("DLP1A.DLP1A.glassCount");
+ String countEntity = s7DataDLPOne.getGlassCount().toString();
+// if (null == countEntity.getValue() || Integer.parseInt(countEntity.getValue() + "") != glassIdList.size()) {
+ if (null == countEntity || Integer.parseInt(countEntity) != glassIdList.size()) {
+ log.info("褰撳墠澶ц溅杩涚墖鐜荤拑鏁伴噺{}涓巑es璇诲彇鍒扮殑鏁伴噺{}涓嶅尮閰嶏紝缁撴潫杩涚墖浠诲姟", countEntity, glassIdList.size());
+ //鍚憄lc鍙戦�佹姤璀�:褰撳墠澶ц溅杩涚墖鐜荤拑鏁伴噺涓巑es璇诲彇鍒扮殑鏁伴噺涓嶅尮閰�
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 1));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlramSignal((short) 1);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
Map<String, Long> glassCountMap = glassIdList.stream().collect(Collectors.groupingBy(e -> e, Collectors.counting()));
for (Map.Entry<String, Long> entry : glassCountMap.entrySet()) {
if (entry.getValue() > 1) {
log.info("杩涚墖鐜荤拑{}瀛樺湪鐩稿悓锛岀粨鏉熸湰娆′换鍔�", entry.getKey());
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 2));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlramSignal((short) 2);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
}
@@ -158,37 +179,59 @@
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
if (CollectionUtil.isNotEmpty(detailsList)) {
log.info("鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑{}锛岀粨鏉熸湰娆′换鍔�", detailsList);
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 4));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlramSignal((short) 4);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIdList));
if (glassInfoList.size() != inTaskList.size()) {
log.info("杩涚墖浠诲姟鏁伴噺{}涓庣幓鐠冩暟閲弡}涓嶅尮閰嶏紝缁撴潫鏈杩涚墖", inTaskList.size(), glassInfoList.size());
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:杩涚墖浠诲姟鏁伴噺涓庣郴缁熸煡璇㈠埌鐨勭幓鐠冩暟閲忎笉鍖归厤
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 8));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlramSignal((short) 8);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
+ Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
+ Integer slotMaxthickness = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_MAX_THICKNESS);
+ Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_WIDTH);
+ Integer slotMaxHeight = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_MAX_HEIGHT);
//鎸夌収鐜荤拑鍘氬害鍒嗙粍锛屽垽鏂墿浣欐牸瀛愭槸鍚﹀彲浠ュ瓨鏀�
Map<Double, Long> thickCountMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getThickness, Collectors.counting()));
- for (Map.Entry<Double, Long> entry : thickCountMap.entrySet()) {
- int count = bigStorageCageService.count(new LambdaQueryWrapper<BigStorageCage>()
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
- .le(BigStorageCage::getMinThickness, entry.getKey())
- .ge(BigStorageCage::getMaxThickness, entry.getKey()));
- if (count < entry.getValue()) {
- log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
- //todo:鍚憄lc鍙戦�佹姤璀�
- return;
+ if (glassInfoList.get(0).getThickness() < slotMaxthickness) {
+ for (Map.Entry<Double, Long> entry : thickCountMap.entrySet()) {
+ int count = bigStorageCageService.count(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
+ .le(BigStorageCage::getMinThickness, entry.getKey())
+ .ge(BigStorageCage::getMaxThickness, entry.getKey()));
+ if (count < entry.getValue()) {
+ log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
+ //鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlramSignal((short) 16);
+ s7SerializerDLPOne.write(s7DataDLPOne);
+ return;
+ }
}
}
- //todo:瓒呭ぇ灏哄
- if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) || glassInfoList.get(0).getThickness() > slotMaxthickness) {
+ //瓒呭ぇ灏哄
+ if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) || glassInfoList.get(0).getThickness() >= slotMaxthickness) {
int count = bigStorageCageDetailsService.count(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getSlot, THROUGH_SLOT)
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlramSignal((short) 64);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
}
@@ -205,7 +248,7 @@
//璁＄畻鐩爣鏍煎瓙
List<BigStorageCageHistoryTask> historyTasks = new ArrayList<>();
//瓒呭ぇ灏哄涓庢甯稿昂瀵哥幓鐠冭绠楁柟寮忎笉涓�鏍�
- if (slotMaxHeight > Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight())) {
+ if (slotMaxHeight > Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) && glassInfoList.get(0).getThickness() < slotMaxthickness) {
for (BigStorageCageTask task : inTaskList) {
GlassInfo info = glassListMap.get(task.getGlassId()).get(0);
BigStorageDTO bigStorageDTO = bigStorageGlassInfoService.queryBigStorageTargetSlot(info.getEngineerId(), info.getTemperingLayoutId(), info.getTemperingFeedSequence());
@@ -231,6 +274,7 @@
cageDetails.setState(Const.GLASS_STATE_NEW);
cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
cageDetails.setSequence(bigStorageDTO.getSlotSequence());
+ cageDetails.setAngle((int) info.getAngle());
cageDetails.setGap(glassGap);
cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
@@ -255,6 +299,7 @@
cageDetails.setDeviceId(0);
cageDetails.setSequence(0);
cageDetails.setGap(glassGap);
+ cageDetails.setAngle((int) info.getAngle());
cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
bigStorageCageDetailsService.save(cageDetails);
@@ -262,24 +307,55 @@
//鍘嗗彶鏁版嵁鍏ュ簱
bigStorageCageHistoryTaskService.saveBatch(historyTasks);
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= inTaskList.size(); i++) {
- list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= inTaskList.size(); i++) {
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// }
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 1));
+// miloService.writeToOpcWord(list);
+ s7DataDLPOne = new S7DataDLPOne();
+ for (int i = 0; i < inTaskList.size() && i < 6; i++) {
+ short value = (short) Integer.parseInt(inTaskList.get(i).getTargetSlot().toString());
+ switch (i) {
+ case 0:
+ s7DataDLPOne.setTo1(value);
+ break;
+ case 1:
+ s7DataDLPOne.setTo2(value);
+ break;
+ case 2:
+ s7DataDLPOne.setTo3(value);
+ break;
+ case 3:
+ s7DataDLPOne.setTo4(value);
+ break;
+ case 4:
+ s7DataDLPOne.setTo5(value);
+ break;
+ case 5:
+ s7DataDLPOne.setTo6(value);
+ break;
+ }
}
- list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 1));
- miloService.writeToOpcWord(list);
+ s7SerializerDLPOne.write(s7DataDLPOne);
+
}
@Scheduled(fixedDelay = 1000)
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataWLTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataWLTwo.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
@@ -292,6 +368,8 @@
//鏄惁鍏佽閽㈠寲
//鏄惁鏈夋鍦ㄩ挗鍖栫殑鐜荤拑:閽㈠寲灏忕墖琛ㄥ叧鑱斿巻鍙蹭换鍔¤〃锛岀瓫閫夋湭鍑虹鐨勭幓鐠冧俊鎭�
// 鑾峰彇褰撳墠閽㈠寲浠诲姟鏈畬鎴愬嚭鐗囩殑鐜荤拑淇℃伅
+
+ Integer temperingOutTargetPosition = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_TEMPERING_OUT_TARGET_POSITION);
List<TemperingGlassInfo> unFinishTemperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW).orderByAsc(TemperingGlassInfo::getTemperingLayoutId).orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
if (CollectionUtil.isNotEmpty(unFinishTemperingGlassInfoList)) {
@@ -343,6 +421,8 @@
}
}
//鏄惁鏈変汉宸ヤ笅鐗囦换鍔� 鏈夌洿鎺ュ嚭
+ Integer artificialOutTargetPosition = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_ARTIFICIAL_OUT_TARGET_POSITION);
+ Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_OUT_CAR_SIZE);
List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
.orderByAsc(BigStorageCageDetails::getSlot)
@@ -395,8 +475,11 @@
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚杩涚墖浠诲姟");
return;
}
@@ -405,25 +488,75 @@
List<BigStorageCageTask> inTaskList = new ArrayList();
List<String> glassIdList = new ArrayList<>();
- ReadWriteEntity toWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO1");
- if ("0".equals(toWord.getValue() + "")) {
+// ReadWriteEntity toWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO1");
+// if ("0".equals(toWord.getValue() + "")) {
+ String toWord = s7DataDLPOne.getTo1().toString();
+ if ("0".equals(toWord)) {
log.info("瀹屾垚浠诲姟宸叉墽琛岋紝缁撴潫鏈瀹屾垚杩涚墖浠诲姟");
return;
}
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
- ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
- ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM" + i);
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+// ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
+// ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM" + i);
+ String requestWord = "";
+ String statetWord = "";
+ String toOpcUa = "";
+ String fromOpcUa = "";
+ switch (i) {
+ case 0:
+ requestWord = s7DataDLPOne.getId1().toString();
+ statetWord = s7DataDLPOne.getState1().toString();
+ toOpcUa = s7DataDLPOne.getTo1().toString();
+ fromOpcUa = s7DataDLPOne.getFrom1().toString();
+ break;
+ case 1:
+ requestWord = s7DataDLPOne.getId2().toString();
+ statetWord = s7DataDLPOne.getState2().toString();
+ toOpcUa = s7DataDLPOne.getTo2().toString();
+ fromOpcUa = s7DataDLPOne.getFrom2().toString();
+ break;
+ case 2:
+ requestWord = s7DataDLPOne.getId3().toString();
+ statetWord = s7DataDLPOne.getState3().toString();
+ toOpcUa = s7DataDLPOne.getTo3().toString();
+ fromOpcUa = s7DataDLPOne.getFrom3().toString();
+ break;
+ case 3:
+ requestWord = s7DataDLPOne.getId4().toString();
+ statetWord = s7DataDLPOne.getState4().toString();
+ toOpcUa = s7DataDLPOne.getTo4().toString();
+ fromOpcUa = s7DataDLPOne.getFrom4().toString();
+ break;
+ case 4:
+ requestWord = s7DataDLPOne.getId5().toString();
+ statetWord = s7DataDLPOne.getState5().toString();
+ toOpcUa = s7DataDLPOne.getTo5().toString();
+ fromOpcUa = s7DataDLPOne.getFrom5().toString();
+ break;
+ case 5:
+ requestWord = s7DataDLPOne.getId6().toString();
+ statetWord = s7DataDLPOne.getState6().toString();
+ toOpcUa = s7DataDLPOne.getTo6().toString();
+ fromOpcUa = s7DataDLPOne.getFrom6().toString();
+ break;
+ }
- if (null != requestWord.getValue()) {
+// if (null != requestWord.getValue()) {
+ if (null != requestWord) {
BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setTargetSlot(Integer.parseInt(toOpcUa.getValue() + ""));
- task.setTaskState(Integer.parseInt(statetWord.getValue() + ""));
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setGlassId(requestWord.getValue() + "");
+// task.setTargetSlot(Integer.parseInt(toOpcUa.getValue() + ""));
+// task.setTaskState(Integer.parseInt(statetWord.getValue() + ""));
+// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setGlassId(requestWord);
+ task.setTargetSlot(Integer.parseInt(toOpcUa));
+ task.setTaskState(Integer.parseInt(statetWord));
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
- glassIdList.add(requestWord.getValue() + "");
+// glassIdList.add(requestWord.getValue() + "");
+ glassIdList.add(requestWord);
continue;
}
}
@@ -474,18 +607,30 @@
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= 6; i++) {
- list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, 0));
- }
- list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 0));
- miloService.writeToOpcWord(list);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= 6; i++) {
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, 0));
+// }
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 0));
+// miloService.writeToOpcWord(list);
+ s7DataDLPOne =new S7DataDLPOne();
+ s7DataDLPOne.setTo1((short)0);
+ s7DataDLPOne.setTo2((short)0);
+ s7DataDLPOne.setTo3((short)0);
+ s7DataDLPOne.setTo4((short)0);
+ s7DataDLPOne.setTo5((short)0);
+ s7DataDLPOne.setTo6((short)0);
+ s7DataDLPOne.setMesReply((short)0);
+ s7SerializerDLPOne.write(s7DataDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataWLTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
@@ -577,7 +722,10 @@
bigStorageCageTaskService.updateOutTaskMessage("big_storage_cage_out_one_task");
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 0));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 0));
+ S7DataDLPTwo s7DataDLPTwo=new S7DataDLPTwo();
+ s7DataDLPTwo.setMesReply((short)0);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
}
private void dealDamageInTask(List<BigStorageCageTask> damageTaskList) {
@@ -690,9 +838,18 @@
*/
private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfoByVirtualSlot(List<T> list, String tableName, int targetSlot, int state, int taskType) {
//浠诲姟鏁版嵁:鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲�,鐜荤拑闂撮殧
- List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
- list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
- List<T> outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
+ List<T> outGlassList = list;
+ if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
+ //todo:涓存椂瑙ｅ喅鏂规:鍑虹墖鏃惰�冭檻鐜荤拑纰版挒锛屾敼涓轰竴鐗囦竴鍑�
+ // 鐣岄潰鍏抽棴璋冨害寮�鍏� !Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType)
+ if (list.get(0).getThickness() >= 8) {
+ outGlassList = list.subList(0, 1);
+ } else {
+ List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
+ list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
+ outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
+ }
+ }
Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", outGlassList.size());
List<BigStorageCageTask> bigStorageCageTaskList = outGlassList.stream()
@@ -723,7 +880,10 @@
.ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.in(BigStorageCageDetails::getGlassId, glassIds));
try {
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+ S7DataDLPTwo s7DataDLPTwo=new S7DataDLPTwo();
+ s7DataDLPTwo.setMesReply((short)1);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -741,7 +901,9 @@
//浠诲姟鏁版嵁:鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲�,鐜荤拑闂撮殧
List<BigStorageCageTask> bigStorageCageTaskList = new ArrayList<>();
//鎵撹溅鍓╀綑灏哄
- Integer remainWidth = carWidth;
+ Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_OUT_CAR_SIZE);
+ Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
+ Integer remainWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_CAR_WIDTH);
for (T e : list) {
if (bigStorageCageTaskList.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
break;
@@ -778,7 +940,10 @@
.set(Const.GLASS_STATE_SCHEDULE_ING.equals(state), BigStorageCageBaseInfo::getSlot, targetSlot)
.in(BigStorageCageDetails::getGlassId, glassIds));
try {
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+ S7DataDLPTwo s7DataDLPTwo=new S7DataDLPTwo();
+ s7DataDLPTwo.setMesReply((short)1);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -791,6 +956,8 @@
List<BigStorageCageDetails> inSlotGlassList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
.in(BigStorageCageDetails::getSlot, slotList).in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
Map<Integer, Double> slotRemainMap = new HashMap<>();
+ Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
+ Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_WIDTH);
//鏄惁瀛樺湪鏈夋牸瀛愰潪绌虹殑鐜荤拑
if (CollectionUtil.isNotEmpty(inSlotGlassList)) {
//瀛樺湪 灏嗘牸瀛愬唴鐨勭幓鐠冨垎鍒繘琛屾洿鏂�
--
Gitblit v1.8.0