wangsr
/
DLRK-CST305-SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat - 硫化配方配置

Browse Source
master
SoulStar 2 months ago
parent 5eb5c0d911
commit a462562b09
19 changed files with 492 additions and 189 deletions
Show Stats Download Patch File Download Diff File

18
HighWayIot.Plc/PlcConnect.cs
Unescape Escape View File

@ -22,13 +22,13 @@ namespace HighWayIot.Plc
/// <summary>
/// 静态懒加载MelsecMcNet1 开炼机CPU
/// </summary>
//public static readonly MelsecMcNet MelsecInstance1 = new PlcConnect().CreateAb("10.20.48.40");
public static readonly MelsecMcNet MelsecInstance1 = new PlcConnect().CreateAb("127.0.0.1");
public static readonly MelsecMcNet MelsecInstance1 = new PlcConnect().CreateAb("10.20.48.40");
//public static readonly MelsecMcNet MelsecInstance1 = new PlcConnect().CreateAb("127.0.0.1");
/// <summary>
/// 静态懒加载MelsecMcNet2 成型机CPU
/// </summary>
public static readonly MelsecMcNet MelsecInstance2 = new PlcConnect().CreateAb("10.20.48.225");
public static readonly MelsecMcNet MelsecInstance2 = new PlcConnect().CreateAb("10.20.48.10");
private PlcConnect()
{
@ -75,9 +75,9 @@ namespace HighWayIot.Plc
get
{
if (MelsecInstance1 == null) return false;
var result = MelsecInstance1.IpAddressPing();
logHelper.Info($"PLC[{MelsecInstance1.IpAddress}]连接：[{(result == System.Net.NetworkInformation.IPStatus.Success ? "正常" : "异常")}]");
return result == System.Net.NetworkInformation.IPStatus.Success;
var result = MelsecInstance1.ReadBool("B0").IsSuccess;
logHelper.Info($"PLC[{MelsecInstance1.IpAddress}]连接：[{(result ? "正常" : "异常")}]");
return result;
}
}
@ -89,9 +89,9 @@ namespace HighWayIot.Plc
get
{
if (MelsecInstance2 == null) return false;
var result = MelsecInstance2.IpAddressPing();
logHelper.Info($"PLC[{MelsecInstance2.IpAddress}]连接：[{(result == System.Net.NetworkInformation.IPStatus.Success ? "正常" : "异常")}]");
return result == System.Net.NetworkInformation.IPStatus.Success;
var result = MelsecInstance2.ReadBool("B0").IsSuccess;
logHelper.Info($"PLC[{MelsecInstance2.IpAddress}]连接：[{(result ? "正常" : "异常")}]");
return result;
}
}

19
HighWayIot.Plc/PlcHelper/WorkStationHelper.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using HighWayIot.Plc.PlcEntity;
using HighWayIot.Log4net;
using HighWayIot.Plc.PlcEntity;
using HslCommunication;
using System;
using System.Collections.Generic;
@ -20,17 +21,19 @@ namespace HighWayIot.Plc.PlcHelper
/// <returns></returns>
public bool WriteStationSingal(int rgvStationNo, int deviceNo)
{
int point = 0x600;
LogHelper.Instance.Info($"{rgvStationNo}工位, {deviceNo}号车");
return true;
//int point = 0x600;
//选择是哪个小车
point += (deviceNo - 1) * 32;
////选择是哪个小车
//point += (deviceNo - 1) * 32;
//选择是小车的哪个点位
point += rgvStationNo;
////选择是小车的哪个点位
//point += rgvStationNo;
bool result = PlcConnect.PlcWrite2($"B{point.ToString("X")}", true, DataTypeEnum.Bool).IsSuccess;
//bool result = PlcConnect.PlcWrite2($"B{point.ToString("X")}", true, DataTypeEnum.Bool).IsSuccess;
return result;
//return result;
}
/// <summary>

2
HighWayIot.Repository/HighWayIot.Repository.csproj
Unescape Escape View File

