From 44dd454d11a25d11494cf32737df1456cae47bf3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 24 七月 2024 13:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
index 05ad286..c567a90 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -28,8 +28,16 @@
@Test
public void testFindPa() {
- List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12);
- log.info("杩涚倝涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
+ if(!layoutId.isEmpty()) {
+ List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
+ log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(intoGlass));
+ //杩涚倝涓殑绗簩涓増鍥�
+ if (layoutId.size() > 1) {
+ List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
+ log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(intoGlass2));
+ }
+ }
}
@Test
public void testFindPa2() {
@@ -46,15 +54,5 @@
public void testFindPa4() {
List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
log.info("閽㈠寲鍚庣殑鐜荤拑锛歿}", Arrays.asList(glass));
- }
- @Test
- public void testFindPa5() {
- List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
- //杩涚倝涓殑鐜荤拑
- log.info("鐗堝浘id锛歿}", Arrays.asList(layoutId.get(0).getTemperingLayoutId()));
- List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
- log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass));
- List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
- log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass2));
}
}
--
Gitblit v1.8.0