From 8db5b45c853fe5e49f2bca9047ea63e739cb8d79 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 25 五月 2024 08:21:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java |  116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 109 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index f64b4b3..09de05d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,9 +1,16 @@
 package mes;
 
 import com.mes.UnLoadGlassApplication;
+import com.mes.downglassinfo.service.impl.DownGlassInfoServiceImpl;
+import com.mes.downglassinfo.service.impl.DownGlassTaskServiceImpl;
 import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.downstorage.service.impl.DownStorageCageDetailsServiceImpl;
 import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;
 
+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;
@@ -27,6 +34,20 @@
 
     @Autowired
     DownStorageCageServiceImpl downStorageCageServiceImpl;
+    @Autowired
+    DownGlassTaskServiceImpl downGlassTaskServiceImpl;
+    @Autowired
+    DownGlassInfoServiceImpl downGlassInfoServiceImpl;
+    @Autowired
+    DownStorageCageDetailsServiceImpl downStorageCageDetailsServiceImpl;
+    @Autowired
+    DownStorageCageDetailsService downStorageCageDetailsService;
+    @Autowired
+    DownWorkstationServiceImpl downWorkstationServiceImpl;
+    @Autowired
+    GlassInfoServiceImpl glassInfoServiceImpl;
+    @Autowired
+    DownWorkstationService downWorkstationService;
 
     @Test
     public void testFindPath() {
@@ -35,20 +56,101 @@
 
     @Test
     public void testCacheGlass() {
-        List<Map> map= downStorageCageServiceImpl.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= downStorageCageServiceImpl.getCacheLeisure();
-        log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+       // List<DownStorageCageDetails> map = downStorageCageDetailsServiceImpl.getCacheLeisure();
+       // log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
     }
 
 
     @Test
     public void testgetCacheOut() {
-        List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheOut(1,5);
-        log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗囷細{}", Arrays.asList(map));
+       // List<DownStorageCageDetails> map = downStorageCageDetailsServiceImpl.getCacheOut(1, 5);
+      //  log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗囷細{}", Arrays.asList(map));
     }
 
-}
+
+    @Test
+    public void testupdateFlowCardIdAndCount() {
+        log.info("缁戝畾娴佺▼鍗″彿鍜屾暟閲�");
+        downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1);
+
+    }
+
+    @Test
+    public void testplc() {
+        log.info("娴嬭瘯");
+        glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01");
+
+    }
+
+
+
+    @Test
+    public void testin2() {
+        log.info("娴嬭瘯杩涚墖");
+        //downStorageCageDetailsServiceImpl.getIsExistIntoCacheByflowcardid("NG2023005",500);
+
+    }
+
+
+    @Test
+    public void selectCacheEmpty() {
+        log.info("娴嬭瘯杩涚墖");
+        //downStorageCageDetailsServiceImpl.getCacheLeisure();
+
+    }
+
+    @Test
+    public void CacheEmpty() {
+        log.info("娴嬭瘯鍑虹墖");
+        downStorageCageDetailsService.CacheOut(1,2);
+
+    }
+    @Test
+    public void CacheEmpty1() {
+        log.info("娴嬭瘯鍑虹墖");
+        downStorageCageDetailsServiceImpl.CacheOut1(1,6);
+
+    }
+
+
+
+
+    @Test
+    public void getTotalGlassDimensionsByWorkstation() {
+        log.info("宸ヤ綅鏄剧ず");
+        downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
+
+    }
+
+
+    @Test
+    public void getMaxSequenceByFlowCardId() {
+        log.info("鏈�澶у簭鍙�");
+
+        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005");
+    }
+
+    @Test
+    public void updateTaskStateToZero() {
+        log.info("鏇存柊鐘舵��0");
+
+        downGlassTaskServiceImpl.updateTaskState("3");
+    }
+
+
+    @Test
+    public void selectCacheEmpty2() {
+
+
+        downStorageCageServiceImpl.selectCacheEmpty();
+    }
+
+
+}
\ No newline at end of file

--
Gitblit v1.8.0