Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-12 a5771725ac324c3dae366e6fcc38055b39ea4386

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java

@@ -67,8 +67,12 @@

     List<Engineering> setRawGlassTaskRequest(Engineering request);

     List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
//     List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);

     UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);
//     UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);

     UpPattenUsage selectedEngineering(String engineerId);

    void deleteTask(String engineerId);
}