From bb37f664476c01aefd93dd9b8856851f11d4d3cf Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 15 七月 2024 08:48:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 13828db..395722b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,6 +1,7 @@
package mes;
import com.mes.UnLoadGlassApplication;
+import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downglassinfo.service.impl.DownGlassInfoServiceImpl;
import com.mes.downglassinfo.service.impl.DownGlassTaskServiceImpl;
@@ -14,6 +15,7 @@
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
+import com.mes.job.DownLoadCacheGlassTask;
import com.mes.utils.Result;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -37,7 +39,7 @@
*/
@Slf4j
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = UnLoadGlassApplication.class)
+@SpringBootTest(classes = UnLoadGlassApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class UnloadGlassModuleApplicationTest {
@@ -61,6 +63,8 @@
DownStorageCageService downStorageCageService;
@Autowired
DownGlassTaskService downGlassTaskService;
+ @Autowired
+ DownGlassInfoService downGlassInfoService;
@@ -94,14 +98,14 @@
@Test
public void testupdateFlowCardIdAndCount() {
log.info("缁戝畾娴佺▼鍗″彿鍜屾暟閲�");
- downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1);
+ downWorkstationServiceImpl.updateFlowCardIdAndCount("NG24060401A020", 1, 2);
}
@Test
public void testplc() {
log.info("娴嬭瘯");
- glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01");
+ glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01",1);
}
@@ -153,7 +157,7 @@
public void getMaxSequenceByFlowCardId() {
log.info("鏈�澶у簭鍙�");
- downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005");
+ downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005",1);
}
@Test
@@ -182,19 +186,24 @@
public void getUnloadingTaskState() {
- downGlassTaskService.getUnloadingTaskState();
+ downGlassInfoService.generateOutGlassTask("NG24031401A01-4-3-1-3");
+ //downGlassTaskService.getUnloadingTaskState();
}
- @Test
+ /* @Test
public void updateDownStorageCage() {
DownStorageCage downStorageCage= new DownStorageCage();
- downStorageCage.setEnableState("0");
+ downStorageCage.setEnableState(0);
downStorageCage.setId(1);
downStorageCageService.updateDownStorageCage(downStorageCage);
- }
+ }*/
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0