From 73a0edcbfad8a4eb9420c1bb4b2e0c48dd45e15c Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 27 九月 2024 09:53:37 +0800 Subject: [PATCH] 增加上片的判断和工程号提示 --- hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 129 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 117 insertions(+), 12 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 d148295..5ed0657 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java @@ -1,20 +1,27 @@ 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.order.entity.Orderdetail; +import com.mes.order.entity.Orders; +import com.mes.order.service.OrdersService; +import com.mes.pp.entity.OptimizeProject; +import com.mes.pp.entity.request.AwaitingRepair; +import com.mes.pp.entity.request.OptimizeRequest; +import com.mes.pp.entity.request.Reportingdamage; +import com.mes.pp.service.OptimizeProjectService; +import com.mes.pp.service.ReportingWorkService; 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; @@ -34,6 +41,14 @@ private GlassInfoService glassInfoService; @Autowired private EngineeringService engineeringService; + @Autowired + private UpWorkstationService workstationService; + @Autowired + private OptimizeProjectService optimizeProjectService; + @Autowired + private OrdersService ordersService; + @Autowired + private ReportingWorkService reportingWorkService; @Test public void test() { // List<OptimizeProject> list = optimizeProjectMapper.saveProject("P24032204"); @@ -48,19 +63,109 @@ @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.getWorkstationId()); + //鍑忓皯鏁伴噺 + 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(){ + Engineering engineering=new Engineering(); List<Engineering> glass= engineeringService.selectEngineering("P24032204"); engineeringService.saveEngineering(glass); log.info("glassinfo锛歿}", Arrays.asList(glass)); } + + @Test + public void textengineering3(){ + //涓婄墖琛ㄦ渶鍚庝竴鐗� + 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); + } + @Test + public void textengineering6(){ + //涓婄墖琛ㄦ渶鍚庝竴鐗� + UpPattenUsage upPattenUsage=new UpPattenUsage(); + upPattenUsage.setState(100); + upPattenUsage.setId(2248L); + boolean isOver= upPattenUsageService.updateGlassState(upPattenUsage); + log.info("鏇存敼鏄惁鎴愬姛{}",isOver); + } + @Test + public void test2() { + List<Orders> list = ordersService.selectOrders(); + System.out.println("鑾峰彇璁板綍鏁帮細" + list); + } + @Test + public void test3() { + Orders orders = new Orders(); + orders.setOrderId("P24051103"); + List<Orderdetail> list = ordersService.selectOrderdetail(orders); + System.out.println("璁㈠崟璇︾粏鏁版嵁锛�" + list); + } + @Test + public void test4() { + //鑾峰彇宸ュ簭鍔犲伐娆$牬鏁伴噺 + Reportingdamage reportingdamage = new Reportingdamage(); + reportingdamage.setThisProcess("纾ㄨ竟"); + reportingdamage.setDeviceName("蹇�熺("); + reportingdamage.setReportingWorkTime("2024-05-22"); + List<Reportingdamage> list = reportingWorkService.selectDamage(reportingdamage); + System.out.println("璁㈠崟璇︾粏鏁版嵁锛�" + list); + } + @Test + public void test5() { + //鑾峰彇娆$牬鏈ˉ淇℃伅 + List<AwaitingRepair> list = reportingWorkService.selectAwaitingRepair(); + System.out.println("鑾峰彇璁板綍鏁帮細" + list); + } + @Test + public void test6() { + //鑾峰彇娆$牬鏈ˉ淇℃伅 + List<OptimizeProject> list=optimizeProjectService.getDoingTask(); + System.out.println("鑾峰彇姝e湪杩涜鐨勫伐绋嬶細" + list); + } + @Test + public void test7() { + //鑾峰彇娆$牬鏈ˉ淇℃伅 + List<GlassInfo> list=glassInfoService.selectGlassInfo("P24062706"); + System.out.println("宸ョ▼锛�"+list); + } + @Test + public void test8() { + //鑾峰彇娆$牬鏈ˉ淇℃伅 + UpPattenUsage upPattenUsage=new UpPattenUsage(); + upPattenUsage.setEngineeringId("P24062706"); + List<UpPattenUsage> list=upPattenUsageService.selectSaveUpPattenUsage("P24062706"); + System.out.println("宸ョ▼锛�"+list); + } + + } -- Gitblit v1.8.0