From c2b1f33ad95f77d676eb8de187875ad1d9aed61d Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 13 八月 2024 08:40:23 +0800 Subject: [PATCH] 修改磨边队列调用接口的参数 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 132 +++++++++++++++++++++++++++++++------------ 1 files changed, 94 insertions(+), 38 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 23badef..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,7 +1,12 @@ package com.mes; +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; @@ -28,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() { @@ -41,74 +111,60 @@ @Test public void plcToHomeEdgOutTask() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.plcToHomeEdgOutTask(); } @Test public void plcToHomeEdgFreeCarTask() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.plcToHomeEdgFreeCarTask(); } @Test public void plcStorageCageTask() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); - List<String> list = new ArrayList<>(); - //2002 -// list.add("P24060403|4|3"); -// list.add("P24060403|5|4"); -// list.add("P24060403|2|1"); -// list.add("P24060403|3|2"); -// list.add("P24060403|1|3"); -// list.add("P24060403|3|1"); -// list.add("P24060403|2|3"); -// list.add("P24060403|1|1"); -// list.add("P24060403|8|6"); -// list.add("P24060403|7|2"); - //2001 -// list.add("P24060403|3|6"); -// list.add("P24060403|5|2"); -// list.add("P24060403|4|4"); -// list.add("P24060403|3|5"); -// list.add("P24060403|5|3"); -// list.add("P24060403|1|2"); -// list.add("P24060403|2|2"); -// list.add("P24060403|5|1"); - list.add("P24060403|2|4"); - list.add("P24060403|1|5"); - list.add("P24060403|4|2"); - list.add("P24060403|1|4"); - list.add("P24060403|4|1"); - list.add("P24060403|8|7"); - for (String e : list) { - plcStorageCageTask.plcToHomeEdgScan(e); - } + plcStorageCageTask.plcToHomeEdgScan(); + } @Test public void computeTargetByLine() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); plcStorageCageTask.computeTargetByLine(2001); } @Test public void judgeGlassTypeStatus() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); - plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION); + plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION, "mesD03Address"); } @Test public void getStartLine() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); Integer startLine = plcStorageCageTask.getStartLine(); log.info("---------{}", startLine); } @Test public void selectBigStorageCageUsage() { -// bigStorageCageService.querybigStorageCageDetail(1); 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