From 60f572b6b7c516db6ccda32c768f9117b4e51167 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 17 四月 2025 16:49:58 +0800
Subject: [PATCH] 1、fixbug:中空出片优先lisec问题解决 2、卧式理片笼出片路径调整，优先小线 3、fixbug:卧式理片笼两条线同时跑发生大线往小线送玻璃的情况 4、磨边后新增玻璃交互，为plc获取不到玻璃尺寸做二道保障
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 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 6673bc9..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,19 +2,16 @@
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;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
+import com.mes.taskcache.service.TaskCacheService;
import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -25,6 +22,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,12 +45,15 @@
@Autowired
TaskCacheServiceImpl taskCacheServiceImpl;
- @Autowired
+ @Resource
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
GlassInfoService glassInfoService;
+// @Autowired
+// CacheGlassTask cacheGlassTask;
+
@Autowired
- CacheGlassTask cacheGlassTask;
+ TaskCacheService taskCacheService;
@Test
public void testFindPath() {
@@ -60,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() {
@@ -113,22 +101,27 @@
}
+
@Test
- public void testCacheGlass() {
- List<Map<String, Object>> map = edgStorageCageService.selectEdgStorageCages();
- log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+ public void testEngineerTerritory() {
+ List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+ log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
@Test
- public void testSelectCacheEmpty() {
-// List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
-// log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+ public void testidentWorn() {
+ Map<String, Object> arguments=new HashMap<>();
+ arguments.put("glassId","NG24051802A002-1-4-2-4");//鐜荤拑ID
+ arguments.put("state","8"); //鎷胯蛋锛�200/鐮存崯锛�201
+ arguments.put("line","1001"); //绾胯矾锛�
+ arguments.put("workingProcedure","璇嗗埆"); //璁惧鍚嶇О锛�
+// edgStorageCageDetailsService.identWorn(arguments);
+ log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
}
-
@Test
- public void testScan() {
- List<Map<String, Object>> map = edgStorageCageDetailsService.selectCutTerritory();
- log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+ public void testInToVerify() {
+ boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1");
+ log.info("鏄惁瀛樺湪閲嶅ID 銆嬪厑璁歌繘鐗囷細{}", result);
}
@Test
@@ -163,4 +156,11 @@
log.info("鍑虹墖浠诲姟锛歿}", Arrays.asList(edgStorageCageDetails));
}
+ @Test
+ public void testedgTask() {
+ List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo("2001");
+
+ log.info("纾ㄨ竟浠诲姟锛歿}", Arrays.asList(EdgTasks));
+ }
+
}
--
Gitblit v1.8.0