xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 工序关联人员

Browse Source
master
yinq 1 year ago
parent f6154c5816
commit c96c320387
10 changed files with 415 additions and 4 deletions
Show Stats Download Patch File Download Diff File

11
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessInfo.java
Unescape Escape View File

@ -56,6 +56,17 @@ public class MesBaseProcessInfo extends BaseEntity {
*/
private List<MesBaseProcessProdline> mesBaseProcessProdlineList;
/** 工序关联人员信息 */
private List<MesBaseProcessUser> mesBaseProcessUserList;
public List<MesBaseProcessUser> getMesBaseProcessUserList() {
return mesBaseProcessUserList;
}
public void setMesBaseProcessUserList(List<MesBaseProcessUser> mesBaseProcessUserList) {
this.mesBaseProcessUserList = mesBaseProcessUserList;
}
public void setProcessId(Long processId) {
this.processId = processId;
}

66
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBaseProcessUser.java
Unescape Escape View File

@ -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();
}
}

33
hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesBaseProcessInfoMapper.java
Unescape Escape View File

@ -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<MesBaseProcessUser> mesBaseProcessUserList);
/**
* 通过工序信息主键删除工序关联人员信息
*
* @param processId 工序信息ID
* @return 结果
*/
public int deleteMesBaseProcessUserByProcessId(Long processId);
}

15
hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesBaseProcessInfoService.java
Unescape Escape View File

