From 2bcc7bbdf9257c5b9e952f7e206123bf1c3d6826 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 15:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 153 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 139 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 4074725..4c38ae0 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -1,19 +1,34 @@
package mes;
import com.mes.UnLoadGlassApplication;
+import com.mes.downglassinfo.entity.DownGlassInfo;
+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;
@@ -26,17 +41,35 @@
*/
@Slf4j
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = UnLoadGlassApplication.class)
+@SpringBootTest(classes = UnLoadGlassApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+
public class UnloadGlassModuleApplicationTest {
@Autowired
DownStorageCageServiceImpl downStorageCageServiceImpl;
+ @Autowired
+ DownGlassTaskServiceImpl downGlassTaskServiceImpl;
+ @Autowired
+ DownGlassInfoServiceImpl downGlassInfoServiceImpl;
@Autowired
DownStorageCageDetailsServiceImpl downStorageCageDetailsServiceImpl;
@Autowired
DownStorageCageDetailsService downStorageCageDetailsService;
@Autowired
DownWorkstationServiceImpl downWorkstationServiceImpl;
+ @Autowired
+ GlassInfoServiceImpl glassInfoServiceImpl;
+ @Autowired
+ DownWorkstationService downWorkstationService;
+ @Autowired
+ DownStorageCageService downStorageCageService;
+ @Autowired
+ DownGlassTaskService downGlassTaskService;
+ @Autowired
+ DownGlassInfoService downGlassInfoService;
+
+
+
@Test
public void testFindPath() {
@@ -45,35 +78,36 @@
@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));
}
@Test
public void testupdateFlowCardIdAndCount() {
log.info("缁戝畾娴佺▼鍗″彿鍜屾暟閲�");
- downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1);
+ downWorkstationServiceImpl.updateFlowCardIdAndCount("NG24060401A020", 1, 2);
}
@Test
public void testplc() {
log.info("娴嬭瘯");
- downWorkstationServiceImpl.insertdownglassinfo();
+ glassInfoServiceImpl.getGlassInfoCountByFlowCardId("NG24030702A01",1);
}
@@ -82,7 +116,7 @@
@Test
public void testin2() {
log.info("娴嬭瘯杩涚墖");
- downStorageCageDetailsServiceImpl.getIsExistIntoCacheByflowcardid("NG2023005",500);
+ //downStorageCageDetailsServiceImpl.getIsExistIntoCacheByflowcardid("NG2023005",500);
}
@@ -90,25 +124,116 @@
@Test
public void selectCacheEmpty() {
log.info("娴嬭瘯杩涚墖");
- downStorageCageDetailsServiceImpl.getCacheLeisure();
+ //downStorageCageDetailsServiceImpl.getCacheLeisure();
}
+
+// @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("宸ヤ綅鏄剧ず");
- downWorkstationServiceImpl.getTotalGlassDimensionsByWorkstation();
+ downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
}
+ @Test
+ public void getMaxSequenceByFlowCardId() {
+ log.info("鏈�澶у簭鍙�");
+
+ downGlassInfoServiceImpl.getMaxSequenceByFlowCardId("NG2023005",1);
+ }
+
+ @Test
+ public void updateTaskStateToZero() {
+ log.info("鏇存柊鐘舵��0");
+
+ downGlassTaskServiceImpl.updateTaskState("3");
+ }
+
+
+ @Test
+ public void selectCacheEmpty2() {
+
+
+ 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);
+
+ }*/
+
+ @Test
+ public void downGlassPrint() {
+ DownGlassInfo downGlassInfo=new DownGlassInfo();
+ downGlassInfo.setFlowCardId("NG24070506A001");
+ downGlassInfo.setLayer(1);
+ downGlassInfoService.downGlassPrint(downGlassInfo);
+ }
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0