From 849442e4f63a5fd7ae154ef6bc77c967a82f40b8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 26 六月 2025 08:46:01 +0800
Subject: [PATCH] 删除改S7通讯时注释的原opc代码
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 49 +------------------------------------------------
1 files changed, 1 insertions(+), 48 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 4ef74ca..049549b 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
@@ -89,39 +89,24 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageTask() throws Exception {
S7DataCC S7DataCCOne = s7SerializerCC.read(S7DataCC.class);
- log.info("浠撳偍閫氳璇诲彇{}",S7DataCCOne);
+ log.info("浠撳偍閫氳璇诲彇{}", S7DataCCOne);
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) && "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)) {
-// 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;
}
@@ -163,8 +148,6 @@
public void rawStorageInCar() throws Exception {
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;
@@ -184,8 +167,6 @@
public void rawStorageFinish() throws Exception {
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;
@@ -251,9 +232,6 @@
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() {
@@ -310,13 +288,6 @@
//鐢熸垚鍑哄簱浠诲姟
rawGlassStorageDetailsService.generateTask(startSlot, lefting, startSlot, rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
-// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
-// list.add(generateReadWriteEntity("CC.CC.endSlot", lefting));
-// miloService.writeToOpcWord(list);
-
//淇敼鍑虹墖浠诲姟鐘舵��
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
@@ -338,15 +309,6 @@
return Boolean.FALSE;
}
//鐢熸垚澶嶄綅浠诲姟
-
-// 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));
-// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
-// list.add(generateReadWriteEntity("CC.CC.endSlot", lefting));
-// miloService.writeToOpcWord(list);
//淇敼澶嶄綅浠诲姟鐘舵��
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
@@ -375,12 +337,6 @@
RawGlassStorageDetails details = rawGlassList.get(0);
rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
-// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("CC.CC.startSlot", details.getSlot()));
-// list.add(generateReadWriteEntity("CC.CC.endSlot", details.getShelf()));
-// miloService.writeToOpcWord(list);
//鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
//淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负103 鍑虹墖涓�
//淇敼鍑虹墖浠诲姟鐘舵��
@@ -500,7 +456,6 @@
RawGlassStorageDetails twoLoadStation = loadStationList.stream().filter(e -> e.getSlot().equals(loadStation.get(1))).findFirst().orElse(null);
if (null == twoLoadStation) {
//鎸夌収灏哄鐢熸垚浜屽彿浣嶄笂鐗囦换鍔′俊鎭�
-// LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
S7DataSP loadTask = new S7DataSP();
if (stationCell == 5) {
loadTask = s7SerializerSPOne.read(S7DataSP.class);
@@ -532,7 +487,6 @@
} else {
//todo:褰撲簩鍙蜂负鐨勫昂瀵稿ぇ浜�0鏃讹紝鏄惁鎵ц璋冨害浠诲姟锛屾洿鎹㈠綋鍓嶅師鐗囩殑灏哄锛岀瓑寰呬笅涓�娆′换鍔＄殑鐩存帴鎵ц锛涜繕鏄户缁瓑寰咃紝褰撳昂瀵镐笉涓�鏍凤紝绛夊緟涓�鍙峰伐浣嶇殑杩涘嚭搴撹皟搴︿换鍔°��
if (twoLoadStation.getRemainQuantity() > 0) {
-// LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
S7DataSP loadTask = new S7DataSP();
if (stationCell == 5) {
loadTask = s7SerializerSPOne.read(S7DataSP.class);
@@ -570,7 +524,6 @@
return Boolean.TRUE;
}
}
-// return Boolean.FALSE;
} else {
log.info("2鍙蜂笂鐗囦綅浠呭墿绌烘灦瀛愶紝1鍙蜂笂鐗囦綅鐢熸垚鍑哄簱璋冨害浠诲姟");
rawGlassStorageDetailsService.generateTask(loadStation.get(0), oneLoadStation.getShelf(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
--
Gitblit v1.8.0