From 8cc26dd54779273f895a3cbc3f84c8933a02a0dc Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 10 七月 2024 14:44:47 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 6 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 ae11d30..3aba6ca 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,10 @@ package com.mes; +import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; 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; @@ -26,6 +29,10 @@ BigStorageCageService bigStorageCageService; @Autowired PlcStorageCageTask plcStorageCageTask; + @Autowired + BigStorageCageDetailsService bigStorageCageDetailsService; + @Autowired + DamageService damageService; @Test public void testFindPath() { @@ -33,28 +40,61 @@ } @Test + public void outGlass() { + log.info("瀹屾暣璺緞锛歿}", bigStorageCageService.outGlass()); + } + + @Test + public void plcToHomeEdgOutTask() { + plcStorageCageTask.plcToHomeEdgOutTask(); + } + + @Test + public void plcToHomeEdgFreeCarTask() { + plcStorageCageTask.plcToHomeEdgFreeCarTask(); + } + + @Test + public void plcStorageCageTask() { + plcStorageCageTask.plcToHomeEdgScan(); + + } + + @Test public void computeTargetByLine() { -// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}",bigStorageCageService.querybigStorageCageDetail()); - plcStorageCageTask.computeTargetByLine(2001, "", ""); + 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); + + } } -- Gitblit v1.8.0