| Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Admin.NET/WCS.Application/Enum/PLCEnum.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Web/src/views/wcs/wcsAlarmInfo/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Admin.NET/WCS.Application/Entity/WcsAlarmInfo.cs
@@ -5,19 +5,28 @@ /// 报警信息表 /// </summary> [SugarTable("WCSAlarmInfo","报警信息表")] public class WcsAlarmInfo : EntityBaseData public class WcsAlarmInfo : EntityBaseData { /// <summary> /// PLCIP地址 /// </summary> [Required] [SugarColumn(ColumnName = "PlcIP", ColumnDescription = "PLCIP地址", Length = 20)] public string? PlcIP { get; set; } public string PlcIP { get; set; } /// <summary> /// PLCIP地址 /// </summary> [Required] [SugarColumn(ColumnName = "PlcPort", ColumnDescription = "PLCIP地址")] public int PlcPort { get; set; } /// <summary> /// 报警编号 /// </summary> [Required] [SugarColumn(ColumnName = "AlarmCode", ColumnDescription = "报警编号", Length = 20)] public string? AlarmCode { get; set; } public string AlarmCode { get; set; } /// <summary> /// 报警描述 @@ -30,18 +39,18 @@ /// </summary> [SugarColumn(ColumnName = "LedIP", ColumnDescription = "显示屏ip地址", Length = 20)] public string? LedIP { get; set; } /// <summary> /// 状态 /// </summary> [SugarColumn(ColumnName = "Status", ColumnDescription = "状态")] public YesNoEnum? Status { get; set; } = YesNoEnum.N; public YesNoEnum? Status { get; set; } /// <summary> /// 设备类型 /// </summary> [SugarColumn(ColumnName = "Type", ColumnDescription = "设备类型", Length = 20)] public string? Type { get; set; } public PLCTypeEnum Type { get; set; } /// <summary> /// 报警日期 Admin.NET/WCS.Application/Enum/PLCEnum.cs
@@ -12,9 +12,9 @@ [Description("堆跺机")] StackingMachine = 0, /// <summary> /// 输送线 /// 托盘输送线 /// </summary> [Description("输送线")] [Description("托盘输送线")] ConveyorLine = 1, /// <summary> /// AGV小车 @@ -26,6 +26,11 @@ /// </summary> [Description("叠拆托机")] PalletMachine = 3, /// <summary> /// 件箱输送线 /// </summary> [Description("件箱输送线")] BoxConveyorLine = 4, } /// <summary> Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoDto.cs
@@ -1,104 +1,104 @@ // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ namespace WCS.Application; /// <summary> /// 报警信息表输出参数 /// </summary> public class WcsAlarmInfoDto { /// <summary> /// 报警信息表输出参数 /// 主键Id /// </summary> public class WcsAlarmInfoDto { /// <summary> /// 主键Id /// </summary> public long Id { get; set; } /// <summary> /// PLCIP地址 /// </summary> public string? PlcIP { get; set; } /// <summary> /// 报警编号 /// </summary> public string? AlarmCode { get; set; } /// <summary> /// 报警描述 /// </summary> public string? AlarmName { get; set; } /// <summary> /// 显示屏ip地址 /// </summary> public string? LedIP { get; set; } /// <summary> /// 状态 /// </summary> public YesNoEnum Status { get; set; } /// <summary> /// 设备类型 /// </summary> public string? Type { get; set; } /// <summary> /// 报警日期 /// </summary> public DateTime? AlarmTime { get; set; } /// <summary> /// LED状态 /// </summary> public YesNoEnum LedStatus { get; set; } /// <summary> /// 创建时间 /// </summary> public DateTime? CreateTime { get; set; } /// <summary> /// 更新时间 /// </summary> public DateTime? UpdateTime { get; set; } /// <summary> /// 创建者Id /// </summary> public long? CreateUserId { get; set; } /// <summary> /// 创建者姓名 /// </summary> public string? CreateUserName { get; set; } /// <summary> /// 修改者Id /// </summary> public long? UpdateUserId { get; set; } /// <summary> /// 修改者姓名 /// </summary> public string? UpdateUserName { get; set; } /// <summary> /// 创建者部门Id /// </summary> public long? CreateOrgId { get; set; } /// <summary> /// 创建者部门名称 /// </summary> public string? CreateOrgName { get; set; } /// <summary> /// 软删除 /// </summary> public bool IsDelete { get; set; } } public long Id { get; set; } /// <summary> /// PLCIP地址 /// </summary> public string PlcIP { get; set; } /// <summary> /// PLCIP地址 /// </summary> public int PlcPort { get; set; } /// <summary> /// 报警编号 /// </summary> public string AlarmCode { get; set; } /// <summary> /// 报警描述 /// </summary> public string? AlarmName { get; set; } /// <summary> /// 显示屏ip地址 /// </summary> public string? LedIP { get; set; } /// <summary> /// 状态 /// </summary> public int? Status { get; set; } /// <summary> /// 设备类型 /// </summary> public PLCTypeEnum Type { get; set; } /// <summary> /// 报警日期 /// </summary> public DateTime? AlarmTime { get; set; } /// <summary> /// LED状态 /// </summary> public int? LedStatus { get; set; } /// <summary> /// 创建时间 /// </summary> public DateTime? CreateTime { get; set; } /// <summary> /// 更新时间 /// </summary> public DateTime? UpdateTime { get; set; } /// <summary> /// 创建者Id /// </summary> public long? CreateUserId { get; set; } /// <summary> /// 创建者姓名 /// </summary> public string? CreateUserName { get; set; } /// <summary> /// 修改者Id /// </summary> public long? UpdateUserId { get; set; } /// <summary> /// 修改者姓名 /// </summary> public string? UpdateUserName { get; set; } /// <summary> /// 创建者部门Id /// </summary> public long? CreateOrgId { get; set; } /// <summary> /// 创建者部门名称 /// </summary> public string? CreateOrgName { get; set; } /// <summary> /// 软删除 /// </summary> public bool IsDelete { get; set; } } Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoInput.cs
@@ -1,12 +1,4 @@ // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ using Admin.NET.Core; using System.ComponentModel.DataAnnotations; namespace WCS.Application; /// <summary> @@ -17,12 +9,17 @@ /// <summary> /// PLCIP地址 /// </summary> public virtual string? PlcIP { get; set; } public virtual string PlcIP { get; set; } /// <summary> /// PLCIP地址 /// </summary> public virtual int PlcPort { get; set; } /// <summary> /// 报警编号 /// </summary> public virtual string? AlarmCode { get; set; } public virtual string AlarmCode { get; set; } /// <summary> /// 报警描述 @@ -37,12 +34,12 @@ /// <summary> /// 状态 /// </summary> public virtual YesNoEnum Status { get; set; } = YesNoEnum.N; public virtual int? Status { get; set; } /// <summary> /// 设备类型 /// </summary> public virtual string? Type { get; set; } public virtual PLCTypeEnum Type { get; set; } /// <summary> /// 报警日期 @@ -52,7 +49,7 @@ /// <summary> /// LED状态 /// </summary> public virtual YesNoEnum LedStatus { get; set; } = YesNoEnum.N; public virtual int? LedStatus { get; set; } /// <summary> /// 创建时间 @@ -117,9 +114,14 @@ public string? PlcIP { get; set; } /// <summary> /// 状态 /// </summary> public YesNoEnum? Status { get; set; } /// <summary> /// 设备类型 /// </summary> public string? Type { get; set; } public PLCTypeEnum? Type { get; set; } } @@ -129,6 +131,30 @@ public class AddWcsAlarmInfoInput : WcsAlarmInfoBaseInput { /// <summary> /// PLCIP地址 /// </summary> [Required(ErrorMessage = "PLCIP地址不能为空")] public override string PlcIP { get; set; } /// <summary> /// PLCIP地址 /// </summary> [Required(ErrorMessage = "PLCIP地址不能为空")] public override int PlcPort { get; set; } /// <summary> /// 报警编号 /// </summary> [Required(ErrorMessage = "报警编号不能为空")] public override string AlarmCode { get; set; } /// <summary> /// 设备类型 /// </summary> [Required(ErrorMessage = "设备类型不能为空")] public override PLCTypeEnum Type { get; set; } /// <summary> /// 软删除 /// </summary> [Required(ErrorMessage = "软删除不能为空")] Admin.NET/WCS.Application/Service/WcsAlarmInfo/Dto/WcsAlarmInfoOutput.cs
@@ -1,10 +1,4 @@ // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ namespace WCS.Application; namespace WCS.Application; /// <summary> /// 报警信息表输出参数 @@ -15,92 +9,97 @@ /// 主键Id /// </summary> public long Id { get; set; } /// <summary> /// PLCIP地址 /// </summary> public string? PlcIP { get; set; } public string PlcIP { get; set; } /// <summary> /// PLCIP地址 /// </summary> public int PlcPort { get; set; } /// <summary> /// 报警编号 /// </summary> public string? AlarmCode { get; set; } public string AlarmCode { get; set; } /// <summary> /// 报警描述 /// </summary> public string? AlarmName { get; set; } /// <summary> /// 显示屏ip地址 /// </summary> public string? LedIP { get; set; } /// <summary> /// 状态 /// </summary> public YesNoEnum Status { get; set; } public int? Status { get; set; } /// <summary> /// 设备类型 /// </summary> public string? Type { get; set; } public PLCTypeEnum Type { get; set; } /// <summary> /// 报警日期 /// </summary> public DateTime? AlarmTime { get; set; } /// <summary> /// LED状态 /// </summary> public YesNoEnum LedStatus { get; set; } public int? LedStatus { get; set; } /// <summary> /// 创建时间 /// </summary> public DateTime? CreateTime { get; set; } /// <summary> /// 更新时间 /// </summary> public DateTime? UpdateTime { get; set; } /// <summary> /// 创建者Id /// </summary> public long? CreateUserId { get; set; } /// <summary> /// 创建者姓名 /// </summary> public string? CreateUserName { get; set; } /// <summary> /// 修改者Id /// </summary> public long? UpdateUserId { get; set; } /// <summary> /// 修改者姓名 /// </summary> public string? UpdateUserName { get; set; } /// <summary> /// 创建者部门Id /// </summary> public long? CreateOrgId { get; set; } /// <summary> /// 创建者部门名称 /// </summary> public string? CreateOrgName { get; set; } /// <summary> /// 软删除 /// </summary> public bool IsDelete { get; set; } } }
@@ -1,12 +1,4 @@ // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ using Admin.NET.Core.Service; using Microsoft.AspNetCore.Http; namespace WCS.Application; namespace WCS.Application; /// <summary> /// 报警信息表服务 @@ -30,18 +22,19 @@ [DisplayName("分页查询报警信息表")] public async Task<SqlSugarPagedList<WcsAlarmInfoOutput>> Page(PageWcsAlarmInfoInput input) { input.SearchKey = input.SearchKey?.Trim(); input.SearchKey = input.SearchKey?.Trim(); var query = _wcsAlarmInfoRep.AsQueryable() .WhereIF(!string.IsNullOrEmpty(input.SearchKey), u => u.PlcIP.Contains(input.SearchKey) || u.Type.Contains(input.SearchKey) ) .WhereIF(!string.IsNullOrWhiteSpace(input.PlcIP), u => u.PlcIP.Contains(input.PlcIP.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Type), u => u.Type.Contains(input.Type.Trim())) .WhereIF(input.Status.HasValue, u => u.Status == input.Status) .WhereIF(input.Type.HasValue, u => u.Type == input.Type) .Select<WcsAlarmInfoOutput>(); return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize); return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize); } /// <summary> /// 增加报警信息表 /// </summary> Web/src/views/wcs/wcsAlarmInfo/component/editDialog.vue
@@ -20,6 +20,13 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="PLCIP端口" prop="plcPort"> <el-input-number v-model="ruleForm.plcPort" placeholder="请输入PLCIP地址" clearable /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="报警编号" prop="alarmCode"> <el-input v-model="ruleForm.alarmCode" placeholder="请输入报警编号" maxlength="20" show-word-limit clearable /> @@ -42,11 +49,15 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="设备类型" prop="type"> <el-input v-model="ruleForm.type" placeholder="请输入设备类型" maxlength="20" show-word-limit clearable /> <el-select clearable v-model="ruleForm.type" placeholder="请选择设备类型"> <el-option v-for="(item,index) in dl('PLCTypeEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option> </el-select> </el-form-item> </el-col> </el-row> </el-form> <template #footer> @@ -89,6 +100,9 @@ const ruleForm = ref<any>({}); //自行添加其他规则 const rules = ref<FormRules>({ plcIP: [{required: true, message: '请输入PLCIP地址！', trigger: 'blur',},], plcPort: [{required: true, message: '请输入PLCIP地址！', trigger: 'blur',},], alarmCode: [{required: true, message: '请输入报警编号！', trigger: 'blur',},], }); // 页面加载时 Web/src/views/wcs/wcsAlarmInfo/index.vue
@@ -1,42 +1,50 @@ <template> <div class="wcsAlarmInfo-container"> <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> <el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> <el-form :model="queryParams" ref="queryForm" labelWidth="90"> <el-row> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10"> <el-form-item label="关键字"> <el-input v-model="queryParams.searchKey" clearable="" placeholder="请输入模糊查询关键字" /> <el-input v-model="queryParams.searchKey" clearable="" placeholder="请输入模糊查询关键字"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI"> <el-form-item label="PLCIP地址"> <el-input v-model="queryParams.plcIP" clearable="" placeholder="请输入PLCIP地址" /> <el-input v-model="queryParams.plcIP" clearable="" placeholder="请输入PLCIP地址"/> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI"> <el-form-item label="状态"> <el-select clearable="" v-model="queryParams.status" placeholder="请选择状态"> <el-option v-for="(item,index) in dl('YesNoEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" /> </el-select> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI"> <el-form-item label="设备类型"> <el-input v-model="queryParams.type" clearable="" placeholder="请输入设备类型" /> <el-select clearable="" v-model="queryParams.type" placeholder="请选择设备类型"> <el-option v-for="(item,index) in dl('PLCTypeEnum')" :key="index" :value="item.value" :label="`${item.name} (${item.code}) [${item.value}] `" /> </el-select> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10"> <el-form-item> <el-form-item > <el-button-group style="display: flex; align-items: center;"> <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsAlarmInfo:page'"> 查询 </el-button> <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 重置 </el-button> <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 高级查询 </el-button> <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 隐藏 </el-button> <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsAlarmInfo" v-auth="'wcsAlarmInfo:add'"> 新增 </el-button> <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsAlarmInfo:page'"> 查询 </el-button> <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 重置 </el-button> <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 高级查询 </el-button> <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 隐藏 </el-button> <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsAlarmInfo" v-auth="'wcsAlarmInfo:add'"> 新增 </el-button> </el-button-group> </el-form-item> </el-col> </el-row> </el-form> @@ -46,21 +54,27 @@ @sort-change="sortChange" border=""> <el-table-column type="index" label="序号" width="55" align="center" /> <el-table-column prop="plcIP" label="PLCIP地址" show-overflow-tooltip="" /> <el-table-column prop="plcPort" label="PLCIP端口" show-overflow-tooltip="" /> <el-table-column prop="alarmCode" label="报警编号" show-overflow-tooltip="" /> <el-table-column prop="alarmName" label="报警描述" show-overflow-tooltip="" /> <el-table-column prop="ledIP" label="显示屏ip地址" show-overflow-tooltip="" /> <el-table-column prop="status" label="报警状态" show-overflow-tooltip=""> <el-table-column prop="status" label="状态" show-overflow-tooltip=""> <template #default="scope"> <el-tag :type="dv('YesNoEnum', scope.row.status)?.tagType"> {{ dv('YesNoEnum', scope.row.status)?.name }}</el-tag> scope.row.status)?.name}}</el-tag> </template> </el-table-column> <el-table-column prop="type" label="设备类型" show-overflow-tooltip="" /> <el-table-column prop="type" label="设备类型" show-overflow-tooltip=""> <template #default="scope"> <el-tag :type="dv('PLCTypeEnum', scope.row.type)?.tagType"> {{ dv('PLCTypeEnum', scope.row.type)?.name}}</el-tag> </template> </el-table-column> <el-table-column prop="alarmTime" label="报警日期" show-overflow-tooltip="" /> <el-table-column prop="ledStatus" label="LED显示状态" show-overflow-tooltip=""> <el-table-column prop="ledStatus" label="LED状态" show-overflow-tooltip=""> <template #default="scope"> <el-tag :type="dv('YesNoEnum', scope.row.ledStatus)?.tagType"> {{ dv('YesNoEnum', scope.row.ledStatus)?.name }}</el-tag> scope.row.ledStatus)?.name}}</el-tag> </template> </el-table-column> <el-table-column label="修改记录" width="80" align="center" show-overflow-tooltip>
