From 31a6849672a6ccac2289fc3bd8fbacdd13c99634 Mon Sep 17 00:00:00 2001 From: zhangyong <517047165@qq.com> Date: 星期二, 26 十一月 2024 13:24:43 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java index 377b77e..2c1e2f8 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java @@ -38,13 +38,17 @@ * 鏇存柊涓婄墖琛ㄧ姸鎬� */ void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state); + /** * 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩� + * * @return UpPattenUsage */ - UpPattenUsage selectedEngineering(String engineeringId); + UpPattenUsage selectedTaskEngineering(String engineeringId); + /** * 鏌ヨ姝e湪鎵ц鐨勪笂鐗囦换鍔� + * * @return UpPattenUsage */ UpPattenUsage selectOverTask(); @@ -56,10 +60,17 @@ /** * 鏇存敼涓婄墖鐜荤拑鐘舵�� + * * @return UpPattenUsage */ Boolean updateGlassState(UpPattenUsage upPattenUsage); List<Engineering> setRawGlassTaskRequest(Engineering request); + +// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell); + +// UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell); + + UpPattenUsage selectedEngineering(String engineerId); } -- Gitblit v1.8.0