From a4cc855f17c36f6ceda20100bc491bc6a0071c27 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 11 七月 2024 10:33:06 +0800 Subject: [PATCH] 下片:人工下片表字段改为其他 大理片:新增读取plc数据计时功能 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 66 +++++++++++++-------------------- 1 files changed, 26 insertions(+), 40 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..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; @@ -10,9 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; /** * @Author : zhoush @@ -28,6 +29,10 @@ BigStorageCageService bigStorageCageService; @Autowired PlcStorageCageTask plcStorageCageTask; + @Autowired + BigStorageCageDetailsService bigStorageCageDetailsService; + @Autowired + DamageService damageService; @Test public void testFindPath() { @@ -41,74 +46,55 @@ @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); + + } } -- Gitblit v1.8.0