From 1e862ae4a11072451fa9b0449f13f48c0d98e91d Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 10:06:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 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..d9a451e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -1,8 +1,12 @@
package com.mes;
+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.job.PlcStorageCageTask;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -11,7 +15,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 +35,69 @@
PlcStorageCageTask plcStorageCageTask;
@Autowired
BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Autowired
+ DamageService damageService;
+
+// @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 +132,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 +151,20 @@
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();
+ }
+
}
--
Gitblit v1.8.0