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/common/constant/CommonGroupConstant.java | 3 +++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java | 5 +++++
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java | 3 +++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonGroupConstant.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonGroupConstant.java
index f2b49e7..91803cf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonGroupConstant.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonGroupConstant.java
@@ -20,6 +20,9 @@
public static final Long ALL_WORKSTATION_ID = 1L;
public static final Long DEFAULT_WORKSTATION_ID = 101L;
public static final Long DEFAULT_ALL_GROUP_ID = 1L;
+ /**
+ * 榛樿缁刬d
+ */
public static final Long DEFAULT_GROUP_ID = 101L;
public static final Integer WORK_STATION_TAG = 2;
}
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 af151f5..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
@@ -72,6 +72,11 @@
WorkstationVO getDetail(Long workstationId);
+ /**
+ * 鍒犻櫎宸ヤ綅缁�
+ * @param groupId 缁刬d
+ * @return 鏄惁鍒犻櫎鎴愬姛
+ */
Boolean deleteGroup(Long groupId);
BladeFile importWorkstation(List<WorkstationImport> data);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
index 982bd70..1519765 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java
@@ -532,6 +532,9 @@
@Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteGroup(Long groupId) {
+ commonGroupOfItemService.lambdaUpdate().set(CommonGroupOfItem::getGroupId,CommonGroupConstant.DEFAULT_GROUP_ID)
+ .eq(CommonGroupOfItem::getGroupId, groupId).update();
+
if (this.commonGroupOfItemService.count(Lambda.eq(CommonGroupOfItem::getGroupId, groupId)) > 0) {
throw new ServiceException(MessageUtils.message("cps.common.group.production.line.delete.fail", new Object[0]));
}
--
Gitblit v1.9.3