1、冲突代码合并

ZengTao

2025-10-11 f4712cb12cc653b2aff19379fd7756fcfb478b90

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

@@ -107,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);
        }
    }
@@ -129,8 +129,8 @@
//        glassInfoService.deleteTask(engineering.getEngineerId());
//        upPattenUsageService.deleteTask(engineering.getEngineerId());
//        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
        //暂停工程
        engineeringService.pauseTask(engineering.getEngineerId(), 0);
        //暂停工程  - > 改为删除工程
        engineeringService.deleteTask(engineering.getEngineerId());
        //查询未上片的小片信息
        List<GlassInfo> glasslist = glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
        return Result.build(200, "删除成功" + engineering.getEngineerId(), glasslist);