From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java | 118 +++++++++++++++++++++++++++++------------------------------
1 files changed, 58 insertions(+), 60 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
index e5e4608..c567a90 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -1,60 +1,58 @@
-//package com.mes;
-//
-//import com.mes.temperingglass.entity.TemperingGlassInfo;
-//import com.mes.temperingglass.service.TemperingAgoService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//
-///**
-// * @Author : zhoush
-// * @Date: 2024/3/27 16:37
-// * @Description:
-// */
-//@Slf4j
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = TemperingGlassModuleApplication.class)
-//public class TemperingApplicationTest {
-//
-// @Autowired
-// private TemperingAgoService temperingAgoService;
-//
-//
-// @Test
-// public void testFindPa() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12);
-// log.info("杩涚倝涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-// @Test
-// public void testFindPa2() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
-// log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-//
-// @Test
-// public void testFindPa3() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
-// log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-// @Test
-// public void testFindPa4() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
-// log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-// }
-// @Test
-// public void testFindPa5() {
-// List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
-// //杩涚倝涓殑鐜荤拑
-// log.info("鐗堝浘id锛歿}", Arrays.asList(layoutId.get(0).getTemperingLayoutId()));
-// List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
-// log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass));
-// List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
-// log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass2));
-// }
-//}
+package com.mes;
+
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TemperingGlassModuleApplication.class)
+public class TemperingApplicationTest {
+
+ @Autowired
+ private TemperingGlassInfoService temperingAgoService;
+
+
+ @Test
+ public void testFindPa() {
+ List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
+ if(!layoutId.isEmpty()) {
+ List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
+ log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(intoGlass));
+ //杩涚倝涓殑绗簩涓増鍥�
+ if (layoutId.size() > 1) {
+ List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
+ log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(intoGlass2));
+ }
+ }
+ }
+ @Test
+ public void testFindPa2() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
+ log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+
+ @Test
+ public void testFindPa3() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
+ log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+ @Test
+ public void testFindPa4() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
+ log.info("閽㈠寲鍚庣殑鐜荤拑锛歿}", Arrays.asList(glass));
+ }
+}
--
Gitblit v1.8.0