From 31553fc8b224d70f4415e9edf4098587dea44e3f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 27 六月 2024 13:27:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 7 ++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml | 10 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java | 3 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 4
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml | 10 +++
hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java | 40 +++++++++++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java | 16 ++++-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java | 6 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/DatabaseDesignDocUtil.java | 8 +-
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 4 -
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java | 14 ++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 10 +++
13 files changed, 110 insertions(+), 24 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
index 13d0253..deb797b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/AwaitingRepair.java
@@ -80,7 +80,7 @@
/**
* 鐗囨爣璁帮紙浣嶇疆锛�
*/
- private Integer glassAddress;
+ private String glassAddress;
/**
* 琛ョ墖鏁伴噺
@@ -150,12 +150,12 @@
/**
* 娆＄牬闈㈢Н
*/
- private LocalDateTime patchArea;
+ private Double patchArea;
/**
* 璐ㄦ鍛�
*/
- private LocalDateTime qualityInspector;
+ private String qualityInspector;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
index 402a774..cd88ede 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
@@ -1,7 +1,10 @@
package com.mes.pp.entity.request;
+import cn.hutool.core.date.DateTime;
import lombok.Data;
+import java.time.LocalDate;
+
/**
* @author wu
*/
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
index bdab088..a2d8310 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -33,4 +33,11 @@
* @return
*/
boolean overTask(UpPattenUsage sequence, int state);
+ /**
+ * 鑾峰彇姝ｅ湪杩涜涓殑浠诲姟
+ *
+ * @return
+ */
+ List<OptimizeProject> getDoingTask();
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java
index fa13034..2349dbb 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/ReportingWorkService.java
@@ -2,6 +2,7 @@
import com.mes.pp.entity.ReportingWork;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.pp.entity.request.AwaitingRepair;
import com.mes.pp.entity.request.Reportingdamage;
import java.util.List;
@@ -16,6 +17,17 @@
*/
public interface ReportingWorkService extends IService<ReportingWork> {
- //鑾峰彇椤堕儴鎵囧舰鍥剧牬鎹熷姞宸ユ暟閲�
+ /**
+ * 鑾峰彇椤堕儴鎵囧舰鍥剧牬鎹熷姞宸ユ暟閲�,浼犲叆鍙傛暟锛氬伐搴忥紝璁惧锛屽姞宸ユ椂闂�
+ *
+ * @return
+ */
List<Reportingdamage> selectDamage(Reportingdamage reportingdamage);
+ /**
+ * 鑾峰彇鐮存崯鏈ˉ鐗囩殑鍒楄〃
+ *
+ * @return
+ */
+ List<AwaitingRepair> selectAwaitingRepair();
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index 22f9d8e..202a852 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -13,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
/**
@@ -64,5 +66,13 @@
return false;
}
+ @Override
+ public List<OptimizeProject> getDoingTask() {
+ QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
+ wrapper.select("project_no,project_name")
+ .eq("state",200);
+ return this.list(wrapper);
+ }
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
index ce35e08..e42cefa 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.request.AwaitingRepair;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.mapper.ReportingWorkMapper;
import com.mes.pp.mapper.request.AwaitingRepairMapper;
@@ -36,11 +37,18 @@
@Override
public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) {
QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>();
- queryWrapper.eq("this_process",reportingdamage.getThisProcess())
- .eq("device_name",reportingdamage.getDeviceName())
- .le("reporting_work_time", LocalDateTime.now());
+ queryWrapper.select("this_process,sum(completed_quantity)as completedQuantity,sum(breakage_quantity)as breakageQuantity,device_name ")
+ .eq("this_process",reportingdamage.getThisProcess())
+ //.eq("device_name",reportingdamage.getDeviceName())
+ .ge("reporting_work_time",reportingdamage.getReportingWorkTime())
+ .groupBy("this_process");
return reportingDamageMapper.selectList(queryWrapper);
-// rw.reporting_work_time BETWEEN '2024/05/12'and'2024/06/20' and rw.this_process = '纾ㄨ竟' and rw.device_name = '蹇�熺（'
+ }
+ @Override
+ public List<AwaitingRepair> selectAwaitingRepair() {
+ QueryWrapper<AwaitingRepair>queryWrapper=new QueryWrapper<>();
+ queryWrapper.select("*");
+ return awaitingRepairMapper.selectList(queryWrapper);
}
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/DatabaseDesignDocUtil.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/DatabaseDesignDocUtil.java
index 07a4c33..2b31d34 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/DatabaseDesignDocUtil.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/DatabaseDesignDocUtil.java
@@ -31,9 +31,9 @@
public static void documentGeneration() {
//鏁版嵁婧�
HikariConfig hikariConfig = new HikariConfig();
- hikariConfig.setDriverClassName("com.mysql.cj.jdbc.Driver");
- hikariConfig.setJdbcUrl("jdbc:mysql://10.153.19.150:3306/hangzhoumes" + "?serverTimezone=GMT%2B8");
- hikariConfig.setUsername("root");
+ hikariConfig.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+ hikariConfig.setJdbcUrl("jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes");
+ hikariConfig.setUsername("sa");
hikariConfig.setPassword("beibo.123/");
//璁剧疆鍙互鑾峰彇tables remarks淇℃伅
hikariConfig.addDataSourceProperty("useInformationSchema", "true");
@@ -43,7 +43,7 @@
//鐢熸垚閰嶇疆
EngineConfig engineConfig = EngineConfig.builder()
//鐢熸垚鏂囦欢璺緞
- .fileOutputDir("E:\\椤圭洰\\椤圭洰鏂囨。\\鏉窞鍒╂潵1")
+ .fileOutputDir("E:\\椤圭洰\\椤圭洰鏂囨。\\鏉窞鍒╂潵2")
//鎵撳紑鐩綍
.openOutputDir(true)
//鏂囦欢绫诲瀷
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index e7bdf13..9d93d35 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -66,8 +66,8 @@
List<OptimizeUpPattenUsage> upPattenUsageList = null;
if (engineeringId != null) {
upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
- .select("t.project_no,t.glass_type,b.o_width as width,b.o_height as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
- .leftJoin("optimize_layout b on t.project_no=b.project_no")
+ .select("t.project_no,t.glass_type,b.o_width as width,b.o_height as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_number")
+ .leftJoin("optimize_detail b on t.project_no=b.project_no")
.eq("b.project_no", engineeringId));
}
// 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
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 15be7ab..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,12 +1,13 @@
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.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;
@@ -21,7 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-
import java.util.Arrays;
import java.util.List;
@@ -132,12 +132,40 @@
}
@Test
public void test4() {
- Reportingdamage orders = new Reportingdamage();
- orders.setThisProcess("纾ㄨ竟");
- orders.setDeviceName("蹇�熺（");
- List<Reportingdamage> list = reportingWorkService.selectDamage(orders);
+ //鑾峰彇宸ュ簭鍔犲伐娆＄牬鏁伴噺
+ 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("鑾峰彇姝ｅ湪杩涜鐨勫伐绋嬶細" + 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);
+ }
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index d548f45..3f108b5 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -1,9 +1,7 @@
package com.mes.job;
-
import cn.hutool.json.JSONObject;
import com.mes.temperingglass.service.TemperingAgoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.TemperingAgoService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +26,7 @@
*/
@Scheduled(fixedDelay = 1000)
- public void loadGlassHome(){
+ public void temperingGlassHome(){
JSONObject jsonObject = new JSONObject();
//姝ｅ湪绛夊緟杩涚墖鐨勭幓鐠�
List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass();
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
index b3eae47..7a1a916 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
@@ -24,6 +24,16 @@
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ pp:
+ url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ sd:
+ url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
index 7aab87f..d00e665 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
@@ -15,6 +15,16 @@
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ pp:
+ url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ sd:
+ url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index 12e113b..e9fcc1e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8084
spring:
profiles:
- active: dev
+ active: prod
application:
name: temperingGlass
mybatis-plus:
--
Gitblit v1.8.0