From 7e634b208bd68e3bf9c2cfe6682f22a684b1a102 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 24 十月 2024 10:47:21 +0800
Subject: [PATCH] 还原被覆盖代码
---
UI-Project/config.js | 8 ++--
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 31 +++++++++------
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 2
UI-Project/src/utils/constants.js | 4 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 3 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 4 +-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml | 14 +++++-
9 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 4fc6899..8801d0c 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,10 +1,10 @@
export default {
// serverUrl: "10.153.19.150:88/api",
- serverUrl: "192.168.1.199:88/api",
-// serverUrl: "127.0.0.1:88/api",
+// serverUrl: "192.168.1.199:88/api",
+ serverUrl: "127.0.0.1:88/api",
// serverUrl2: "10.153.19.150:88"
- serverUrl2: "192.168.1.199:88"
- // serverUrl2: "127.0.0.1:88"
+ // serverUrl2: "192.168.1.199:88"
+ serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index c104075..69000bc 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
- export const WebSocketHost = "192.168.1.199";
+// export const WebSocketHost = "192.168.1.199";
// export const WebSocketHost = "10.153.19.150";
-// export const WebSocketHost = "127.0.0.1";
+export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 49dacf1..8e0191c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -100,7 +100,7 @@
public static String engineerId = "";
- //@Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
Date startDate = new Date();
log.info("鏈浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 3b73c7e..b59a5cd 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -92,7 +92,8 @@
@ApiOperation("鎸囧畾閽㈠寲")
@PostMapping("/TemperingGlass")
public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
- boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId());
+ boolean result = bigStorageCageDetailsService
+ .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString());
if (result == true) {
return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
} else {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
index 8703694..8daa7b7 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -69,7 +69,7 @@
*/
List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId);
- boolean temperingGlass(String temperingLayoutId, String engineerId);
+ boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence);
List<Map<String, Object>> selectTemperingGlass();
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 8a73f9e..3d83139 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -27,6 +27,7 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.job.PlcStorageCageTask;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -36,10 +37,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -70,6 +68,9 @@
@Resource
private TemperingGlassInfoService temperingGlassInfoService;
+
+ @Resource
+ private PlcStorageCageTask plcStorageCageTask;
@Resource
private DamageService damageService;
@@ -188,7 +189,7 @@
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
bigStorageCageDetailsWrapper
.eq(BigStorageCageDetails::getGlassId, glassId)
- .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN);
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
if (temperingGlassInfo != null) {
@@ -221,7 +222,7 @@
@Override
public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
- List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>();
+ List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
@@ -276,8 +277,8 @@
.gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
.last("limit 1");
if (glassInfo.getTemperingLayoutId() == 0) {
- wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId())
- .eq(BigStorageCageDetails::getLayer,glassInfo.getLayer());
+ wrapper.eq(BigStorageCageDetails::getFlowCardId, glassInfo.getFlowCardId())
+ .eq(BigStorageCageDetails::getLayer, glassInfo.getLayer());
// wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
} else {
wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
@@ -363,7 +364,7 @@
}
@Override
- public boolean temperingGlass(String temperingLayoutId, String engineerId) {
+ public boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence) {
LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
temperingGlassInfoLambdaQueryWrapper
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
@@ -380,11 +381,17 @@
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
- temperingGlassInfoService.saveBatch(temperingGlassInfos);
+ if ("0".equals(temperingFeedSequence)){
+ if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
+ plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, "");
+ }
+ }else{
+ temperingGlassInfoService.saveBatch(temperingGlassInfos);
+ }
return true;
}
}
- return false;
+ return false;
}
@@ -406,7 +413,7 @@
}
@Override
- public void appointEngineerId(String engineerId){
+ public void appointEngineerId(String engineerId) {
redisUtil.setCacheObject("temperingengineerId", engineerId);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index b10f0a1..b130faf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: dev
+ active: cz
application:
name: cacheVerticalGlass
liquibase:
@@ -22,7 +22,7 @@
order: false
minCount: 20
carWidth: 5000 #澶ц溅瀹藉害
- slotWidth: 5000 #澶ц溅瀹藉害
+ slotWidth: 5500 #澶ц溅瀹藉害
inCarMaxSize: 2 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
outCarMaxSize: 3 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
glassGap: 350 #鐜荤拑闂磋窛
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
index 62c6cb8..b8187b9 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -9,7 +9,15 @@
enabled: false
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImplkangaroohy:
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImplkangaroohy:
+kangaroohy:
milo:
- enabled: false
\ No newline at end of file
+ enabled: false
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://zidonghua:49320
+ security-policy: basic256sha256
+ username: zsh
+ password: 1qaz2wsx3edc4rfv
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index ea38837..9bf821e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8084
spring:
profiles:
- active: dev
+ active: cz
application:
name: temperingGlass
liquibase:
--
Gitblit v1.8.0