From 0307175c4c3631fe68b4d0a3a921bc56678ba68b Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 03 十二月 2024 09:13:42 +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 | 16 +++++++++++++++- 1 files changed, 15 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 9bcefd7..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 @@ -1,5 +1,7 @@ package com.mes.uppattenusage.service; + import com.github.yulichang.base.MPJBaseService; +import com.mes.engineering.entity.Engineering; import com.mes.uppattenusage.entity.UpPattenUsage; import java.util.List; @@ -36,13 +38,17 @@ * 鏇存柊涓婄墖琛ㄧ姸鎬� */ void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state); + /** * 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩� + * * @return UpPattenUsage */ - UpPattenUsage selectedEngineering(String engineeringId); + UpPattenUsage selectedTaskEngineering(String engineeringId); + /** * 鏌ヨ姝e湪鎵ц鐨勪笂鐗囦换鍔� + * * @return UpPattenUsage */ UpPattenUsage selectOverTask(); @@ -54,9 +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