From ae2a52a69dd83930c7c91a16b0c521c6349ccaf3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 09:57:58 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 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..9e6a161 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,12 +137,18 @@
     }
 
     @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
-        arguments.put("line","1001");             //绾胯矾锛�
-        arguments.put("machine","璇嗗埆");           //璁惧鍚嶇О锛�
+        arguments.put("glassId","P24060403|3|6");//鐜荤拑ID
+        arguments.put("controlsId","300");        //鎷胯蛋锛�200/鐮存崯锛�201
+        arguments.put("line","2001");             //绾胯矾锛�
+        arguments.put("machine","鍐峰姞宸�");           //璁惧鍚嶇О锛�
         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