From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 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 fd8f7b5..207054d 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;
@@ -23,6 +24,8 @@
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.job.PlcSlicecage;
import com.mes.job.PlcStorageCageTask;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
@@ -44,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author : zhoush
@@ -67,6 +71,8 @@
EdgGlassTaskInfoService edgGlassTaskInfoService;
@Autowired
BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
+ @Autowired
+ GlassInfoService glassInfoService;
// @Autowired
@@ -214,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>()
@@ -257,20 +263,71 @@
@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,"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");
+// List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+// new LambdaQueryWrapper<BigStorageCageFeedTask>()
+// .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
+// .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+// .eq(BigStorageCageFeedTask::getTargetSlot, 0)
+// );
+// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)){
+// log.info("鑾峰彇鍒扮殑杩涚墖浠诲姟淇℃伅{}", bigStorageCageFeedTasks);
+// plcStorageCageTask.computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
+// }
+// plcStorageCageTask.queryAndChangeGlass("P24111102|1|6");
+// bigStorageCageDetailsService.selectFeedTask();
+ plcStorageCageTask.computeSlot("P24122901|21|2");
+// plcStorageCageTask.computeSlot("P24121401|1|4");
+
+// List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
+// log.info("sd"+temperingOccupySlotList);
}
@Test
--
Gitblit v1.8.0