From 61cae17b15d6a7d256e25ce42f0a4ef4163fd088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 15:54:03 +0800
Subject: [PATCH] 1、删除未修改的大屏程序
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index 4aba751..207054d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -47,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author : zhoush
@@ -219,7 +220,7 @@
@Test
public void testttt() {
- List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6);
+ List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6, 1);
List<Integer> deviceUseds = deviceUsedList;
List<BigStorageCageDetails> engineerCount1 = bigStorageCageDetailsService.list(
new LambdaQueryWrapper<BigStorageCageDetails>()
@@ -262,28 +263,51 @@
@Test
public void ca11() {
- plcStorageCageTask.queryAndChangeGlass("P24110503|17|4");
+ bigStorageCageDetailsService.selectFeedTask();
+// plcStorageCageTask.queryAndChangeGlass("P24110503|17|4");
}
@Resource
TemperingGlassInfoService temperingGlassInfoService;
+
@Test
public void computeOutMoreGlassInfo() {
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
- .selectAll(TemperingGlassInfo.class)
- .leftJoin(BigStorageCageOutTask.class, BigStorageCageOutTask::getGlassId, TemperingGlassInfo::getGlassId)
- .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
- .isNull(BigStorageCageOutTask::getGlassId)
- .orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
- plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfoList,true,1);
+// List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
+// .selectAll(TemperingGlassInfo.class)
+// .leftJoin(BigStorageCageOutTask.class, BigStorageCageOutTask::getGlassId, TemperingGlassInfo::getGlassId)
+// .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
+// .isNull(BigStorageCageOutTask::getGlassId)
+// .orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
+// plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfoList, true, 1);
+ List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
+ .orderByAsc(BigStorageCageDetails::getSlot)
+ .orderByDesc(BigStorageCageDetails::getId));
+ plcStorageCageTask.computeOutMoreGlassInfo(artificialList, Boolean.FALSE, 1);
}
@Test
public void ca111() {
// GlassInfo glassInfo=glassInfoService.getOne(
// new LambdaQueryWrapper<GlassInfo>()
-// .eq(GlassInfo::getGlassId,"P24120801|1|2")
+// .eq(GlassInfo::getGlassId,"P24122901|38|9")
// );
+// bigStorageCageDetailsService.queryTargetSlotByTempering(glassInfo);
+// List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
+// new LambdaQueryWrapper<BigStorageCageDetails>()
+// .eq(BigStorageCageDetails::getState, 100)
+// .in(BigStorageCageDetails::getGlassId, "P24122201|1|1", "P24122201|2|3")
+// );
+// List<BigStorageCageDetails> overSizeGlass = bigStorageCageDetailsList.stream().filter(
+// t -> Math.min(t.getWidth(), t.getHeight()) > 2500
+// ).collect(Collectors.toList());
+// log.info("sadfd" + overSizeGlass);
+// List<String> glasss=new ArrayList<>();
+// glasss.add("P24122901|38|5");
+// glasss.add("P24122901|38|7");
+// glasss.add("P24122901|26|5");
+// plcStorageCageTask.computeTargetByLineCar(2001,glasss);
+// bigStorageCageDetailsService.cancelOutTask();
// bigStorageCageDetailsService.queryTargetSlotByTempering(glassInfo);
// List<String> glassIdsCar=new ArrayList<>();
// glassIdsCar.add("P24120801|4|3");
@@ -299,11 +323,11 @@
// }
// plcStorageCageTask.queryAndChangeGlass("P24111102|1|6");
// bigStorageCageDetailsService.selectFeedTask();
-// plcStorageCageTask.computeSlot("P24121401|1|6");
+ plcStorageCageTask.computeSlot("P24122901|21|2");
// plcStorageCageTask.computeSlot("P24121401|1|4");
- List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
- log.info("sd"+temperingOccupySlotList);
+// List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
+// log.info("sd"+temperingOccupySlotList);
}
@Test
--
Gitblit v1.8.0