From d940d0b4c0e7d6fcebfb0fea2bed1c514e1f796f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 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 46bade9..8ab9cf4 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -1,6 +1,6 @@
package com.mes;
-import com.mes.base.entity.BigStorageCageBaseInfo;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.config.Const;
import com.mes.job.PlcStorageCageTask;
@@ -11,9 +11,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
@@ -29,6 +27,8 @@
BigStorageCageService bigStorageCageService;
@Autowired
PlcStorageCageTask plcStorageCageTask;
+ @Autowired
+ BigStorageCageDetailsService bigStorageCageDetailsService;
@Test
public void testFindPath() {
@@ -38,24 +38,6 @@
@Test
public void outGlass() {
log.info("瀹屾暣璺緞锛歿}", bigStorageCageService.outGlass());
- }
-
- @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
@@ -95,4 +77,9 @@
log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageService.selectBigStorageCageUsage());
}
+ @Test
+ public void selectBigStorageCageDetails() {
+ log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageDetailsService.selectBigStorageCageDetails("P24060403|3|6"));
+ }
+
}
--
Gitblit v1.8.0