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 | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 109 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 bd6e1b0..207054d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -4,22 +4,33 @@
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.yulichang.toolkit.JoinWrappers;
+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;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
+import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
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;
import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +38,7 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
+import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
@@ -35,6 +47,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author : zhoush
@@ -56,6 +69,11 @@
DamageService damageService;
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
+ @Autowired
+ BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
+ @Autowired
+ GlassInfoService glassInfoService;
+
// @Autowired
// BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
@@ -172,7 +190,7 @@
@Test
public void insertDamage() {
- Damage damage=new Damage();
+ Damage damage = new Damage();
damage.setGlassId("P24060403|3|6");
damage.setLine(2001);
damage.setWorkingProcedure("鍐峰姞宸�");
@@ -187,7 +205,7 @@
}
@Test
- public void chaxun(){
+ public void chaxun() {
List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
.select("Top 1 *")
.eq("glass_id", "P24072402|1|13")
@@ -196,24 +214,24 @@
}
@Test
- public void deleteByGlassId(){
+ public void deleteByGlassId() {
damageService.deleteByGlassId("P24081203|2|5");
}
@Test
- public void testttt(){
- List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6);
+ public void testttt() {
+ List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6, 1);
List<Integer> deviceUseds = deviceUsedList;
List<BigStorageCageDetails> engineerCount1 = bigStorageCageDetailsService.list(
new LambdaQueryWrapper<BigStorageCageDetails>()
- .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
+ .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.select(BigStorageCageDetails::getEngineerId)
.groupBy(BigStorageCageDetails::getEngineerId)
.between(BigStorageCageDetails::getDeviceId, 1, 5)
);
List<BigStorageCageDetails> engineerCount2 = bigStorageCageDetailsService.list(
new LambdaQueryWrapper<BigStorageCageDetails>()
- .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
+ .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.select(BigStorageCageDetails::getEngineerId)
.groupBy(BigStorageCageDetails::getEngineerId)
.between(BigStorageCageDetails::getDeviceId, 6, 8)
@@ -226,12 +244,94 @@
if (CollectionUtils.isEmpty(deviceUsedList)) {
deviceUsedList = deviceUseds;
}
- log.info("zhi:{}",deviceUsedList);
+ log.info("zhi:{}", deviceUsedList);
}
+ @Test
+ public void ca1() {
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ );
+ if (CollectionUtils.isEmpty(bigStorageCageFeedTasks)) {
+ log.info("zhi:" + bigStorageCageFeedTasks);
+ }
+
+ }
@Test
- public void ca(){
+ public void ca11() {
+ 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<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
+ public void ca() {
try {
// 鐩爣绯荤粺鐨凙PI URL
String url = "http://192.168.3.119:8086/reportingWork/mesSaveReportingWorkWorn";
--
Gitblit v1.8.0