From e52411aebbba634949a0021553e8517b796f481e Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 六月 2025 16:26:08 +0800
Subject: [PATCH] Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
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 a18183a..da8eb31 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.mes.common.config.Const;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
@@ -14,11 +15,13 @@
import com.mes.pp.service.OptimizeProjectService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.s7.entity.S7Data;
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.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -53,6 +56,9 @@
@Resource
private OptimizeProjectService optimizeProjectService;
+ @Autowired(required = false)
+ S7Serializer s7Serializer;
+
private static final List<Integer> LOAD_STATION_01 = Arrays.asList(101, 102);
private static final List<Integer> LOAD_STATION_02 = Arrays.asList(103, 104);
@@ -74,7 +80,7 @@
opcLoadGlassChild(LOAD_GLASS_DEVICE_ONE_TASK, LOAD_GLASS_ONE_DEVICE);
}
- @Scheduled(fixedDelay = 5000)
+ // @Scheduled(fixedDelay = 5000)
public void opcLoadGlassTwo() {
opcLoadGlassChild(LOAD_GLASS_DEVICE_TWO_TASK, LOAD_GLASS_TWO_DEVICE);
}
@@ -84,7 +90,7 @@
opcLoadGlassFinishChid(LOAD_GLASS_DEVICE_ONE_TASK, LOAD_GLASS_ONE_DEVICE);
}
- @Scheduled(fixedDelay = 5000)
+ // @Scheduled(fixedDelay = 5000)
public void opcLoadGlassTwoFinish() {
opcLoadGlassFinishChid(LOAD_GLASS_DEVICE_TWO_TASK, LOAD_GLASS_TWO_DEVICE);
}
@@ -109,6 +115,7 @@
}
private void opcLoadGlassChild(String tableName, Integer deviceId) {
+ S7Data S7DataSP1 = s7Serializer.read(S7Data.class);
Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getState, Const.ENGINEERING_RUNNING).eq(Engineering::getStationCell, deviceId));
if (null == engineering) {
@@ -117,11 +124,14 @@
}
//浠诲姟鏆傚仠
LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- if (0 == task.getInkageState()) {
+ ;
+ if ("0".equals(S7DataSP1.getInkageState().toString())) {
+// if (0 == task.getInkageState()) {
log.info("{}涓婄墖绾匡紝澶勪簬绂荤嚎鐘舵�侊細{}锛岀粨鏉熸湰鍦颁笂鐗囪姹�", deviceId, task.getInkageState());
return;
}
- if (task.getTaskRunning().equals(Const.ENGINEERING_RUNNING)) {
+ if (S7DataSP1.getTaskRunning().toString().equals(Const.ENGINEERING_RUNNING)) {
+// if (task.getTaskRunning().equals(Const.ENGINEERING_RUNNING)) {
log.info("{}涓婄墖绾匡紝鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熸湰鍦颁笂鐗囪姹�", deviceId);
return;
}
@@ -181,19 +191,24 @@
}
private void opcLoadGlassFinishChid(String tableName, Integer deviceId) {
+ S7Data S7DataSP1 = s7Serializer.read(S7Data.class);
LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- if (task.getTaskRunning().equals(Const.ENGINEERING_NEW)) {
+ if (S7DataSP1.getTaskRunning().toString().equals(Const.ENGINEERING_NEW)) {
+// if (task.getTaskRunning().equals(Const.ENGINEERING_NEW)) {
log.info("鏃犱换鍔�,缁撴潫");
return;
}
- if (task.getTaskState() <= 1) {
+ if (Integer.parseInt(S7DataSP1.getTaskState().toString()) <= 1) {
+// if (task.getTaskState() <= 1) {
log.info("浠诲姟姝ｅ湪鎵ц,缁撴潫");
return;
}
//鑾峰彇浠诲姟瀹屾垚鎯呭喌
// 宸插畬鎴愭暟閲� 鐮存崯鏁伴噺
- Integer finishCount = task.getFinishCount();
- Integer damageCount = task.getDamageCount();
+ Integer finishCount = Integer.parseInt(S7DataSP1.getFinishCount().toString());
+ Integer damageCount = Integer.parseInt(S7DataSP1.getDamageCount().toString());
+// Integer finishCount = task.getFinishCount();
+// Integer damageCount = task.getDamageCount();
//鏇存柊褰撳墠鏋跺瓙涓婄殑鍘熺墖鍓╀綑鎯呭喌
rawGlassStorageDetailsService.update(new UpdateWrapper<RawGlassStorageDetails>()
--
Gitblit v1.8.0