From 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 06 十一月 2024 23:21:53 +0800 Subject: [PATCH] 1、opc订阅服务同时订阅一个节点两次,仅一个订阅任务生效,将进出片任务/完成任务放在一起 2、移除原片仓储中的下发字段 --- hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 86 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 82 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java index b680851..5905cdc 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java @@ -1,7 +1,14 @@ package mes; import com.mes.GlassStorageApplication; -import com.mes.storagetask.entity.StorageTask; +import com.mes.rawglassdetails.entity.RawGlassStorageDetails; +import com.mes.rawglassdetails.service.RawGlassStorageDetailsService; +import com.mes.rawglasstask.entity.RawGlassStorageTask; +import com.mes.rawglasstask.entity.request.RawGlassTaskRequest; +import com.mes.rawglasstask.service.RawGlassStorageTaskService; +import com.mes.rawusage.entity.RawUsage; +import com.mes.rawusage.service.RawUsageService; +import com.mes.shelfrack.service.ShelfRackService; import com.mes.storagetask.service.StorageTaskService; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -10,7 +17,13 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; +import java.util.List; /** * @Author : zhoush @@ -27,7 +40,14 @@ @Autowired private StorageTaskService storageTaskService; - + @Autowired + private ShelfRackService shelfRackService; + @Autowired + private RawUsageService rawUsageService; + @Autowired + private RawGlassStorageDetailsService rawGlassStorageDetailsService; + @Autowired + private RawGlassStorageTaskService rawGlassStorageTaskService; @Test public void testFindPath() { @@ -37,12 +57,70 @@ @Test public void testCacheGlass() { // storageTaskService.getBaseMapper().selectById(1); - StorageTask storageTask=new StorageTask(); + //StorageTask storageTask=new StorageTask(); // storageTask.setId(Long.valueOf("1")); // storageTask.setTaskState("1"); // storageTaskService.updateById(storageTask); // storageTaskService.getBaseMapper().deleteById(1); - storageTaskService.findList(storageTask); + // storageTaskService.findList(storageTask); + ///storageTaskService.findLatestTasks(); + storageTaskService.Tasks(); + } + @Test + public void selectshelf_rack() { + + shelfRackService.selectshelf_rack(); + } + + /** + * 娴嬭瘯 + */ +// @Test +// public void testWebSocket() { +// List<RawGlassStorageTask> list=rawGlassStorageTaskService.findAll(); +// log.info("杩斿洖鍐呭锛歿}",list); +// } + + /** + * 娴嬭瘯淇敼WebSocket 鍙傛暟 + */ +// @Test +// public void testWebSocketArgument() { +// RawGlassTaskRequest request=new RawGlassTaskRequest(); +// //璁剧疆鍙傛暟锛� +// DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); +// Date startDate=null; +// Date endDate=null; +// try { +// startDate= df.parse("2022-01-01"); +// endDate= df.parse("2025-01-01"); +// }catch (ParseException e){ +// e.printStackTrace(); +// +// request.setCreateTime(startDate);// +// request.setPatternQuantity(endDate); +// request.setEnableState(new ArrayList<Integer>()); +// request.setEnableType(new ArrayList<Integer>()); +// String list=rawGlassStorageTaskService.setRawGlassTaskRequest(request); +// log.info("杩斿洖鍐呭锛歿}",list); +// } +// } + + + + @Test + public void updateRawPackageAndStorageRack() { + RawUsage raw=new RawUsage(); + + raw.setId(null); + rawUsageService.updateRawPackageAndStorageRack(raw); + } + @Test + public void txt() { + RawGlassStorageDetails rs=new RawGlassStorageDetails(); + rs.setId(105L); + List<RawGlassStorageDetails> aa=rawGlassStorageDetailsService.selectDetails(); + log.info(String.valueOf(aa)); } -- Gitblit v1.8.0