@ -63,6 +63,7 @@
<Compile Include="domain\ZxMaterialChildTypeEntity.cs" />
<Compile Include="domain\ZxMaterialEntity.cs" />
<Compile Include="domain\ZxRecipePositionParaEntity.cs" />
<Compile Include="domain\ZxSchedulingEntity.cs" />
<Compile Include="domain\ZxTagSettingEntity.cs" />
<Compile Include="domain\ZxRecipeEntity.cs" />
<Compile Include="domain\ZxRecipeParaEntity.cs" />
@ -71,6 +72,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Repository.cs" />
<Compile Include="service\ZxRecipePositionParaService.cs" />
<Compile Include="service\ZxSchedulingService.cs" />
<Compile Include="service\ZxTagSettingService.cs" />
<Compile Include="service\ZxReaderSettingService.cs" />
<Compile Include="service\SysLogService.cs" />

70
HighWayIot.Repository/domain/ZxSchedulingEntity.cs
Unescape Escape View File

@ -0,0 +1,70 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace Models
{
/// <summary>
/// 生产排程实体类
///</summary>
[SugarTable("zx_scheduling")]
public class ZxScheduling
{
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 备 注:机台号
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "device_no")]
public int? DeviceNo { get; set; }
/// <summary>
/// 备 注:成品代号1
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "recipe_name_1")]
public string RecipeName1 { get; set; } = string.Empty;
/// <summary>
/// 备 注:配方编号1
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "recipe_no_1")]
public string RecipeNo1 { get; set; } = string.Empty;
/// <summary>
/// 备 注:标称尺度1
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "spec_name_1")]
public string SpecName1 { get; set; } = string.Empty;
/// <summary>
/// 备 注:成品代号2
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "recipe_name_2")]
public string RecipeName2 { get; set; } = string.Empty;
/// <summary>
/// 备 注:配方编号2
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "recipe_no_2")]
public string RecipeNo2 { get; set; } = string.Empty;
/// <summary>
/// 备 注:标称尺度2
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "spec_name_2")]
public string SpecName2 { get; set; } = string.Empty;
}
}

19
HighWayIot.Repository/service/ZxRecipeService.cs
Unescape Escape View File

@ -1,6 +1,7 @@
using HighWayIot.Log4net;
using HighWayIot.Repository.domain;
using Models;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@ -62,6 +63,24 @@ namespace HighWayIot.Repository.service
}
}
/// <summary>
/// 获取所有配方名称
/// </summary>
/// <returns></returns>
public List<string> GetAllRecipeName()
{
try
{
List<string> entity = _repository.GetList(x => x.IsDeleted == false).Select(x => x.RecipeName).ToList();
return entity;
}
catch (Exception ex)
{
log.Error("根据编号查询配方信息获取异常", ex);
return null;
}
}
/// <summary>
/// 修改配方信息

90
HighWayIot.Repository/service/ZxSchedulingService.cs
Unescape Escape View File

@ -0,0 +1,90 @@
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 ZxSchedulingService
{
private static readonly Lazy<ZxSchedulingService> lazy = new Lazy<ZxSchedulingService>(() => new ZxSchedulingService());
public static ZxSchedulingService Instance
{
get
{
return lazy.Value;
}
}
private LogHelper log = LogHelper.Instance;
Repository<ZxScheduling> _repository => new Repository<ZxScheduling>("sqlserver");
/// <summary>
/// 查询所有排程信息
/// </summary>
/// <returns></returns>
public List<ZxScheduling> GetSchedulingInfo(Expression<Func<ZxScheduling, bool>> expression = null)
{
try
{
List<ZxScheduling> entity;
if (expression != null)
{
entity = _repository.GetList(expression);
}
else
{
entity = _repository.GetList();
}
return entity;
}
catch (Exception ex)
{
log.Error("排程信息获取异常", ex);
return null;
}
}
///// <summary>
///// 添加排程信息
///// </summary>
///// <param name="entity"></param>
///// <returns></returns>
//public bool InsertSchedulingInfo(ZxScheduling entity)
//{
// try
// {
// return _repository.Insert(entity);
// }
// catch (Exception ex)
// {
// log.Error("排程信息插入异常", ex);
// return false;
// }
//}
/// <summary>
/// 修改排程信息
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public bool UpdateSchedulingInfo(ZxScheduling entity)
{
try
{
return _repository.Update(entity);
}
catch (Exception ex)
{
log.Error("排程信息修改异常", ex);
return false;
}
}
}
}