@ -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);
/**
* 批量删除工序信息
*

57
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseProcessInfoServiceImpl.java
Unescape Escape View File

@ -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<MesBaseProcessUser> mesBaseProcessUserList = mesBaseProcessInfo.getMesBaseProcessUserList();
Long processId = mesBaseProcessInfo.getProcessId();
if (StringUtils.isNotNull(mesBaseProcessUserList))
{
List<MesBaseProcessUser> list = new ArrayList<>();
for (MesBaseProcessUser mesBaseProcessUser : mesBaseProcessUserList)
{
mesBaseProcessUser.setProcessId(processId);
list.add(mesBaseProcessUser);
}
if (list.size() > 0)
{
mesBaseProcessInfoMapper.batchMesBaseProcessUser(list);
}
}
}
}

56
hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseProcessInfoMapper.xml
Unescape Escape View File

@ -31,6 +31,20 @@
<result property="createTime" column="sub_create_time"/>
</resultMap>
<resultMap id="MesBaseProcessInfoMesBaseProcessUserResult" type="MesBaseProcessInfo"
extends="MesBaseProcessInfoResult">
<collection property="mesBaseProcessUserList" notNullColumn="sub_process_id" javaType="java.util.List"
resultMap="MesBaseProcessUserResult"/>
</resultMap>
<resultMap type="MesBaseProcessUser" id="MesBaseProcessUserResult">
<result property="processId" column="sub_process_id"/>
<result property="userId" column="sub_user_id"/>
<result property="userName" column="sub_user_name"/>
<result property="createBy" column="sub_create_by"/>
<result property="createTime" column="sub_create_time"/>
</resultMap>
<sql id="selectMesBaseProcessInfoVo">
select process_id,
process_code,
@ -82,6 +96,29 @@
where a.process_id = #{processId}
</select>
<select id="selectMesBaseProcessInfoUserByProcessId" parameterType="Long"
resultMap="MesBaseProcessInfoMesBaseProcessUserResult">
select a.process_id,
a.process_code,
a.process_name,
a.process_type,
a.production_time,
a.active_flag,
a.remark,
a.create_by,
a.create_time,
a.update_by,
a.update_time,
b.process_id as sub_process_id,
b.user_id as sub_user_id,
b.user_name as sub_user_name,
b.create_by as sub_create_by,
b.create_time as sub_create_time
from mes_base_process_info a
left join mes_base_process_user b on b.process_id = a.process_id
where a.process_id = #{processId}
</select>
<insert id="insertMesBaseProcessInfo" parameterType="MesBaseProcessInfo" useGeneratedKeys="true"
keyProperty="processId">
insert into mes_base_process_info
@ -160,4 +197,23 @@
( #{item.processId}, #{item.prodlineId}, #{item.createBy}, #{item.createTime})
</foreach>
</insert>
<delete id="deleteMesBaseProcessUserByProcessIds" parameterType="String">
delete from mes_base_process_user where process_id in
<foreach item="processId" collection="array" open="(" separator="," close=")">
#{processId}
</foreach>
</delete>
<delete id="deleteMesBaseProcessUserByProcessId" parameterType="Long">
delete from mes_base_process_user where process_id = #{processId}
</delete>
<insert id="batchMesBaseProcessUser">
insert into mes_base_process_user( process_id, user_id, user_name, create_by, create_time) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.processId}, #{item.userId}, #{item.userName}, #{item.createBy}, #{item.createTime})
</foreach>
</insert>
</mapper>

20
hw-modules/hw-system/src/main/java/com/hw/system/controller/SysUserController.java
Unescape Escape View File

@ -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<SysUser> list = userService.selectUserList(user);
List<HashMap<String, Object>> userList = new ArrayList<>();
list.forEach(e -> {
HashMap<String, Object> 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")

17
hw-ui/src/api/mes/processInfo.js
Unescape Escape View File

@ -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({

9
hw-ui/src/api/system/user.js
Unescape Escape View File

@ -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({

135
hw-ui/src/views/mes/processInfo/index.vue
Unescape Escape View File

@ -115,7 +115,14 @@
icon="el-icon-circle-plus"
@click="handleProdLineUpdate(scope.row)"
>关联产线</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-s-check"
@click="handleUserUpdate(scope.row)"
>关联人员</el-button>
</template>
</el-table-column>
</el-table>
@ -227,13 +234,67 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="userOpen" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-form-item label="工序编号" prop="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序编号" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="1.5">
<el-form-item label="工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序名称" :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="center">工序关联人员信息</el-divider>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddMesBaseProcessUser">添加人员</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteMesBaseProcessUser">删除</el-button>
</el-col>
</el-row>
<el-table :data="mesBaseProcessUserList" :row-class-name="rowMesBaseProcessUserIndex" @selection-change="handleMesBaseProcessUserSelectionChange" ref="mesBaseProcessUser">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" />
<el-table-column label="关联人员" align="center" prop="prodlineId" >
<template slot-scope="scope">
<el-select v-model="scope.row.userId" filterable placeholder="请选择关联人员" clearable>
<el-option
v-for="item in userList"
:key="item.userId"
:label="item.nickName"
:value="item.userId"
:disabled="isUserDisabled(item.userId)"
></el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitUserForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listProcessInfo, getProcessInfo, delProcessInfo, addProcessInfo, updateProcessInfo } from "@/api/mes/processInfo";
import {findFactoryList} from "@//api/mes/baseFactoryInfo";
import {
listProcessInfo,
getProcessInfo,
delProcessInfo,
addProcessInfo,
updateProcessInfo,
getProcessInfoUser, updateProcessInfoUser
} from "@/api/mes/processInfo";
import {findProdLineList} from "@//api/mes/baseProdlineInfo";
import {findUserList} from "@//api/system/user";
export default {
name: "ProcessInfo",
@ -246,6 +307,8 @@ export default {
ids: [],
// 子表选中数据
checkedMesBaseProcessProdline: [],
// 子表选中数据
checkedMesBaseProcessUser: [],
// 非单个禁用
single: true,
// 非多个禁用
@ -258,11 +321,14 @@ export default {
processInfoList: [],
// 工序关联产线表格数据
mesBaseProcessProdlineList: [],
// 工序关联人员表格数据
mesBaseProcessUserList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
prodLineOpen: false,
userOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
@ -302,7 +368,9 @@ export default {
{ key: 10, label: `更新时间`, visible: true },
],
//产线选项
prodLineList: []
prodLineList: [],
//人员选项
userList: []
};
},
created() {
@ -315,6 +383,9 @@ export default {
findProdLineList(null).then(response => {
this.prodLineList = response.data
})
findUserList(null).then(response => {
this.userList = response.data
})
listProcessInfo(this.queryParams).then(response => {
this.processInfoList = response.rows;
this.total = response.total;
@ -325,6 +396,7 @@ export default {
cancel() {
this.open = false;
this.prodLineOpen = false;
this.userOpen = false;
this.reset();
},
// 表单重置
@ -359,6 +431,10 @@ export default {
// 返回 true 表示禁用，false 表示可用
return this.mesBaseProcessProdlineList.some(item => item.prodlineId === prodlineId);
},
isUserDisabled(userId) {
// 返回 true 表示禁用，false 表示可用
return this.mesBaseProcessUserList.some(item => item.userId === userId);
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.processId)
@ -392,6 +468,16 @@ export default {
this.title = "关联产线";
});
},
handleUserUpdate(row) {
this.reset();
const processId = row.processId || this.ids
getProcessInfoUser(processId).then(response => {
this.form = response.data;
this.mesBaseProcessUserList = response.data.mesBaseProcessUserList;
this.userOpen = true;
this.title = "关联人员";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
@ -414,6 +500,21 @@ export default {
}
});
},
/** 用户提交按钮 */
submitUserForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.mesBaseProcessUserList = this.mesBaseProcessUserList;
if (this.form.processId != null) {
updateProcessInfoUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.userOpen = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const processIds = row.processId || this.ids;
@ -424,10 +525,14 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 工序关联产线序号 */
/** 工序关联产线序号 */
rowMesBaseProcessProdlineIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
/** 工序关联产线序号 */
rowMesBaseProcessUserIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
/** 工序关联产线添加按钮操作 */
handleAddMesBaseProcessProdline() {
let obj = {};
@ -450,6 +555,28 @@ export default {
handleMesBaseProcessProdlineSelectionChange(selection) {
this.checkedMesBaseProcessProdline = selection.map(item => item.index)
},
/** 工序关联人员添加按钮操作 */
handleAddMesBaseProcessUser() {
let obj = {};
obj.userName = "";
this.mesBaseProcessUserList.push(obj);
},
/** 工序关联人员删除按钮操作 */
handleDeleteMesBaseProcessUser() {
if (this.checkedMesBaseProcessUser.length == 0) {
this.$modal.msgError("请先选择要删除的工序关联人员数据");
} else {
const mesBaseProcessUserList = this.mesBaseProcessUserList;
const checkedMesBaseProcessUser = this.checkedMesBaseProcessUser;
this.mesBaseProcessUserList = mesBaseProcessUserList.filter(function(item) {
return checkedMesBaseProcessUser.indexOf(item.index) == -1
});
}
},
/** 复选框选中数据 */
handleMesBaseProcessUserSelectionChange(selection) {
this.checkedMesBaseProcessUser = selection.map(item => item.index)
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/processInfo/export', {

Write Preview
Loading…
Cancel
Save