From 62c74409a587d9921df1a2248ce23b3b0375fbd1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 29 五月 2024 14:13:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
index 9725c57..ab63b5f 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -4,6 +4,8 @@
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
@@ -72,23 +74,31 @@
engineeringService.saveEngineering(glass);
log.info("glassinfo锛歿}", Arrays.asList(glass));
}
- @Test
- public void textengineering2(){
- //鏇存柊宸ョ▼琛ㄧ姸鎬佷负宸查鍙�
- //optimizeProjectService.changeTask("P24050801",200);
- engineeringService.changeTask("P24051102",1);
- }
+
@Test
public void textengineering3(){
- //鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛�
- UpPattenUsage upPattenUsage=upPattenUsageService.selectOverTask();
- log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",upPattenUsage);
+ //涓婄墖琛ㄦ渶鍚庝竴鐗�
+ UpPattenUsage upPattenUsage=new UpPattenUsage();
+ upPattenUsage.setEngineeringId("P24051103");
+ UpPattenUsage upPattenUsage1=upPattenUsageService.selectSequence(upPattenUsage);
+ log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",upPattenUsage1);
+ boolean isOver= optimizeProjectService.overTask(upPattenUsage1,300);
+ log.info("鏇存敼鏄惁鎴愬姛{}",isOver);
}
@Test
public void textengineering4(){
//鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛�
List<Engineering> engineerings=engineeringService.selectTask();
log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",engineerings);
+
+ }
+ @Test
+ public void textengineering5(){
+ //鏄剧ず閫夋嫨宸ョ▼
+ OptimizeRequest optimizeRequest=new OptimizeRequest();
+ optimizeRequest.setState(100);
+ List<OptimizeProject> engineerings=optimizeProjectService.listByState(optimizeRequest);
+ log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",engineerings);
}
}
--
Gitblit v1.8.0