From 2935442d9bdb795fecaa704d3bce2f6249b208d4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 25 十二月 2024 16:12:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 46719e4..fc44563 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -11,6 +11,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
@@ -46,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author : zhoush
@@ -218,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>()
@@ -266,6 +268,7 @@
@Resource
TemperingGlassInfoService temperingGlassInfoService;
+
@Test
public void computeOutMoreGlassInfo() {
List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
@@ -274,15 +277,25 @@
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
.isNull(BigStorageCageOutTask::getGlassId)
.orderByAsc(TemperingGlassInfo::getTemperingFeedSequence));
- plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfoList,true,1);
+ plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfoList, true, 1);
}
@Test
public void ca111() {
// GlassInfo glassInfo=glassInfoService.getOne(
// new LambdaQueryWrapper<GlassInfo>()
-// .eq(GlassInfo::getGlassId,"P24120801|1|2")
+// .eq(GlassInfo::getGlassId,"P24121602|1|10")
// );
+// 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);
// bigStorageCageDetailsService.queryTargetSlotByTempering(glassInfo);
// List<String> glassIdsCar=new ArrayList<>();
// glassIdsCar.add("P24120801|4|3");
@@ -297,7 +310,12 @@
// plcStorageCageTask.computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
// }
// plcStorageCageTask.queryAndChangeGlass("P24111102|1|6");
- bigStorageCageDetailsService.selectFeedTask();
+// bigStorageCageDetailsService.selectFeedTask();
+// plcStorageCageTask.computeSlot("P24121401|1|6");
+// plcStorageCageTask.computeSlot("P24121401|1|4");
+
+// List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
+// log.info("sd"+temperingOccupySlotList);
}
@Test
--
Gitblit v1.8.0