From 4c42d82f177b24f21dee14dd041035fb6c1ce7ee Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 06 八月 2024 08:11:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 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 e363838..4029a6e 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,6 +1,8 @@
 package mes;
 
 import com.mes.UnLoadGlassApplication;
+import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
 import com.mes.downglassinfo.service.impl.DownGlassInfoServiceImpl;
 import com.mes.downglassinfo.service.impl.DownGlassTaskServiceImpl;
 import com.mes.downstorage.entity.DownStorageCage;
@@ -10,9 +12,11 @@
 import com.mes.downstorage.service.impl.DownStorageCageDetailsServiceImpl;
 import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;
 
+import com.mes.downworkstation.entity.DownWorkstation;
 import com.mes.downworkstation.service.DownWorkstationService;
 import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
 import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
+import com.mes.job.DownLoadCacheGlassTask;
 import com.mes.utils.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -36,7 +40,7 @@
  */
 @Slf4j
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = UnLoadGlassApplication.class)
+@SpringBootTest(classes = UnLoadGlassApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 
 public class UnloadGlassModuleApplicationTest {
 
@@ -58,6 +62,10 @@
     DownWorkstationService downWorkstationService;
     @Autowired
     DownStorageCageService downStorageCageService;
+    @Autowired
+    DownGlassTaskService downGlassTaskService;
+    @Autowired
+    DownGlassInfoService downGlassInfoService;
 
 
 
@@ -91,14 +99,14 @@
     @Test
     public void testupdateFlowCardIdAndCount() {
         log.info("缁戝畾娴佺▼鍗″彿鍜屾暟閲�");
-        downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1);
+        downWorkstationServiceImpl.updateFlowCardIdAndCount("NG24060401A020", 1, 2);
 
     }
 
     @Test
     public void testplc() {
         log.info("娴嬭瘯");
-        glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01");
+        glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01",1);
 
     }
 
@@ -150,7 +158,7 @@
     public void getMaxSequenceByFlowCardId() {
         log.info("鏈�澶у簭鍙�");
 
-        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005");
+        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005",1);
     }
 
     @Test
@@ -171,20 +179,54 @@
     @Test
     public void getFlowCardId() {
 
-
         glassInfoServiceImpl.getFlowCardId();
+
     }
 
     @Test
+    public void getUnloadingTaskState() {
+
+
+        downGlassInfoService.generateOutGlassTask("NG24031401A01-4-3-1-3");
+        //downGlassTaskService.getUnloadingTaskState();
+    }
+
+    @Test
+    public void updateDownWorkstationstate() {
+
+        DownWorkstation downWorkstation=  new DownWorkstation();
+
+        downWorkstation.setId(1);
+        downWorkstation.setEnableState(0);
+        downWorkstationServiceImpl.updateDownWorkstationstate(downWorkstation);
+    }
+
+
+    @Test
+    public void updateDownstate() {
+
+        DownStorageCage downStorageCage=  new DownStorageCage();
+
+        downStorageCage.setId(1);
+        downStorageCage.setEnableState(0);
+        downStorageCageServiceImpl.updateDownStorageCage(downStorageCage);
+    }
+
+
+ /*   @Test
     public void updateDownStorageCage() {
 
 
         DownStorageCage downStorageCage=  new DownStorageCage();
-        downStorageCage.setEnableState("0");
+        downStorageCage.setEnableState(0);
         downStorageCage.setId(1);
         downStorageCageService.updateDownStorageCage(downStorageCage);
 
-    }
+    }*/
+
+
+
+
 
 
 }
\ No newline at end of file

--
Gitblit v1.8.0