From b21caa5499c50384f3a3a5dd795a7a0ad197d36f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 06 十一月 2025 21:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 852ac35..53259ca 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
@@ -2,6 +2,7 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.uppattenusage.entity.UpPattenUsage;
import io.swagger.models.auth.In;
@@ -66,9 +67,22 @@
List<OptimizeProject> updateEngineerScheduling(Integer type, List<OptimizeProject> engineerList);
/**
+ * 鏇存柊宸ョ▼鎺掍骇淇℃伅
+ *
+ * @return
+ */
+ List<OptimizeProject> updateCuttingLayout(Integer type, List<OptimizeProject> engineerList);
+
+ /**
* 鍒犻櫎宸ョ▼鎺掍骇淇℃伅
*
* @return
*/
void deleteengineerSchedulingByid(String engineerId, List<Integer> types);
+ /**
+ * 鏌ヨ宸ョ▼杩涘害
+ *
+ * @return ProgressDTO
+ */
+ List<ProgressDTO> selectProgress(String engineerId);
}
--
Gitblit v1.8.0