15
HighWayIot.Winform/Business/WorkStationBusiness.cs
Unescape Escape View File

@ -77,7 +77,7 @@ namespace HighWayIot.Winform.Business
_readerSetting = _readerService.GetReaderInfos();
this.CreateAllRFIDClient();
_touchSocketTcpClient.GetMessageAction += ReciveRFIDSingal;
timer = new Timer(new System.Threading.TimerCallback(SingalMonitor), null, 0, 2000);
timer = new Timer(new System.Threading.TimerCallback(SingalMonitor), null, 0, 1000);
}
/// <summary>
@ -125,7 +125,16 @@ namespace HighWayIot.Winform.Business
{
if (IsAllConnected == true)
{
ZxReaderSettingEntity setting = _readerSetting.FirstOrDefault(x => x.WorkstationNo == no.ToString());
ZxReaderSettingEntity setting = null;
try
{
setting = _readerSetting.FirstOrDefault(x => x.WorkstationNo == no.ToString());
}
catch (Exception ex)
{
LogHelper.Instance.Error($"[{no}] 工位读写器信息获取失败!", ex);
}
if (setting == null)
{
return;
@ -147,6 +156,8 @@ namespace HighWayIot.Winform.Business
}
}
/// <summary>
/// 接收信息的信号
/// </summary>

2
HighWayIot.Winform/Configuration.xml
Unescape Escape View File

@ -14,7 +14,7 @@
<Role PageName = "配方管理" RoleIndex = "8" />
<Role PageName = "日报表" RoleIndex = "9" />
<Role PageName = "机台物料信息绑定" RoleIndex = "10" />
<Role PageName = "生产排程" RoleIndex = "11" />
<Role PageName = "硫化机配方参数配置" RoleIndex = "11" />
<Role PageName = "RFID参数配置" RoleIndex = "12" />
<Role PageName = "设备参数配置" RoleIndex = "13" />
<Role PageName = "PLC测试页面" RoleIndex = "14" />

7
HighWayIot.Winform/HighWayIot.Winform.csproj
Unescape Escape View File

@ -149,10 +149,10 @@
<Compile Include="UserControlPages\EquipMaterialBindingPage.Designer.cs">
<DependentUpon>EquipMaterialBindingPage.cs</DependentUpon>
</Compile>
<Compile Include="UserControlPages\ProductionScheduling.cs">
<Compile Include="UserControlPages\ParamConfigPages\ProductionScheduling.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UserControlPages\ProductionScheduling.Designer.cs">
<Compile Include="UserControlPages\ParamConfigPages\ProductionScheduling.Designer.cs">
<DependentUpon>ProductionScheduling.cs</DependentUpon>
</Compile>
<Compile Include="UserControlPages\MaterialConfigPages\MaterialConfigPage.cs">
@ -265,7 +265,7 @@
<EmbeddedResource Include="UserControlPages\EquipMaterialBindingPage.resx">
<DependentUpon>EquipMaterialBindingPage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControlPages\ProductionScheduling.resx">
<EmbeddedResource Include="UserControlPages\ParamConfigPages\ProductionScheduling.resx">
<DependentUpon>ProductionScheduling.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControlPages\MaterialConfigPages\MaterialConfigPage.resx">
@ -355,6 +355,7 @@
<None Include="Resources\165-RFID.png" />
<None Include="Resources\设备.png" />
<None Include="Resources\参数.png" />
<None Include="Resources\加硫-03.png" />
<Content Include="Static\海威.ico" />
<Content Include="Configuration.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

104
HighWayIot.Winform/MainForm/BaseForm.Designer.cs generated
Unescape Escape View File

@ -46,7 +46,6 @@ namespace HighWayIot.Winform.MainForm
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.MaterialMenuStripItem = new System.Windows.Forms.ToolStripMenuItem();
this.MaterialConfigStripItem = new System.Windows.Forms.ToolStripMenuItem();
this.MaterialTypeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem();
@ -56,6 +55,7 @@ namespace HighWayIot.Winform.MainForm
this.DeviceDataManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DeviceParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.VulcanizerRecipeConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.UserControlTabs = new System.Windows.Forms.TabControl();
this.ClosePageButton = new System.Windows.Forms.Button();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
@ -66,14 +66,14 @@ namespace HighWayIot.Winform.MainForm
this.SplitLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.LogInformationToolStrip = new System.Windows.Forms.ToolStripStatusLabel();
this.SplitLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
this.Label1 = new System.Windows.Forms.ToolStripStatusLabel();
this.OpenMixStateLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.Label2 = new System.Windows.Forms.ToolStripStatusLabel();
this.MolderStateLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.SplitLabel4 = new System.Windows.Forms.ToolStripStatusLabel();
this.StripLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components);
this.SplitLabel4 = new System.Windows.Forms.ToolStripStatusLabel();
this.Label1 = new System.Windows.Forms.ToolStripStatusLabel();
this.Label2 = new System.Windows.Forms.ToolStripStatusLabel();
this.OpenMixStateLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.MolderStateLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.MainMenu.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@ -84,7 +84,6 @@ namespace HighWayIot.Winform.MainForm
this.SysConfigStripMenuItem,
this.LogManageStripMenuItem,
this.MonitorMainPageStripMenuItem,
this.ProductionSchedulingStripItem,
this.MaterialMenuStripItem,
this.RecipeConfigStripItem,
this.EquipMaterialBindingStripItem,
@ -165,7 +164,7 @@ namespace HighWayIot.Winform.MainForm
//
this.DaliyReportStripItem.Image = global::HighWayIot.Winform.Properties.Resources.报表数据;
this.DaliyReportStripItem.Name = "DaliyReportStripItem";
this.DaliyReportStripItem.Size = new System.Drawing.Size(124, 22);
this.DaliyReportStripItem.Size = new System.Drawing.Size(180, 22);
this.DaliyReportStripItem.Text = "日报表";
this.DaliyReportStripItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
@ -173,7 +172,7 @@ namespace HighWayIot.Winform.MainForm
//
this.OperateLogStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.操作日志;
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);
//
@ -181,7 +180,7 @@ namespace HighWayIot.Winform.MainForm
//
this.AlarmLogStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.报警日志;
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);
//
@ -193,14 +192,6 @@ namespace HighWayIot.Winform.MainForm
this.MonitorMainPageStripMenuItem.Text = "监控主页面";
this.MonitorMainPageStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// ProductionSchedulingStripItem
//
this.ProductionSchedulingStripItem.Image = global::HighWayIot.Winform.Properties.Resources.生产排程;
this.ProductionSchedulingStripItem.Name = "ProductionSchedulingStripItem";
this.ProductionSchedulingStripItem.Size = new System.Drawing.Size(84, 22);
this.ProductionSchedulingStripItem.Text = "生产排程";
this.ProductionSchedulingStripItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// MaterialMenuStripItem
//
this.MaterialMenuStripItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -255,7 +246,8 @@ namespace HighWayIot.Winform.MainForm
//
this.DeviceDataManageToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.RFIDParamManageToolStripMenuItem,
this.DeviceParamManageToolStripMenuItem});
this.DeviceParamManageToolStripMenuItem,
this.VulcanizerRecipeConfigToolStripMenuItem});
this.DeviceDataManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.参数;
this.DeviceDataManageToolStripMenuItem.Name = "DeviceDataManageToolStripMenuItem";
this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(84, 22);
@ -265,7 +257,7 @@ namespace HighWayIot.Winform.MainForm
//
this.RFIDParamManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources._165_RFID;
this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem";
this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置";
this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
@ -273,10 +265,18 @@ namespace HighWayIot.Winform.MainForm
//
this.DeviceParamManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.设备;
this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem";
this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置";
this.DeviceParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// VulcanizerRecipeConfigToolStripMenuItem
//
this.VulcanizerRecipeConfigToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.加硫_03;
this.VulcanizerRecipeConfigToolStripMenuItem.Name = "VulcanizerRecipeConfigToolStripMenuItem";
this.VulcanizerRecipeConfigToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.VulcanizerRecipeConfigToolStripMenuItem.Text = "硫化机配方参数配置";
this.VulcanizerRecipeConfigToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// UserControlTabs
//
this.UserControlTabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -371,6 +371,36 @@ namespace HighWayIot.Winform.MainForm
this.SplitLabel3.Name = "SplitLabel3";
this.SplitLabel3.Size = new System.Drawing.Size(4, 17);
//
// Label1
//
this.Label1.Name = "Label1";
this.Label1.Size = new System.Drawing.Size(89, 17);
this.Label1.Text = "开炼PLC状态：";
//
// OpenMixStateLabel
//
this.OpenMixStateLabel.Name = "OpenMixStateLabel";
this.OpenMixStateLabel.Size = new System.Drawing.Size(31, 17);
this.OpenMixStateLabel.Text = "N/A";
//
// Label2
//
this.Label2.Name = "Label2";
this.Label2.Size = new System.Drawing.Size(89, 17);
this.Label2.Text = "成型PLC状态：";
//
// MolderStateLabel
//
this.MolderStateLabel.Name = "MolderStateLabel";
this.MolderStateLabel.Size = new System.Drawing.Size(31, 17);
this.MolderStateLabel.Text = "N/A";
//
// SplitLabel4
//
this.SplitLabel4.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.SplitLabel4.Name = "SplitLabel4";
this.SplitLabel4.Size = new System.Drawing.Size(4, 17);
//
// StripLabel2
//
this.StripLabel2.Name = "StripLabel2";
@ -388,36 +418,6 @@ namespace HighWayIot.Winform.MainForm
this.TimeDisplayTimer.Interval = 1000;
this.TimeDisplayTimer.Tick += new System.EventHandler(this.TimeDisplayTimer_Tick);
//
// SplitLabel4
//
this.SplitLabel4.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.SplitLabel4.Name = "SplitLabel4";
this.SplitLabel4.Size = new System.Drawing.Size(4, 17);
//
// Label1
//
this.Label1.Name = "Label1";
this.Label1.Size = new System.Drawing.Size(89, 17);
this.Label1.Text = "开炼PLC状态：";
//
// Label2
//
this.Label2.Name = "Label2";
this.Label2.Size = new System.Drawing.Size(89, 17);
this.Label2.Text = "成型PLC状态：";
//
// OpenMixStateLabel
//
this.OpenMixStateLabel.Name = "OpenMixStateLabel";
this.OpenMixStateLabel.Size = new System.Drawing.Size(31, 17);
this.OpenMixStateLabel.Text = "N/A";
//
// MolderStateLabel
//
this.MolderStateLabel.Name = "MolderStateLabel";
this.MolderStateLabel.Size = new System.Drawing.Size(31, 17);
this.MolderStateLabel.Text = "N/A";
//
// BaseForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -467,7 +467,6 @@ namespace HighWayIot.Winform.MainForm
private ToolStripMenuItem TestMenuItem;
private ToolStripMenuItem ShiftTimeConfigStripItem;
private ToolStripMenuItem DaliyReportStripItem;
private ToolStripMenuItem ProductionSchedulingStripItem;
private ToolStripMenuItem MaterialMenuStripItem;
private ToolStripMenuItem RecipeConfigStripItem;
private ToolStripMenuItem EquipMaterialBindingStripItem;
@ -483,5 +482,6 @@ namespace HighWayIot.Winform.MainForm
private ToolStripStatusLabel OpenMixStateLabel;
private ToolStripStatusLabel Label2;
private ToolStripStatusLabel MolderStateLabel;
private ToolStripMenuItem VulcanizerRecipeConfigToolStripMenuItem;
}
}

