From 1bd7562e918a9d32a5228dd8ae77f1cbe26e1232 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 21 二月 2025 15:13:26 +0800
Subject: [PATCH] 增加钢化指定工程查询
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 32 ++++++++++++++--
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 18 +++++++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 24 ++++++++++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 8 +++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 9 ++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 20 +++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 6 ++-
8 files changed, 106 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index b62a160..8e1081f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -1,6 +1,9 @@
package com.mes.temperingglass.service;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
+
import com.github.yulichang.base.MPJBaseService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+
import java.util.List;
/**
@@ -53,4 +56,7 @@
*/
List<TemperingGlassInfo> selectGlassInfoById(Integer id);
+ GlassInfo selectTempering(GlassInfo glassInfo);
+
+ List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index d555f46..386c8aa 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -25,6 +28,8 @@
public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
@Resource
TemperingGlassInfoMapper temperingMapper;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
@Override
public List<TemperingGlassInfo> selectWaitingGlass() {
@@ -132,4 +137,23 @@
}
return result;
}
+
+ @Override
+ public GlassInfo selectTempering(GlassInfo glassInfo) {
+
+ QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.select("max(tempering_layout_id)as id")
+ .eq("engineer_id", glassInfo.getEngineerId());
+
+ return glassInfoMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
+ QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineer_id", glassInfo.getEngineerId())
+ .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
+ .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
+ return glassInfoMapper.selectList(wrapper);
+ }
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index adcf7cb..217fadc 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -9,6 +9,7 @@
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,8 @@
private UpPattenUsageService upPattenUsageService;
@Autowired
private OptimizeProjectService optimizeProjectService;
-
+ @Autowired
+ RedisUtil redisUtil;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@@ -124,10 +126,20 @@
jsonObject.append("prioritylist", upPattenUsages);
}
//鏌ヨ1鍙风嚎鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
+ Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ if (request == null) {
+ request = new Engineering();
+ request.setStationCell(5);
+ }
+ List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
jsonObject.append("loadTask1", upPattenUsages1);
//鏌ヨ2鍙风嚎鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
+ Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
+ if (request2 == null) {
+ request2 = new Engineering();
+ request2.setStationCell(6);
+ }
+ List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
jsonObject.append("loadTask2", upPattenUsages2);
//鏌ヨ宸ヤ綅浠诲姟
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 6ea664c..1462b10 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -85,7 +85,14 @@
@PostMapping("/setUpPattenRequest")
public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
log.info("鏌ヨ涓婄墖淇℃伅:{}", request);
- return Result.build(200, "鏌ヨ鎴愬姛", upPattenUsageService.setRawGlassTaskRequest(request));
+ if (request.getStationCell() == 5) {
+ return Result.build(200, "鏌ヨ1鍙风嚎", upPattenUsageService.setRawGlassTaskRequest(request));
+ } else if (request.getStationCell() == 6) {
+ return Result.build(200, "鏌ヨ2鍙风嚎", upPattenUsageService.setRawGlassTaskRequest2(request));
+ } else {
+ return Result.build(100, "鏌ヨ澶辫触", null);
+ }
+
}
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index 67ff14f..9a793da 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -66,7 +66,9 @@
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
- List<Engineering> setRawGlassTaskRequest(Engineering request);
+ String setRawGlassTaskRequest(Engineering request);
+
+ String setRawGlassTaskRequest2(Engineering request);
// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
@@ -77,7 +79,7 @@
void deleteTask(String engineerId);
- List<UpPattenUsage> selectLoadTask(Integer i);
+ List<UpPattenUsage> selectLoadTask(Engineering engineering);
/**
* 鎷胯蛋:9/鐮存崯:8
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 f1beb4e..4410f73 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,10 +197,28 @@
}
@Override
- public List<Engineering> setRawGlassTaskRequest(Engineering request) {
- return null;
+ public String setRawGlassTaskRequest(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequest");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequest", request);
+ }
+ return "success";
}
+ @Override
+ public String setRawGlassTaskRequest2(Engineering request) {
+ // 璋冪敤 RedisUtil 淇濆瓨 loadGlass
+ if (request == null) {
+ redisUtil.deleteObject("loadGlassRequest2");
+ } else {
+ redisUtil.setCacheObject("loadGlassRequest2", request);
+ }
+ return "success";
+ }
+
+
public Object Engineering(Engineering request) {
return null;
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index f8fa7c1..465ec44 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,9 +1,12 @@
package com.mes.temperingglass.controller;
+
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
-import com.mes.temperingglass.service.TemperingGlassInfoService;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +18,7 @@
/**
* @author SNG-010
*/
+@Api(tags = "閽㈠寲鏄剧ず")
@RestController
@RequestMapping("/temperingGlassInfo")
@Slf4j
@@ -58,5 +62,19 @@
return Result.build(200, "鐮存崯鎴愬姛", result);
}
+ @ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿")
+ @PostMapping("/selectTempering") //鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿
+ public Result<GlassInfo> selectTempering(@RequestBody GlassInfo glassInfo) {
+ GlassInfo glass = temperingGlassInfoService.selectTempering(glassInfo);
+ return Result.build(200, "鏌ヨ鎴愬姛", glass);
+ }
+
+ @ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙风殑閽㈠寲鐗堝浘")
+ @PostMapping("/selectTemperingGlass") //鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿
+ public Result<List<GlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) {
+ List<GlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
+ return Result.build(200, "鏌ヨ鎴愬姛", glass);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
index b23ce0f..8264ed3 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
@@ -10,7 +10,7 @@
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
salve_northGlassMes:
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=north_glass_mes
+ url: jdbc:sqlserver://10.153.19.150:1433;databasename=north_glass_mes
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
--
Gitblit v1.8.0