From 8f1ff8eefdaf6c9722541975abd2422772c9ebdd Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 19 七月 2024 15:18:17 +0800 Subject: [PATCH] 添加指定版图钢化的接口 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 92 insertions(+), 20 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java index 46bade9..d9a451e 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java @@ -1,8 +1,12 @@ package com.mes; -import com.mes.base.entity.BigStorageCageBaseInfo; +import com.mes.bigstorage.entity.BigStorageCage; +import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; +import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper; import com.mes.common.config.Const; +import com.mes.damage.entity.Damage; +import com.mes.damage.service.DamageService; import com.mes.job.PlcStorageCageTask; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -29,6 +33,71 @@ BigStorageCageService bigStorageCageService; @Autowired PlcStorageCageTask plcStorageCageTask; + @Autowired + BigStorageCageDetailsService bigStorageCageDetailsService; + @Autowired + DamageService damageService; + +// @Autowired +// BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper; + + @Test + public void testInsertSlot() { + List<BigStorageCage> list = new ArrayList(); + for (int j = 1; j <= 5; j++) { + for (int i = 1 + (55 * (j - 1)); i <= 55 * j; i++) { + BigStorageCage cage = new BigStorageCage(); + cage.setDeviceId(j); + cage.setSlot(i); + cage.setMinThickness(4); + cage.setMaxThickness(6); + cage.setEnableState(1); + cage.setRemainWidth(5000); + list.add(cage); + } + } + for (int i = 276; i <= 300; i++) { + BigStorageCage cage = new BigStorageCage(); + cage.setDeviceId(6); + cage.setSlot(i); + cage.setMinThickness(8); + cage.setMaxThickness(12); + cage.setEnableState(1); + cage.setRemainWidth(5000); + list.add(cage); + } + for (int i = 301; i <= 330; i++) { + BigStorageCage cage = new BigStorageCage(); + cage.setDeviceId(7); + cage.setSlot(i); + cage.setMinThickness(8); + cage.setMaxThickness(12); + cage.setEnableState(1); + cage.setRemainWidth(5000); + list.add(cage); + } + for (int i = 331; i <= 355; i++) { + BigStorageCage cage = new BigStorageCage(); + cage.setDeviceId(8); + cage.setSlot(i); + cage.setMinThickness(8); + cage.setMaxThickness(12); + cage.setEnableState(1); + cage.setRemainWidth(5000); + list.add(cage); + } + for (int i = 356; i <= 380; i++) { + BigStorageCage cage = new BigStorageCage(); + cage.setDeviceId(9); + cage.setSlot(i); + cage.setMinThickness(15); + cage.setMaxThickness(19); + cage.setEnableState(1); + cage.setRemainWidth(5000); + list.add(cage); + } + bigStorageCageService.saveBatch(list); + } @Test public void testFindPath() { @@ -38,24 +107,6 @@ @Test public void outGlass() { log.info("瀹屾暣璺緞锛歿}", bigStorageCageService.outGlass()); - } - - @Test - public void updateSlotRemain() { - List<String> taskGlassIds = Arrays.asList( -// "P24060403|1|1", -// "P24060403|1|2", -// "P24060403|1|3", -// "P24060403|1|4", - "P24060403|1|5"); - List<BigStorageCageBaseInfo> list = new ArrayList<>(); - list.add(new BigStorageCageBaseInfo("P24060403|1|1", 1080.0, 4)); - list.add(new BigStorageCageBaseInfo("P24060403|1|2", 1080.0, 1)); - list.add(new BigStorageCageBaseInfo("P24060403|1|3", 1080.0, 1)); - list.add(new BigStorageCageBaseInfo("P24060403|1|4", 1080.0, 16)); - list.add(new BigStorageCageBaseInfo("P24060403|1|5", 1080.0, 15)); - - plcStorageCageTask.updateSlotRemain(list, taskGlassIds); } @Test @@ -81,7 +132,7 @@ @Test public void judgeGlassTypeStatus() { - plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION); + plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION, "mesD03Address"); } @Test @@ -95,4 +146,25 @@ log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageService.selectBigStorageCageUsage()); } + @Test + public void selectBigStorageCageDetails() { + log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageDetailsService.selectBigStorageCageDetails("P24060403|3|6")); + } + + @Test + public void insertDamage() { + Damage damage=new Damage(); + damage.setGlassId("P24060403|3|6"); + damage.setLine(2001); + damage.setWorkingProcedure("鍐峰姞宸�"); + damage.setRemark(""); + damage.setStatus(2); + damageService.insertDamage(damage); + } + + @Test + public void updateOutGlassStateTask() { + plcStorageCageTask.updateOutGlassStateTask(); + } + } -- Gitblit v1.8.0