From c0505074f5149b7f0c7fe26822e793eac18319f3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 11:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index a783463..ed2c929 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -10,6 +10,7 @@
 
 import com.mes.downworkstation.service.DownWorkstationService;
 import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
+import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,6 +44,10 @@
     DownStorageCageDetailsService downStorageCageDetailsService;
     @Autowired
     DownWorkstationServiceImpl downWorkstationServiceImpl;
+    @Autowired
+    GlassInfoServiceImpl glassInfoServiceImpl;
+    @Autowired
+    DownWorkstationService downWorkstationService;
 
     @Test
     public void testFindPath() {
@@ -51,21 +56,22 @@
 
     @Test
     public void testCacheGlass() {
-        List<Map> map = downStorageCageDetailsServiceImpl.getCacheInfo();
-        log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+        //List<Map<String, Object>> map = downStorageCageServiceImpl.selectDownStorageCages();
+      //  log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+        downStorageCageServiceImpl.updateDownStorageCageDetails(1,null);
     }
 
     @Test
     public void testselectCacheEmpty() {
-        List<DownStorageCageDetails> map = downStorageCageDetailsServiceImpl.getCacheLeisure();
-        log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+       // List<DownStorageCageDetails> map = downStorageCageDetailsServiceImpl.getCacheLeisure();
+       // log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
     }
 
 
     @Test
     public void testgetCacheOut() {
-        List<DownStorageCageDetails> map = downStorageCageDetailsServiceImpl.getCacheOut(1, 5);
-        log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗囷細{}", Arrays.asList(map));
+       // List<DownStorageCageDetails> map = downStorageCageDetailsServiceImpl.getCacheOut(1, 5);
+      //  log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗囷細{}", Arrays.asList(map));
     }
 
 
@@ -79,7 +85,7 @@
     @Test
     public void testplc() {
         log.info("娴嬭瘯");
-        downWorkstationServiceImpl.insertdownglassinfo();
+        glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01");
 
     }
 
@@ -88,7 +94,7 @@
     @Test
     public void testin2() {
         log.info("娴嬭瘯杩涚墖");
-        downStorageCageDetailsServiceImpl.getIsExistIntoCacheByflowcardid("NG2023005",500);
+        //downStorageCageDetailsServiceImpl.getIsExistIntoCacheByflowcardid("NG2023005",500);
 
     }
 
@@ -96,14 +102,14 @@
     @Test
     public void selectCacheEmpty() {
         log.info("娴嬭瘯杩涚墖");
-        downStorageCageDetailsServiceImpl.getCacheLeisure();
+        //downStorageCageDetailsServiceImpl.getCacheLeisure();
 
     }
 
     @Test
     public void CacheEmpty() {
         log.info("娴嬭瘯鍑虹墖");
-        downStorageCageDetailsService.CacheOut(1,10);
+        downStorageCageDetailsService.CacheOut(1,2);
 
     }
 
@@ -111,7 +117,7 @@
     @Test
     public void getTotalGlassDimensionsByWorkstation() {
         log.info("宸ヤ綅鏄剧ず");
-        downWorkstationServiceImpl.getTotalGlassDimensionsByWorkstation();
+        downWorkstationService.getTotalGlassDimensionsByWorkstation();
 
     }
 
@@ -127,7 +133,7 @@
     public void updateTaskStateToZero() {
         log.info("鏇存柊鐘舵��0");
 
-        downGlassTaskServiceImpl.updateTaskStateToZero(3);
+        downGlassTaskServiceImpl.updateTaskState("3");
     }
 
 

--
Gitblit v1.8.0