From a8bddf65438ac58787c5b4abee5da145a2d9d2ab Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 28 十月 2025 09:44:27 +0800
Subject: [PATCH] 增加新切割保存方法、前端显示防错位、切割钢化排产防重复、根据标签切换接口
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 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..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
@@ -1,9 +1,11 @@
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.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import io.swagger.models.auth.In;
import java.util.List;
@@ -19,17 +21,68 @@
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
- * @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);
+
+ /**
+ * 鑾峰彇姝ｅ湪杩涜涓殑浠诲姟
+ *
+ * @return
+ */
+ List<OptimizeProject> getDoingTask();
+
+ /**
+ * 鏌ヨ宸ョ▼淇℃伅
+ *
+ * @return
+ */
+ List<OptimizeProject> queryEngineer();
+
+ /**
+ * 鏌ヨ宸ョ▼鎺掑簭淇℃伅
+ *
+ * @return
+ */
+ List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject);
+
+ /**
+ * 鏇存柊宸ョ▼鎺掍骇淇℃伅
+ *
+ * @return
+ */
+ 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