From ae07cd92f46b88bf034c7d9d0b96b3a5e83fdc98 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 20 五月 2025 16:29:00 +0800
Subject: [PATCH] 仓储，上片，卧理修改OPC为S7通讯
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 475749d..2c9f493 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -17,6 +17,7 @@
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +43,8 @@
EngineeringService engineeringService;
@Autowired
DamageService damageService;
+ @Autowired
+ RedisUtil redisUtil;
@Override
public List<UpPattenUsage> prioritylist() {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
@@ -58,13 +61,16 @@
}
@Override
- public List<UpPattenUsage> selectLoadTask(Integer cell) {
+ public List<UpPattenUsage> selectLoadTask(Engineering cell) {
//鑾峰彇姝ｅ湪涓婄墖鐨勪换鍔d
- Engineering engineering= engineeringService.selectInitiates(1,cell);
+ Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
if(engineering!=null){
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
+ if (cell.getState() != null) {
+ wrapper.eq(UpPattenUsage::getState, cell.getState());
+ }
return this.list(wrapper);
} else {
return null;
@@ -191,9 +197,27 @@
}
@Override
- public List<Engineering> setRawGlassTaskRequest(Engineering request) {
- return null;
+ public String setRawGlassTaskRequest(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequestOne");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequestOne", request);
+ }
+ return "success";
}
+
+ @Override
+ public String setRawGlassTaskRequest2(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequestTwo");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequestTwo", request);
+ }
+ return "success";
+ }
+
public Object Engineering(Engineering request) {
return null;
@@ -202,7 +226,7 @@
@Override
public String identControls(DamageRequest request) {
//灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
- damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "鎺扮墖璇嗗埆", request.getState());
+ damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "涓婄墖鏈�", request.getState());
return "success";
}
}
--
Gitblit v1.8.0