From e555f50e1bb0cb6b8facca208c70df4dcce06b80 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 21 六月 2024 14:45:57 +0800 Subject: [PATCH] 大理片笼进出片任务bug修复完毕,自测已完成,待联调 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 58 +++++++++++++++++++++------------------------------------- 1 files changed, 21 insertions(+), 37 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..46bade9 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java @@ -1,5 +1,6 @@ package com.mes; +import com.mes.base.entity.BigStorageCageBaseInfo; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.common.config.Const; import com.mes.job.PlcStorageCageTask; @@ -40,74 +41,57 @@ } @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 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); } @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()); } -- Gitblit v1.8.0