From 62681d14e34466f4ed4eafaa2cef197c53e6fd82 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 二月 2025 14:07:05 +0800
Subject: [PATCH] 修改打印样式 修改报工界面查询条件 修改磨边获取出片线路条件 大理片非钢化出片添加宽度与数量限制
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 9e74c8d..207054d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -263,7 +263,8 @@
@Test
public void ca11() {
- plcStorageCageTask.queryAndChangeGlass("P24110503|17|4");
+ bigStorageCageDetailsService.selectFeedTask();
+// plcStorageCageTask.queryAndChangeGlass("P24110503|17|4");
}
@Resource
@@ -271,13 +272,18 @@
@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
--
Gitblit v1.8.0