diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessInfo.java index 2eb69466..905ff0d9 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessInfo.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessInfo.java @@ -56,6 +56,17 @@ public class MesBaseProcessInfo extends BaseEntity { */ private List mesBaseProcessProdlineList; + /** 工序关联人员信息 */ + private List mesBaseProcessUserList; + + public List getMesBaseProcessUserList() { + return mesBaseProcessUserList; + } + + public void setMesBaseProcessUserList(List mesBaseProcessUserList) { + this.mesBaseProcessUserList = mesBaseProcessUserList; + } + public void setProcessId(Long processId) { this.processId = processId; } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessUser.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessUser.java new file mode 100644 index 00000000..83a9b4c3 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessUser.java @@ -0,0 +1,66 @@ +package com.hw.mes.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 工序关联人员对象 mes_base_process_user + * + * @author Yinq + * @date 2024-01-29 + */ +public class MesBaseProcessUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 工序ID,关联工序主键 */ + private Long processId; + + /** 用户ID,关联用户主键 */ + private Long userId; + + /** 用户名称,关联sys_user的user_name */ + @Excel(name = "用户名称") + private String userName; + + public void setProcessId(Long processId) + { + this.processId = processId; + } + + public Long getProcessId() + { + return processId; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("processId", getProcessId()) + .append("userId", getUserId()) + .append("userName", getUserName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProcessInfoMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProcessInfoMapper.java index 9651dbfd..4d419ac4 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProcessInfoMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProcessInfoMapper.java @@ -3,6 +3,7 @@ package com.hw.mes.mapper; import java.util.List; import com.hw.mes.domain.MesBaseProcessInfo; import com.hw.mes.domain.MesBaseProcessProdline; +import com.hw.mes.domain.MesBaseProcessUser; /** * 工序信息Mapper接口 @@ -20,6 +21,13 @@ public interface MesBaseProcessInfoMapper */ public MesBaseProcessInfo selectMesBaseProcessInfoByProcessId(Long processId); + /** + * 获取工序用户信息详细信息 + * @param processId 工序信息主键 + * @return 工序信息 + */ + public MesBaseProcessInfo selectMesBaseProcessInfoUserByProcessId(Long processId); + /** * 查询工序信息列表 * @@ -84,4 +92,29 @@ public interface MesBaseProcessInfoMapper * @return 结果 */ public int deleteMesBaseProcessProdlineByProcessId(Long processId); + + /** + * 批量删除工序关联人员 + * + * @param processIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseProcessUserByProcessIds(Long[] processIds); + + /** + * 批量新增工序关联人员 + * + * @param mesBaseProcessUserList 工序关联人员列表 + * @return 结果 + */ + public int batchMesBaseProcessUser(List mesBaseProcessUserList); + + + /** + * 通过工序信息主键删除工序关联人员信息 + * + * @param processId 工序信息ID + * @return 结果 + */ + public int deleteMesBaseProcessUserByProcessId(Long processId); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProcessInfoService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProcessInfoService.java index 99516536..99e40d91 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProcessInfoService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProcessInfoService.java @@ -19,6 +19,13 @@ public interface IMesBaseProcessInfoService */ public MesBaseProcessInfo selectMesBaseProcessInfoByProcessId(Long processId); + /** + * 获取工序用户信息详细信息 + * @param processId + * @return + */ + public MesBaseProcessInfo selectMesBaseProcessInfoUserByProcessId(Long processId); + /** * 查询工序信息列表 * @@ -43,6 +50,14 @@ public interface IMesBaseProcessInfoService */ public int updateMesBaseProcessInfo(MesBaseProcessInfo mesBaseProcessInfo); + /** + * 修改工序关联人员信息 + * + * @param mesBaseProcessInfo 工序信息 + * @return 结果 + */ + public int updateMesBaseProcessInfoUser(MesBaseProcessInfo mesBaseProcessInfo); + /** * 批量删除工序信息 * diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProcessInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProcessInfoServiceImpl.java index 1f805707..e22cfd47 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProcessInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProcessInfoServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; import com.hw.common.security.utils.SecurityUtils; +import com.hw.mes.domain.MesBaseProcessUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -39,6 +40,18 @@ public class MesBaseProcessInfoServiceImpl implements IMesBaseProcessInfoService return mesBaseProcessInfoMapper.selectMesBaseProcessInfoByProcessId(processId); } + /** + * 获取工序用户信息详细信息 + * + * @param processId 工序信息主键 + * @return 工序信息 + */ + @Override + public MesBaseProcessInfo selectMesBaseProcessInfoUserByProcessId(Long processId) + { + return mesBaseProcessInfoMapper.selectMesBaseProcessInfoUserByProcessId(processId); + } + /** * 查询工序信息列表 * @@ -87,6 +100,26 @@ public class MesBaseProcessInfoServiceImpl implements IMesBaseProcessInfoService return mesBaseProcessInfoMapper.updateMesBaseProcessInfo(mesBaseProcessInfo); } + /** + * 修改工序关联人员信息 + * + * @param mesBaseProcessInfo 工序信息 + * @return 结果 + */ + @Transactional + @Override + public int updateMesBaseProcessInfoUser(MesBaseProcessInfo mesBaseProcessInfo) + { + mesBaseProcessInfo.setUpdateTime(DateUtils.getNowDate()); + mesBaseProcessInfoMapper.deleteMesBaseProcessUserByProcessId(mesBaseProcessInfo.getProcessId()); + try { + insertMesBaseProcessUser(mesBaseProcessInfo); + } catch (Exception e) { + throw new ServiceException("该工序已关联此用户!"); + } + return mesBaseProcessInfoMapper.updateMesBaseProcessInfo(mesBaseProcessInfo); + } + /** * 批量删除工序信息 * @@ -140,4 +173,28 @@ public class MesBaseProcessInfoServiceImpl implements IMesBaseProcessInfoService } } } + + /** + * 新增工序关联人员信息 + * + * @param mesBaseProcessInfo 工序信息对象 + */ + public void insertMesBaseProcessUser(MesBaseProcessInfo mesBaseProcessInfo) + { + List mesBaseProcessUserList = mesBaseProcessInfo.getMesBaseProcessUserList(); + Long processId = mesBaseProcessInfo.getProcessId(); + if (StringUtils.isNotNull(mesBaseProcessUserList)) + { + List list = new ArrayList<>(); + for (MesBaseProcessUser mesBaseProcessUser : mesBaseProcessUserList) + { + mesBaseProcessUser.setProcessId(processId); + list.add(mesBaseProcessUser); + } + if (list.size() > 0) + { + mesBaseProcessInfoMapper.batchMesBaseProcessUser(list); + } + } + } } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProcessInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProcessInfoMapper.xml index b7261651..f8ad1946 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProcessInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProcessInfoMapper.xml @@ -31,6 +31,20 @@ + + + + + + + + + + + + select process_id, process_code, @@ -82,6 +96,29 @@ where a.process_id = #{processId} + + insert into mes_base_process_info @@ -160,4 +197,23 @@ ( #{item.processId}, #{item.prodlineId}, #{item.createBy}, #{item.createTime}) + + + delete from mes_base_process_user where process_id in + + #{processId} + + + + + delete from mes_base_process_user where process_id = #{processId} + + + + insert into mes_base_process_user( process_id, user_id, user_name, create_by, create_time) values + + ( #{item.processId}, #{item.userId}, #{item.userName}, #{item.createBy}, #{item.createTime}) + + + \ No newline at end of file diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysUserController.java b/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysUserController.java index 23c0368e..b319fb1f 100644 --- a/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysUserController.java +++ b/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysUserController.java @@ -1,6 +1,8 @@ package com.hw.system.controller; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -78,6 +80,24 @@ public class SysUserController extends BaseController return getDataTable(list); } + /** + * 获取用户下拉框列表 + */ + @GetMapping("/userList") + public AjaxResult userList(SysUser user) + { + List list = userService.selectUserList(user); + List> userList = new ArrayList<>(); + list.forEach(e -> { + HashMap map = new HashMap<>(); + map.put("userId",e.getUserId()); + map.put("userName",e.getUserName()); + map.put("nickName",e.getNickName()); + userList.add(map); + }); + return success(userList); + } + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") @PostMapping("/export") diff --git a/hw-ui/src/api/mes/processInfo.js b/hw-ui/src/api/mes/processInfo.js index 81ad07f7..2a587d4e 100644 --- a/hw-ui/src/api/mes/processInfo.js +++ b/hw-ui/src/api/mes/processInfo.js @@ -26,6 +26,14 @@ export function getProcessInfo(processId) { }) } +// 查询工序管理用户信息详细 +export function getProcessInfoUser(processId) { + return request({ + url: '/mes/processInfo/user/' + processId, + method: 'get' + }) +} + // 新增工序信息 export function addProcessInfo(data) { return request({ @@ -44,6 +52,15 @@ export function updateProcessInfo(data) { }) } +// 修改工序关联人员信息 +export function updateProcessInfoUser(data) { + return request({ + url: '/mes/processInfo/user', + method: 'put', + data: data + }) +} + // 删除工序信息 export function delProcessInfo(processId) { return request({ diff --git a/hw-ui/src/api/system/user.js b/hw-ui/src/api/system/user.js index f2f76ef9..222502a0 100644 --- a/hw-ui/src/api/system/user.js +++ b/hw-ui/src/api/system/user.js @@ -10,6 +10,15 @@ export function listUser(query) { }) } +// 查询用户下拉框列表 +export function findUserList(query) { + return request({ + url: '/system/user/userList', + method: 'get', + params: query + }) +} + // 查询用户详细 export function getUser(userId) { return request({ diff --git a/hw-ui/src/views/mes/processInfo/index.vue b/hw-ui/src/views/mes/processInfo/index.vue index bafc95ea..9759a075 100644 --- a/hw-ui/src/views/mes/processInfo/index.vue +++ b/hw-ui/src/views/mes/processInfo/index.vue @@ -115,7 +115,14 @@ icon="el-icon-circle-plus" @click="handleProdLineUpdate(scope.row)" >关联产线 + 关联人员 + @@ -227,13 +234,67 @@ 取 消 + + + + + + + + + + + + + + + + 工序关联人员信息 + + + 添加人员 + + + 删除 + + + + + + + + + + + +