From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 11 三月 2025 09:50:47 +0800 Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 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 d5506a4..9a793da 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,8 @@ package com.mes.uppattenusage.service; + import com.github.yulichang.base.MPJBaseService; +import com.mes.damage.entity.request.DamageRequest; +import com.mes.engineering.entity.Engineering; import com.mes.uppattenusage.entity.UpPattenUsage; import java.util.List; @@ -19,6 +22,11 @@ */ List<UpPattenUsage> prioritylist(); /** + * 鏌ヨ涓婄墖琛ㄧ殑宸ョ▼淇℃伅 + * @return List<UpPattenUsage> + */ + List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage); + /** * 鏌ヨ涓婄墖椤哄簭淇℃伅 * @return List<UpPattenUsage> */ @@ -31,15 +39,55 @@ * 鏇存柊涓婄墖琛ㄧ姸鎬� */ void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state); + /** * 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩� + * * @return UpPattenUsage */ - UpPattenUsage selectedEngineering(String engineeringId); + UpPattenUsage selectedTaskEngineering(String engineeringId); + /** * 鏌ヨ姝e湪鎵ц鐨勪笂鐗囦换鍔� + * * @return UpPattenUsage */ UpPattenUsage selectOverTask(); + /** + * 鏌ヨ涓婄墖鏈�鍚庝竴鍧楃殑鐜荤拑 + * @return UpPattenUsage + */ + UpPattenUsage selectSequence(UpPattenUsage upPattenUsage); + + /** + * 鏇存敼涓婄墖鐜荤拑鐘舵�� + * + * @return UpPattenUsage + */ + Boolean updateGlassState(UpPattenUsage upPattenUsage); + + String setRawGlassTaskRequest(Engineering request); + + String setRawGlassTaskRequest2(Engineering request); + +// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell); + +// UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell); + + UpPattenUsage selectedEngineering(String engineerId); + + void deleteTask(String engineerId); + + + List<UpPattenUsage> selectLoadTask(Engineering engineering); + + /** + * 鎷胯蛋:9/鐮存崯:8 + * + * @param request + * @return + */ + String identControls(DamageRequest request); + } -- Gitblit v1.8.0