From 5de29342a9ec4ac6621fca5af803219a8ac0ce42 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 05 八月 2024 13:46:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index c382433..4029a6e 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,22 +1,33 @@
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;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.downstorage.service.DownStorageCageService;
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;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Arrays;
import java.util.List;
@@ -29,7 +40,8 @@
*/
@Slf4j
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = UnLoadGlassApplication.class)
+@SpringBootTest(classes = UnLoadGlassApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+
public class UnloadGlassModuleApplicationTest {
@Autowired
@@ -48,6 +60,15 @@
GlassInfoServiceImpl glassInfoServiceImpl;
@Autowired
DownWorkstationService downWorkstationService;
+ @Autowired
+ DownStorageCageService downStorageCageService;
+ @Autowired
+ DownGlassTaskService downGlassTaskService;
+ @Autowired
+ DownGlassInfoService downGlassInfoService;
+
+
+
@Test
public void testFindPath() {
@@ -56,8 +77,9 @@
@Test
public void testCacheGlass() {
- List<Map<String, Object>> map = downStorageCageServiceImpl.selectDownStorageCages();
- log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+ //List<Map<String, Object>> map = downStorageCageServiceImpl.selectDownStorageCages();
+ // log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+ downStorageCageServiceImpl.updateDownStorageCageDetails(1,null);
}
@Test
@@ -77,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);
}
@@ -105,18 +127,29 @@
}
+// @Test
+// public void CacheEmpty() {
+// log.info("娴嬭瘯鍑虹墖");
+// downStorageCageDetailsService.CacheOut(1,2);
+//
+// }
+
+
+
@Test
- public void CacheEmpty() {
+ public void CacheEmpty1() {
log.info("娴嬭瘯鍑虹墖");
- downStorageCageDetailsService.CacheOut(1,10);
+ downStorageCageDetailsServiceImpl.CacheOut1(1,6);
}
+
+
@Test
public void getTotalGlassDimensionsByWorkstation() {
log.info("宸ヤ綅鏄剧ず");
- downWorkstationService.getTotalGlassDimensionsByWorkstation();
+ downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
}
@@ -125,14 +158,14 @@
public void getMaxSequenceByFlowCardId() {
log.info("鏈�澶у簭鍙�");
- downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005");
+ downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005",1);
}
@Test
public void updateTaskStateToZero() {
log.info("鏇存柊鐘舵��0");
- downGlassTaskServiceImpl.updateTaskStateToZero("3");
+ downGlassTaskServiceImpl.updateTaskState("3");
}
@@ -143,5 +176,57 @@
downStorageCageServiceImpl.selectCacheEmpty();
}
+ @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.setId(1);
+ downStorageCageService.updateDownStorageCage(downStorageCage);
+
+ }*/
+
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0