From 09c9c55d62cdcc6db5e99ee238ae0e78d082ee1a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 21 十月 2024 13:34:25 +0800
Subject: [PATCH] 添加大理片多线程
---
UI-Project/src/views/Slicecage/slicecage.vue | 12 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 8
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 65 +++++++-----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 152 +++++++++++++++---------------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 7 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 10 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 2
7 files changed, 134 insertions(+), 122 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 0b35bd1..06b7e10 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,19 +1,17 @@
<script lang="ts" setup>
-import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
- let language = ref(localStorage.getItem('lang') || 'zh')
-import {Search} from "@element-plus/icons-vue";
+import {useI18n} from 'vue-i18n'
import {useRouter} from "vue-router"
-const router = useRouter()
import request from "@/utils/request"
-
+import {host, WebSocketHost} from '@/utils/constants'
+import {computed, onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+import {ElMessage, ElMessageBox} from 'element-plus'
import PrintLabel from "@/views/UnLoadGlass/PrintCustomLabelSemi1.vue";
const dialogFormVisibleaDownGlasss = ref(false)
const scanGlass = ref([])
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const router = useRouter()
-import { tr } from "element-plus/es/locale";
const dialogFormVisible = ref(false)
const dialoglea = ref(false)
const dialogFormVisiblea = ref(false)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index b7ce80b..887a74d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -116,6 +116,7 @@
// }
// return true;
// }
+
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
*
@@ -124,22 +125,22 @@
@Override
public List<Map<String, Object>> selectCutTerritory() {
//鏌ヨEdgStorageCageDetails鏈�鍚庝竴寮犵幓鐠冩墍灞炵増鍥�
- List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
.distinct()
.innerJoin(Engineering.class, on -> on
.eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
.innerJoin(GlassInfo.class, on -> on
.eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .eq(GlassInfo::getPatternSequence, UpPattenUsage::getLayoutSequence))
.leftJoin(EdgStorageCageDetails.class, on -> on
.eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId))
.leftJoin(Damage.class, on -> on
.eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(Damage::getGlassId,GlassInfo::getGlassId))
- .eq(Engineering::getState,1)
- .and(wrapper->wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
+ .eq(Damage::getGlassId, GlassInfo::getGlassId))
+ .eq(Engineering::getState, 1)
+ .and(wrapper -> wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
.orderByDesc(UpPattenUsage::getLayoutSequence)
.orderByDesc(GlassInfo::getId)
);
@@ -147,43 +148,43 @@
//褰撳墠鐗�
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
//鏌ョ湅褰撳墠鐗堟槸鍚﹀瓨鍦ㄦ湭杩涚瀛愭垨鐮存崯鐨勭幓鐠�
- List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ List<UpPattenUsage> upPattenUsage2 = upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
.distinct()
.innerJoin(GlassInfo.class, on -> on
.eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .eq(GlassInfo::getPatternSequence, UpPattenUsage::getLayoutSequence))
.leftJoin(EdgStorageCageDetails.class, on -> on
.eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId))
.leftJoin(Damage.class, on -> on
.eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
- .eq(Damage::getGlassId,GlassInfo::getGlassId))
- .eq(UpPattenUsage::getEngineeringId,upPattenUsage.get(0).getEngineeringId())
- .eq(UpPattenUsage::getLayoutSequence,upPattenUsage.get(0).getLayoutSequence())
- .and(wrapper->wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
+ .eq(Damage::getGlassId, GlassInfo::getGlassId))
+ .eq(UpPattenUsage::getEngineeringId, upPattenUsage.get(0).getEngineeringId())
+ .eq(UpPattenUsage::getLayoutSequence, upPattenUsage.get(0).getLayoutSequence())
+ .and(wrapper -> wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
.orderByDesc(UpPattenUsage::getLayoutSequence)
.orderByDesc(GlassInfo::getId)
);
//鏄剧ず涓嬩竴鐗� 鍚﹀垯鏄剧ず褰撳墠鐗堝浘
- if(upPattenUsage2.isEmpty()){
+ if (upPattenUsage2.isEmpty()) {
//鍓╀綑鐗堝浘
- List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ List<UpPattenUsage> upPattenUsage3 = upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
.distinct()
.innerJoin(Engineering.class, on -> on
.eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
- .eq(Engineering::getState,1)
- .gt(UpPattenUsage::getLayoutSequence,upPattenUsage1.getLayoutSequence())
+ .eq(Engineering::getState, 1)
+ .gt(UpPattenUsage::getLayoutSequence, upPattenUsage1.getLayoutSequence())
.orderByAsc(UpPattenUsage::getLayoutSequence)
);
- if(!upPattenUsage3.isEmpty()){
+ if (!upPattenUsage3.isEmpty()) {
//鍒囨崲鎴愪笅涓�鐗堝浘
- upPattenUsage1=upPattenUsage3.get(0);
+ upPattenUsage1 = upPattenUsage3.get(0);
}
}
- List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -193,32 +194,32 @@
.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
);
- Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
- ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
+ .eq(EdgStorageCageDetails::getEngineerId, upPattenUsage1.getEngineeringId())
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails));
- Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ Map<String, Damage> damageMaps = damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
.selectAll(Damage.class)
- .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
- .and(wrapper->wrapper.eq(Damage::getType,8)
+ .eq(Damage::getEngineerId, upPattenUsage1.getEngineeringId())
+ .and(wrapper -> wrapper.eq(Damage::getType, 8)
.or()
- .eq(Damage::getType,9))
- ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+ .eq(Damage::getType, 9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId, Damage -> Damage, (V1, V2) -> V2));
- List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ List<Map<String, Object>> resultCutTerritory = new ArrayList<>();
for (Map<String, Object> cutTerritory : cutTerritorys) {
// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
- log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
+ if (cutTerritory.get("glass_id") == null || "".equals(cutTerritory.get("glass_id"))) {
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}", cutTerritorys);
return new ArrayList<>();
- }else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
+ } else if (damageMaps.get(cutTerritory.get("glass_id")) != null) {
//log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getType());
- }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
- cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
- }else{
- cutTerritory.put("glass_state",0);
+ cutTerritory.put("glass_state", damageMaps.get(cutTerritory.get("glass_id")).getType());
+ } else if (edgMaps.get(cutTerritory.get("glass_id")) != null) {
+ cutTerritory.put("glass_state", edgMaps.get(cutTerritory.get("glass_id")).getState());
+ } else {
+ cutTerritory.put("glass_state", 0);
}
resultCutTerritory.add(cutTerritory);
}
@@ -236,18 +237,18 @@
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
- List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
+ List<Engineering> engineering = engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
.selectAll(Engineering.class)
- .eq(Engineering::getEngineerId,current)
+ .eq(Engineering::getEngineerId, current)
);
- if(engineering.size()==0){
- log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
+ if (engineering.size() == 0) {
+ log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}", current);
return new ArrayList<>();
}
//缁撴灉
- List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ List<Map<String, Object>> resultCutTerritory = new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritory = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -257,42 +258,42 @@
.eq(OptimizeDetail::getProjectNo, current)
);
- Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getEngineerId,current)
- ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));
+ .eq(EdgStorageCageDetails::getEngineerId, current)
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails, (V1, V2) -> V2));
- Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ Map<String, Damage> damageMaps = damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
.selectAll(Damage.class)
- .eq(Damage::getEngineerId,current)
- .and(wrapper->wrapper.eq(Damage::getType,8)
+ .eq(Damage::getEngineerId, current)
+ .and(wrapper -> wrapper.eq(Damage::getType, 8)
.or()
- .eq(Damage::getType,9))
- ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+ .eq(Damage::getType, 9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId, Damage -> Damage, (V1, V2) -> V2));
for (Map<String, Object> item : cutTerritory) {
// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
- log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
+ if (item.get("glass_id") == null || "".equals(item.get("glass_id"))) {
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}", cutTerritory);
return new ArrayList<>();
}
- if(damageMaps.get(item.get("glass_id"))!=null){
+ if (damageMaps.get(item.get("glass_id")) != null) {
//log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- item.put("glass_state",damageMaps.get(item.get("glass_id")).getType());
- }else if(edgMaps.get(item.get("glass_id"))!=null){
- item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
- }else{
- item.put("glass_state",0);
+ item.put("glass_state", damageMaps.get(item.get("glass_id")).getType());
+ } else if (edgMaps.get(item.get("glass_id")) != null) {
+ item.put("glass_state", edgMaps.get(item.get("glass_id")).getState());
+ } else {
+ item.put("glass_state", 0);
}
resultCutTerritory.add(item);
}
- Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
+ Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("stock_id").toString()));
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- int count=1;
- List<List<Map<String, Object>>> result=new ArrayList<>();
+ int count = 1;
+ List<List<Map<String, Object>>> result = new ArrayList<>();
for (String item : groupBy.keySet()) {
- String key=count+"";
- if(key!=null){
+ String key = count + "";
+ if (key != null) {
result.add(groupBy.get(key));
}
count++;
@@ -309,7 +310,7 @@
@Override
public List<List<Map<String, Object>>> selectTemperingTerritory(String current) {
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> resultCutTerritory=optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
+ List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
.selectAll(OptimizeHeatDetail.class)
.selectAs(OptimizeProject::getLoadWidth, "olWidth")
.selectAs(OptimizeProject::getLoadLength, "olHeight")
@@ -319,14 +320,15 @@
.leftJoin(OptimizeProject.class, on -> on
.eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
.eq(OptimizeHeatDetail::getProjectNo, current)
+ .gt(OptimizeHeatDetail::getLayoutId, 0)
);
- Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("layout_id").toString()));
+ Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- List<List<Map<String, Object>>> result=new ArrayList<>();
- for (int i=1;i<=groupBy.keySet().size();i++) {
- String key=i+"";
- if(key!=null){
+ List<List<Map<String, Object>>> result = new ArrayList<>();
+ for (int i = 1; i <= groupBy.keySet().size(); i++) {
+ String key = i + "";
+ if (key != null) {
result.add(groupBy.get(key));
}
}
@@ -474,19 +476,19 @@
* @return
*/
@Override
- public boolean inToVerify(String glassId){
+ public boolean inToVerify(String glassId) {
List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getGlassId, glassId)
);
if (listEdgStorageCageDetails.isEmpty()) {
//璇存槑姝ょ幓鐠冩病鏈夎繘杩囩悊鐗�
return true;
- }else{
- List<Damage> damage=damageMapper.selectList(new LambdaQueryWrapper<Damage>()
+ } else {
+ List<Damage> damage = damageMapper.selectList(new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
- .and(wrapper->wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
+ .and(wrapper -> wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
);
- if(!damage.isEmpty()){
+ if (!damage.isEmpty()) {
return true;
}
}
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 7ba0b87..4feec2c 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
@@ -114,10 +114,10 @@
String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
String currentSlot = plcParameterObject.getPlcParameter("Current_slot").getValue();
-// taskRequestTypeValue = "3";
+// taskRequestTypeValue = "2";
// out08Glassstate = "1";
// out10Glassstate = "1";
-// currentSlot = "2";
+// currentSlot = "5";
// confirmationWrodValue = "0";
// glassIdeValue = "P24092706|15|5";
@@ -257,7 +257,6 @@
.eq(GlassInfo::getThickness, glassInfo.getThickness())
.eq(GlassInfo::getFilmsid, glassInfo.getFilmsid())
.eq(GlassInfo::getFlowCardId, glassInfo.getFlowCardId())
- .ne(GlassInfo::getGlassId, glassInfo.getGlassId())
.eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())
.eq(GlassInfo::getLayer, glassInfo.getLayer())
.eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
@@ -302,7 +301,7 @@
// 鐜荤拑灏忕墖琛ㄤ腑鐜荤拑宸茬粡鏇挎崲锛屾洿鏂板崸鐞嗙鍐呯幇鏈夌殑鍑嗗鍑虹鐨勭幓鐠冧俊鎭紝
if (null == swapGlassDetailInfo) {
GlassInfo glassInfoBase = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, swapGlassId));
+ .eq(GlassInfo::getGlassId, glassId));
//闇�瑕佹浛鎹㈢殑鐜荤拑涓哄瓨杩涘崸鐞嗭紝浠呴渶鏇存柊褰撳墠闇�瑕佸嚭绗肩殑鐜荤拑淇℃伅鍗冲彲
edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getGlassId, glassId)
@@ -355,6 +354,7 @@
int endcell = 0;
EdgStorageCageDetails glassInfo = null;
+
boolean flag = queryMaxMinDiff(threshold);
log.info("1銆佽幏鍙栭挗鍖栫増鍥炬槸鍚﹁秴杩囬槇鍊�:{}", flag);
if (flag) {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 1d9a585..4a4a439 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: dev
+ active: cz
application:
name: cacheGlass
liquibase:
@@ -15,8 +15,8 @@
mes:
threshold: 3
ratio: 10
-cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
- cacheWidth: 4000
+ cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
+ cacheWidth: 3600
cacheHeight: 3000
max: # 绗簩鏉＄嚎鐨勬渶澶у昂瀵镐俊鎭�
firstLength: 3500
@@ -30,12 +30,12 @@
secondLength: 400
sequence:
order: false
+kangaroohy:
milo:
- primary: default
+ enabled: false
config:
default:
endpoint: opc.tcp://127.0.0.1:49320
security-policy: basic256sha256
username: zsh
password: 1qaz2wsx3edc4rfv
-
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 903d7aa..1f92723 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -168,7 +168,7 @@
}
}
- @Scheduled(fixedDelay = Long.MAX_VALUE)
+// @Scheduled(fixedDelay = Long.MAX_VALUE)
public void scanCodeTask() {
log.info("鎵弿浠诲姟宸插惎鍔�");
while (true) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 61a0a3c..170123e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -574,7 +574,7 @@
/**
* 纭瀛楁竻绌�
*/
-// @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 300)
public void confirmClear() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
@@ -602,21 +602,21 @@
/**
* 杩涚墖鐘舵�佷慨鏀�
*/
-// @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 300)
public void feedStatusUpdate() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
- List<String> glassIds1 = null;
- List<String> glassIds2 = null;
- for (int i = 1; i <= 2; i++) {
- String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getAddress();
- if (StringUtils.isEmpty(line1GlassId)) {
- glassIds1.add(line1GlassId);
- }
- String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getAddress();
- if (StringUtils.isEmpty(line2GlassId)) {
- glassIds1.add(line2GlassId);
- }
- }
+ List<String> glassIds1 = new ArrayList<>();
+ List<String> glassIds2 = new ArrayList<>();
+// for (int i = 1; i <= 6; i++) {
+// String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
+// if (StringUtils.isNotEmpty(line1GlassId)) {
+// glassIds1.add(line1GlassId);
+// }
+// String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
+// if (StringUtils.isNotEmpty(line2GlassId)) {
+// glassIds1.add(line2GlassId);
+// }
+// }
List<BigStorageCageFeedTask> bigStorageCageFeedTasks1 = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getTaskState, 1)
@@ -627,27 +627,33 @@
.eq(BigStorageCageFeedTask::getTaskState, 1)
.eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
);
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)&& glassIds1 != null) {
List<String> matchingIds1 = bigStorageCageFeedTasks1.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds1::contains)
.distinct()
.collect(Collectors.toList());
+ bigStorageCageFeedTaskService.update(
+ new LambdaUpdateWrapper<BigStorageCageFeedTask>()
+ .in(BigStorageCageFeedTask::getGlassId, matchingIds1)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ );
}
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2)) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2)&& glassIds2 != null) {
List<String> matchingIds2 = bigStorageCageFeedTasks2.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds2::contains)
.distinct()
.collect(Collectors.toList());
+ bigStorageCageFeedTaskService.update(
+ new LambdaUpdateWrapper<BigStorageCageFeedTask>()
+ .in(BigStorageCageFeedTask::getGlassId, matchingIds2)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ );
}
- bigStorageCageFeedTaskService.update(
- new LambdaUpdateWrapper<BigStorageCageFeedTask>()
- .in(BigStorageCageFeedTask::getGlassId, glassIds1, glassIds2)
- .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
- .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
- );
- if (glassIds1 == null) {
+ if (CollectionUtils.isEmpty(glassIds1)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine,Const.A09_OUT_TARGET_POSITION)
@@ -657,7 +663,7 @@
.set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
);
}
- if (glassIds1 == null) {
+ if (CollectionUtils.isEmpty(glassIds2)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine,Const.A10_OUT_TARGET_POSITION)
@@ -757,11 +763,12 @@
//鍚憄lc鍙戦�佽繘鐗囩‘璁�
if (flag) {
//鍚憄lc鍐欏叆纭瀛�
- int returnData = 0;
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ int returnData = 1;
int count = 1;
while (returnData != 0) {
S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
- PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+
if (Const.A10_OUT_TARGET_POSITION.equals(line)) {
returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D04ToMES").getValue());
} else {
@@ -886,14 +893,14 @@
s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚,璧峰浣嶇疆鏄瘂}锛岀洰鏍囦綅缃槸", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
}
- int returnData = 0;
+ int returnData = 1;
int count = 1;
while (returnData != 0) {
s7control.writeWord(outLine, 2);
if (line.equals(Const.A09_OUT_TARGET_POSITION)) {
- returnData = Integer.parseInt(plcMesObject.getPlcParameter("MESToD03").getValue());
+ returnData = Integer.parseInt(plcMesObject.getPlcParameter("D03ToMES").getValue());
} else {
- returnData = Integer.parseInt(plcMesObject.getPlcParameter("MESToD05").getValue());
+ returnData = Integer.parseInt(plcMesObject.getPlcParameter("D05ToMES").getValue());
}
// returnData = s7control.readWord(outLine, 1).get(0);
log.info("宸插悜plc绗瑊}娆″彂閫佽繘鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, outLine, 2);
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 7de2d4e..cacf77c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,11 +3,16 @@
spring:
profiles:
- active: dev
+ active: cz
application:
name: cacheVerticalGlass
liquibase:
enabled: false
+ task:
+ scheduling:
+ pool:
+ size: 10
+ thread-name-prefix: task-cacheVertical
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
# configuration:
--
Gitblit v1.8.0