yangys
2025-11-21 e8ed1a91c77ab62a924f12acd55777f227bacd7e
工位组删除后,其下工位移动到默认组
已修改3个文件
11 ■■■■■ 文件已修改
smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonGroupConstant.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    /**
     * 默认组id
     */
    public static final Long DEFAULT_GROUP_ID = 101L;
    public static final Integer WORK_STATION_TAG = 2;
}
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/IWorkstationService.java
@@ -72,6 +72,11 @@
    WorkstationVO getDetail(Long workstationId);
    /**
     * 删除工位组
     * @param groupId 组id
     * @return 是否删除成功
     */
    Boolean deleteGroup(Long groupId);
    BladeFile importWorkstation(List<WorkstationImport> data);
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]));
        }