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/smis/service/IWorkstationService.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
index b842031..4374dd9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
@@ -46,6 +46,15 @@
Boolean delete(List<Long> workstationIds, Integer type);
+ /**
+ * 宸ヤ綅鍒嗛〉鏌ヨ
+ * @param workstationVOIPage 鍒嗛〉淇℃伅
+ * @param keyWord 鍏抽敭瀛�
+ * @param groupId 鍒嗙粍id
+ * @param status 鐘舵��
+ * @param type 绫诲瀷
+ * @return 鍒嗛〉鏁版嵁
+ */
IPage<WorkstationVO> listPage(IPage<WorkstationVO> workstationVOIPage, String keyWord, Long groupId, Integer status, Integer type);
List<WorkstationVO> getWorkstationByGroupIds(final List<String> groupIds);
@@ -63,6 +72,11 @@
WorkstationVO getDetail(Long workstationId);
+ /**
+ * 鍒犻櫎宸ヤ綅缁�
+ * @param groupId 缁刬d
+ * @return 鏄惁鍒犻櫎鎴愬姛
+ */
Boolean deleteGroup(Long groupId);
BladeFile importWorkstation(List<WorkstationImport> data);
@@ -77,13 +91,13 @@
*/
IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query);
- List<RealTimeStatusVO> getRealTimeProperties(Long workstationId, Long machineId);
+ //List<RealTimeStatusVO> getRealTimeProperties(Long workstationId, Long machineId);
IPage<Workstation> listWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Query query, Integer shift, Integer type);
List<Workstation> listWorkStationOnShift(List<Long> ids, LocalDate localDate, List<Integer> shifts, Integer type);
- List<DmpVariablesVO> getDmpVariables(String workstationId, String machineId);
+ //List<DmpVariablesVO> getDmpVariables(String workstationId, String machineId);
Integer countWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Integer shift, Integer type);
--
Gitblit v1.9.3