From df5a46acb9a169c29692ed8b8d1e712fbec65e81 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 16 五月 2024 13:56:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 c4d40db..9725c57 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -4,7 +4,6 @@
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
@@ -17,7 +16,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
@@ -59,20 +57,15 @@
log.info("寮�濮嬩笂鐗囩殑宸ョ▼锛歿}", Arrays.asList(engineering));
UpPattenUsage upPattenUsage = workstationService.selectPriority(engineering);
log.info("涓婄墖椤哄簭锛歿}", Arrays.asList(upPattenUsage));
- UpWorkstation glass2=workstationService.selectworkstation(upPattenUsage);
+ UpWorkstation glass2=workstationService.selectWorkstation(upPattenUsage);
log.info("绗﹀悎鐨勫伐浣嶇幓鐠儃}",glass2);
- workstationService.reduceWorkstationNumber(glass2);
+ workstationService.reduceWorkstationNumber(glass2.getWorkstationId());
//鍑忓皯鏁伴噺
- upPattenUsageService.updateupPattenUsageState(upPattenUsage,1);
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage,1);
//鏇存柊鐘舵��
}
- @Test
- public void textglassinfo(){
- List<GlassInfo> glass= glassInfoService.selectGlassInfo("P24032204");
- log.info("glassinfo锛歿}", Arrays.asList(glass));
- glassInfoService.saveGlassInfo(glass);
- }
+
@Test
public void textengineering(){
List<Engineering> glass= engineeringService.selectEngineering("P24032204");
@@ -82,11 +75,20 @@
@Test
public void textengineering2(){
//鏇存柊宸ョ▼琛ㄧ姸鎬佷负宸查鍙�
- optimizeProjectService.changeTask("P24050801",200);
+ //optimizeProjectService.changeTask("P24050801",200);
+ engineeringService.changeTask("P24051102",1);
}
@Test
public void textengineering3(){
//鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛�
- upPattenUsageService.selectedEngineering("P24050801");
+ UpPattenUsage upPattenUsage=upPattenUsageService.selectOverTask();
+ log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",upPattenUsage);
}
+ @Test
+ public void textengineering4(){
+ //鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛�
+ List<Engineering> engineerings=engineeringService.selectTask();
+ log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",engineerings);
+ }
+
}
--
Gitblit v1.8.0