From 09bb613cb75774426df43ecd5152aeac35e5315c Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 09 九月 2024 15:01:56 +0800 Subject: [PATCH] 掰片查询修改为查卧式理片数据,钢化查询界面添加显示更多信息,去除重复玻璃id不能连续扫码限制,人工下片添加判断是否超尺寸 --- hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 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 8a15f1b..ad5430b 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; @@ -54,6 +55,9 @@ GlassInfoService glassInfoService; @Autowired CacheGlassTask cacheGlassTask; + + @Autowired + TaskCacheService taskCacheService; @Test public void testFindPath() { @@ -122,8 +126,8 @@ @Test public void testSelectCacheEmpty() { - List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty(); - log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map)); +// List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty(); +// log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map)); } @Test @@ -133,13 +137,19 @@ } @Test + public void testEngineerCutTerritory() { + List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806"); + log.info("鍒囧壊宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map)); + } + + @Test public void testidentWorn() { - Map<String, String> arguments=new HashMap<>(); - arguments.put("glassId","P24060405|30|1");//鐜荤拑ID - arguments.put("controlsId","200"); //鎷胯蛋锛�200/鐮存崯锛�201 + 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("machine","璇嗗埆"); //璁惧鍚嶇О锛� - edgStorageCageDetailsService.identWorn(arguments); + arguments.put("workingProcedure","璇嗗埆"); //璁惧鍚嶇О锛� +// edgStorageCageDetailsService.identWorn(arguments); log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1); } @@ -175,4 +185,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