修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔

ZengTao

2025-03-28 f68d3c71819feb59e7a227a5d992b059b900916c

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -2,6 +2,7 @@

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.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -35,8 +36,6 @@
    private  EngineeringService engineeringService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;


    @ApiOperation("显示选择的工程信息")
    @GetMapping("/prioritylist") //查询现在上片机的玻璃信息
    @ResponseBody
@@ -50,19 +49,17 @@
    @PostMapping("/selectUpPattenUsage") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
        List<UpPattenUsage> upPattenUsages = null;
        List<UpPattenUsage> upPattenUsages=null;
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if (upPattenUsage == null) {
//            return Result.build(200, "失败无数据", null);
//            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
        if(upPattenUsage == null){
            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
        } else {
            upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
        }else {
            upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
        }

        if (!upPattenUsages.isEmpty()) {
            return Result.build(200, "成功", upPattenUsages);
        } else {
        }else {
            return Result.build(100, "失败", upPattenUsages);
        }

@@ -73,19 +70,13 @@
    @ResponseBody
    public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
        Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
        if (whether) {
        if (whether){
            return Result.build(200, "成功", whether);
        } else {
        }else {
            return Result.build(100, "失败", whether);
        }

    }

    @ApiOperation("设置上片查询条件")
    @PostMapping("/setUpPattenRequest")
    public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
        log.info("查询上片信息:{}", request);
        return Result.build(200, "查询成功", upPattenUsageService.setRawGlassTaskRequest(request));
    }
}