From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
index 05ec5fe..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() {
@@ -43,7 +63,64 @@
// storageTaskService.updateById(storageTask);
// storageTaskService.getBaseMapper().deleteById(1);
// storageTaskService.findList(storageTask);
- storageTaskService.findLatestTasks();
+ ///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