From d7765b799489db445388e528044ab3b2bd2e649e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 六月 2025 08:22:57 +0800
Subject: [PATCH] 钢化模块modbus和S7改造
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 130 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 46 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index 76e3087..1f200dc 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
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.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.common.config.Const;
@@ -16,11 +17,14 @@
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
+import com.mes.s7.entity.S7DataCC;
+import com.mes.s7.entity.S7DataSP;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.entity.vo.UpPattenUsageVO;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -57,6 +61,18 @@
@Autowired(required = false)
private MiloService miloService;
+ @Autowired
+ @Qualifier("s7SerializerCC")
+ S7Serializer s7SerializerCC;
+
+ @Autowired
+ @Qualifier("s7SerializerSPOne")
+ private S7Serializer s7SerializerSPOne;
+
+ @Autowired
+ @Qualifier("s7SerializerSPTwo")
+ private S7Serializer s7SerializerSPTwo;
+
private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
@@ -64,6 +80,7 @@
private static final List<Integer> LOAD_STATION_01 = Arrays.asList(101, 102);
private static final List<Integer> LOAD_STATION_02 = Arrays.asList(103, 104);
+ private static final List<Integer> LOAD_STATION_ALL = Arrays.asList(101, 102, 103, 104);
private static final Integer LEFTING_01 = 98;
private static final Integer LEFTING_02 = 99;
private static final Integer LOAD_GLASS_ONE_DEVICE = 5;
@@ -71,23 +88,39 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageTask() throws Exception {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
- ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
- ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
- ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
- String requestValue = requestWord.getValue() + "";
+ S7DataCC S7DataCCOne = s7SerializerCC.read(S7DataCC.class);
+ String requestWord = S7DataCCOne.getRequest().toString();
+ String confireWord = S7DataCCOne.getConfirmation().toString();
+ String reportWord = S7DataCCOne.getReportWord().toString();
+ String taskWord = S7DataCCOne.getTaskWord().toString();
+ String requestValue = requestWord;
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
+// ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
+// ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
+// ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
+// String requestValue = requestWord.getValue() + "";
if ("0".equals(requestValue)) {
- if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(confireWord) && "0".equals(reportWord)) {
+// if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
+ S7DataCC s7Data = new S7DataCC();
+ s7Data.setConfirmation(0);
+ s7SerializerCC.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
+// miloService.writeToOpcWord(list);
}
- if ("1".equals(taskWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
- list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
- list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(taskWord)) {
+// if ("1".equals(taskWord.getValue() + "")) {
+ S7DataCC s7Data = new S7DataCC();
+ s7Data.setTaskWord(0);
+ s7Data.setStartSlot(0);
+ s7Data.setEndSlot(0);
+ s7SerializerCC.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
+// list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
+// list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
+// miloService.writeToOpcWord(list);
}
return;
}
@@ -127,8 +160,10 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
- String value = entity.getValue() + "";
+ S7DataCC S7DataCCOne = s7SerializerCC.read(S7DataCC.class);
+ String value = S7DataCCOne.getInCar().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
+// String value = entity.getValue() + "";
if (!"1".equals(value)) {
log.info("澶ц溅涓婃病鏈夋灦瀛�");
return;
@@ -142,13 +177,14 @@
}
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getId, one.getId())
.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
-
}
@Scheduled(fixedDelay = 1000)
public void rawStorageFinish() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
- String value = entity.getValue() + "";
+ S7DataCC S7DataCCOne = s7SerializerCC.read(S7DataCC.class);
+ String value = S7DataCCOne.getReportWord().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
+// String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -161,7 +197,7 @@
}
RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
.in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
- RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
+ RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
int deviceId = details.getDeviceId();
Integer taskType = task.getTaskType();
if ("1".equals(value)) {
@@ -211,9 +247,12 @@
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
}
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
- miloService.writeToOpcWord(list);
+ S7DataCC s7Data = new S7DataCC();
+ s7Data.setConfirmation(1);
+ s7SerializerCC.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
+// miloService.writeToOpcWord(list);
}
private boolean isHasRunningTask() {
@@ -299,7 +338,7 @@
}
//鐢熸垚澶嶄綅浠诲姟
- rawGlassStorageDetailsService.generateTask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+// rawGlassStorageDetailsService.generatask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
// List<ReadWriteEntity> list = new ArrayList<>();
// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
@@ -406,6 +445,10 @@
if (CollectionUtils.isEmpty(loadStationList)) {
log.info("1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
+ if (rawDetails == null) {
+ log.info("浠撳簱鍐呮棤鍖归厤鐨勭幓鐠�");
+ return Boolean.FALSE;
+ }
rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
//缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
@@ -425,7 +468,7 @@
log.info("2鍙蜂笂鐗囦綅鐜荤拑灏哄涓嶄竴鑷达紝1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
//鎸夌収灏哄鍙婃暟閲忚幏鍙栨暟閲忔渶鎺ヨ繎鐨勬牸瀛愪俊鎭�
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- if(null == rawDetails){
+ if (null == rawDetails) {
log.info("浠撳簱鍐呮棤闇�瑕佷笂鏋剁殑鐜荤拑");
return Boolean.FALSE;
}
@@ -456,7 +499,13 @@
RawGlassStorageDetails twoLoadStation = loadStationList.stream().filter(e -> e.getSlot().equals(loadStation.get(1))).findFirst().orElse(null);
if (null == twoLoadStation) {
//鎸夌収灏哄鐢熸垚浜屽彿浣嶄笂鐗囦换鍔′俊鎭�
- LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+// LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+ S7DataSP loadTask = new S7DataSP();
+ if (stationCell == 5) {
+ loadTask = s7SerializerSPOne.read(S7DataSP.class);
+ } else {
+ loadTask = s7SerializerSPTwo.read(S7DataSP.class);
+ }
RawGlassStorageDetails rawDetails = null;
if (oneLoadStation.getRemainQuantity() > (loadTask.getTotalCount() + loadTask.getDamageCount())) {
usageVOS = upListMap.get("2");
@@ -482,7 +531,13 @@
} else {
//todo:褰撲簩鍙蜂负鐨勫昂瀵稿ぇ浜�0鏃讹紝鏄惁鎵ц璋冨害浠诲姟锛屾洿鎹㈠綋鍓嶅師鐗囩殑灏哄锛岀瓑寰呬笅涓�娆′换鍔＄殑鐩存帴鎵ц锛涜繕鏄户缁瓑寰咃紝褰撳昂瀵镐笉涓�鏍凤紝绛夊緟涓�鍙峰伐浣嶇殑杩涘嚭搴撹皟搴︿换鍔°��
if (twoLoadStation.getRemainQuantity() > 0) {
- LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+// LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+ S7DataSP loadTask = new S7DataSP();
+ if (stationCell == 5) {
+ loadTask = s7SerializerSPOne.read(S7DataSP.class);
+ } else {
+ loadTask = s7SerializerSPTwo.read(S7DataSP.class);
+ }
if (oneLoadStation.getRemainQuantity() > (loadTask.getTotalCount() + loadTask.getDamageCount())) {
usageVOS = upListMap.get("2");
if (CollectionUtils.isEmpty(usageVOS)) {
@@ -534,24 +589,6 @@
}
}
- private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
- RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
- RawGlassStorageStation station = rawGlassStorageStationService.getOne(new LambdaQueryWrapper<RawGlassStorageStation>()
- .eq(RawGlassStorageStation::getSlot, targetSlot));
- targetDetails.setDeviceId(station.getDeviceId());
- targetDetails.setSlot(targetSlot);
- targetDetails.setShelf(details.getShelf());
- targetDetails.setPatternWidth(details.getPatternWidth());
- targetDetails.setPatternHeight(details.getPatternHeight());
- targetDetails.setPatternThickness(details.getPatternThickness());
- targetDetails.setFilmsId(details.getFilmsId());
- targetDetails.setRemainQuantity(details.getRemainQuantity());
- targetDetails.setCreateTime(new Date());
- targetDetails.setState(Const.RAW_GLASS_STATE_IN);
- return targetDetails;
- }
-
-
private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
ReadWriteEntity readWriteEntity = new ReadWriteEntity();
readWriteEntity.setIdentifier(identifier);
@@ -565,6 +602,7 @@
.eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
.eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
.eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .notIn(RawGlassStorageDetails::getSlot, LOAD_STATION_ALL)
.eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
.orderByAsc(RawGlassStorageDetails::getRemainQuantity)
.last("order by abs(t.remain_quantity - " + remainQuantity + ") asc")
--
Gitblit v1.8.0