From 08bae96ce03625f054f3977147a7e9861c51209d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 28 六月 2024 08:21:52 +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 | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 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 fbbcf0e..15be7ab 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -2,9 +2,15 @@
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.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.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;
@@ -39,6 +45,10 @@
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");
@@ -65,35 +75,69 @@
//鏇存柊鐘舵��
}
- @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 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);
+ }
+ @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 orders = new Reportingdamage();
+ orders.setThisProcess("纾ㄨ竟");
+ orders.setDeviceName("蹇�熺（");
+ List<Reportingdamage> list = reportingWorkService.selectDamage(orders);
+ System.out.println("璁㈠崟璇︾粏鏁版嵁锛�" + list);
+ }
+
}
--
Gitblit v1.8.0