3.5.3
车间生产： 各工序增加物料到货情况和申请物料情况信息的显示 仓储： 成品出库记录完善，合并的物料可以查看明细 退库记录查看详情完善 退库审核完善 系统： 登录时增加nickname的保存，后续在保存createby时需要修改成保存nicknamemaster
parent
5e64b1ff12
commit
af1cdacce6
@ -0,0 +1,61 @@
|
||||
package com.hw.mes.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.mes.domain.MesStockAlarmDetail;
|
||||
|
||||
/**
|
||||
* 库存告警信息明细Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-11-21
|
||||
*/
|
||||
public interface MesStockAlarmDetailMapper
|
||||
{
|
||||
/**
|
||||
* 查询库存告警信息明细
|
||||
*
|
||||
* @param stockAlarmDetailId 库存告警信息明细主键
|
||||
* @return 库存告警信息明细
|
||||
*/
|
||||
public MesStockAlarmDetail selectMesStockAlarmDetailByStockAlarmDetailId(Long stockAlarmDetailId);
|
||||
|
||||
/**
|
||||
* 查询库存告警信息明细列表
|
||||
*
|
||||
* @param mesStockAlarmDetail 库存告警信息明细
|
||||
* @return 库存告警信息明细集合
|
||||
*/
|
||||
public List<MesStockAlarmDetail> selectMesStockAlarmDetailList(MesStockAlarmDetail mesStockAlarmDetail);
|
||||
|
||||
/**
|
||||
* 新增库存告警信息明细
|
||||
*
|
||||
* @param mesStockAlarmDetail 库存告警信息明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesStockAlarmDetail(MesStockAlarmDetail mesStockAlarmDetail);
|
||||
|
||||
/**
|
||||
* 修改库存告警信息明细
|
||||
*
|
||||
* @param mesStockAlarmDetail 库存告警信息明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesStockAlarmDetail(MesStockAlarmDetail mesStockAlarmDetail);
|
||||
|
||||
/**
|
||||
* 删除库存告警信息明细
|
||||
*
|
||||
* @param stockAlarmDetailId 库存告警信息明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesStockAlarmDetailByStockAlarmDetailId(Long stockAlarmDetailId);
|
||||
|
||||
/**
|
||||
* 批量删除库存告警信息明细
|
||||
*
|
||||
* @param stockAlarmDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesStockAlarmDetailByStockAlarmDetailIds(Long[] stockAlarmDetailIds);
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.hw.mes.mapper.MesStockAlarmDetailMapper">
|
||||
|
||||
<resultMap type="MesStockAlarmDetail" id="MesStockAlarmDetailResult">
|
||||
<result property="stockAlarmDetailId" column="stock_alarm_detail_id" />
|
||||
<result property="alarmInfoId" column="alarm_info_id" />
|
||||
<result property="materialId" column="material_id" />
|
||||
<result property="materialCode" column="material_code" />
|
||||
<result property="materialName" column="material_name" />
|
||||
<result property="materialSpec" column="material_spec" />
|
||||
<result property="safeStockAmount" column="safe_stock_amount" />
|
||||
<result property="stockAmount" column="stock_amount" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createDate" column="create_date" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateDate" column="update_date" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesStockAlarmDetailVo">
|
||||
select stock_alarm_detail_id, alarm_info_id, material_id, material_code, material_name, material_spec, safe_stock_amount, stock_amount, create_by, create_date, update_by, update_date from mes_stock_alarm_detail
|
||||
</sql>
|
||||
|
||||
<select id="selectMesStockAlarmDetailList" parameterType="MesStockAlarmDetail" resultMap="MesStockAlarmDetailResult">
|
||||
<include refid="selectMesStockAlarmDetailVo"/>
|
||||
<where>
|
||||
<if test="alarmInfoId != null "> and alarm_info_id = #{alarmInfoId}</if>
|
||||
<if test="materialId != null "> and material_id = #{materialId}</if>
|
||||
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
|
||||
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
|
||||
<if test="materialSpec != null and materialSpec != ''"> and material_spec = #{materialSpec}</if>
|
||||
<if test="safeStockAmount != null "> and safe_stock_amount = #{safeStockAmount}</if>
|
||||
<if test="stockAmount != null "> and stock_amount = #{stockAmount}</if>
|
||||
<if test="createDate != null "> and create_date = #{createDate}</if>
|
||||
<if test="updateDate != null "> and update_date = #{updateDate}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesStockAlarmDetailByStockAlarmDetailId" parameterType="Long" resultMap="MesStockAlarmDetailResult">
|
||||
<include refid="selectMesStockAlarmDetailVo"/>
|
||||
where stock_alarm_detail_id = #{stockAlarmDetailId}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesStockAlarmDetail" parameterType="MesStockAlarmDetail" useGeneratedKeys="true" keyProperty="stockAlarmDetailId">
|
||||
insert into mes_stock_alarm_detail
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="alarmInfoId != null">alarm_info_id,</if>
|
||||
<if test="materialId != null">material_id,</if>
|
||||
<if test="materialCode != null">material_code,</if>
|
||||
<if test="materialName != null">material_name,</if>
|
||||
<if test="materialSpec != null">material_spec,</if>
|
||||
<if test="safeStockAmount != null">safe_stock_amount,</if>
|
||||
<if test="stockAmount != null">stock_amount,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createDate != null">create_date,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateDate != null">update_date,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="alarmInfoId != null">#{alarmInfoId},</if>
|
||||
<if test="materialId != null">#{materialId},</if>
|
||||
<if test="materialCode != null">#{materialCode},</if>
|
||||
<if test="materialName != null">#{materialName},</if>
|
||||
<if test="materialSpec != null">#{materialSpec},</if>
|
||||
<if test="safeStockAmount != null">#{safeStockAmount},</if>
|
||||
<if test="stockAmount != null">#{stockAmount},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createDate != null">#{createDate},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateDate != null">#{updateDate},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesStockAlarmDetail" parameterType="MesStockAlarmDetail">
|
||||
update mes_stock_alarm_detail
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="alarmInfoId != null">alarm_info_id = #{alarmInfoId},</if>
|
||||
<if test="materialId != null">material_id = #{materialId},</if>
|
||||
<if test="materialCode != null">material_code = #{materialCode},</if>
|
||||
<if test="materialName != null">material_name = #{materialName},</if>
|
||||
<if test="materialSpec != null">material_spec = #{materialSpec},</if>
|
||||
<if test="safeStockAmount != null">safe_stock_amount = #{safeStockAmount},</if>
|
||||
<if test="stockAmount != null">stock_amount = #{stockAmount},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createDate != null">create_date = #{createDate},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateDate != null">update_date = #{updateDate},</if>
|
||||
</trim>
|
||||
where stock_alarm_detail_id = #{stockAlarmDetailId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesStockAlarmDetailByStockAlarmDetailId" parameterType="Long">
|
||||
delete from mes_stock_alarm_detail where stock_alarm_detail_id = #{stockAlarmDetailId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesStockAlarmDetailByStockAlarmDetailIds" parameterType="String">
|
||||
delete from mes_stock_alarm_detail where stock_alarm_detail_id in
|
||||
<foreach item="stockAlarmDetailId" collection="array" open="(" separator="," close=")">
|
||||
#{stockAlarmDetailId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,54 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询生产告警信息列表
|
||||
export function listAlarmInfo(query) {
|
||||
return request({
|
||||
url: '/mes/alarmInfo/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询生产告警信息详细
|
||||
export function getAlarmInfo(alarmInfoId) {
|
||||
return request({
|
||||
url: '/mes/alarmInfo/' + alarmInfoId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增生产告警信息
|
||||
export function addAlarmInfo(data) {
|
||||
return request({
|
||||
url: '/mes/alarmInfo',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改生产告警信息
|
||||
export function updateAlarmInfo(data) {
|
||||
return request({
|
||||
url: '/mes/alarmInfo',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除生产告警信息
|
||||
export function delAlarmInfo(alarmInfoId) {
|
||||
return request({
|
||||
url: '/mes/alarmInfo/' + alarmInfoId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 查询生产告警信息列表
|
||||
export function listStockAlarmDetail(query) {
|
||||
return request({
|
||||
url: '/mes/alarmInfo/listStockAlarmDetail',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
@ -0,0 +1,272 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
|
||||
<!-- <el-form-item label="创建时间" prop="createDate">-->
|
||||
<!-- <el-date-picker clearable-->
|
||||
<!-- v-model="queryParams.createDate"-->
|
||||
<!-- type="date"-->
|
||||
<!-- value-format="yyyy-MM-dd"-->
|
||||
<!-- placeholder="请选择创建时间">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="最后更新时间" prop="updateDate">-->
|
||||
<!-- <el-date-picker clearable-->
|
||||
<!-- v-model="queryParams.updateDate"-->
|
||||
<!-- type="date"-->
|
||||
<!-- value-format="yyyy-MM-dd"-->
|
||||
<!-- placeholder="请选择最后更新时间">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
|
||||
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-form>-->
|
||||
|
||||
<!-- <el-row :gutter="10" class="mb8">-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-plus"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleAdd"-->
|
||||
<!-- v-hasPermi="['mes:alarmInfo:add']"-->
|
||||
<!-- >新增</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="success"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-edit"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="single"-->
|
||||
<!-- @click="handleUpdate"-->
|
||||
<!-- v-hasPermi="['mes:alarmInfo:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="danger"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="multiple"-->
|
||||
<!-- @click="handleDelete"-->
|
||||
<!-- v-hasPermi="['mes:alarmInfo:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="warning"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-download"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleExport"-->
|
||||
<!-- v-hasPermi="['mes:alarmInfo:export']"-->
|
||||
<!-- >导出</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
|
||||
<!-- </el-row>-->
|
||||
|
||||
<el-table v-loading="loading" :data="alarmInfoList" @selection-change="handleSelectionChange">
|
||||
<el-table-column label="报警类型" align="center" prop="alarmInfoType" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.mes_alarm_info_type" :value="scope.row.alarmInfoType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="处理状态(0未处理 1已处理)" align="center" prop="handleStatus" />-->
|
||||
<el-table-column label="报警时间" align="center" prop="createDate" width="180">
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleDetail(scope.row)"
|
||||
v-hasPermi="['mes:alarmInfo:query']"
|
||||
>报警明细</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改生产告警信息对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="报警时间" prop="createDate">
|
||||
{{form.createDate}}
|
||||
</el-form-item>
|
||||
<el-divider content-position="center">库存告警明细信息</el-divider>
|
||||
<el-table :data="mesStockAlarmDetailList" ref="mesStockAlarmDetail">
|
||||
<!-- <el-table-column label="序号" align="center" type="index" width="50"/>-->
|
||||
<el-table-column label="物料编码" prop="materialCode" width="150">
|
||||
</el-table-column>
|
||||
<el-table-column label="物料名称" prop="materialName" width="150">
|
||||
</el-table-column>
|
||||
<el-table-column label="物料规格" prop="materialSpec" width="150">
|
||||
</el-table-column>
|
||||
<el-table-column label="安全库存数量" prop="safeStockAmount" width="150">
|
||||
</el-table-column>
|
||||
<el-table-column label="库存数量" prop="stockAmount" width="150">
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="detailTotal>0"
|
||||
:total="detailTotal"
|
||||
:page.sync="detailQueryParams.pageNum"
|
||||
:limit.sync="detailQueryParams.pageSize"
|
||||
@pagination="getDetailList"
|
||||
/>
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listAlarmInfo, listStockAlarmDetail } from "@/api/mes/alarmInfo";
|
||||
|
||||
export default {
|
||||
name: "AlarmInfo",
|
||||
dicts: ['mes_alarm_info_type'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 子表选中数据
|
||||
checkedMesStockAlarmDetail: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 生产告警信息表格数据
|
||||
alarmInfoList: [],
|
||||
// 库存告警信息明细表格数据
|
||||
mesStockAlarmDetailList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
alarmInfoType: null,
|
||||
handleStatus: null,
|
||||
createDate: null,
|
||||
updateDate: null
|
||||
},
|
||||
|
||||
detailTotal:0,
|
||||
detailQueryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
alarmInfoType: null,
|
||||
handleStatus: null,
|
||||
createDate: null,
|
||||
updateDate: null
|
||||
},
|
||||
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
alarmInfoType: [
|
||||
{ required: true, message: "报警类型(1库存报警)不能为空", trigger: "change" }
|
||||
],
|
||||
handleStatus: [
|
||||
{ required: true, message: "处理状态(0未处理 1已处理)不能为空", trigger: "change" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询生产告警信息列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listAlarmInfo(this.queryParams).then(response => {
|
||||
this.alarmInfoList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
alarmInfoId: null,
|
||||
alarmInfoType: null,
|
||||
handleStatus: null,
|
||||
createBy: null,
|
||||
createDate: null,
|
||||
updateBy: null,
|
||||
updateDate: null
|
||||
};
|
||||
this.mesStockAlarmDetailList = [];
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.alarmInfoId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
||||
handleDetail(row){
|
||||
this.mesStockAlarmDetailList = [];
|
||||
this.detailTotal = 0;
|
||||
this.form.createDate = row.createDate;
|
||||
this.open = true;
|
||||
this.title = "库存告警明细";
|
||||
this.detailQueryParams.alarmInfoId = row.alarmInfoId;
|
||||
this.getDetailList();
|
||||
},
|
||||
|
||||
/** 查询生产告警信息列表 */
|
||||
getDetailList() {
|
||||
// this.loading = true;]
|
||||
listStockAlarmDetail(this.detailQueryParams).then(response => {
|
||||
this.mesStockAlarmDetailList = response.rows;
|
||||
this.detailTotal = response.total;
|
||||
// this.loading = false;
|
||||
});
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue