From 4f0cb9ec2884d79510f225802fb2ec420c40d24c Mon Sep 17 00:00:00 2001 From: zxy Date: Fri, 8 May 2026 17:05:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(supplier):=20=E4=BC=98=E5=8C=96=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=88=97=E8=A1=A8=E8=A1=A8=E6=A0=BC=E5=88=97?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=B9=B6=E5=AE=8C=E5=96=84=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/usermachine/UserMachineMapper.java | 13 ++++++++----- .../usermachine/UserMachineServiceImpl.java | 14 +++++++++++++- .../src/views/biz/supplier/index.vue | 6 +++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/usermachine/UserMachineMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/usermachine/UserMachineMapper.java index ce0b9a8..ded3433 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/usermachine/UserMachineMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/usermachine/UserMachineMapper.java @@ -1,13 +1,12 @@ package com.ningxia.yunxi.chemmes.module.biz.dal.mysql.usermachine; -import java.util.*; - +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; -import com.ningxia.yunxi.chemmes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.ningxia.yunxi.chemmes.framework.mybatis.core.mapper.BaseMapperX; +import com.ningxia.yunxi.chemmes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.ningxia.yunxi.chemmes.module.biz.controller.admin.usermachine.vo.UserMachinePageReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.usermachine.UserMachineDO; import org.apache.ibatis.annotations.Mapper; -import com.ningxia.yunxi.chemmes.module.biz.controller.admin.usermachine.vo.*; /** * 人员所属机台、班组配置 Mapper @@ -25,4 +24,8 @@ public interface UserMachineMapper extends BaseMapperX { .orderByDesc(UserMachineDO::getId)); } -} \ No newline at end of file + default UserMachineDO selectByUserId(String userId) { + return selectOne(new LambdaQueryWrapper() + .eq(UserMachineDO::getUserId, userId)); + } +} diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineServiceImpl.java index 6b2d016..c68e7c7 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineServiceImpl.java @@ -15,6 +15,8 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; +import static com.ningxia.yunxi.chemmes.framework.common.exception.util.ServiceExceptionUtil.exception; + /** * 人员所属机台、班组配置 Service 实现类 * @@ -33,6 +35,7 @@ public class UserMachineServiceImpl implements UserMachineService { @Override @Transactional(rollbackFor = Exception.class) public Integer createUserMachine(UserMachineSaveReqVO createReqVO) { + validateUserMachineUnique(createReqVO); UserMachineDO userMachine = BeanUtils.toBean(createReqVO, UserMachineDO.class); userMachineMapper.insert(userMachine); @@ -45,6 +48,7 @@ public class UserMachineServiceImpl implements UserMachineService { @Transactional(rollbackFor = Exception.class) public void updateUserMachine(UserMachineSaveReqVO updateReqVO) { validateUserMachineExists(updateReqVO.getId()); + validateUserMachineUnique(updateReqVO); UserMachineDO updateObj = BeanUtils.toBean(updateReqVO, UserMachineDO.class); userMachineMapper.updateById(updateObj); @@ -68,10 +72,18 @@ public class UserMachineServiceImpl implements UserMachineService { private void validateUserMachineExists(Integer id) { if (userMachineMapper.selectById(id) == null) { -// throw exception(USER_MACHINE_NOT_EXISTS); + throw exception("人员所属机台、班组配置不存在"); } } + private void validateUserMachineUnique(UserMachineSaveReqVO saveReqVO) { + UserMachineDO existUserMachine = userMachineMapper.selectByUserId(saveReqVO.getUserId()); + if (existUserMachine != null && !existUserMachine.getId().equals(saveReqVO.getId())) { + throw exception("该人员已配置，请确认！"); + } + } + + @Override public UserMachineDO getUserMachine(Integer id) { return userMachineMapper.selectById(id); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/index.vue index c35e022..199cdd8 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/index.vue @@ -106,17 +106,17 @@ - + - + - +