From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 101 ++++++++++++++++++--------------------------------
1 files changed, 36 insertions(+), 65 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 233e6f1..ca10149 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -2,14 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
-import com.mes.common.config.Const;
-import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
-import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.job.CacheGlassTask;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.entity.OptimizeLayout;
import com.mes.pp.mapper.OptimizeDetailMapper;
@@ -49,12 +45,12 @@
@Autowired
TaskCacheServiceImpl taskCacheServiceImpl;
- @Autowired
+ @Resource
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
GlassInfoService glassInfoService;
- @Autowired
- CacheGlassTask cacheGlassTask;
+// @Autowired
+// CacheGlassTask cacheGlassTask;
@Autowired
TaskCacheService taskCacheService;
@@ -65,43 +61,30 @@
log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
}
- @Test
- public void queryChangeGlassInfo() {
- cacheGlassTask.queryChangeGlassInfo(Const.A10_OUT_TARGET_POSITION, "");
- }
-
- @Test
- public void testChangeCellSize() {
-// String url=getClass().getResource("").getPath();
-// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
- cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
- }
-
- @Test
- public void testCellSize() {
-// String url=getClass().getResource("").getPath();
-// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
- cacheGlassTask.outTo(0, 0, "", "NG24051802A001|1|1|1|1", 0);
- }
-
- @Test
- public void testinTo() {
-// String url=getClass().getResource("").getPath();
-// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
-// NG24051802A001|1|4|1|4
-// cacheGlassTask.inTo("NG24051802A001|1|1|1|1", "1", "1");
-// cacheGlassTask.inTo("NG24051802A001|1|4|1|4", "1", "1");
- cacheGlassTask.inTo("NG24051802A001|1|1|2|1", "1", "1");
- }
-
- @Test
- public void testChangeGlassInfo() {
-// String url=getClass().getResource("").getPath();
-// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
-// NG24051802A001|1|4|1|4
- cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|1|1|1");
-// cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|4|1|4");
- }
+// @Test
+// public void queryChangeGlassInfo() {
+// cacheGlassTask.queryChangeGlassInfo(Const.A10_OUT_TARGET_POSITION, "");
+// }
+//
+// @Test
+// public void testChangeCellSize() {
+// cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+// }
+//
+// @Test
+// public void testCellSize() {
+// cacheGlassTask.outTo(0, 0, "", "NG24051802A001|1|1|1|1", 0);
+// }
+//
+// @Test
+// public void testinTo() {
+// cacheGlassTask.inTo("NG24051802A001|1|1|2|1", "1", "1");
+// }
+//
+// @Test
+// public void testChangeGlassInfo() {
+// cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|1|1|1");
+// }
@Test
public void testSqlServer() {
@@ -118,28 +101,11 @@
}
- @Test
- public void testCacheGlass() {
- List<Map<String, Object>> map = edgStorageCageService.selectEdgStorageCages();
- log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
- }
@Test
- public void testSelectCacheEmpty() {
-// List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
-// log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
- }
-
- @Test
- public void testScan() {
- List<Map<String, Object>> map = edgStorageCageDetailsService.selectCutTerritory();
- log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
- }
-
- @Test
- public void testEngineerCutTerritory() {
- List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806");
- log.info("鍒囧壊宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+ public void testEngineerTerritory() {
+ List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+ log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
@Test
@@ -149,9 +115,14 @@
arguments.put("state","8"); //鎷胯蛋锛�200/鐮存崯锛�201
arguments.put("line","1001"); //绾胯矾锛�
arguments.put("workingProcedure","璇嗗埆"); //璁惧鍚嶇О锛�
- edgStorageCageDetailsService.identWorn(arguments);
+// edgStorageCageDetailsService.identWorn(arguments);
log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
}
+ @Test
+ public void testInToVerify() {
+ boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1");
+ log.info("鏄惁瀛樺湪閲嶅ID 銆嬪厑璁歌繘鐗囷細{}", result);
+ }
@Test
public void testPpOptimizeDetail() {
--
Gitblit v1.8.0