From 29f942cefe9d9f4272332eec0276f2c5a60d9d9e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 一月 2025 09:13:42 +0800
Subject: [PATCH] 添加自动下片机打印标签功能

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 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..9e74c8d 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>()
@@ -267,6 +268,7 @@
 
     @Resource
     TemperingGlassInfoService temperingGlassInfoService;
+
     @Test
     public void computeOutMoreGlassInfo() {
         List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
@@ -275,15 +277,31 @@
                 .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,"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 +317,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