From 3345225e1a1c5c9665a948ae612a677ae284431b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 十二月 2024 09:27:39 +0800
Subject: [PATCH] 1、提交中控模块 2、修改大理片笼进出片交互bug
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/opccallback/BigStorageStartCallback.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/opccallback/BigStorageStartCallback.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/opccallback/BigStorageStartCallback.java
index 9c3c9d4..a539b6d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/opccallback/BigStorageStartCallback.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/opccallback/BigStorageStartCallback.java
@@ -11,7 +11,7 @@
import com.mes.base.entity.BigStorageCageBaseInfo;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.entity.BigStorageDTO;
+import com.mes.bigstorage.entity.dto.BigStorageDTO;
import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
@@ -37,7 +37,6 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -121,7 +120,7 @@
}
- @Scheduled(fixedDelay = 10000)
+ // @Scheduled(fixedDelay = 10000)
public void plcToHomeEdgOutTask() {
String mesToPLCAddress = "";
List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
@@ -233,7 +232,7 @@
/**
* 纭瀛楁竻绌�
*/
- @Scheduled(fixedDelay = 300)
+// @Scheduled(fixedDelay = 300)
public void confirmClear() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
@@ -261,7 +260,7 @@
/**
* 杩涚墖鐘舵�佷慨鏀�
*/
- @Scheduled(fixedDelay = 300)
+// @Scheduled(fixedDelay = 300)
public void feedStatusUpdate() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
List<String> glassIds1 = new ArrayList<>();
@@ -358,7 +357,7 @@
edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
.eq(EdgGlassTaskInfo::getLine, line)
.apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
- .orderByAsc(EdgGlassTaskInfo::getTime));
+ .orderByAsc(EdgGlassTaskInfo::getCreateTime));
if (edgGlassTaskInfoList.size() == 0) {
edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
.select("Top 1 *")
@@ -604,7 +603,7 @@
if (maxX + minLength <= xMaxSize) {
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1, new Date()));
- maxX = Math.max(maxX, e.getXCoordinate());
+// maxX = Math.max(maxX, e.getXCoordinate());
} else {
break;
}
@@ -663,12 +662,12 @@
if (maxX + minLength <= xMaxSize) {
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
- maxX = Math.max(maxX, e.getXCoordinate());
+// maxX = Math.max(maxX, e.getXCoordinate());
} else {
remainWidth = carWidth - maxLength - glassGap;
trainNumber = trainNumber + 1;
serialNumber = 1;
- maxX = e.getXCoordinate();
+// maxX = e.getXCoordinate();
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
}
@@ -716,7 +715,7 @@
return null;
}
- @Scheduled(fixedDelay = 300)
+ // @Scheduled(fixedDelay = 300)
public void querySizeByEngineerTask() {
log.info("鏌ヨ缁撴灉锛歿}", querySizeByEngineer("P24072402", 1, 10, 8));
log.info("鏌ヨ缁撴灉锛歿}", querySizeByEngineer("P24072402", 1, 5, 8));
@@ -786,7 +785,7 @@
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
- .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
.inSql(BigStorageCage::getDeviceId,
"select distinct device_id from big_storage_cage_details where engineer_id = '" + engineerId + "' and tempering_layout_id = " + temperingLayoutId)
.last("limit 1"));
@@ -804,7 +803,7 @@
List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(thickness);
for (Integer item : deviceUsedList) {
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
- .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.eq(BigStorageCage::getDeviceId, item)
.last("limit 1"));
--
Gitblit v1.8.0