From 8cc26dd54779273f895a3cbc3f84c8933a02a0dc Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 10 七月 2024 14:44:47 +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 | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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..3aba6ca 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,10 @@
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.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
import com.mes.job.PlcStorageCageTask;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
@@ -11,9 +13,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 +29,10 @@
BigStorageCageService bigStorageCageService;
@Autowired
PlcStorageCageTask plcStorageCageTask;
+ @Autowired
+ BigStorageCageDetailsService bigStorageCageDetailsService;
+ @Autowired
+ DamageService damageService;
@Test
public void testFindPath() {
@@ -38,24 +42,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
@@ -81,7 +67,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
@@ -95,4 +81,20 @@
log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageService.selectBigStorageCageUsage());
}
+ @Test
+ public void selectBigStorageCageDetails() {
+ 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);
+
+ }
}
--
Gitblit v1.8.0