hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
@@ -28,6 +28,14 @@ private String project; /** * 流程卡号 */ private String processId; /** * 订单序号 */ private String orderNumber; /** * 产品名称 */ private String productName; @@ -50,13 +58,25 @@ */ private Integer quantity; /** * 加工方式 * 补片数量 */ private String processingNote; private Integer numberPatches; /** * 送货时间 * 已入数量 */ private String deliveryDate; private Integer receivedQuantity; /** * 生产状态 */ private Integer terminationStatus; /** * 包装方式 */ private String packType; /** * 工程号 */ private String projectNo;
@@ -27,14 +27,15 @@ @Autowired private ReportingWorkService reportingWorkService; @ApiOperation("显示工程选择信息") @ApiOperation("显示大屏显示扇形图信息") @PostMapping("/selectDamage") //显示工程选择信息 @ResponseBody public Result<List<Reportingdamage>> selectDamage(@RequestBody Reportingdamage reportingdamage) { log.info("将请求参数封装在请求类里面"); List<Reportingdamage> glass = reportingWorkService.selectDamage(reportingdamage); log.info("显示工程选择信息:{}", glass); log.info("显示大屏显示扇形图信息:{}", glass); return Result.build(200, "", glass); } }
@@ -31,6 +31,10 @@ * 次破时间 */ private String reportingWorkTime; /** * 次破时间2 */ private String reportingWorkTime2; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -42,6 +42,7 @@ //.eq("this_process", reportingdamage.getThisProcess()) //.eq("device_name",reportingdamage.getDeviceName()) .ge("reporting_work_time", reportingdamage.getReportingWorkTime()) .le("reporting_work_time",reportingdamage.getReportingWorkTime2()) .groupBy("this_process"); return reportingDamageMapper.selectList(queryWrapper); } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -166,12 +166,12 @@ } } } @Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = 10000) public void loadGlassIsRun() { JSONObject jsonObject = new JSONObject(); //是否开始工程 Engineering engineering = engineeringService.selectInitiate(1); jsonObject.append("engineering", engineering); jsonObject.append("engineering", engineering); //工位信息 List<UpWorkstation> upWorkstations = upWorkstationService.list(); jsonObject.append("list", upWorkstations); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -12,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -33,14 +36,28 @@ * fixedDelay : 上一个调用结束后再次调用的延时 */ @Scheduled(fixedDelay = 2000) @Scheduled(fixedDelay = 10000) public void screenHome() { JSONObject jsonObject = new JSONObject(); Reportingdamage reportingdamage = new Reportingdamage(); reportingdamage.setReportingWorkTime("2024-05-11"); //reportingdamage.setReportingWorkTime("2024-05-11"); // 获取当前日期 LocalDate today = LocalDate.now(); // 计算最近七天的开始日期 LocalDate startOfPeriod = today.minusDays(6); // 7天的范围包括今天，所以减去6天 // 最近七天的结束日期就是今天 LocalDate endOfPeriod = today; // 格式化日期为字符串 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String startOfPeriodStr = startOfPeriod.format(formatter); String endOfPeriodStr = endOfPeriod.format(formatter); // 设置为最近七天的时间范围 reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr); //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr); //扇形图各设备的加工破损数量 List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("device", device); //获取次破未补信息 List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair(); jsonObject.append("awaitingRepairs", awaitingRepairs);
