From 041d9bd56e7e761af3df78a39e9c8f629868f360 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 18 十二月 2024 09:54:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 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 9e6a161..38e391f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -49,7 +49,7 @@
 
     @Autowired
     TaskCacheServiceImpl taskCacheServiceImpl;
-    @Autowired
+    @Resource
     OptimizeDetailMapper optimizeDetailMapper;
     @Autowired
     GlassInfoService glassInfoService;
@@ -74,7 +74,8 @@
     public void testChangeCellSize() {
 //        String url=getClass().getResource("").getPath();
 //        log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
-        cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+//        cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+        cacheGlassTask.inTo("P24110503|26|2","","2");
     }
 
     @Test
@@ -143,15 +144,26 @@
     }
 
     @Test
+    public void testEngineerTerritory() {
+        List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+        log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+    }
+
+    @Test
     public void testidentWorn() {
-        Map<String, String> arguments=new HashMap<>();
-        arguments.put("glassId","P24060403|3|6");//鐜荤拑ID
-        arguments.put("controlsId","300");        //鎷胯蛋锛�200/鐮存崯锛�201
-        arguments.put("line","2001");             //绾胯矾锛�
-        arguments.put("machine","鍐峰姞宸�");           //璁惧鍚嶇О锛�
-        edgStorageCageDetailsService.identWorn(arguments);
+        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() {

--
Gitblit v1.8.0