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 | 54 ++++++++++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 28 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 4578a6f..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,12 +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.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.edgstoragecage.service.EdgStorageCageService; 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; @@ -51,8 +49,8 @@ OptimizeDetailMapper optimizeDetailMapper; @Autowired GlassInfoService glassInfoService; - @Autowired - CacheGlassTask cacheGlassTask; +// @Autowired +// CacheGlassTask cacheGlassTask; @Autowired TaskCacheService taskCacheService; @@ -63,30 +61,30 @@ log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url)); } - @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 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() { -- Gitblit v1.8.0