From f39fd71eedfd828e715d33356a8c38ffbe66eb1a Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期五, 24 五月 2024 15:28: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 | 73 ++++++++++++++++++++++++++++++++---- 1 files changed, 64 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 5ebb233..9725c57 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java @@ -1,30 +1,44 @@ package com.mes; -import com.mes.pp.entity.OptimizeProject; -import com.mes.pp.mapper.OptimizeProjectMapper; +import com.mes.engineering.entity.Engineering; +import com.mes.engineering.service.EngineeringService; +import com.mes.glassinfo.entity.GlassInfo; +import com.mes.glassinfo.service.GlassInfoService; +import com.mes.pp.service.OptimizeProjectService; +import com.mes.uppattenusage.entity.UpPattenUsage; +import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl; +import com.mes.workstation.entity.UpWorkstation; +import com.mes.workstation.service.UpWorkstationService; 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 javax.annotation.Resource; import java.util.Arrays; import java.util.List; /** - * @Author : zhoush - * @Date: 2024/3/27 16:37 - * @Description: + */ @Slf4j @RunWith(SpringRunner.class) @SpringBootTest(classes = LoadGlassModuleApplication.class) public class LoadGlassModuleApplicationTest { - @Resource - private OptimizeProjectMapper optimizeProjectMapper; - +// @Resource +// private OptimizeProjectMapper optimizeProjectMapper; + @Autowired + private UpPattenUsageServiceImpl upPattenUsageService; + @Autowired + private GlassInfoService glassInfoService; + @Autowired + private EngineeringService engineeringService; + @Autowired + private UpWorkstationService workstationService; + @Autowired + private OptimizeProjectService optimizeProjectService; @Test public void test() { // List<OptimizeProject> list = optimizeProjectMapper.saveProject("P24032204"); @@ -36,4 +50,45 @@ public void testFindPath() { log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123")); } + + @Test + public void testFindPa() { + Engineering engineering= engineeringService.selectInitiate(1); + log.info("寮�濮嬩笂鐗囩殑宸ョ▼锛歿}", Arrays.asList(engineering)); + UpPattenUsage upPattenUsage = workstationService.selectPriority(engineering); + log.info("涓婄墖椤哄簭锛歿}", Arrays.asList(upPattenUsage)); + UpWorkstation glass2=workstationService.selectWorkstation(upPattenUsage); + log.info("绗﹀悎鐨勫伐浣嶇幓鐠儃}",glass2); + workstationService.reduceWorkstationNumber(glass2.getWorkstationId()); + //鍑忓皯鏁伴噺 + upPattenUsageService.updateUpPattenUsageState(upPattenUsage,1); + //鏇存柊鐘舵�� + } + + + @Test + public void textengineering(){ + List<Engineering> glass= engineeringService.selectEngineering("P24032204"); + 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); + } + @Test + public void textengineering4(){ + //鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛� + List<Engineering> engineerings=engineeringService.selectTask(); + log.info("涓婄墖琛ㄤ换鍔′腑鐨勬暟鎹畕}",engineerings); + } + } -- Gitblit v1.8.0