From 09402133807b1e774e658a13ad365b2e6efca25b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 四月 2025 16:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
index d41a4cd..9e6a1c7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
@@ -14,7 +15,7 @@
import com.mes.opctask.mapper.EdgStorageDeviceTaskMapper;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
-import org.springframework.beans.factory.annotation.Value;
+import com.mes.sysconfig.service.SysConfigService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -41,11 +42,13 @@
private EdgStorageCageService edgStorageCageService;
@Resource
EdgStorageDeviceTaskMapper edgStorageDeviceTaskMapper;
+ @Resource
+ SysConfigService sysConfigService;
- @Value("${mes.glassGap}")
- private int glassGap;
- @Value("${mes.cellLength}")
- private int cellLength;
+// @Value("${mes.glassGap}")
+// private int glassGap;
+// @Value("${mes.cellLength}")
+// private int cellLength;
@Override
public EdgStorageDeviceTask queryTaskMessage(String tableName) {
@@ -96,6 +99,7 @@
task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
task.setGlassIdOut("");
task.setStartCell(0);
+ task.setEndCell(0);
this.updateTaskMessage(tableName, task);
return Boolean.TRUE;
}
@@ -114,17 +118,20 @@
task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
task.setGlassIdOut("");
task.setStartCell(0);
+ task.setEndCell(0);
this.updateTaskMessage(tableName, task);
return Boolean.TRUE;
}
private boolean resetSlotRemainWidth() {
+ int cellLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_CELL_LENGTH);
+ int glassGap = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_GLASS_GAP);
//灏嗗昂瀵搁噸缃负鍘熷灏哄
edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().set(EdgStorageCage::getRemainWidth, cellLength));
//鑾峰彇绗煎唴鐨勮鎯呮暟鎹�
List<EdgSlotRemainVO> edgSlotRemainVOS = edgStorageCageDetailsService.querySlotRemainWidth(cellLength, glassGap);
//鎸夌収鏌ヨ缁撴灉瀵圭鍐呯幇鏈夌幓鐠冪殑鏍煎瓙灏哄杩涜鏇存柊
- if(CollectionUtils.isNotEmpty(edgSlotRemainVOS)){
+ if (CollectionUtils.isNotEmpty(edgSlotRemainVOS)) {
edgStorageCageService.resetSlotRemainWidth(edgSlotRemainVOS);
}
return Boolean.TRUE;
--
Gitblit v1.8.0