diff --git a/HighWayIot.Repository/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj index 0322eb8..47bded0 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -52,10 +52,20 @@ + + + + + + + + + + diff --git a/HighWayIot.Repository/domain/SysShiftTimeEntity.cs b/HighWayIot.Repository/domain/SysShiftTimeEntity.cs new file mode 100644 index 0000000..a08ae80 --- /dev/null +++ b/HighWayIot.Repository/domain/SysShiftTimeEntity.cs @@ -0,0 +1,51 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.domain +{ + /// + /// 班次时间表 + /// + [SugarTable("sys_shift_time")] + public class SysShiftTimeEntity + { + /// + /// 备 注: 班次ID + /// 默认值: + /// + [SugarColumn(ColumnName = "shift_id", IsPrimaryKey = true)] + public string ShiftId { get; set; } + + /// + /// 备 注:班次名称 + /// 默认值: + /// + [SugarColumn(ColumnName = "shift_name")] + public string ShiftName { get; set; } = null; + + /// + /// 备 注:班次开始时间 + /// 默认值: + /// + [SugarColumn(ColumnName = "shift_st")] + public string ShiftStartTime { get; set; } = null; + + /// + /// 备 注:班次结束时间 + /// 默认值: + /// + [SugarColumn(ColumnName = "shift_et")] + public string ShiftEndTime { get; set; } = null; + + /// + /// 备 注:班次类型 + /// 默认值: + /// + [SugarColumn(ColumnName = "shift_class")] + public string ShiftClass { get; set; } = null; + } +} diff --git a/HighWayIot.Repository/domain/ZxMaterialEntity.cs b/HighWayIot.Repository/domain/ZxMaterialEntity.cs new file mode 100644 index 0000000..f8b59ff --- /dev/null +++ b/HighWayIot.Repository/domain/ZxMaterialEntity.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Models +{ + /// + /// + /// + [SugarTable("zx_material")] + public class ZxMaterialEntity + { + /// + /// 备 注:物料编码 + /// 默认值: + /// + [SugarColumn(ColumnName = "material_code", IsPrimaryKey = true)] + public string MaterialCode { get; set; } = null; + + /// + /// 备 注:物料名称 + /// 默认值: + /// + [SugarColumn(ColumnName = "material_name")] + public string MaterialName { get; set; } = null; + + /// + /// 备 注:物料类型 + /// 默认值: + /// + [SugarColumn(ColumnName = "material_type")] + public string MaterialType { get; set; } = null; + + /// + /// 备 注:子类型 + /// 默认值: + /// + [SugarColumn(ColumnName = "child_type")] + public string ChildType { get; set; } = null; + + /// + /// 备 注:是否已删除 + /// 默认值: + /// + [SugarColumn(ColumnName = "is_deleted")] + public bool? IsDeleted { get; set; } + + /// + /// 备 注:是否使用 + /// 默认值: + /// + [SugarColumn(ColumnName = "is_use")] + public bool? IsUse { get; set; } + + + } + +} \ No newline at end of file diff --git a/HighWayIot.Repository/domain/ZxRecipeEntity.cs b/HighWayIot.Repository/domain/ZxRecipeEntity.cs new file mode 100644 index 0000000..24406ef --- /dev/null +++ b/HighWayIot.Repository/domain/ZxRecipeEntity.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Models +{ + /// + /// + /// + [SugarTable("zx_recipe")] + public class ZxRecipeEntity + { + /// + /// 备 注:配方编号 + /// 默认值: + /// + [SugarColumn(ColumnName = "recipe_code", IsPrimaryKey = true)] + public string RecipeCode { get; set; } + + /// + /// 备 注:配方名称 + /// 默认值: + /// + [SugarColumn(ColumnName = "recipe_name")] + public string RecipeName { get; set; } = null; + + /// + /// 备 注:SPEC编号 + /// 默认值: + /// + [SugarColumn(ColumnName = "recipe_spec_code")] + public string RecipeSpecCode { get; set; } = null; + + /// + /// 备 注:SPEC规格 + /// 默认值: + /// + [SugarColumn(ColumnName = "recipe_spec_name")] + public string RecipeSpecName { get; set; } = null; + + /// + /// 备 注:寸别 + /// 默认值: + /// + [SugarColumn(ColumnName = "size_kind")] + public int? SizeKind { get; set; } + + /// + /// 备 注:固定胶宽度 + /// 默认值: + /// + [SugarColumn(ColumnName = "fixed_width")] + public decimal? FixedWidth { get; set; } + + /// + /// 备 注:重量公差(%) + /// 默认值: + /// + [SugarColumn(ColumnName = "weight_error")] + public int? WeightError { get; set; } + + /// + /// 备 注:是否使用 + /// 默认值: + /// + [SugarColumn(ColumnName = "is_use")] + public bool? IsUse { get; set; } + + /// + /// 备 注:是否已删除 + /// 默认值: + /// + [SugarColumn(ColumnName = "is_deleted")] + public bool? IsDeleted { get; set; } + + + } + +} \ No newline at end of file diff --git a/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs b/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs new file mode 100644 index 0000000..c1b550f --- /dev/null +++ b/HighWayIot.Repository/domain/ZxRecipeParaEntity.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Models +{ + /// + /// + /// + [SugarTable("zx_recipe_para")] + public class ZxRecipeParaEntity + { + + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "recipe_code")] + public string RecipeCode { get; set; } = null; + + + } + +} \ No newline at end of file diff --git a/HighWayIot.Repository/domain/ZxWeightEntity.cs b/HighWayIot.Repository/domain/ZxWeightEntity.cs new file mode 100644 index 0000000..4ea53b7 --- /dev/null +++ b/HighWayIot.Repository/domain/ZxWeightEntity.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using SqlSugar; +namespace Models +{ + /// + /// + /// + [SugarTable("zx_weight")] + public class ZxWeightEntity + { + + + /// + /// 备 注: + /// 默认值: + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + + /// + /// 备 注:配方编号 + /// 默认值: + /// + [SugarColumn(ColumnName = "recipe_code")] + public string RecipeCode { get; set; } = null; + + /// + /// 备 注:物料编号 + /// 默认值: + /// + [SugarColumn(ColumnName = "material_code")] + public string MaterialCode { get; set; } = null; + + /// + /// 备 注:厚度 + /// 默认值: + /// + [SugarColumn(ColumnName = "set_thickness")] + public decimal? SetThickness { get; set; } + + /// + /// 备 注:宽度 + /// 默认值: + /// + [SugarColumn(ColumnName = "set_width")] + public decimal? SetWidth { get; set; } + + /// + /// 备 注:层数 + /// 默认值: + /// + [SugarColumn(ColumnName = "set_layer")] + public int? SetLayer { get; set; } + + /// + /// 备 注:重量 + /// 默认值: + /// + [SugarColumn(ColumnName = "set_weight")] + public decimal? SetWeight { get; set; } + + /// + /// 备 注:公差 + /// 默认值: + /// + [SugarColumn(ColumnName = "set_error")] + public decimal? SetError { get; set; } + + /// + /// 备 注:是否使用 + /// 默认值: + /// + [SugarColumn(ColumnName = "is_use")] + public bool? IsUse { get; set; } + + + } + +} \ No newline at end of file diff --git a/HighWayIot.Repository/service/SysShiftTimeService.cs b/HighWayIot.Repository/service/SysShiftTimeService.cs new file mode 100644 index 0000000..7b838de --- /dev/null +++ b/HighWayIot.Repository/service/SysShiftTimeService.cs @@ -0,0 +1,63 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public class SysShiftTimeService + { + private static readonly Lazy lazy = new Lazy(() => new SysShiftTimeService()); + + public static SysShiftTimeService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 条件查询所有用户列表 用户名为模糊查询 + /// + /// + public List GetShiftInfos() + { + try + { + List deviceInfo = _repository.GetList(); + return deviceInfo; + } + catch (Exception ex) + { + log.Error("用户信息获取异常", ex); + return null; + } + } + + /// + /// 修改班次信息 + /// + /// + /// + public bool UpdateShiftInfo(SysShiftTimeEntity sysUserEntity) + { + try + { + return _repository.Update(sysUserEntity); + } + catch(Exception ex) + { + log.Error("用户信息修改异常", ex); + return false; + } + } + } +} diff --git a/HighWayIot.Repository/service/ZxMaterialService.cs b/HighWayIot.Repository/service/ZxMaterialService.cs new file mode 100644 index 0000000..8c88e9e --- /dev/null +++ b/HighWayIot.Repository/service/ZxMaterialService.cs @@ -0,0 +1,64 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public class ZxMaterialService + { + private static readonly Lazy lazy = new Lazy(() => new ZxMaterialService()); + + public static ZxMaterialService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 条件查询所有用户列表 用户名为模糊查询 + /// + /// + public List GetShiftInfos() + { + try + { + List deviceInfo = _repository.GetList(); + return deviceInfo; + } + catch (Exception ex) + { + log.Error("用户信息获取异常", ex); + return null; + } + } + + /// + /// 修改班次信息 + /// + /// + /// + public bool UpdateShiftInfo(ZxMaterialEntity sysUserEntity) + { + try + { + return _repository.Update(sysUserEntity); + } + catch(Exception ex) + { + log.Error("用户信息修改异常", ex); + return false; + } + } + } +} diff --git a/HighWayIot.Repository/service/ZxRecipeParaService.cs b/HighWayIot.Repository/service/ZxRecipeParaService.cs new file mode 100644 index 0000000..6f0aca2 --- /dev/null +++ b/HighWayIot.Repository/service/ZxRecipeParaService.cs @@ -0,0 +1,64 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public class ZxRecipeParaService + { + private static readonly Lazy lazy = new Lazy(() => new ZxRecipeParaService()); + + public static ZxRecipeParaService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 条件查询所有用户列表 用户名为模糊查询 + /// + /// + public List GetShiftInfos() + { + try + { + List deviceInfo = _repository.GetList(); + return deviceInfo; + } + catch (Exception ex) + { + log.Error("用户信息获取异常", ex); + return null; + } + } + + /// + /// 修改班次信息 + /// + /// + /// + public bool UpdateShiftInfo(ZxRecipeParaEntity sysUserEntity) + { + try + { + return _repository.Update(sysUserEntity); + } + catch(Exception ex) + { + log.Error("用户信息修改异常", ex); + return false; + } + } + } +} diff --git a/HighWayIot.Repository/service/ZxRecipeService.cs b/HighWayIot.Repository/service/ZxRecipeService.cs new file mode 100644 index 0000000..05f7ca5 --- /dev/null +++ b/HighWayIot.Repository/service/ZxRecipeService.cs @@ -0,0 +1,64 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public class ZxRecipeService + { + private static readonly Lazy lazy = new Lazy(() => new ZxRecipeService()); + + public static ZxRecipeService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 条件查询所有用户列表 用户名为模糊查询 + /// + /// + public List GetShiftInfos() + { + try + { + List deviceInfo = _repository.GetList(); + return deviceInfo; + } + catch (Exception ex) + { + log.Error("用户信息获取异常", ex); + return null; + } + } + + /// + /// 修改班次信息 + /// + /// + /// + public bool UpdateShiftInfo(ZxRecipeEntity sysUserEntity) + { + try + { + return _repository.Update(sysUserEntity); + } + catch(Exception ex) + { + log.Error("用户信息修改异常", ex); + return false; + } + } + } +} diff --git a/HighWayIot.Repository/service/ZxWeightService.cs b/HighWayIot.Repository/service/ZxWeightService.cs new file mode 100644 index 0000000..ece667e --- /dev/null +++ b/HighWayIot.Repository/service/ZxWeightService.cs @@ -0,0 +1,64 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Repository.service +{ + public class ZxWeightService + { + private static readonly Lazy lazy = new Lazy(() => new ZxWeightService()); + + public static ZxWeightService Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper log = LogHelper.Instance; + Repository _repository => new Repository("sqlserver"); + + /// + /// 条件查询所有用户列表 用户名为模糊查询 + /// + /// + public List GetShiftInfos() + { + try + { + List deviceInfo = _repository.GetList(); + return deviceInfo; + } + catch (Exception ex) + { + log.Error("用户信息获取异常", ex); + return null; + } + } + + /// + /// 修改班次信息 + /// + /// + /// + public bool UpdateShiftInfo(ZxWeightEntity sysUserEntity) + { + try + { + return _repository.Update(sysUserEntity); + } + catch(Exception ex) + { + log.Error("用户信息修改异常", ex); + return false; + } + } + } +} diff --git a/HighWayIot.Winform/Business/RoleBusiness.cs b/HighWayIot.Winform/Business/RoleBusiness.cs index f4ac206..226697f 100644 --- a/HighWayIot.Winform/Business/RoleBusiness.cs +++ b/HighWayIot.Winform/Business/RoleBusiness.cs @@ -62,6 +62,7 @@ namespace HighWayIot.Winform.Business //转换为Char数组 char[] chars = roleString.ToCharArray(); + //返回权限结果 return chars[roleConfig.RoleIndex] == '1'; } diff --git a/HighWayIot.Winform/Configuration.xml b/HighWayIot.Winform/Configuration.xml index 766aea4..1a6d69e 100644 --- a/HighWayIot.Winform/Configuration.xml +++ b/HighWayIot.Winform/Configuration.xml @@ -8,6 +8,12 @@ + + + + + + \ No newline at end of file diff --git a/HighWayIot.Winform/HighWayIot.Winform.csproj b/HighWayIot.Winform/HighWayIot.Winform.csproj index 9ca819f..3964905 100644 --- a/HighWayIot.Winform/HighWayIot.Winform.csproj +++ b/HighWayIot.Winform/HighWayIot.Winform.csproj @@ -83,6 +83,36 @@ MonitorMainPage.cs + + UserControl + + + RecipeConfigPage.cs + + + UserControl + + + DailyReportPage.cs + + + UserControl + + + EquipMaterialBindingPage.cs + + + UserControl + + + ProductionScheduling.cs + + + UserControl + + + MaterialConfigPage.cs + Form @@ -95,10 +125,16 @@ RoleConfigPage.cs - + + UserControl + + + ShiftTimePage.cs + + UserControl - + TestPage.cs @@ -150,13 +186,31 @@ MonitorMainPage.cs + + RecipeConfigPage.cs + + + DailyReportPage.cs + + + EquipMaterialBindingPage.cs + + + ProductionScheduling.cs + + + MaterialConfigPage.cs + RoleUpdateForm.cs RoleConfigPage.cs - + + ShiftTimePage.cs + + TestPage.cs diff --git a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs index 0e3dacd..5d85f1e 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs @@ -38,12 +38,18 @@ namespace HighWayIot.Winform.MainForm this.SysConfigStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UserStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RoleStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ShiftTimeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.LogoutStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SysQuitStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LogManageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DaliyReportStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.OperateLogStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AlarmLogStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MonitorMainPageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ProductionSchedulingStripItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MaterialConfigStripItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RecipeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EquipMaterialBindingStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.TestMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UserControlTabs = new System.Windows.Forms.TabControl(); this.ClosePageButton = new System.Windows.Forms.Button(); @@ -66,6 +72,10 @@ namespace HighWayIot.Winform.MainForm this.SysConfigStripMenuItem, this.LogManageStripMenuItem, this.MonitorMainPageStripMenuItem, + this.ProductionSchedulingStripItem, + this.MaterialConfigStripItem, + this.RecipeConfigStripItem, + this.EquipMaterialBindingStripItem, this.TestMenuItem}); this.MainMenu.Location = new System.Drawing.Point(0, 0); this.MainMenu.Name = "MainMenu"; @@ -79,6 +89,7 @@ namespace HighWayIot.Winform.MainForm this.SysConfigStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.UserStripMenuItem, this.RoleStripMenuItem, + this.ShiftTimeConfigStripItem, this.LogoutStripMenuItem, this.SysQuitStripMenuItem}); this.SysConfigStripMenuItem.Name = "SysConfigStripMenuItem"; @@ -88,51 +99,66 @@ namespace HighWayIot.Winform.MainForm // UserStripMenuItem // this.UserStripMenuItem.Name = "UserStripMenuItem"; - this.UserStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.UserStripMenuItem.Size = new System.Drawing.Size(136, 22); this.UserStripMenuItem.Text = "用户管理"; this.UserStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // // RoleStripMenuItem // this.RoleStripMenuItem.Name = "RoleStripMenuItem"; - this.RoleStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.RoleStripMenuItem.Size = new System.Drawing.Size(136, 22); this.RoleStripMenuItem.Text = "角色管理"; this.RoleStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // + // ShiftTimeConfigStripItem + // + this.ShiftTimeConfigStripItem.Name = "ShiftTimeConfigStripItem"; + this.ShiftTimeConfigStripItem.Size = new System.Drawing.Size(136, 22); + this.ShiftTimeConfigStripItem.Text = "班时间维护"; + this.ShiftTimeConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // // LogoutStripMenuItem // this.LogoutStripMenuItem.Name = "LogoutStripMenuItem"; - this.LogoutStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.LogoutStripMenuItem.Size = new System.Drawing.Size(136, 22); this.LogoutStripMenuItem.Text = "注销"; this.LogoutStripMenuItem.Click += new System.EventHandler(this.LogoutStripMenuItem_Click); // // SysQuitStripMenuItem // this.SysQuitStripMenuItem.Name = "SysQuitStripMenuItem"; - this.SysQuitStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.SysQuitStripMenuItem.Size = new System.Drawing.Size(136, 22); this.SysQuitStripMenuItem.Text = "退出系统"; this.SysQuitStripMenuItem.Click += new System.EventHandler(this.SysQuitStripMenuItem_Click); // // LogManageStripMenuItem // this.LogManageStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.DaliyReportStripItem, this.OperateLogStripMenuItem, this.AlarmLogStripMenuItem}); this.LogManageStripMenuItem.Name = "LogManageStripMenuItem"; this.LogManageStripMenuItem.Size = new System.Drawing.Size(68, 22); this.LogManageStripMenuItem.Text = "日志管理"; // + // DaliyReportStripItem + // + this.DaliyReportStripItem.Name = "DaliyReportStripItem"; + this.DaliyReportStripItem.Size = new System.Drawing.Size(180, 22); + this.DaliyReportStripItem.Text = "日报表"; + this.DaliyReportStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // // OperateLogStripMenuItem // this.OperateLogStripMenuItem.Name = "OperateLogStripMenuItem"; - this.OperateLogStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.OperateLogStripMenuItem.Size = new System.Drawing.Size(180, 22); this.OperateLogStripMenuItem.Text = "操作日志"; this.OperateLogStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // // AlarmLogStripMenuItem // this.AlarmLogStripMenuItem.Name = "AlarmLogStripMenuItem"; - this.AlarmLogStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.AlarmLogStripMenuItem.Size = new System.Drawing.Size(180, 22); this.AlarmLogStripMenuItem.Text = "报警日志"; this.AlarmLogStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // @@ -143,6 +169,34 @@ namespace HighWayIot.Winform.MainForm this.MonitorMainPageStripMenuItem.Text = "监控主页面"; this.MonitorMainPageStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // + // ProductionSchedulingStripItem + // + this.ProductionSchedulingStripItem.Name = "ProductionSchedulingStripItem"; + this.ProductionSchedulingStripItem.Size = new System.Drawing.Size(68, 22); + this.ProductionSchedulingStripItem.Text = "生产排程"; + this.ProductionSchedulingStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // MaterialConfigStripItem + // + this.MaterialConfigStripItem.Name = "MaterialConfigStripItem"; + this.MaterialConfigStripItem.Size = new System.Drawing.Size(80, 22); + this.MaterialConfigStripItem.Text = "原材料管理"; + this.MaterialConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // RecipeConfigStripItem + // + this.RecipeConfigStripItem.Name = "RecipeConfigStripItem"; + this.RecipeConfigStripItem.Size = new System.Drawing.Size(68, 22); + this.RecipeConfigStripItem.Text = "配方管理"; + this.RecipeConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // EquipMaterialBindingStripItem + // + this.EquipMaterialBindingStripItem.Name = "EquipMaterialBindingStripItem"; + this.EquipMaterialBindingStripItem.Size = new System.Drawing.Size(116, 22); + this.EquipMaterialBindingStripItem.Text = "机台物料信息绑定"; + this.EquipMaterialBindingStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // // TestMenuItem // this.TestMenuItem.Name = "TestMenuItem"; @@ -169,6 +223,7 @@ namespace HighWayIot.Winform.MainForm this.ClosePageButton.BackColor = System.Drawing.Color.Red; this.ClosePageButton.Cursor = System.Windows.Forms.Cursors.Hand; this.ClosePageButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.ClosePageButton.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.ClosePageButton.Location = new System.Drawing.Point(1580, 1); this.ClosePageButton.Name = "ClosePageButton"; this.ClosePageButton.Size = new System.Drawing.Size(20, 20); @@ -288,5 +343,11 @@ namespace HighWayIot.Winform.MainForm private ToolStripStatusLabel TimeStripLabel; private Timer TimeDisplayTimer; private ToolStripMenuItem TestMenuItem; + private ToolStripMenuItem ShiftTimeConfigStripItem; + private ToolStripMenuItem DaliyReportStripItem; + private ToolStripMenuItem ProductionSchedulingStripItem; + private ToolStripMenuItem MaterialConfigStripItem; + private ToolStripMenuItem RecipeConfigStripItem; + private ToolStripMenuItem EquipMaterialBindingStripItem; } } \ No newline at end of file diff --git a/HighWayIot.Winform/MainForm/BaseForm.cs b/HighWayIot.Winform/MainForm/BaseForm.cs index f299960..af6d25b 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.cs @@ -17,6 +17,9 @@ namespace HighWayIot.Winform.MainForm { public partial class BaseForm : Form { + /// + /// 日志实例 + /// private static LogHelper logger = LogHelper.Instance; /// @@ -54,7 +57,6 @@ namespace HighWayIot.Winform.MainForm /// private void SysQuitStripMenuItem_Click(object sender, EventArgs e) { - Application.Exit(); } @@ -70,15 +72,14 @@ namespace HighWayIot.Winform.MainForm /// /// 菜单事件 - /// 菜单事件 /// /// /// private void StripMenuItemClick(object sender, EventArgs e) { - if (sender is ToolStripMenuItem && sender != null) + if (sender is ToolStripMenuItem item && sender != null) { - ToolStripMenuItem button = (ToolStripMenuItem)sender; + ToolStripMenuItem button = item; switch (button.Text) { case "角色管理": @@ -88,7 +89,7 @@ namespace HighWayIot.Winform.MainForm UserPanelSwitch(typeof(UserConfigPage), button.Text); break; case "操作日志": - UserPanelSwitch(typeof(OperateConfigPage), button.Text); + UserPanelSwitch(typeof(MaterialConfigPage), button.Text); break; case "报警日志": UserPanelSwitch(typeof(AlarmConfigPage), button.Text); @@ -99,6 +100,24 @@ namespace HighWayIot.Winform.MainForm case "测试页面": UserPanelSwitch(typeof(TestPage), button.Text); break; + case "班时间维护": + UserPanelSwitch(typeof(ShiftTimePage), button.Text); + break; + case "原材料管理": + UserPanelSwitch(typeof(MaterialConfigPage), button.Text); + break; + case "配方管理": + UserPanelSwitch(typeof(RecipeConfigPage), button.Text); + break; + case "日报表": + UserPanelSwitch(typeof(DailyReportPage), button.Text); + break; + case "机台物料信息绑定": + UserPanelSwitch(typeof(EquipMaterialBindingPage), button.Text); + break; + case "生产排程": + UserPanelSwitch(typeof(ProductionScheduling), button.Text); + break; case "": break; default: @@ -233,10 +252,12 @@ namespace HighWayIot.Winform.MainForm private void TraverseMenuitem(ToolStripMenuItem item) { item.Enabled = roleBusiness.PageIsAccess(item.Text); + //if(UserControls.Where(x => x.Tag == item.Text)) foreach (ToolStripMenuItem i in item.DropDownItems) { TraverseMenuitem(i); } } + } } diff --git a/HighWayIot.Winform/UserControlPages/DailyReportPage.Designer.cs b/HighWayIot.Winform/UserControlPages/DailyReportPage.Designer.cs new file mode 100644 index 0000000..00eb88a --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/DailyReportPage.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + partial class DailyReportPage + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(883, 61); + this.ButtonPanel.TabIndex = 4; + // + // OperateConfigPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "OperateConfigPage"; + this.Size = new System.Drawing.Size(883, 562); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/DailyReportPage.cs b/HighWayIot.Winform/UserControlPages/DailyReportPage.cs new file mode 100644 index 0000000..6bf5911 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/DailyReportPage.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + public partial class DailyReportPage : UserControl + { + public DailyReportPage() + { + InitializeComponent(); + } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.resx b/HighWayIot.Winform/UserControlPages/DailyReportPage.resx similarity index 100% rename from HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.resx rename to HighWayIot.Winform/UserControlPages/DailyReportPage.resx diff --git a/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.Designer.cs b/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.Designer.cs new file mode 100644 index 0000000..2d1a103 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + partial class EquipMaterialBindingPage + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(883, 61); + this.ButtonPanel.TabIndex = 4; + // + // OperateConfigPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "OperateConfigPage"; + this.Size = new System.Drawing.Size(883, 562); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.cs b/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.cs new file mode 100644 index 0000000..461290f --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + public partial class EquipMaterialBindingPage : UserControl + { + public EquipMaterialBindingPage() + { + InitializeComponent(); + } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.resx b/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/EquipMaterialBindingPage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/MaterialConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/MaterialConfigPage.Designer.cs new file mode 100644 index 0000000..d70f2dd --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/MaterialConfigPage.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + partial class MaterialConfigPage + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(883, 61); + this.ButtonPanel.TabIndex = 4; + // + // OperateConfigPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "OperateConfigPage"; + this.Size = new System.Drawing.Size(883, 562); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/MaterialConfigPage.cs b/HighWayIot.Winform/UserControlPages/MaterialConfigPage.cs new file mode 100644 index 0000000..3a971b5 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/MaterialConfigPage.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + public partial class MaterialConfigPage : UserControl + { + public MaterialConfigPage() + { + InitializeComponent(); + } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/MaterialConfigPage.resx b/HighWayIot.Winform/UserControlPages/MaterialConfigPage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/MaterialConfigPage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs b/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs new file mode 100644 index 0000000..6b49471 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + partial class ProductionScheduling + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(883, 61); + this.ButtonPanel.TabIndex = 4; + // + // OperateConfigPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "OperateConfigPage"; + this.Size = new System.Drawing.Size(883, 562); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/ProductionScheduling.cs b/HighWayIot.Winform/UserControlPages/ProductionScheduling.cs new file mode 100644 index 0000000..5ec5dd5 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ProductionScheduling.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + public partial class ProductionScheduling : UserControl + { + public ProductionScheduling() + { + InitializeComponent(); + } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/ProductionScheduling.resx b/HighWayIot.Winform/UserControlPages/ProductionScheduling.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ProductionScheduling.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.Designer.cs new file mode 100644 index 0000000..cd2293f --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + partial class RecipeConfigPage + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(883, 61); + this.ButtonPanel.TabIndex = 4; + // + // OperateConfigPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "OperateConfigPage"; + this.Size = new System.Drawing.Size(883, 562); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.cs b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.cs new file mode 100644 index 0000000..1b09ba9 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages +{ + public partial class RecipeConfigPage : UserControl + { + public RecipeConfigPage() + { + InitializeComponent(); + } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/RecipeConfigPage.resx b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/RecipeConfigPage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.Designer.cs index 1dd7449..dded3df 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.Designer.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace HighWayIot.Winform.UserControlPages +namespace HighWayIot.Winform.UserControlPages.SysConfigPages { partial class RoleConfigPage { diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.cs index 0f4af65..57ed93f 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.cs +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleConfigPage.cs @@ -13,7 +13,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace HighWayIot.Winform.UserControlPages +namespace HighWayIot.Winform.UserControlPages.SysConfigPages { public partial class RoleConfigPage : UserControl { diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleUpdateForm.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleUpdateForm.cs index 6fa5ec1..2ce9280 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleUpdateForm.cs +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/RoleUpdateForm.cs @@ -101,7 +101,7 @@ namespace HighWayIot.Winform.UserControlPages.SysConfigPages if (_sysUserRoleService.UpdateRoleInfo(_roleEntity)) { - MessageBox.Show("角色修改成功", "提示", MessageBoxButtons.OK); + MessageBox.Show("角色修改成功，若重新应用权限需重启软件", "提示", MessageBoxButtons.OK); } else { diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.Designer.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.Designer.cs new file mode 100644 index 0000000..42b4ac7 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.Designer.cs @@ -0,0 +1,180 @@ +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages.SysConfigPages +{ + partial class ShiftTimePage + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.ShiftTimeDataGridView = new System.Windows.Forms.DataGridView(); + this.UpdateShiftTimeButton = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + this.RefreshShiftTime = new System.Windows.Forms.Button(); + this.ShiftId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShiftName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShiftStartTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShiftEndTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShiftClass = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.ShiftTimeDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // ShiftTimeDataGridView + // + this.ShiftTimeDataGridView.AllowUserToAddRows = false; + this.ShiftTimeDataGridView.AllowUserToDeleteRows = false; + this.ShiftTimeDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ShiftTimeDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.ShiftTimeDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ShiftId, + this.ShiftName, + this.ShiftStartTime, + this.ShiftEndTime, + this.ShiftClass}); + this.ShiftTimeDataGridView.Location = new System.Drawing.Point(0, 65); + this.ShiftTimeDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ShiftTimeDataGridView.Name = "ShiftTimeDataGridView"; + this.ShiftTimeDataGridView.RowHeadersVisible = false; + this.ShiftTimeDataGridView.RowTemplate.Height = 25; + this.ShiftTimeDataGridView.Size = new System.Drawing.Size(1164, 772); + this.ShiftTimeDataGridView.TabIndex = 0; + // + // UpdateShiftTimeButton + // + this.UpdateShiftTimeButton.Location = new System.Drawing.Point(11, 11); + this.UpdateShiftTimeButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.UpdateShiftTimeButton.Name = "UpdateShiftTimeButton"; + this.UpdateShiftTimeButton.Size = new System.Drawing.Size(103, 39); + this.UpdateShiftTimeButton.TabIndex = 1; + this.UpdateShiftTimeButton.Text = "更改班次信息"; + this.UpdateShiftTimeButton.UseVisualStyleBackColor = true; + this.UpdateShiftTimeButton.Click += new System.EventHandler(this.UpdateShiftTimeButton_Click); + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.RefreshShiftTime); + this.ButtonPanel.Controls.Add(this.UpdateShiftTimeButton); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(1164, 61); + this.ButtonPanel.TabIndex = 4; + this.ButtonPanel.Tag = "报警日志"; + // + // RefreshShiftTime + // + this.RefreshShiftTime.Location = new System.Drawing.Point(122, 11); + this.RefreshShiftTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RefreshShiftTime.Name = "RefreshShiftTime"; + this.RefreshShiftTime.Size = new System.Drawing.Size(103, 39); + this.RefreshShiftTime.TabIndex = 2; + this.RefreshShiftTime.Text = "刷新班次信息"; + this.RefreshShiftTime.UseVisualStyleBackColor = true; + this.RefreshShiftTime.Click += new System.EventHandler(this.RefreshShiftTime_Click); + // + // ShiftId + // + this.ShiftId.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ShiftId.DataPropertyName = "ShiftId"; + this.ShiftId.HeaderText = "班次代号"; + this.ShiftId.Name = "ShiftId"; + this.ShiftId.ReadOnly = true; + this.ShiftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShiftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // ShiftName + // + this.ShiftName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ShiftName.DataPropertyName = "ShiftName"; + this.ShiftName.HeaderText = "班次名称"; + this.ShiftName.Name = "ShiftName"; + this.ShiftName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShiftName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // ShiftStartTime + // + this.ShiftStartTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ShiftStartTime.DataPropertyName = "ShiftStartTime"; + this.ShiftStartTime.HeaderText = "班次开始时间"; + this.ShiftStartTime.Name = "ShiftStartTime"; + this.ShiftStartTime.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShiftStartTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.ShiftStartTime.ToolTipText = "格式为：hh:mm:ss"; + // + // ShiftEndTime + // + this.ShiftEndTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ShiftEndTime.DataPropertyName = "ShiftEndTime"; + this.ShiftEndTime.HeaderText = "班次结束时间"; + this.ShiftEndTime.Name = "ShiftEndTime"; + this.ShiftEndTime.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShiftEndTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.ShiftEndTime.ToolTipText = "格式为：hh:mm:ss"; + // + // ShiftClass + // + this.ShiftClass.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ShiftClass.DataPropertyName = "ShiftClass"; + this.ShiftClass.HeaderText = "班次类型"; + this.ShiftClass.Name = "ShiftClass"; + this.ShiftClass.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShiftClass.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // ShiftTimePage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.ShiftTimeDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "ShiftTimePage"; + this.Size = new System.Drawing.Size(1164, 837); + this.Tag = ""; + ((System.ComponentModel.ISupportInitialize)(this.ShiftTimeDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView ShiftTimeDataGridView; + private Button UpdateShiftTimeButton; + private Panel ButtonPanel; + private Button RefreshShiftTime; + private DataGridViewTextBoxColumn ShiftId; + private DataGridViewTextBoxColumn ShiftName; + private DataGridViewTextBoxColumn ShiftStartTime; + private DataGridViewTextBoxColumn ShiftEndTime; + private DataGridViewTextBoxColumn ShiftClass; + } +} diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.cs new file mode 100644 index 0000000..7384e2a --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.cs @@ -0,0 +1,90 @@ +using HighWayIot.Repository.domain; +using HighWayIot.Repository.service; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages.SysConfigPages +{ + public partial class ShiftTimePage : UserControl + { + /// + /// 班组时间业务实例 + /// + SysShiftTimeService _sysShiftTimeService = SysShiftTimeService.Instance; + + /// + /// 数据流转 + /// + private List _list; + + public ShiftTimePage() + { + InitializeComponent(); + Init(); + } + + private void Init() + { + ShiftTimeDataGridView.AutoGenerateColumns = false; + _list = _sysShiftTimeService.GetShiftInfos(); + ShiftTimeDataGridView.DataSource = null; + ShiftTimeDataGridView.DataSource = _list; + } + + private void RefreshShiftTime_Click(object sender, EventArgs e) + { + _list = _sysShiftTimeService.GetShiftInfos(); + ShiftTimeDataGridView.DataSource = null; + ShiftTimeDataGridView.DataSource = _list; + } + + private void UpdateShiftTimeButton_Click(object sender, EventArgs e) + { + if (MessageBox.Show("确认要修改班次信息？", "确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) + { + return; + } + + foreach (DataGridViewRow row in ShiftTimeDataGridView.Rows) + { + if (row.IsNewRow) + { + continue; + } + + + SysShiftTimeEntity shiftTimeEntity = new SysShiftTimeEntity(); + + if (row.Cells[1].Value.ToString().Length > 1 || + row.Cells[2].Value.ToString().Length > 8 || + row.Cells[3].Value.ToString().Length > 8 || + row.Cells[4].Value.ToString().Length > 1 + ) + { + MessageBox.Show("输入信息长度有误，班次内容、班次类型为单字，班次时间格式为 时时:分分:秒秒 \" 08:00:00 \""); + return; + } + + + shiftTimeEntity.ShiftId = row.Cells[0].Value.ToString(); + shiftTimeEntity.ShiftName = row.Cells[1].Value.ToString(); + shiftTimeEntity.ShiftStartTime = row.Cells[2].Value.ToString(); + shiftTimeEntity.ShiftEndTime = row.Cells[3].Value.ToString(); + shiftTimeEntity.ShiftClass = row.Cells[4].Value.ToString(); + + _sysShiftTimeService.UpdateShiftInfo(shiftTimeEntity); + } + + _list = _sysShiftTimeService.GetShiftInfos(); + ShiftTimeDataGridView.DataSource = null; + ShiftTimeDataGridView.DataSource = _list; + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.resx b/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.resx new file mode 100644 index 0000000..3beef1d --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/ShiftTimePage.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs index 5c6537d..b737add 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.Designer.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace HighWayIot.Winform.UserControlPages +namespace HighWayIot.Winform.UserControlPages.SysConfigPages { partial class UserConfigPage { diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.cs b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.cs index 8b31370..a9308f4 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.cs +++ b/HighWayIot.Winform/UserControlPages/SysConfigPages/UserConfigPage.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace HighWayIot.Winform.UserControlPages +namespace HighWayIot.Winform.UserControlPages.SysConfigPages { public partial class UserConfigPage : UserControl { diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.Designer.cs b/HighWayIot.Winform/UserControlPages/TestPage.Designer.cs similarity index 97% rename from HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.Designer.cs rename to HighWayIot.Winform/UserControlPages/TestPage.Designer.cs index ea70030..759c4d8 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/TestPage.Designer.cs @@ -1,4 +1,4 @@ -namespace HighWayIot.Winform.UserControlPages.SysConfigPages +namespace HighWayIot.Winform.UserControlPages { partial class TestPage { diff --git a/HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.cs b/HighWayIot.Winform/UserControlPages/TestPage.cs similarity index 94% rename from HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.cs rename to HighWayIot.Winform/UserControlPages/TestPage.cs index 2d28516..049512a 100644 --- a/HighWayIot.Winform/UserControlPages/SysConfigPages/TestPage.cs +++ b/HighWayIot.Winform/UserControlPages/TestPage.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace HighWayIot.Winform.UserControlPages.SysConfigPages +namespace HighWayIot.Winform.UserControlPages { public partial class TestPage : UserControl { diff --git a/HighWayIot.Winform/UserControlPages/TestPage.resx b/HighWayIot.Winform/UserControlPages/TestPage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/TestPage.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file