From 82ae4f5a83ffaadc6c7f37c19050400156eb8a9e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 28 十二月 2024 21:56:20 +0800
Subject: [PATCH] 1、中空大理片笼详情页新增删除、破损、拿走操作按钮接口 2、理片笼进片任务计算目标格子优化：笼子进笼将格子分组求笼内最大组序，确保中间块玻璃破损后仍能进入，导致玻璃错乱的情况
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index e3b5d27..d180015 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -8,13 +8,12 @@
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
import com.mes.common.config.Const;
-import com.mes.hollow.entity.HollowBigStorageCage;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.hollow.service.HollowBigStorageCageDetailsService;
import com.mes.hollow.service.HollowBigStorageCageService;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -38,11 +37,13 @@
public class PushMessageToIndex {
@Resource
- HollowGlassQueueInfoService hollowGlassQueueInfoService;
+ HollowGlassQueueInfoService hollowGlassQueueInfoService;
@Resource
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
@Resource
HollowBigStorageCageService hollowBigStorageCageService;
+ @Resource
+ HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
@Resource
BigStorageCageTaskService bigStorageCageTaskService;
@@ -51,6 +52,7 @@
@Resource
RedisUtil redisUtil;
+
@Scheduled(fixedDelay = 1000)
public void hollowGlassTask() {
List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
@@ -109,7 +111,7 @@
carPostion.add(0.5);
jsonObject.append("carPostion", carPostion);
//鐣岄潰灞曠ず绗煎瓙淇℃伅
- jsonObject.append("bigStorageCageInfos", hollowBigStorageCageService.queryHollowbigStorageCageDetail());
+ jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());
try{
//杩涚墖浠诲姟鏁版嵁
--
Gitblit v1.8.0