Merge remote-tracking branch 'origin/master'

wangfei

2024-11-29 c377d90fe2a01c2118f6c69c3c177f75be7c318b

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

@@ -67,8 +67,10 @@

     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);
}