From e8ed1a91c77ab62a924f12acd55777f227bacd7e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 21 十一月 2025 17:15:17 +0800
Subject: [PATCH] 工位组删除后,其下工位移动到默认组

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
index f2a4d34..1010384 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java
@@ -4,9 +4,11 @@
 import java.util.List;
 import com.qianwen.core.mp.support.Query;
 import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
-import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
+import com.qianwen.smartman.modules.smis.dto.WorkstationWcsDmpDTO;
+import com.qianwen.smartman.modules.smis.entity.GlobalWcs;
+import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
 import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
+import com.qianwen.smartman.modules.mdc.dto.ProcessParameterVO;
 import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
 import com.qianwen.smartman.modules.mdc.vo.AllShiftTimeDetail;
 import com.qianwen.smartman.modules.mdc.vo.CollectParamResVO;
@@ -26,14 +28,24 @@
 
     IPage<ProcessParameterRealVO> pageProcessParameter(Query query, ProcessParameterItemSearchVO vo);
 
-    List<WorkstationWcsDmpDTO> processParam(String workstationId);
+    /**
+     * 鑾峰彇宸ヤ綅鐨勬墍鏈夐噰闆嗗弬鏁板垪琛�,璋冭瘯瀹屾垚鍚庨渶瑕佸垹闄�
+     * @param workstationId
+     * @return
+     */
+    //List<WorkstationWcsDmpDTO> processParam(String workstationId);
 
-    ProParamSheetVO queryProcessParameterSheet(ProcessParameterSearchVO vo, Boolean isFilterProcessParameter);
+    //ProParamSheetVO queryProcessParameterSheet(ProcessParameterSearchVO vo, Boolean isFilterProcessParameter);
 
-    BladeFile exportProcessParam(ProcessParamExcelVO vo);
+    //BladeFile exportProcessParam(ProcessParamExcelVO vo);
 
     ShiftTimeVO getShiftTime(ProcessParameterSearchVO vo);
 
+    /**
+     * 鏌ヨ鍗曚釜杩囩▼鍙傛暟鐨勫浘琛ㄦ暟鎹�
+     * @param vo
+     * @return
+     */
     CollectParamResVO<?> queryProcessParameterOneChart(CollectParamSearchVO vo);
 
     List<AllShiftTimeDetail> getAllShiftTime(WorkstationShiftSearchVO vo);
@@ -43,5 +55,21 @@
      * @param workstationId 宸ヤ綅id
      * @return 鍙傛暟鍊煎垪琛紙n,v锛�
      */
-    List<WorkstationCollectData> lastParameter(long workstationId);
+    //List<WorkstationCollectData> lastParameter(long workstationId);
+    
+    /**
+     * 鏌ヨ宸ヤ綅鏈�鏂板弬鏁伴泦鍚堬紙iotdb浣跨敤mybatis鏌ヨ鏈夐棶棰橈紝鑷繁瀹炵幇锛�
+     * @param workstationId
+     * @return
+     */
+    List<WorkstationCollectData> queryLastParameter(long workstationId);
+
+    /**
+     * 鑾峰彇宸ヤ綅鐨勬墍鏈夋暟鎹偣鍙傛暟(鍏佽杩囩▼鍙傛暟灞曠ず鐨�)
+     * @param workstationId 宸ヤ綅id
+     * @return
+     */
+	List<DatapointDTO> processParams(String workstationId);
+    
+   
 }

--
Gitblit v1.9.3