From 05bd172d550f1b6b963fcb23ef21d79e2a43d757 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 10 六月 2025 13:59:34 +0800
Subject: [PATCH] 更新S7通讯程序
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 197e3f7..d9f28e1 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
@@ -103,7 +103,7 @@
if ("1".equals(confireWord) && "0".equals(reportWord)) {
// if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
S7DataCC s7Data = new S7DataCC();
- s7Data.setConfirmation((short) 0);
+ s7Data.setConfirmation(0);
s7SerializerCC.write(s7Data);
// List<ReadWriteEntity> list = new ArrayList<>();
// list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
@@ -112,9 +112,9 @@
if ("1".equals(taskWord)) {
// if ("1".equals(taskWord.getValue() + "")) {
S7DataCC s7Data = new S7DataCC();
- s7Data.setTaskWord((short) 0);
- s7Data.setStartSlot((short) 0);
- s7Data.setEndSlot((short) 0);
+ s7Data.setTaskWord(0);
+ s7Data.setStartSlot(0);
+ s7Data.setEndSlot(0);
s7SerializerCC.write(s7Data);
// List<ReadWriteEntity> list = new ArrayList<>();
// list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
@@ -248,7 +248,7 @@
}
S7DataCC s7Data = new S7DataCC();
- s7Data.setConfirmation((short) 1);
+ s7Data.setConfirmation(1);
s7SerializerCC.write(s7Data);
// List<ReadWriteEntity> list = new ArrayList<>();
// list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
@@ -500,11 +500,11 @@
if (null == twoLoadStation) {
//鎸夌収灏哄鐢熸垚浜屽彿浣嶄笂鐗囦换鍔′俊鎭�
// LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- S7DataSP loadTask=new S7DataSP();
- if(stationCell == 5){
- loadTask=s7SerializerSPOne.read(S7DataSP.class);
- }else{
- loadTask=s7SerializerSPTwo.read(S7DataSP.class);
+ 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())) {
@@ -532,11 +532,11 @@
//todo:褰撲簩鍙蜂负鐨勫昂瀵稿ぇ浜�0鏃讹紝鏄惁鎵ц璋冨害浠诲姟锛屾洿鎹㈠綋鍓嶅師鐗囩殑灏哄锛岀瓑寰呬笅涓�娆′换鍔＄殑鐩存帴鎵ц锛涜繕鏄户缁瓑寰咃紝褰撳昂瀵镐笉涓�鏍凤紝绛夊緟涓�鍙峰伐浣嶇殑杩涘嚭搴撹皟搴︿换鍔°��
if (twoLoadStation.getRemainQuantity() > 0) {
// LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- S7DataSP loadTask=new S7DataSP();
- if(stationCell == 5){
- loadTask=s7SerializerSPOne.read(S7DataSP.class);
- }else{
- loadTask=s7SerializerSPTwo.read(S7DataSP.class);
+ 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");
--
Gitblit v1.8.0