From 566afa95de99a2f7cc3b9c928a6c4448865f8af5 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 01 七月 2024 18:09:03 +0800 Subject: [PATCH] 根据现场变动情况修改接口,添加当前值班表 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 51 +++++++++++---------------------------------------- 1 files changed, 11 insertions(+), 40 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 23badef..14a8a13 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java @@ -1,5 +1,6 @@ package com.mes; +import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.common.config.Const; import com.mes.job.PlcStorageCageTask; @@ -10,9 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; /** * @Author : zhoush @@ -28,6 +27,8 @@ BigStorageCageService bigStorageCageService; @Autowired PlcStorageCageTask plcStorageCageTask; + @Autowired + BigStorageCageDetailsService bigStorageCageDetailsService; @Test public void testFindPath() { @@ -41,74 +42,44 @@ @Test public void plcToHomeEdgOutTask() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.plcToHomeEdgOutTask(); } @Test public void plcToHomeEdgFreeCarTask() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.plcToHomeEdgFreeCarTask(); } @Test public void plcStorageCageTask() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); - List<String> list = new ArrayList<>(); - //2002 -// list.add("P24060403|4|3"); -// list.add("P24060403|5|4"); -// list.add("P24060403|2|1"); -// list.add("P24060403|3|2"); -// list.add("P24060403|1|3"); -// list.add("P24060403|3|1"); -// list.add("P24060403|2|3"); -// list.add("P24060403|1|1"); -// list.add("P24060403|8|6"); -// list.add("P24060403|7|2"); - //2001 -// list.add("P24060403|3|6"); -// list.add("P24060403|5|2"); -// list.add("P24060403|4|4"); -// list.add("P24060403|3|5"); -// list.add("P24060403|5|3"); -// list.add("P24060403|1|2"); -// list.add("P24060403|2|2"); -// list.add("P24060403|5|1"); - list.add("P24060403|2|4"); - list.add("P24060403|1|5"); - list.add("P24060403|4|2"); - list.add("P24060403|1|4"); - list.add("P24060403|4|1"); - list.add("P24060403|8|7"); - for (String e : list) { - plcStorageCageTask.plcToHomeEdgScan(e); - } + plcStorageCageTask.plcToHomeEdgScan(); + } @Test public void computeTargetByLine() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.computeTargetByLine(2001); } @Test public void judgeGlassTypeStatus() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); - plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION); + plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION,""); } @Test public void getStartLine() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); Integer startLine = plcStorageCageTask.getStartLine(); log.info("---------{}", startLine); } @Test public void selectBigStorageCageUsage() { -// bigStorageCageService.querybigStorageCageDetail(1); log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageService.selectBigStorageCageUsage()); } + @Test + public void selectBigStorageCageDetails() { + log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageDetailsService.selectBigStorageCageDetails("P24060403|3|6")); + } + } -- Gitblit v1.8.0