From cdd6aec25462fad925010537fbb7c25b9f649a26 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 27 八月 2024 09:54:29 +0800 Subject: [PATCH] 下片添加新增虚拟工位功能,大理片非钢玻璃按流程卡进片按流程卡出片 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 1 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 8ab9cf4..ca96d50 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java @@ -1,9 +1,18 @@ package com.mes; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.edgglasstask.entity.EdgGlassTaskInfo; +import com.mes.edgglasstask.service.EdgGlassTaskInfoService; import com.mes.job.PlcStorageCageTask; +import com.mes.temperingglass.entity.TemperingGlassInfo; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; @@ -11,7 +20,9 @@ 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 @@ -29,6 +40,71 @@ PlcStorageCageTask plcStorageCageTask; @Autowired BigStorageCageDetailsService bigStorageCageDetailsService; + @Autowired + DamageService damageService; + @Autowired + EdgGlassTaskInfoService edgGlassTaskInfoService; + +// @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() { @@ -63,7 +139,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 @@ -82,4 +158,29 @@ 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(); + } + + @Test + public void chaxun(){ + List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>() + .select("Top 1 *") + .eq("glass_id", "P24072402|1|13") + ); + log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList); + } + } -- Gitblit v1.8.0