hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -3,6 +3,7 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
@@ -15,6 +16,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -41,6 +43,7 @@
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    DamageService damageService;
    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
    @PostMapping("/pauseTask") //暂停上片任务
@@ -74,12 +77,14 @@
    public  Result <Boolean> changeTask(@RequestBody Engineering engineering) {
        log.info("engineeringId:{}", engineering);
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if (upPattenUsage != null) {
        Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
        GlassInfo glassInfos = engineeringService.selectGlassinfoIsnull(engineering.getEngineerId());
        if (upPattenUsage != null && engineerings != null && glassInfos != null) {
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            return Result.build(200, "已保存过", work);
        } else {
            return Result.build(200, "开始上片", work);
        } else if (upPattenUsage == null && engineerings == null && glassInfos == null) {
            List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
            log.info("将查询出的UpPattenUsage数据保存到数据库表里");
            upPattenUsageService.saveUpPattenUsage(upPattenUsages);
@@ -99,6 +104,11 @@
            }else {
                return Result.build(200, "保存失败"+engineering.getEngineerId(), false);
            }
        } else {
            upPattenUsageService.deleteTask(engineering.getEngineerId());
            engineeringService.deleteTask(engineering.getEngineerId());
            glassInfoService.deleteTask(engineering.getEngineerId());
            return Result.build(200, "请重新点击上片" + engineering.getEngineerId(), true);
        }
    }
@@ -137,5 +147,11 @@
        return Result.build(200, "操作成功", null);
    }
    @ApiOperation("识别操作:   破损/拿走     参数(ID,功能[9:拿走,8:破损])")
    @PostMapping("/identControls")
    public Result<String> identControls(@RequestBody @Validated DamageRequest request) {
        return Result.build(200, "成功", upPattenUsageService.identControls(request));
    }
}