Merge remote-tracking branch 'origin/master'

ZengTao

2025-10-31 d55b5b015eef8c31d9dea6587dc6fd0e02818cd1

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

@@ -4,6 +4,8 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.engineerScheduling.entity.EngineerScheduling;
import com.mes.engineerScheduling.service.EngineerSchedulingService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -15,6 +17,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -42,6 +45,9 @@
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    DamageService damageService;
    @Autowired
    EngineerSchedulingService engineerSchedulingService;



    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
@@ -75,6 +81,11 @@
    @ResponseBody
    public synchronized Result<Boolean> changeTask(@RequestBody Engineering engineering) {
        try {
            //获取排产顺序，不是当前正在上片的工程号直接返回失败   暂时注释，等待排产功能正式上线
//            List<EngineerScheduling> engineerScheduling = engineerSchedulingService.queryByType(1);
//            if (!engineerScheduling.get(0).getProjectNo().equals(engineering.getEngineerId())) {
//                return Result.build(100, "请根据当前排产顺序选择工程号，排产首位为：" + engineerScheduling.get(0).getProjectNo(), false);
//            }
            log.info("engineeringId:{}", engineering);
            UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
            Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
@@ -106,15 +117,15 @@
            } else {
                upPattenUsageService.deleteTask(engineering.getEngineerId());
                engineeringService.deleteTask(engineering.getEngineerId());
                glassInfoService.deleteTask(engineering.getEngineerId());
//                glassInfoService.deleteTask(engineering.getEngineerId());
                return Result.build(200, "请重新点击上片" + engineering.getEngineerId(), true);
            }
        } catch (Exception e) {
            log.info("异常信息:{}", e);
            log.error("异常信息:{}", e);
            upPattenUsageService.deleteTask(engineering.getEngineerId());
            engineeringService.deleteTask(engineering.getEngineerId());
            glassInfoService.deleteTask(engineering.getEngineerId());
//            upPattenUsageService.deleteTask(engineering.getEngineerId());
//            engineeringService.deleteTask(engineering.getEngineerId());
//            glassInfoService.deleteTask(engineering.getEngineerId());
            return Result.build(200, "保存失败" + engineering.getEngineerId(), false);
        }
    }