From 982bc1e3eb588021b2f73dfb04bfc78beb462db7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 10 六月 2025 14:25:19 +0800
Subject: [PATCH] 添加引入，修改S7类short为int
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java | 32 ++++++++--------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java | 1
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java | 46 +++++++++++-----------
3 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
index e171408..d1b7045 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
@@ -9,6 +9,7 @@
import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest;
import com.mes.bigstoragecagetask.mapper.BigStorageCageHistoryTaskMapper;
+import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.DateUtil;
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
index 2a79d53..66bdcb3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
@@ -134,10 +134,10 @@
return;
}
//浠诲姟鏆傚仠
- S7DataSP task=new S7DataSP();
- if(LOAD_GLASS_ONE_DEVICE.equals(deviceId)){
+ S7DataSP task = new S7DataSP();
+ if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
s7SerializerSPOne.read(S7DataSP.class);
- }else{
+ } else {
s7SerializerSPTwo.read(S7DataSP.class);
}
// LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
@@ -183,18 +183,18 @@
}
int number = Math.min(twoLoadStation.getRemainQuantity(), usageVOS.size());
//鐢熸垚涓婄墖浠诲姟
- task.setTotalCount((short)number);
+ task.setTotalCount(number);
task.setTaskRunning(Boolean.TRUE);
- task.setRawGlassWidth((short) usageVOS.get(0).getWidth());
- task.setRawGlassHeight((short) usageVOS.get(0).getHeight());
- task.setSlot(loadStation.get(1).shortValue());
+ task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
+ task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
+ task.setSlot(loadStation.get(1));
// loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
S7DataSP s7DataSPWrite = new S7DataSP();
- s7DataSPWrite.setTotalCount((short) number);
+ s7DataSPWrite.setTotalCount(number);
s7DataSPWrite.setTaskRunning(Boolean.TRUE);
- s7DataSPWrite.setRawGlassWidth((short) usageVOS.get(0).getWidth());
- s7DataSPWrite.setRawGlassHeight((short) usageVOS.get(0).getHeight());
- s7DataSPWrite.setSlot(loadStation.get(1).shortValue());
+ s7DataSPWrite.setRawGlassWidth((int) usageVOS.get(0).getWidth());
+ s7DataSPWrite.setRawGlassHeight((int) usageVOS.get(0).getHeight());
+ s7DataSPWrite.setSlot(loadStation.get(1));
if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
s7SerializerSPOne.write(s7DataSPWrite);
} else {
@@ -210,18 +210,18 @@
}
//鐢熸垚涓婄墖浠诲姟
int number = Math.min(oneLoadStation.getRemainQuantity(), usageVOS.size());
- task.setTotalCount((short)number);
+ task.setTotalCount(number);
task.setTaskRunning(Boolean.TRUE);
- task.setRawGlassWidth((short) usageVOS.get(0).getWidth());
- task.setRawGlassHeight((short) usageVOS.get(0).getHeight());
- task.setSlot(loadStation.get(0).shortValue());
+ task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
+ task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
+ task.setSlot(loadStation.get(0));
// loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
S7DataSP s7DataSPWrite = new S7DataSP();
- s7DataSPWrite.setTotalCount((short) number);
+ s7DataSPWrite.setTotalCount(number);
s7DataSPWrite.setTaskRunning(Boolean.TRUE);
- s7DataSPWrite.setRawGlassWidth((short) usageVOS.get(0).getWidth());
- s7DataSPWrite.setRawGlassHeight((short) usageVOS.get(0).getHeight());
- s7DataSPWrite.setSlot(loadStation.get(0).shortValue());
+ s7DataSPWrite.setRawGlassWidth((int) usageVOS.get(0).getWidth());
+ s7DataSPWrite.setRawGlassHeight((int) usageVOS.get(0).getHeight());
+ s7DataSPWrite.setSlot(loadStation.get(0));
if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
s7SerializerSPOne.write(s7DataSPWrite);
} else {
@@ -280,10 +280,10 @@
// loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
S7DataSP s7DataSPWrite = new S7DataSP();
s7DataSPWrite.setTaskRunning(Boolean.FALSE);
- s7DataSPWrite.setTotalCount((short) 0);
- s7DataSPWrite.setRawGlassWidth((short) 0);
- s7DataSPWrite.setRawGlassHeight((short) 0);
- s7DataSPWrite.setSlot((short) 0);
+ s7DataSPWrite.setTotalCount(0);
+ s7DataSPWrite.setRawGlassWidth(0);
+ s7DataSPWrite.setRawGlassHeight(0);
+ s7DataSPWrite.setSlot(0);
if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
s7SerializerSPOne.write(s7DataSPWrite);
} else {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
index 188b532..f3be3ab 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/s7/entity/S7DataSP.java
@@ -13,32 +13,32 @@
public class S7DataSP {
- @S7Variable(address = "DB19.14", type = EDataType.INT16)
- private Short taskState;
+ @S7Variable(address = "DB19.14", type = EDataType.UINT16)
+ private Integer taskState;
- @S7Variable(address = "DB19.18", type = EDataType.INT16)
- private Short damageCount;
+ @S7Variable(address = "DB19.18", type = EDataType.UINT16)
+ private Integer damageCount;
- @S7Variable(address = "DB19.20", type = EDataType.INT16)
- private Short rawGlassWidth;
+ @S7Variable(address = "DB19.20", type = EDataType.UINT16)
+ private Integer rawGlassWidth;
- @S7Variable(address = "DB19.22", type = EDataType.INT16)
- private Short rawGlassHeight;
+ @S7Variable(address = "DB19.22", type = EDataType.UINT16)
+ private Integer rawGlassHeight;
- @S7Variable(address = "DB19.24", type = EDataType.INT16)
- private Short slot;
+ @S7Variable(address = "DB19.24", type = EDataType.UINT16)
+ private Integer slot;
- @S7Variable(address = "DB19.26", type = EDataType.INT16)
- private Short totalCount;
+ @S7Variable(address = "DB19.26", type = EDataType.UINT16)
+ private Integer totalCount;
- @S7Variable(address = "DB19.28", type = EDataType.INT16)
- private Short finishCount;
+ @S7Variable(address = "DB19.28", type = EDataType.UINT16)
+ private Integer finishCount;
@S7Variable(address = "DB19.16.0", type = EDataType.BOOL)
private Boolean taskRunning;
- @S7Variable(address = "DB19.30", type = EDataType.INT16)
- private Short inkageState;
+ @S7Variable(address = "DB19.30", type = EDataType.UINT16)
+ private Integer inkageState;
}
--
Gitblit v1.8.0