修改报工接口，提交完工和次破分别调用不同的接口

ZengTao

2025-02-14 689b8c3b733fd30a72b4d76cb91f78e350f9d83b

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -1,6 +1,9 @@
package com.mes.engineering.controller;



import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -36,6 +39,9 @@
    private GlassInfoService glassInfoService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    DamageService damageService;

    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
    @PostMapping("/pauseTask") //暂停上片任务
    @ResponseBody
@@ -54,11 +60,11 @@
    @ResponseBody
    public  Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
        boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
//        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
        if(work){
            return Result.build(200,"成功",glass);
            return Result.build(200, "成功", null);
        }else {
            return Result.build(100,"成功",glass);
            return Result.build(100, "失敗", null);
        }
    }

@@ -69,7 +75,7 @@
        log.info("engineeringId:{}", engineering);
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if (upPattenUsage != null) {
            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            return Result.build(200, "已保存过", work);
@@ -78,14 +84,14 @@
            log.info("将查询出的UpPattenUsage数据保存到数据库表里");
            upPattenUsageService.saveUpPattenUsage(upPattenUsages);
            log.info("从PP表查询glassinfo的数据并保存到表里");
            List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering.getEngineerId());
            List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering);
            glassInfoService.saveGlassInfo(glassinfo);
            log.info("从PP表查询engineering的数据并保存到表里");
            List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
            engineeringService.saveEngineering(listEngineering);
            log.info("更改pp表状态为已领取");
            //将engineering表状态为正在上片
            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            if (work) {
@@ -97,6 +103,24 @@

    }

    @ApiOperation("删除工程上片")
    @PostMapping("/deleteTask") //调用上片任务
    @ResponseBody
    public  Result <List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) {
        //删除工程表、小片表、上片表，更改优化表状态
//        boolean work=engineeringService.deleteTask(engineering.getEngineerId());
//        glassInfoService.deleteTask(engineering.getEngineerId());
//        upPattenUsageService.deleteTask(engineering.getEngineerId());
//        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
        //暂停工程
        engineeringService.pauseTask(engineering.getEngineerId(),0);
          //查询未上片的小片信息
        List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
        return Result.build(200, "删除成功"+engineering.getEngineerId(), glasslist);


    }

    @ApiOperation("查询可以上片的工程号")
    @GetMapping("/selectTask") //调用上片任务
    @ResponseBody
@@ -105,5 +129,13 @@
        log.info("可领取任务返回:{}", engineering);
        return Result.build(200, "",engineering);
    }

    @ApiOperation("//上片破损拿走")
    @PostMapping("/insetDamage") //上片破损拿走
    public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
        damageService.insertDamage(damage);
        return Result.build(200, "操作成功", null);
    }

}