From a6720987358933753d9b90acda9103003cfb37ee Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 13 六月 2025 17:09:57 +0800
Subject: [PATCH] 更新通讯依赖版本为1.5.4，中空大理片，钢化大理片S7，modbus测试完成代码提交
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 635 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 471 insertions(+), 164 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index 534dfda..5641094 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -6,12 +6,15 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.base.entity.HollowBigStorageCageBaseInfo;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
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.glassinfo.entity.GlassInfo;
@@ -32,6 +35,10 @@
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
import com.mes.hollowtask.entity.HollowBigStorageCageHistoryTask;
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
+import com.mes.s7.entity.S7DataZKDLPOne;
+import com.mes.s7.entity.S7DataZKDLPTwo;
+import com.mes.s7.entity.S7DataZKExtra;
+import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.RedisUtil;
@@ -39,7 +46,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 +82,24 @@
private HollowGlassQueueInfoService hollowGlassQueueInfoService;
@Resource
private HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
+ @Resource
+ private SysConfigService sysConfigService;
+
+ @Autowired
+ @Qualifier("s7SerializerZKDLPOne")
+ private S7Serializer s7SerializerZKDLPOne;
+
+ @Autowired
+ @Qualifier("s7SerializerZKDLPTwo")
+ private S7Serializer s7SerializerZKDLPTwo;
+
+ @Autowired
+ @Qualifier("s7SerializerZKQ2")
+ private S7Serializer s7SerializerZKQ2;
+
+ @Autowired
+ @Qualifier("CMJ1ModbusTcp")
+ ModbusTcp CMJ1ModbusTcp;
private static final String BIG_STORAGE_CAGE_IN_TWO_TASK = "big_storage_cage_in_two_task";
private static final String BIG_STORAGE_CAGE_OUT_TWO_TASK = "big_storage_cage_out_two_task";
@@ -87,52 +112,67 @@
@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.slotMaxHeight}")
- private Integer slotMaxHeight;
- @Value("${mes.slotMaxthickness}")
- private Integer slotMaxthickness;
+// @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.slotMaxHeight}")
+// private Integer slotMaxHeight;
+// @Value("${mes.slotMaxthickness}")
+// private Integer slotMaxthickness;
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+ log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPOne:{}", s7DataZKDLPOne);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2A.DLP2A.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2A.DLP2A.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP2A.DLP2A.MesReply");
- if ("1".equals(mesReplyEntity.getValue() + "")) {
+// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP2A.DLP2A.MesReply");
+// if ("1".equals(mesReplyEntity.getValue() + "")) {
+ String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+ if ("1".equals(mesReplyEntity)) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
return;
}
List<BigStorageCageTask> inTaskList = new ArrayList();
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
+ String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
List<String> glassIdList = new ArrayList<>();
+ List<String> requestWords = s7DataZKDLPOne.getIds();
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
- if (null != requestWord.getValue()) {
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
+ String requestWord = requestWords.get(i - 1);
+// if (null != requestWord.getValue()) {
+ if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setGlassId(requestWord.getValue() + "");
+ task.setGlassId(requestWord.toString());
+// 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.toString());
continue;
}
}
@@ -145,7 +185,11 @@
for (Map.Entry<String, Long> entry : glassCountMap.entrySet()) {
if (entry.getValue() > 1) {
log.info("杩涚墖鐜荤拑{}瀛樺湪鐩稿悓锛岀粨鏉熸湰娆′换鍔�", entry.getKey());
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 2));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal(2);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
}
@@ -153,16 +197,26 @@
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
if (CollectionUtil.isNotEmpty(detailsList)) {
log.info("鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑{}锛岀粨鏉熸湰娆′换鍔�", detailsList);
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 4));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal(4);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
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("DLP2A.DLP2A.alarmSignal", 8));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal(8);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
+
+ Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
//鎸夌収鐜荤拑鍘氬害鍒嗙粍锛屽垽鏂墿浣欐牸瀛愭槸鍚﹀彲浠ュ瓨鏀�
Map<Double, Long> thickCountMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getThickness, Collectors.counting()));
for (Map.Entry<Double, Long> entry : thickCountMap.entrySet()) {
@@ -172,18 +226,28 @@
.ge(HollowBigStorageCage::getMaxThickness, entry.getKey()));
if (count < entry.getValue()) {
log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 16));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal(16);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
}
- //todo:瓒呭ぇ灏哄
- if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) || glassInfoList.get(0).getThickness() > slotMaxthickness) {
+ //瓒呭ぇ灏哄
+ Integer slotMaxHeight = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_MAX_HEIGHT);
+ Integer slotMaxthickness = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_MAX_THICKNESS);
+ if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) || glassInfoList.get(0).getThickness() >= slotMaxthickness) {
int count = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
- //todo:鍚憄lc鍙戦�佹姤璀�
+ //鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 64));
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal(64);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
return;
}
}
@@ -201,18 +265,54 @@
//璁＄畻鐩爣鏍煎瓙
List<HollowBigStorageCageHistoryTask> historyTasks = new ArrayList<>();
+
+ Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
try {
- for (BigStorageCageTask task : inTaskList) {
- GlassInfo info = glassListMap.get(task.getGlassId()).get(0);
- HollowBigStorageDTO bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(),
- info.getWidth(), info.getHeight(), info.getTotalLayer(), info.getLayer());
+ 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);
+ HollowBigStorageDTO bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(),
+ info.getWidth(), info.getHeight(), info.getTotalLayer(), info.getLayer());
// 涓存椂鏇存柊鏍煎瓙鐨勫墿浣欏昂瀵革細闃叉鐩搁偦鐜荤拑杩涘悓涓�鏍煎瓙閫犳垚鍓╀綑灏哄涓嶈冻锛岀幓鐠冭秺鐣岀殑鎯呭喌锛屼换鍔″畬鎴愬悗鍐嶆鏇存柊澶х悊鐗囩琛ㄥ墿浣欏搴︼紙鎸夌収绗煎唴鐜荤拑鏁伴噺鏇存柊澶х悊鐗囩鍓╀綑灏哄锛�
- hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
- .set(HollowBigStorageCage::getRemainWidth, bigStorageDTO.getRemainWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap)
- .eq(HollowBigStorageCage::getSlot, bigStorageDTO.getSlot()));
- task.setTargetSlot(bigStorageDTO.getSlot());
- task.setGlassId(info.getGlassId());
- bigStorageCageTaskService.updateTaskMessage(BIG_STORAGE_CAGE_IN_TWO_TASK, task);
+ hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
+ .set(HollowBigStorageCage::getRemainWidth, bigStorageDTO.getRemainWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap)
+ .eq(HollowBigStorageCage::getSlot, bigStorageDTO.getSlot()));
+ task.setTargetSlot(bigStorageDTO.getSlot());
+ task.setGlassId(info.getGlassId());
+// bigStorageCageTaskService.updateTaskMessage(BIG_STORAGE_CAGE_IN_TWO_TASK, task);
+ //瀛樻斁鍘嗗彶浠诲姟
+ HollowBigStorageCageHistoryTask historyTask = new HollowBigStorageCageHistoryTask();
+ BeanUtils.copyProperties(task, historyTask);
+ historyTask.setTaskType(Const.BIG_STORAGE_AFTER_IN);
+ historyTask.setGlassCount(glassInfoList.size());
+ historyTask.setTaskState(Const.ENGINEERING_NEW);
+ historyTasks.add(historyTask);
+ //瀛樻斁璇︽儏鏁版嵁
+ HollowBigStorageCageDetails cageDetails = new HollowBigStorageCageDetails();
+ BeanUtils.copyProperties(bigStorageDTO, cageDetails);
+ BeanUtils.copyProperties(info, cageDetails);
+ cageDetails.setState(Const.GLASS_STATE_NEW);
+ cageDetails.setSequence(bigStorageDTO.getSlotSequence());
+ cageDetails.setGap(glassGap);
+ cageDetails.setId(null);
+ hollowBigStorageCageDetailsService.save(cageDetails);
+ hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
+ .set(HollowGlassRelationInfo::getGlassId, cageDetails.getGlassId())
+ .set(HollowGlassRelationInfo::getTemperingLayoutId, cageDetails.getTemperingLayoutId())
+ .set(HollowGlassRelationInfo::getTemperingFeedSequence, cageDetails.getTemperingFeedSequence())
+ .set(HollowGlassRelationInfo::getEngineerId, cageDetails.getEngineerId())
+ .set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
+ .eq(HollowGlassRelationInfo::getFlowCardId, bigStorageDTO.getFlowCardId())
+ .eq(HollowGlassRelationInfo::getLayer, bigStorageDTO.getLayer())
+ .eq(HollowGlassRelationInfo::getVirtualSlot, bigStorageDTO.getVirtualSlot())
+ .eq(HollowGlassRelationInfo::getSlotSequence, bigStorageDTO.getSlotSequence())
+ .eq(HollowGlassRelationInfo::getHollowSequence, bigStorageDTO.getHollowSequence())
+ );
+ }
+ } else {
+ BigStorageCageTask task = inTaskList.get(0);
+ task.setTargetSlot(THROUGH_SLOT);
+// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_two_task", task);
//瀛樻斁鍘嗗彶浠诲姟
HollowBigStorageCageHistoryTask historyTask = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -220,27 +320,18 @@
historyTask.setGlassCount(glassInfoList.size());
historyTask.setTaskState(Const.ENGINEERING_NEW);
historyTasks.add(historyTask);
- //瀛樻斁璇︽儏鏁版嵁
+ GlassInfo info = glassInfoList.get(0);
HollowBigStorageCageDetails cageDetails = new HollowBigStorageCageDetails();
- BeanUtils.copyProperties(bigStorageDTO, cageDetails);
BeanUtils.copyProperties(info, cageDetails);
+ cageDetails.setSlot(THROUGH_SLOT);
cageDetails.setState(Const.GLASS_STATE_NEW);
- cageDetails.setSequence(bigStorageDTO.getSlotSequence());
+ cageDetails.setDeviceId(0);
+ cageDetails.setSequence(0);
+ cageDetails.setHollowSequence(0);
cageDetails.setGap(glassGap);
+ cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
hollowBigStorageCageDetailsService.save(cageDetails);
- hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
- .set(HollowGlassRelationInfo::getGlassId, cageDetails.getGlassId())
- .set(HollowGlassRelationInfo::getTemperingLayoutId, cageDetails.getTemperingLayoutId())
- .set(HollowGlassRelationInfo::getTemperingFeedSequence, cageDetails.getTemperingFeedSequence())
- .set(HollowGlassRelationInfo::getEngineerId, cageDetails.getEngineerId())
- .set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
- .eq(HollowGlassRelationInfo::getFlowCardId, bigStorageDTO.getFlowCardId())
- .eq(HollowGlassRelationInfo::getLayer, bigStorageDTO.getLayer())
- .eq(HollowGlassRelationInfo::getVirtualSlot, bigStorageDTO.getVirtualSlot())
- .eq(HollowGlassRelationInfo::getSlotSequence, bigStorageDTO.getSlotSequence())
- .eq(HollowGlassRelationInfo::getHollowSequence, bigStorageDTO.getHollowSequence())
- );
}
} catch (Exception exception) {
log.info("杩涚墖浠诲姟鎵ц涓彂鐢熷紓甯革細{}", exception);
@@ -256,73 +347,115 @@
//鍘嗗彶鏁版嵁鍏ュ簱
hollowBigStorageCageHistoryTaskService.saveBatch(historyTasks);
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= inTaskList.size(); i++) {
- list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= inTaskList.size(); i++) {
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// }
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 1));
+// miloService.writeToOpcWord(list);
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ for (int i = 0; i < inTaskList.size() && i < 6; i++) {
+ Integer value = inTaskList.get(i).getTargetSlot();
+ switch (i) {
+ case 0:
+ s7DataZKDLPOne.setTo1(value);
+ break;
+ case 1:
+ s7DataZKDLPOne.setTo2(value);
+ break;
+ case 2:
+ s7DataZKDLPOne.setTo3(value);
+ break;
+ case 3:
+ s7DataZKDLPOne.setTo4(value);
+ break;
+ case 4:
+ s7DataZKDLPOne.setTo5(value);
+ break;
+ case 5:
+ s7DataZKDLPOne.setTo6(value);
+ break;
+ }
}
- list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 1));
- miloService.writeToOpcWord(list);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setMesReply(1);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+ log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPTwo:{}", s7DataZKDLPTwo);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataZKDLPTwo.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
//鑾峰彇鍑虹墖浠诲姟琛�
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+
+ List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
+
if (CollectionUtil.isNotEmpty(outTaskList)) {
log.info("鏈夋鍦ㄦ墽琛岀殑鍑虹墖浠诲姟锛岀粨鏉熸湰娆″嚭鐗囦换鍔�");
return;
}
//鑾峰彇绌洪棽涓旈鍙栦换鍔＄殑鏁版嵁淇℃伅锛屾病鏈変换鍔＄洿鎺ヨ蛋鐜荤拑璋冨害
- ReadWriteEntity oneEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+
+ HashMap<Integer, Boolean> map = new HashMap<>();
+ S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
+ Boolean oneEntity = CMJ1ModbusTcp.readUInt16(42027 - 40001) != 0;
+ log.info("璇诲彇浠诲姟{}", CMJ1ModbusTcp.readUInt16(42027 - 40001));
+ Boolean twoEntity = s7DataZKExtra.getIsFree();
+ Boolean threeEntity = s7DataZKExtra.getIsFree03();
+// HashMap<Integer, ReadWriteEntity> map = new HashMap<>();
+// ReadWriteEntity oneEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+// ReadWriteEntity twoEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
+// ReadWriteEntity threeEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree03");
+ map.put(930, oneEntity);
+ map.put(931, twoEntity);
+ map.put(932, threeEntity);
HollowGlassOutRelationInfo hollowGlassOutRelationInfo = null;
int cell = -1;
- //鏉庤禌鍏嬬嚎闇�瑕佽幏鍙栭煩姹焢lc鐨勭嚎璺┖闂茬姸鎬侊細10000000绗�8浣嶄负 1琛ㄧず蹇欑 0琛ㄧず绌洪棽
- if (null != oneEntity.getValue() && "1".equals(oneEntity.getValue() + "")) {
- cell = 930;
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
+ for (int i = 930; i <= 932; i++) {
+ if (null == hollowGlassOutRelationInfo) {
+ Boolean entity = map.get(i);
+ cell = i;
+// if (null != entity.getValue() && ("1".equals(entity.getValue() + "") || Boolean.parseBoolean(entity.getValue() + ""))) {
+ if (null != entity && entity) {
+ hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
+ .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+ .eq(HollowGlassOutRelationInfo::getCell, cell)
+ .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
+ );
+ }
+ } else {
+ break;
+ }
}
-
- ReadWriteEntity twoEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
- if (null == hollowGlassOutRelationInfo && null != twoEntity.getValue() && Boolean.parseBoolean(twoEntity.getValue() + "")) {
- cell = 931;
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
- }
- if (null == hollowGlassOutRelationInfo) {
- cell = 930;
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
- }
-
- if (null == hollowGlassOutRelationInfo) {
- cell = 931;
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
+ for (int i = 930; i <= 932; i++) {
+ if (null == hollowGlassOutRelationInfo) {
+ cell = i;
+ hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
+ .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+ .eq(HollowGlassOutRelationInfo::getCell, cell)
+ .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
+ );
+ } else {
+ break;
+ }
}
if (null != hollowGlassOutRelationInfo) {
@@ -391,33 +524,86 @@
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚杩涚墖浠诲姟");
return;
}
//鑾峰彇杩涚墖浠诲姟琛�
List<BigStorageCageTask> inTaskList = new ArrayList();
List<String> glassIdList = new ArrayList<>();
- ReadWriteEntity toWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO1");
- if ("0".equals(toWord.getValue() + "")) {
+// ReadWriteEntity toWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO1");
+// if ("0".equals(toWord.getValue() + "")) {
+ String toWord = s7DataZKDLPOne.getTo1().toString();
+ if ("0".equals(toWord)) {
log.info("瀹屾垚浠诲姟宸叉墽琛岋紝缁撴潫鏈瀹屾垚杩涚墖浠诲姟");
return;
}
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
- ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
- ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM" + i);
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
+// ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
+// ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM" + i);
+ String requestWord = "";
+ String statetWord = "";
+ String toOpcUa = "";
+ String fromOpcUa = "";
+ switch (i) {
+ case 1:
+ requestWord = s7DataZKDLPOne.getId1().toString();
+ statetWord = s7DataZKDLPOne.getState1().toString();
+ toOpcUa = s7DataZKDLPOne.getTo1().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
+ break;
+ case 2:
+ requestWord = s7DataZKDLPOne.getId2().toString();
+ statetWord = s7DataZKDLPOne.getState2().toString();
+ toOpcUa = s7DataZKDLPOne.getTo2().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom2().toString();
+ break;
+ case 3:
+ requestWord = s7DataZKDLPOne.getId3().toString();
+ statetWord = s7DataZKDLPOne.getState3().toString();
+ toOpcUa = s7DataZKDLPOne.getTo3().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom3().toString();
+ break;
+ case 4:
+ requestWord = s7DataZKDLPOne.getId4().toString();
+ statetWord = s7DataZKDLPOne.getState4().toString();
+ toOpcUa = s7DataZKDLPOne.getTo4().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom4().toString();
+ break;
+ case 5:
+ requestWord = s7DataZKDLPOne.getId5().toString();
+ statetWord = s7DataZKDLPOne.getState5().toString();
+ toOpcUa = s7DataZKDLPOne.getTo5().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom5().toString();
+ break;
+ case 6:
+ requestWord = s7DataZKDLPOne.getId6().toString();
+ statetWord = s7DataZKDLPOne.getState6().toString();
+ toOpcUa = s7DataZKDLPOne.getTo6().toString();
+ fromOpcUa = s7DataZKDLPOne.getFrom6().toString();
+ break;
+ }
- if (null != requestWord.getValue()) {
+// if (null != requestWord.getValue()) {
+ if (null != requestWord && !requestWord.isEmpty()) {
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;
}
}
@@ -489,30 +675,45 @@
.eq(HollowBigStorageCageHistoryTask::getGlassId, item.getGlassId()));
item.setTargetSlot(0);
//娓呯┖浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", item);
+// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", item);
}
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= 6; i++) {
- list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, 0));
- }
- list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 0));
- miloService.writeToOpcWord(list);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= 6; i++) {
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, 0));
+// }
+// list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 0));
+// miloService.writeToOpcWord(list);
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setTo1(0);
+ s7DataZKDLPOne.setTo2(0);
+ s7DataZKDLPOne.setTo3(0);
+ s7DataZKDLPOne.setTo4(0);
+ s7DataZKDLPOne.setTo5(0);
+ s7DataZKDLPOne.setTo6(0);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setMesReply(0);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
- //鑾峰彇杩涚墖浠诲姟琛�
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+ //鑾峰彇鍑虹墖浠诲姟琛�
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+ List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
if (CollectionUtil.isEmpty(outTaskList)) {
- log.info("褰撳墠澶ц溅鏃犺繘鐗囩幓鐠冿紝缁撴潫瀹屾垚杩涚墖浠诲姟");
+ log.info("褰撳墠澶ц溅鏃犲嚭鐗囩幓鐠冿紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
List<BigStorageCageTask> unFinishTaskList = outTaskList.stream().filter(e -> e.getTaskState() <= 1 || e.getStartSlot() == 0).collect(Collectors.toList());
@@ -533,7 +734,7 @@
taskMap.forEach((e1, v) -> {
if (e1 == 2) {
//杩涚墖瀹屾垚
- log.info("3銆佽幏鍙栬繘鐗囧凡瀹屾垚鐨勭幓鐠冧俊鎭痠d:{}", v);
+ log.info("3銆佽幏鍙栧嚭鐗囧凡瀹屾垚鐨勭幓鐠冧俊鎭痠d:{}", v);
List<Integer> outSuccessGlassSlot = new ArrayList<>();
if (finalTaskType.equals(Const.BIG_STORAGE_AFTER_OUT)) {
outSuccessGlassSlot = v.stream().map(BigStorageCageTask::getStartSlot).collect(Collectors.toList());
@@ -561,7 +762,7 @@
List<Integer> slotList = storageCageDTOList.stream().map(UpdateHollowBigStorageCageDTO::getTargetSlot).distinct().collect(Collectors.toList());
hollowBigStorageCageDetailsService.updateDeviceIdBySlot(slotList);
}
- log.info("4銆佸ぇ鐞嗙墖绗艰繘鐗囩姸鎬佸凡瀹屾垚宸插畬鎴愮殑鐜荤拑淇℃伅id:{}", v);
+ log.info("4銆佸ぇ鐞嗙墖绗煎嚭鐗囩姸鎬佸凡瀹屾垚宸插畬鎴愮殑鐜荤拑淇℃伅id:{}", v);
updateSlotRemainBySlots(outSuccessGlassSlot);
} else if (e1 == 3) {
//鐮存崯澶勭悊
@@ -628,11 +829,14 @@
}
// 閲嶇疆浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.updateOutTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
-
+// bigStorageCageTaskService.updateOutTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+ resetOutTask();
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
+ s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo.setMesReply(0);
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
}
private void dealDamageInTask(List<BigStorageCageTask> damageTaskList) {
@@ -737,7 +941,8 @@
}
- private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list, int targetSlot, int isPair, int totalLayer, int isForce) {
+ private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list,
+ int targetSlot, int isPair, int totalLayer, int isForce) throws Exception {
List<T> resultList = new ArrayList<>();
List<T> tempList = new ArrayList<>();
int taskType = Const.BIG_STORAGE_AFTER_OUT;
@@ -749,6 +954,8 @@
break;
}
}
+
+ Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
if (isPair == 0 && isForce != 1) {
taskType = Const.BIG_STORAGE_AFTER_DISPATCH;
taskState = Const.GLASS_STATE_SCHEDULE_ING;
@@ -762,6 +969,16 @@
.ge(HollowBigStorageCage::getMaxThickness, list.get(0).getThickness())
.eq(HollowBigStorageCage::getRemainWidth, slotWidth)
.orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
+
+ if (null == storageCage) {
+ //鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
+ S7DataZKDLPOne s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setAlramSignal(16);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
+ Assert.isFalse(storageCage == null, "浠诲姟璋冨害娌℃湁澶氫綑鏍煎瓙锛岀粨鏉熻皟搴︿换鍔�");
+ }
+
targetSlot = storageCage.getSlot();
hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
.set(HollowBigStorageCage::getRemainWidth, 0).eq(HollowBigStorageCage::getSlot, targetSlot));
@@ -783,11 +1000,14 @@
* @param totalLayer
* @return
*/
- private <T extends HollowBigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, String tableName, int targetSlot, int state, int taskType, int totalLayer, int isForce) {
+ private <T extends HollowBigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, String tableName,
+ int targetSlot, int state, int taskType, int totalLayer, int isForce) {
//浠诲姟鏁版嵁:鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲�,鐜荤拑闂撮殧
List<T> templist = new ArrayList<>();
//鎵撹溅鍓╀綑灏哄
- Integer remainWidth = carWidth;
+ Integer remainWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
+ Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
+ Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
for (T e : list) {
if (templist.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
break;
@@ -798,7 +1018,7 @@
}
Assert.isFalse(CollectionUtil.isEmpty(templist), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", templist.size());
- List<T> baseInfoList = new ArrayList<>();
+ List<T> baseInfoList = templist;
if (1 != isForce) {
if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
//鏍￠獙闃叉灏忎簬绛変簬鎬诲眰鏁扮幓鐠冪墖搴忎笉鍖归厤鐨勯棶棰橈紝璇ラ棶棰樺鍑虹幇鍦ㄥぇ鐗囩幓鐠冿紝3灞�
@@ -816,21 +1036,10 @@
} else {
//澶т簬鎬诲眰鏁板厛鍙杢otalLyaer鍊嶆暟鏁伴噺鐨勭幓鐠冿紝淇濊瘉澶ц溅涓婄殑鐜荤拑鎴愬浼�
int remainCount = templist.size() % totalLayer;
- if (targetSlot == 931) {
- baseInfoList = templist.subList(0, templist.size() - remainCount);
+ if (targetSlot == 930) {
+ baseInfoList = templist.subList(0, totalLayer);
} else {
- //930鏃剁幓鐠冮『搴忓�掑簭銆佸悓涓�瀵圭幓鐠冨�掑簭
baseInfoList = templist.subList(0, templist.size() - remainCount);
- Map<Integer, List<T>> listMap = baseInfoList.stream().collect(Collectors.groupingBy(T::getHollowSequence));
- Map<Integer, List<T>> sortListMap = new TreeMap<>(Collections.reverseOrder());
- sortListMap.putAll(listMap);
- List<T> resultList = new ArrayList<>();
- for (Map.Entry<Integer, List<T>> e : sortListMap.entrySet()) {
- for (T t : e.getValue()) {
- resultList.add(t);
- }
- }
- baseInfoList = resultList;
}
}
}
@@ -839,16 +1048,58 @@
int glassCount = baseInfoList.size();
List<BigStorageCageTask> bigStorageCageTaskList = new ArrayList<>();
//鐢熸垚鍑虹墖浠诲姟鏉℃暟涓嶈冻6琛ュ叏
- for (T t : baseInfoList) {
- bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
- }
- while (baseInfoList.size() < 6) {
- bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
- }
+// for (T t : baseInfoList) {
+// bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
+// }
+// while (bigStorageCageTaskList.size() < 6) {
+// bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
+// }
//娓呯┖浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.removeAll(tableName);
- bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
- List<HollowBigStorageCageHistoryTask> historyList = baseInfoList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
+ resetOutTask();
+// bigStorageCageTaskService.removeAll(tableName);
+// bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
+ S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ for (int i = 0; i < bigStorageCageTaskList.size() && i < 6; i++) {
+ String glassId = bigStorageCageTaskList.get(i).getGlassId();
+ Integer startSlot = bigStorageCageTaskList.get(i).getStartSlot();
+ Integer target = bigStorageCageTaskList.get(i).getTargetSlot();
+ if (startSlot > 0) {
+ switch (i) {
+ case 0:
+ s7DataZKDLPTwo.setId1(glassId);
+ s7DataZKDLPTwo.setFrom1(startSlot);
+ s7DataZKDLPTwo.setTo1(target);
+ break;
+ case 1:
+ s7DataZKDLPTwo.setId2(glassId);
+ s7DataZKDLPTwo.setFrom2(startSlot);
+ s7DataZKDLPTwo.setTo2(target);
+ break;
+ case 2:
+ s7DataZKDLPTwo.setId3(glassId);
+ s7DataZKDLPTwo.setFrom3(startSlot);
+ s7DataZKDLPTwo.setTo3(target);
+ break;
+ case 3:
+ s7DataZKDLPTwo.setId4(glassId);
+ s7DataZKDLPTwo.setFrom4(startSlot);
+ s7DataZKDLPTwo.setTo4(target);
+ break;
+ case 4:
+ s7DataZKDLPTwo.setId5(glassId);
+ s7DataZKDLPTwo.setFrom5(startSlot);
+ s7DataZKDLPTwo.setTo5(target);
+ break;
+ case 5:
+ s7DataZKDLPTwo.setId6(glassId);
+ s7DataZKDLPTwo.setFrom6(startSlot);
+ s7DataZKDLPTwo.setTo6(target);
+ break;
+ }
+ }
+ }
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
+ List<HollowBigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
HollowBigStorageCageHistoryTask history = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(e, history);
history.setGlassCount(glassCount);
@@ -863,7 +1114,11 @@
.ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.in(HollowBigStorageCageDetails::getGlassId, glassIds));
try {
- miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
+
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
+ s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo.setMesReply(1);
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -876,6 +1131,8 @@
.in(HollowBigStorageCageDetails::getSlot, slotList).in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
Map<Integer, Double> slotRemainMap = new HashMap<>();
//鏄惁瀛樺湪鏈夋牸瀛愰潪绌虹殑鐜荤拑
+ Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
+ Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
//瀛樺湪 灏嗘牸瀛愬唴鐨勭幓鐠冨垎鍒繘琛屾洿鏂�
// List<HollowBigStorageCage> hollowBigStorageCageList = hollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>()
@@ -905,4 +1162,54 @@
.value(value)
.build();
}
+
+ //璇诲彇鍑虹墖鍦板潃
+ private List<BigStorageCageTask> getOutTaskList(S7DataZKDLPTwo s7DataZKDLPTwo) {
+ List<BigStorageCageTask> outTaskList = new ArrayList<>();
+ List<String> glassIds = s7DataZKDLPTwo.getIds();
+ List<Integer> startSlots = s7DataZKDLPTwo.getFroms();
+ List<Integer> endSlots = s7DataZKDLPTwo.getTos();
+ List<Integer> states = s7DataZKDLPTwo.getStates();
+ for (int i = 0; i < 6; i++) {
+ if (glassIds.get(i) != null && !glassIds.get(i).isEmpty()) {
+ BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
+ bigStorageCageTask.setGlassId(glassIds.get(i));
+ bigStorageCageTask.setStartSlot(startSlots.get(i));
+ bigStorageCageTask.setTargetSlot(endSlots.get(i));
+ bigStorageCageTask.setTaskState(states.get(i));
+ outTaskList.add(bigStorageCageTask);
+ }
+ }
+ return outTaskList;
+ }
+
+ //閲嶇疆浠诲姟琛�
+ private void resetOutTask() {
+ S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo.setId1("");
+ s7DataZKDLPTwo.setId2("");
+ s7DataZKDLPTwo.setId3("");
+ s7DataZKDLPTwo.setId4("");
+ s7DataZKDLPTwo.setId5("");
+ s7DataZKDLPTwo.setId6("");
+ s7DataZKDLPTwo.setFrom1(0);
+ s7DataZKDLPTwo.setFrom2(0);
+ s7DataZKDLPTwo.setFrom3(0);
+ s7DataZKDLPTwo.setFrom4(0);
+ s7DataZKDLPTwo.setFrom5(0);
+ s7DataZKDLPTwo.setFrom6(0);
+ s7DataZKDLPTwo.setTo1(0);
+ s7DataZKDLPTwo.setTo2(0);
+ s7DataZKDLPTwo.setTo3(0);
+ s7DataZKDLPTwo.setTo4(0);
+ s7DataZKDLPTwo.setTo5(0);
+ s7DataZKDLPTwo.setTo6(0);
+ s7DataZKDLPTwo.setState1(0);
+ s7DataZKDLPTwo.setState2(0);
+ s7DataZKDLPTwo.setState3(0);
+ s7DataZKDLPTwo.setState4(0);
+ s7DataZKDLPTwo.setState5(0);
+ s7DataZKDLPTwo.setState6(0);
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0