From a851a0eb0b9c5a8a5e9e4b038fbd1f0bf5f58bbc Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期五, 21 六月 2024 16:12:08 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java index e12e67f..bdab088 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java @@ -1,9 +1,9 @@ package com.mes.pp.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; import com.mes.pp.entity.OptimizeProject; import com.mes.pp.entity.request.OptimizeRequest; +import com.mes.uppattenusage.entity.UpPattenUsage; import java.util.List; @@ -19,17 +19,18 @@ /** * 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅 - * @return + * @return List<OptimizeProject> */ List<OptimizeProject> listByState(OptimizeRequest optimizeRequest); - /** - * 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛� - * @return - */ - void insetupPattenUsage(List<OptimizeProject> glass); + /** * 灏嗗伐绋嬩俊鎭洿鏂扮姸鎬佷负宸查鍙� - * @return */ void changeTask(String engineeringId, int i); + /** + * 瀹屾垚宸ョ▼浠诲姟鏀逛负300 + * + * @return + */ + boolean overTask(UpPattenUsage sequence, int state); } -- Gitblit v1.8.0