From a8e32b8a10bb462bb01f37e3b03d9d9fc3ffdee5 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 10 五月 2024 16:28:59 +0800 Subject: [PATCH] 增加上片模块线程,增加保存工程时的已保存判断 --- hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 42 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 afb83c3..c4d40db 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java @@ -1,11 +1,15 @@ package com.mes; +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.mapper.OptimizeProjectMapper; -import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; +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; @@ -16,24 +20,27 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; -import java.util.Map; /** - * @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"); @@ -48,12 +55,38 @@ @Test public void testFindPa() { - List<UpPattenUsage> glass = upPattenUsageService.selectSaveUpPattenUsage("P24032204"); - log.info("瀹屾暣璺緞锛歿}", Arrays.asList(glass)); + 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); + //鍑忓皯鏁伴噺 + 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"); + engineeringService.saveEngineering(glass); + log.info("glassinfo锛歿}", Arrays.asList(glass)); + } + @Test + public void textengineering2(){ + //鏇存柊宸ョ▼琛ㄧ姸鎬佷负宸查鍙� + optimizeProjectService.changeTask("P24050801",200); + } + @Test + public void textengineering3(){ + //鍒ゆ柇鏄惁宸蹭繚瀛樿繃宸ョ▼鍙峰埌涓婄墖琛� + upPattenUsageService.selectedEngineering("P24050801"); } } -- Gitblit v1.8.0