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;
@@ -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 */ 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(); } 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(); } 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); } } 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); } } 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) //文件类型 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 用于保存映射后的实体对象 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); } } 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(); 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: 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: 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:
