From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 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 93f0fda..4578a6f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -3,11 +3,9 @@
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;
@@ -49,7 +47,7 @@
@Autowired
TaskCacheServiceImpl taskCacheServiceImpl;
- @Autowired
+ @Resource
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
GlassInfoService glassInfoService;
@@ -72,35 +70,22 @@
@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
@@ -118,33 +103,10 @@
}
- @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));
- }
@Test
public void testEngineerTerritory() {
- List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+ List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
--
Gitblit v1.8.0