From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期日, 09 三月 2025 23:51:28 +0800 Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改:10mm及以上厚度的玻璃走直通任务,厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询,同一个流程卡同一层出现2种厚度,导致厚度赋值异常,目前已改为查询最后一次导入的为准 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 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..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,6 +1,7 @@ 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; @@ -38,13 +39,17 @@ * 鏇存柊涓婄墖琛ㄧ姸鎬� */ void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state); + /** * 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩� + * * @return UpPattenUsage */ - UpPattenUsage selectedEngineering(String engineeringId); + UpPattenUsage selectedTaskEngineering(String engineeringId); + /** * 鏌ヨ姝e湪鎵ц鐨勪笂鐗囦换鍔� + * * @return UpPattenUsage */ UpPattenUsage selectOverTask(); @@ -56,10 +61,33 @@ /** * 鏇存敼涓婄墖鐜荤拑鐘舵�� + * * @return UpPattenUsage */ Boolean updateGlassState(UpPattenUsage upPattenUsage); - List<Engineering> setRawGlassTaskRequest(Engineering request); + 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