3
HighWayIot.Winform/MainForm/BaseForm.cs
Unescape Escape View File

@ -163,7 +163,7 @@ namespace HighWayIot.Winform.MainForm
case "机台物料信息绑定":
UserPanelSwitch(typeof(EquipMaterialBindingPage), button.Text);
break;
case "生产排程":
case "硫化机配方参数配置":
UserPanelSwitch(typeof(ProductionScheduling), button.Text);
break;
case "RFID参数配置":
@ -374,5 +374,6 @@ namespace HighWayIot.Winform.MainForm
// MoldingMachineWatchDog = 2;
//}
}
}
}

10
HighWayIot.Winform/Properties/Resources.Designer.cs generated
Unescape Escape View File

@ -100,6 +100,16 @@ namespace HighWayIot.Winform.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap 加硫_03 {
get {
object obj = ResourceManager.GetObject("加硫-03", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>

27
HighWayIot.Winform/Properties/Resources.resx
Unescape Escape View File

@ -124,6 +124,9 @@
<data name="注销" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\注销.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="报警日志" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\报警日志.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="监控" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\监控.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -145,20 +148,26 @@
<data name="绑定" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\绑定.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="参数" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\参数.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="系统设置" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\系统设置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MesnacLogoHighPixel" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Static\MesnacLogoHighPixel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="日志管理" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\日志管理.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="物料需求" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\物料需求.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="业务_配方" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\业务_配方.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="操作日志" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\操作日志.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="报警日志" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\报警日志.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="物料需求" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\物料需求.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="权限" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\权限.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -166,12 +175,6 @@
<data name="设备" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\设备.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="业务_配方" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\业务_配方.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="系统设置" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\系统设置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="物料库存管控" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\物料库存管控.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -181,7 +184,7 @@
<data name="生产排程" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\生产排程.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="参数" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\参数.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="加硫-03" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\加硫-03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
HighWayIot.Winform/Resources/加硫-03.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

163
HighWayIot.Winform/UserControlPages/ParamConfigPages/ProductionScheduling.Designer.cs generated
Unescape Escape View File

@ -0,0 +1,163 @@
using System.Drawing;
using System.Windows.Forms;
namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
{
partial class ProductionScheduling
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.RoleDataGridView = new System.Windows.Forms.DataGridView();
this.SelectConfigButton = new System.Windows.Forms.Button();
this.ButtonPanel = new System.Windows.Forms.Panel();
this.UpdateConfigButton = new System.Windows.Forms.Button();
this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeName1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SpecName1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeName2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SpecName2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
((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.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.DeviceNo,
this.RecipeName1,
this.SpecName1,
this.RecipeName2,
this.SpecName2});
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(1105, 676);
this.RoleDataGridView.TabIndex = 0;
this.RoleDataGridView.Tag = "";
//
// SelectConfigButton
//
this.SelectConfigButton.Location = new System.Drawing.Point(11, 11);
this.SelectConfigButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.SelectConfigButton.Name = "SelectConfigButton";
this.SelectConfigButton.Size = new System.Drawing.Size(103, 39);
this.SelectConfigButton.TabIndex = 1;
this.SelectConfigButton.Text = "查询配置信息";
this.SelectConfigButton.UseVisualStyleBackColor = true;
this.SelectConfigButton.Click += new System.EventHandler(this.SelectConfigButton_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.UpdateConfigButton);
this.ButtonPanel.Controls.Add(this.SelectConfigButton);
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(1105, 61);
this.ButtonPanel.TabIndex = 4;
//
// UpdateConfigButton
//
this.UpdateConfigButton.Location = new System.Drawing.Point(120, 11);
this.UpdateConfigButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.UpdateConfigButton.Name = "UpdateConfigButton";
this.UpdateConfigButton.Size = new System.Drawing.Size(103, 39);
this.UpdateConfigButton.TabIndex = 2;
this.UpdateConfigButton.Text = "修改配置信息";
this.UpdateConfigButton.UseVisualStyleBackColor = true;
this.UpdateConfigButton.Click += new System.EventHandler(this.UpdateConfigButton_Click);
//
// DeviceNo
//
this.DeviceNo.HeaderText = "机台编号";
this.DeviceNo.Name = "DeviceNo";
//
// RecipeName1
//
this.RecipeName1.HeaderText = "成品代号 - 上模";
this.RecipeName1.Name = "RecipeName1";
this.RecipeName1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.RecipeName1.Width = 150;
//
// SpecName1
//
this.SpecName1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SpecName1.HeaderText = "标称尺度 - 上模";
this.SpecName1.Name = "SpecName1";
//
// RecipeName2
//
this.RecipeName2.HeaderText = "成品代号 - 下模";
this.RecipeName2.Name = "RecipeName2";
this.RecipeName2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.RecipeName2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.RecipeName2.Width = 150;
//
// SpecName2
//
this.SpecName2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SpecName2.HeaderText = "标称尺度 - 下模";
this.SpecName2.Name = "SpecName2";
this.SpecName2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.SpecName2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// ProductionScheduling
//
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 = "ProductionScheduling";
this.Size = new System.Drawing.Size(1105, 741);
((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit();
this.ButtonPanel.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private DataGridView RoleDataGridView;
private Button SelectConfigButton;
private Panel ButtonPanel;
private Button UpdateConfigButton;
private DataGridViewTextBoxColumn DeviceNo;
private DataGridViewTextBoxColumn RecipeName1;
private DataGridViewTextBoxColumn SpecName1;
private DataGridViewTextBoxColumn RecipeName2;
private DataGridViewTextBoxColumn SpecName2;
}
}

17
HighWayIot.Winform/UserControlPages/ProductionScheduling.cs → HighWayIot.Winform/UserControlPages/ParamConfigPages/ProductionScheduling.cs
Unescape Escape View File

@ -8,16 +8,29 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace HighWayIot.Winform.UserControlPages
namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
{
public partial class ProductionScheduling : UserControl
{
public ProductionScheduling()
{
InitializeComponent();
init();
}
private void UpdateRole_Click(object sender, EventArgs e)
private void init()
{
}
private void UpdateConfigButton_Click(object sender, EventArgs e)
{
}
private void SelectConfigButton_Click(object sender, EventArgs e)
{
}

15
HighWayIot.Winform/UserControlPages/ProductionScheduling.resx → HighWayIot.Winform/UserControlPages/ParamConfigPages/ProductionScheduling.resx
Unescape Escape View File

@ -117,4 +117,19 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="DeviceNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeName1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecName1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeName2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecName2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

98
HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs generated
Unescape Escape View File

@ -1,98 +0,0 @@
using System.Drawing;
using System.Windows.Forms;
namespace HighWayIot.Winform.UserControlPages
{
partial class ProductionScheduling
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
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(1105, 676);
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(1105, 61);
this.ButtonPanel.TabIndex = 4;
//
// ProductionScheduling
//
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 = "ProductionScheduling";
this.Size = new System.Drawing.Size(1105, 741);
((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit();
this.ButtonPanel.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private DataGridView RoleDataGridView;
private Button AddRole;
private Panel ButtonPanel;
}
}
Write Preview
Loading…
Cancel
Save