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 |   68 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 7 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 93cd685..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,8 +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;
 
@@ -14,21 +17,72 @@
  * @author zhoush
  * @since 2024-04-16
  */
-public interface OptimizeProjectService extends IService<OptimizeProject> {
+public interface OptimizeProjectService extends MPJBaseService<OptimizeProject> {
 
     /**
      * 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
-     * @return
+     *
+     * @return List<OptimizeProject>
      */
     List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
+
     /**
-     * 鏌ヨ淇濆瓨鍒板師鐗囦娇鐢ㄨ鎯呰〃鐨勬暟鎹�
+     * 灏嗗伐绋嬩俊鎭洿鏂扮姸鎬佷负宸查鍙�
+     */
+    void changeTask(String engineeringId, int i);
+
+    /**
+     * 瀹屾垚宸ョ▼浠诲姟鏀逛负300
+     *
      * @return
      */
-    List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
+    boolean overTask(UpPattenUsage sequence, int state);
+
     /**
-     * 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
+     * 鑾峰彇姝e湪杩涜涓殑浠诲姟
+     *
      * @return
      */
-    void insetProject(OptimizeProject glass);
+    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