From e9de57df1ef825a3f17b792e9110f24c407c03fb Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 14 十月 2024 08:31:48 +0800 Subject: [PATCH] Merge branch 'hangzhou_master' of http://bore.pub:10439/r/HangZhouMes into hangzhou_master --- hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java index 6673bc9..93f0fda 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java @@ -15,6 +15,7 @@ import com.mes.pp.mapper.OptimizeDetailMapper; import com.mes.taskcache.entity.TaskCache; import com.mes.taskcache.mapper.TaskCacheMapper; +import com.mes.taskcache.service.TaskCacheService; import com.mes.taskcache.service.impl.TaskCacheServiceImpl; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -53,6 +55,9 @@ GlassInfoService glassInfoService; @Autowired CacheGlassTask cacheGlassTask; + + @Autowired + TaskCacheService taskCacheService; @Test public void testFindPath() { @@ -132,6 +137,34 @@ } @Test + public void testEngineerCutTerritory() { + List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806"); + log.info("鍒囧壊宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map)); + } + + @Test + public void testEngineerTerritory() { + List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203"); + log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map)); + } + + @Test + public void testidentWorn() { + Map<String, Object> arguments=new HashMap<>(); + arguments.put("glassId","NG24051802A002-1-4-2-4");//鐜荤拑ID + arguments.put("state","8"); //鎷胯蛋锛�200/鐮存崯锛�201 + arguments.put("line","1001"); //绾胯矾锛� + arguments.put("workingProcedure","璇嗗埆"); //璁惧鍚嶇О锛� +// edgStorageCageDetailsService.identWorn(arguments); + log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1); + } + @Test + public void testInToVerify() { + boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1"); + log.info("鏄惁瀛樺湪閲嶅ID 銆嬪厑璁歌繘鐗囷細{}", result); + } + + @Test public void testPpOptimizeDetail() { List<OptimizeDetail> optimizeDetail = optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>() .eq("project_no", "P24032204") @@ -163,4 +196,11 @@ log.info("鍑虹墖浠诲姟锛歿}", Arrays.asList(edgStorageCageDetails)); } + @Test + public void testedgTask() { + List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo("2001"); + + log.info("纾ㄨ竟浠诲姟锛歿}", Arrays.asList(EdgTasks)); + } + } -- Gitblit v1.8.0