From a4cc855f17c36f6ceda20100bc491bc6a0071c27 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 11 七月 2024 10:33:06 +0800
Subject: [PATCH] 下片:人工下片表字段改为其他 大理片:新增读取plc数据计时功能

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 13828db..76d153c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,6 +1,7 @@
 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;
@@ -14,6 +15,7 @@
 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;
@@ -37,7 +39,7 @@
  */
 @Slf4j
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = UnLoadGlassApplication.class)
+@SpringBootTest(classes = UnLoadGlassApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 
 public class UnloadGlassModuleApplicationTest {
 
@@ -61,6 +63,8 @@
     DownStorageCageService downStorageCageService;
     @Autowired
     DownGlassTaskService downGlassTaskService;
+    @Autowired
+    DownGlassInfoService downGlassInfoService;
 
 
 
@@ -94,14 +98,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);
 
     }
 
@@ -153,7 +157,7 @@
     public void getMaxSequenceByFlowCardId() {
         log.info("鏈�澶у簭鍙�");
 
-        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005");
+        downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005",1);
     }
 
     @Test
@@ -182,7 +186,8 @@
     public void getUnloadingTaskState() {
 
 
-        downGlassTaskService.getUnloadingTaskState();
+        downGlassInfoService.generateOutGlassTask("NG24031401A01-4-3-1-3");
+        //downGlassTaskService.getUnloadingTaskState();
     }
 
     @Test
@@ -190,11 +195,15 @@
 
 
         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