Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-13 83f738105416c9b11e3b7c5246a0980e41b6650e

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

@@ -15,6 +15,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.*;

@@ -106,15 +107,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);
        }
    }