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

fix - 小修改，重新引入程序集

Browse Source
master
SoulStar 7 months ago
parent 36a7df120d
commit 7405786547
37 changed files with 916 additions and 61938 deletions
Show Stats Download Patch File Download Diff File

BIN
HighWayIot.Library/HslCommunication.dll
View File

Binary file not shown.

61471
HighWayIot.Library/HslCommunication.xml
View File

File diff suppressed because it is too large Load Diff

13
HighWayIot.Plc/HighWayIot.Plc.csproj
Unescape Escape View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}</ProjectGuid>
<ProjectGuid>{FE3EA2BE-71C5-4F56-8125-E8E5AAA8FB84}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HighWayIot.Plc</RootNamespace>
@ -12,7 +12,6 @@
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -32,6 +31,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="HslCommunication">
<HintPath>..\HighWayIot.Library\HslCommunication.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@ -63,12 +65,9 @@
<Name>HighWayIot.Log4net</Name>
</ProjectReference>
<ProjectReference Include="..\HighWayIot.Repository\HighWayIot.Repository.csproj">
<Project>{D0DC3CFB-6748-4D5E-B56A-76FDC72AB4B3}</Project>
<Project>{d0dc3cfb-6748-4d5e-b56a-76fdc72ab4b3}</Project>
<Name>HighWayIot.Repository</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Impl\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

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

@ -82,19 +82,19 @@ namespace HighWayIot.Plc
// }
//}
/// <summary>
/// plc2 是不是保持链接
/// </summary>
public static bool IsConnect2
{
get
{
if (MelsecInstance2 == null) return false;
var result = MelsecInstance2.ReadBool("B0").IsSuccess;
logHelper.Info($"PLC[{MelsecInstance2.IpAddress}]连接：[{(result ? "正常" : "异常")}]");
return result;
}
}
///// <summary>
///// plc2 是不是保持链接
///// </summary>
//public static bool IsConnect2
//{
// get
// {
// if (MelsecInstance2 == null) return false;
// var result = MelsecInstance2.ReadBool("D100").IsSuccess;
// logHelper.Info($"PLC[{MelsecInstance2.IpAddress}]连接：[{(result ? "正常" : "异常")}]");
// return result;
// }
//}
///// <summary>
///// PLC1写入数据

1
HighWayIot.Plc/PlcHelper/RecipeParaHelper.cs
Unescape Escape View File

@ -1,6 +1,5 @@
using HighWayIot.Repository.domain;
using HslCommunication;
using HslCommunication.Profinet.Panasonic.Helper;
using Models;
using System;
using System.Collections.Generic;

7
HighWayIot.Plc/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("HighWayIot.Plc")]
[assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyCopyright("Copyright © 2025")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("4ee4c3e2-ac45-4275-8017-e99d70fc1f52")]
[assembly: Guid("fe3ea2be-71c5-4f56-8125-e8e5aaa8fb84")]
// 程序集的版本信息由下列四个值组成:
//
@ -29,8 +29,5 @@ using System.Runtime.InteropServices;
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

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

@ -52,6 +52,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="domain\ExportTableEntity.cs" />
<Compile Include="domain\MonitorDataSource.cs" />
<Compile Include="domain\SysShiftTimeEntity.cs" />
<Compile Include="domain\SysUserEntity.cs" />

129
HighWayIot.Repository/domain/ExportTableEntity.cs
Unescape Escape View File

@ -0,0 +1,129 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.domain
{
/// <summary>
/// 报表导出实体类
/// </summary>
public class ExportTableEntity
{
/// <summary>
/// 成品代号
/// </summary>
public string RecipeCode { get; set; } = string.Empty;
/// <summary>
/// 标称尺度
/// </summary>
public string RecipeName { get; set; } = string.Empty;
/// <summary>
/// SPEC编号
/// </summary>
public string SpecCode { get; set; } = string.Empty;
/// <summary>
/// SPEC规格
/// </summary>
public string SpecName { get; set; } = string.Empty;
/// <summary>
/// 开始时间
/// </summary>
public string StartTime { get; set; } = string.Empty;
/// <summary>
/// 基部胶胶号
/// </summary>
public string BaseRubName { get; set; } = string.Empty;
/// <summary>
/// 基部胶厚度
/// </summary>
public string BaseRubThickness { get; set; } = string.Empty;
/// <summary>
/// 基部胶宽度
/// </summary>
public string BaseRubWidth { get; set; } = string.Empty;
/// <summary>
/// 基部胶层数
/// </summary>
public string BaseRubLayer { get; set; } = string.Empty;
/// <summary>
/// 基部胶完成时间
/// </summary>
public string BaseRubFinishTime { get; set; } = string.Empty;
/// <summary>
/// 中层胶胶号
/// </summary>
public string MidRubName { get; set; } = string.Empty;
/// <summary>
/// 中层胶厚度
/// </summary>
public string MidRubThickness { get; set; } = string.Empty;
/// <summary>
/// 中层胶宽度
/// </summary>
public string MidRubWidth { get; set; } = string.Empty;
/// <summary>
/// 中层胶层数
/// </summary>
public string MidRubLayer { get; set; } = string.Empty;
/// <summary>
/// 中层胶完成时间
/// </summary>
public string MidRubFinishTime { get; set; } = string.Empty;
/// <summary>
/// 胎面胶胶号
/// </summary>
public string FaceRubName { get; set; } = string.Empty;
/// <summary>
/// 胎面胶厚度
/// </summary>
public string FaceRubThickness { get; set; } = string.Empty;
/// <summary>
/// 胎面胶宽度
/// </summary>
public string FaceRubWidth1 { get; set; } = string.Empty;
/// <summary>
/// 胎边胶宽度
/// </summary>
public string FaceRubWidth2 { get; set; } = string.Empty;
/// <summary>
/// 生胎完成时间
/// </summary>
public string FaceRubFinishTime { get; set; } = string.Empty;
/// <summary>
/// 生胎宽度（胎面胶宽度 +（厚度*2）） 无中层胶就等于胎面胶宽度
/// </summary>
public string RawTireWidth { get; set; } = string.Empty;
/// <summary>
/// 生胎重量
/// </summary>
public string RawTireWeight { get; set; } = string.Empty;
/// <summary>
/// 复重重量
/// </summary>
public string RepeatWeight { get; set; } = string.Empty;
}
}

4
HighWayIot.Repository/domain/MonitorDataSource.cs
Unescape Escape View File

@ -29,13 +29,13 @@ namespace HighWayIot.Repository.domain
/// 备 注:成品代号
/// 默认值:
///</summary>
public string RecipeName { get; set; } = string.Empty;
public string RecipeCode { get; set; } = string.Empty;
/// <summary>
/// 备 注:标称尺度
/// 默认值:
///</summary>
public string SpecName { get; set; } = string.Empty;
public string RecipeName { get; set; } = string.Empty;
/// <summary>
/// 备 注:SPEC编号

12
HighWayIot.Repository/domain/ZxDailyReportEntity.cs
Unescape Escape View File

@ -11,7 +11,7 @@ namespace HighWayIot.Repository.domain
public class ZxDailyReportEntity
{
/// <summary>
/// 备 注:
/// 默认值:
@ -37,15 +37,15 @@ namespace HighWayIot.Repository.domain
/// 备 注:成品代号
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "recipe_name")]
public string RecipeName { get; set; } = string.Empty;
[SugarColumn(ColumnName = "recipe_code")]
public string RecipeCode { get; set; } = string.Empty;
/// <summary>
/// 备 注:标称尺度
/// 备 注:SPEC名称
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "spec_name")]
public string SpecName { get; set; } = string.Empty;
[SugarColumn(ColumnName = "recipe_name")]
public string RecipeName { get; set; } = string.Empty;
/// <summary>
/// 备 注:SPEC编号

7
HighWayIot.Repository/domain/ZxMesPlanTransferEntity.cs
Unescape Escape View File

@ -26,6 +26,13 @@ namespace HighWayIot.Repository.domain
[SugarColumn(ColumnName = "request_flag")]
public bool? RequestFlag { get; set; }
/// <summary>
/// 备 注:成品代号
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "recipe_code")]
public string RecipeCode { get; set; } = string.Empty;
/// <summary>
/// 备 注:标称尺度
/// 默认值:

9
HighWayIot.Repository/service/ZxDailyReportService.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;
@ -32,11 +33,15 @@ namespace HighWayIot.Repository.service
/// 查询报表信息
/// </summary>
/// <returns></returns>
public List<ZxDailyReportEntity> Get50DailyReportInfos()
public List<ZxDailyReportEntity> Get25DailyReportInfos()
{
try
{
List<ZxDailyReportEntity> entity = _repository.GetList().Take(5).ToList();
List<ZxDailyReportEntity> entity =
_repository.AsQueryable()
.OrderByDescending(x => x.StartTime)
.Take(25)
.ToList();
return entity;
}
catch (Exception ex)

10
HighWayIot.TouchSocket/TouchSocketTcpClient.cs
Unescape Escape View File

@ -99,19 +99,19 @@ namespace HighWayIot.TouchSocket
/// </summary>
/// <param name="message">Bytes</param>
/// <returns></returns>
public async Task<bool> Send(string ip, byte[] message)
public bool Send(string ip, byte[] message)
{
try
{
if (Clients.ContainsKey(ip))
{
await Clients[ip].SendAsync(message);
Clients[ip].SendAsync(message);
return true;
}
else
{
return false;
}
return true;
}
catch (Exception e)
{
@ -125,13 +125,13 @@ namespace HighWayIot.TouchSocket
/// </summary>
/// <param name="ip"></param>
/// <returns></returns>
public async Task<bool> DisposeClient(string ip)
public bool DisposeClient(string ip)
{
try
{
if (Clients.ContainsKey(ip))
{
await Clients[ip].CloseAsync();
Clients[ip].Close();
Clients[ip].Dispose();
Clients.Remove(ip);
}

2
HighWayIot.Winform/Business/RecipeSendBusiness.cs
Unescape Escape View File

@ -115,7 +115,7 @@ namespace HighWayIot.Winform.Business
VulcanizationNo = deviceNo,
StartTime = DateTime.Now,
RecipeName = recipeEntity.RecipeName,
SpecName = recipeEntity.RecipeSpecName,
RecipeCode = recipeEntity.RecipeCode,
SpecCode = recipeEntity.RecipeSpecCode,
DeviceNo = RecipeNeededVehicleNo,
IsDone = 0

25
HighWayIot.Winform/Business/TCPClientFactory.cs
Unescape Escape View File

@ -142,7 +142,7 @@ namespace HighWayIot.Winform.Business
try
{
///写入对应的PLC信号
//记录当前配方对应的小车
if (int.Parse(workstationNo) == 1)
{
RecipeSendBusiness.RecipeNeededVehicleNo = int.Parse(deviceNo);
@ -158,6 +158,7 @@ namespace HighWayIot.Winform.Business
// return;
// }
//}
///写入对应的PLC信号
if (_workStationHelper.WriteStationSingal(stationNo, vehicleNo))
{
////写入成功后记录，上次已写入了该点位，不继续写入
@ -217,18 +218,16 @@ namespace HighWayIot.Winform.Business
{
foreach (var kvp in _heartBeatRecord.ToArray())
{
//Task.Run(() =>
//{
TimeSpan timeSpan = DateTime.Now - kvp.Value;
if (timeSpan > TimeSpan.FromSeconds(10))
{
LogHelper.Instance.RfidLog($"[{kvp.Key}] 可能掉线，准备重连");
_touchSocketTcpClient.DisposeClient(kvp.Key).GetAwaiter().GetResult();
_touchSocketTcpClient.CreateTcpClient(kvp.Key, "20108");
_touchSocketTcpClient.Send(kvp.Key, _RfidDataAnalyse.SendBFH(3)).GetAwaiter().GetResult();
_heartBeatRecord.Remove(kvp.Key);
}
//});
TimeSpan timeSpan = DateTime.Now - kvp.Value;
if (timeSpan.TotalSeconds > 10)
{
LogHelper.Instance.RfidLog($"[{kvp.Key}] 可能掉线，准备重连");
_heartBeatRecord.Remove(kvp.Key);
_touchSocketTcpClient.DisposeClient(kvp.Key);
_touchSocketTcpClient.CreateTcpClient(kvp.Key, "20108");
_touchSocketTcpClient.Send(kvp.Key, _RfidDataAnalyse.SendBFH(3));
_heartBeatRecord.Remove(kvp.Key);
}
}
}
catch (Exception ex)

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

@ -85,7 +85,7 @@ namespace HighWayIot.Winform.Business
Task.Run(() =>
{
_touchSocketTcpClient.CreateTcpClient(setting.RfidIp, "20108");
_touchSocketTcpClient.Send(setting.RfidIp, _RfidDataAnalyse.SendBFH(3)).GetAwaiter().GetResult();
_touchSocketTcpClient.Send(setting.RfidIp, _RfidDataAnalyse.SendBFH(3));
});
}
@ -118,7 +118,7 @@ namespace HighWayIot.Winform.Business
/// <summary>
/// 向指定RFID读写器发送读信号
/// </summary>
public async void SendRFIDSingal(int no)
public void SendRFIDSingal(int no)
{
if (IsAllConnected == true)
{
@ -138,15 +138,8 @@ namespace HighWayIot.Winform.Business
return;
}
int i = 0;
bool result = false;
do
{
result = await _touchSocketTcpClient.Send(setting.RfidIp, _RfidDataAnalyse.Send02H(1000));
i++;
}
while (i < 3 && result == false);
bool result = _touchSocketTcpClient.Send(setting.RfidIp, _RfidDataAnalyse.Send02H(1000));
if(result == false)
{
_logHelper.Error($"[{no}] 工位 [{setting.RfidIp}] 读写器指令发送失败!");

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 = "PLC测试页面" RoleIndex = "14" />
</RoleConfig>

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

@ -74,6 +74,12 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UserControlPages\LogPages\ExportPreviewForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UserControlPages\LogPages\ExportPreviewForm.Designer.cs">
<DependentUpon>ExportPreviewForm.cs</DependentUpon>
</Compile>
<Compile Include="UserControlPages\ParamConfigPages\RFIDParamSettingPage.cs">
<SubType>UserControl</SubType>
</Compile>
@ -229,6 +235,9 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="UserControlPages\LogPages\ExportPreviewForm.resx">
<DependentUpon>ExportPreviewForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControlPages\ParamConfigPages\RFIDParamSettingPage.resx">
<DependentUpon>RFIDParamSettingPage.cs</DependentUpon>
</EmbeddedResource>
@ -320,7 +329,7 @@
<Name>HighWayIot.Log4net</Name>
</ProjectReference>
<ProjectReference Include="..\HighWayIot.Plc\HighWayIot.Plc.csproj">
<Project>{4ee4c3e2-ac45-4275-8017-e99d70fc1f52}</Project>
<Project>{fe3ea2be-71c5-4f56-8125-e8e5aaa8fb84}</Project>
<Name>HighWayIot.Plc</Name>
</ProjectReference>
<ProjectReference Include="..\HighWayIot.Repository\HighWayIot.Repository.csproj">

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

@ -51,10 +51,7 @@ namespace HighWayIot.Winform.MainForm
this.MaterialTypeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem();
this.RecipeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem();
this.TestMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DeviceDataManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.VulcanizerRecipeConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.机台物料信息绑定ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.rToolStripMenuItem = 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();
@ -73,6 +70,8 @@ namespace HighWayIot.Winform.MainForm
this.StripLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components);
this.rFID参数配置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.机台物料信息绑定ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.MainMenu.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@ -85,8 +84,10 @@ namespace HighWayIot.Winform.MainForm
this.MonitorMainPageStripMenuItem,
this.MaterialMenuStripItem,
this.RecipeConfigStripItem,
this.TestMenuItem,
this.DeviceDataManageToolStripMenuItem});
this.rToolStripMenuItem,
this.rFID参数配置ToolStripMenuItem,
this.机台物料信息绑定ToolStripMenuItem1,
this.TestMenuItem});
this.MainMenu.Location = new System.Drawing.Point(0, 0);
this.MainMenu.Name = "MainMenu";
this.MainMenu.Padding = new System.Windows.Forms.Padding(5, 1, 0, 1);
@ -232,40 +233,13 @@ namespace HighWayIot.Winform.MainForm
this.TestMenuItem.Text = "PLC测试页面";
this.TestMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// DeviceDataManageToolStripMenuItem
// rToolStripMenuItem
//
this.DeviceDataManageToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.RFIDParamManageToolStripMenuItem,
this.VulcanizerRecipeConfigToolStripMenuItem,
this.机台物料信息绑定ToolStripMenuItem});
this.DeviceDataManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.参数;
this.DeviceDataManageToolStripMenuItem.Name = "DeviceDataManageToolStripMenuItem";
this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(84, 22);
this.DeviceDataManageToolStripMenuItem.Text = "参数管理";
//
// RFIDParamManageToolStripMenuItem
//
this.RFIDParamManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources._165_RFID;
this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem";
this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置";
this.RFIDParamManageToolStripMenuItem.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);
//
// 机台物料信息绑定ToolStripMenuItem
//
this.机台物料信息绑定ToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.绑定;
this.机台物料信息绑定ToolStripMenuItem.Name = "机台物料信息绑定ToolStripMenuItem";
this.机台物料信息绑定ToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
this.机台物料信息绑定ToolStripMenuItem.Text = "机台物料信息绑定";
this.机台物料信息绑定ToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
this.rToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.加硫_03;
this.rToolStripMenuItem.Name = "rToolStripMenuItem";
this.rToolStripMenuItem.Size = new System.Drawing.Size(84, 22);
this.rToolStripMenuItem.Text = "硫化排程";
this.rToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// UserControlTabs
//
@ -408,6 +382,22 @@ namespace HighWayIot.Winform.MainForm
this.TimeDisplayTimer.Interval = 1000;
this.TimeDisplayTimer.Tick += new System.EventHandler(this.TimeDisplayTimer_Tick);
//
// rFID参数配置ToolStripMenuItem
//
this.rFID参数配置ToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources._165_RFID;
this.rFID参数配置ToolStripMenuItem.Name = "rFID参数配置ToolStripMenuItem";
this.rFID参数配置ToolStripMenuItem.Size = new System.Drawing.Size(111, 22);
this.rFID参数配置ToolStripMenuItem.Text = "RFID参数配置";
this.rFID参数配置ToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// 机台物料信息绑定ToolStripMenuItem1
//
this.机台物料信息绑定ToolStripMenuItem1.Image = global::HighWayIot.Winform.Properties.Resources.绑定;
this.机台物料信息绑定ToolStripMenuItem1.Name = "机台物料信息绑定ToolStripMenuItem1";
this.机台物料信息绑定ToolStripMenuItem1.Size = new System.Drawing.Size(132, 22);
this.机台物料信息绑定ToolStripMenuItem1.Text = "机台物料信息绑定";
this.机台物料信息绑定ToolStripMenuItem1.Click += new System.EventHandler(this.StripMenuItemClick);
//
// BaseForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -461,8 +451,6 @@ namespace HighWayIot.Winform.MainForm
private ToolStripMenuItem RecipeConfigStripItem;
private ToolStripMenuItem MaterialConfigStripItem;
private ToolStripMenuItem MaterialTypeConfigStripItem;
private ToolStripMenuItem DeviceDataManageToolStripMenuItem;
private ToolStripMenuItem RFIDParamManageToolStripMenuItem;
private ToolStripStatusLabel SplitLabel2;
private ToolStripStatusLabel SplitLabel3;
private ToolStripStatusLabel SplitLabel4;
@ -470,7 +458,8 @@ namespace HighWayIot.Winform.MainForm
private ToolStripStatusLabel OpenMixStateLabel;
private ToolStripStatusLabel Label2;
private ToolStripStatusLabel MolderStateLabel;
private ToolStripMenuItem VulcanizerRecipeConfigToolStripMenuItem;
private ToolStripMenuItem 机台物料信息绑定ToolStripMenuItem;
private ToolStripMenuItem rToolStripMenuItem;
private ToolStripMenuItem rFID参数配置ToolStripMenuItem;
private ToolStripMenuItem 机台物料信息绑定ToolStripMenuItem1;
}
}

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

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

335
HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs generated
Unescape Escape View File

@ -32,29 +32,28 @@ namespace HighWayIot.Winform.UserControlPages
private void InitializeComponent()
{
this.ReportDataGridView = new System.Windows.Forms.DataGridView();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BeginTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SpecName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.No = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VulcanizationNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.StartTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RGVNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BaseRubFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MidRubTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RowTireFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Operator = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RawTireWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BaseRubTimeSpan = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MidRubTimeSpan = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.FaceRubTimeSpan = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ButtonPanel = new System.Windows.Forms.Panel();
this.ExportTableButton = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.VulcanizationNoCombobox = new System.Windows.Forms.ComboBox();
this.RecipeCodeCombobox = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.RgvNoComboBox = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
this.OperatorTextBox = new System.Windows.Forms.TextBox();
this.DeviceNoCombobox = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.SelectEndTime = new System.Windows.Forms.DateTimePicker();
this.SelectBeginTime = new System.Windows.Forms.DateTimePicker();
this.IsCheckByTime = new System.Windows.Forms.CheckBox();
this.SelectStartTime = new System.Windows.Forms.DateTimePicker();
this.label3 = new System.Windows.Forms.Label();
this.RecipeCodeTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.SelectReport = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.ReportDataGridView)).BeginInit();
@ -70,18 +69,17 @@ namespace HighWayIot.Winform.UserControlPages
| System.Windows.Forms.AnchorStyles.Right)));
this.ReportDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.ReportDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id,
this.DeviceNo,
this.BeginTime,
this.RecipeNo,
this.SpecName,
this.No,
this.VulcanizationNo,
this.StartTime,
this.RecipeCode,
this.RecipeName,
this.SpecCode,
this.RGVNo,
this.Weight,
this.BaseRubFinishTime,
this.MidRubTime,
this.RowTireFinishTime,
this.Operator});
this.DeviceNo,
this.RawTireWeight,
this.BaseRubTimeSpan,
this.MidRubTimeSpan,
this.FaceRubTimeSpan});
this.ReportDataGridView.Location = new System.Drawing.Point(-3, 65);
this.ReportDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ReportDataGridView.Name = "ReportDataGridView";
@ -91,108 +89,111 @@ namespace HighWayIot.Winform.UserControlPages
this.ReportDataGridView.Size = new System.Drawing.Size(1639, 868);
this.ReportDataGridView.TabIndex = 7;
//
// Id
// No
//
this.Id.DataPropertyName = "Id";
this.Id.HeaderText = "ID";
this.Id.Name = "Id";
this.Id.ReadOnly = true;
this.Id.Width = 50;
this.No.DataPropertyName = "No";
this.No.HeaderText = "ID";
this.No.Name = "No";
this.No.ReadOnly = true;
this.No.Width = 50;
//
// DeviceNo
// VulcanizationNo
//
this.DeviceNo.HeaderText = "机位";
this.DeviceNo.Name = "DeviceNo";
this.DeviceNo.ReadOnly = true;
this.DeviceNo.Width = 70;
this.VulcanizationNo.DataPropertyName = "VulcanizationNo";
this.VulcanizationNo.HeaderText = "机位";
this.VulcanizationNo.Name = "VulcanizationNo";
this.VulcanizationNo.ReadOnly = true;
this.VulcanizationNo.Width = 70;
//
// BeginTime
// StartTime
//
this.BeginTime.HeaderText = "开始时间";
this.BeginTime.Name = "BeginTime";
this.BeginTime.ReadOnly = true;
this.BeginTime.Width = 150;
this.StartTime.DataPropertyName = "StartTime";
this.StartTime.HeaderText = "开始时间";
this.StartTime.Name = "StartTime";
this.StartTime.ReadOnly = true;
this.StartTime.Width = 150;
//
// RecipeNo
// RecipeCode
//
this.RecipeNo.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeNo.FillWeight = 30F;
this.RecipeNo.HeaderText = "成品代号";
this.RecipeNo.Name = "RecipeNo";
this.RecipeNo.ReadOnly = true;
this.RecipeCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeCode.DataPropertyName = "RecipeCode";
this.RecipeCode.FillWeight = 30F;
this.RecipeCode.HeaderText = "成品代号";
this.RecipeCode.Name = "RecipeCode";
this.RecipeCode.ReadOnly = true;
//
// SpecName
// RecipeName
//
this.SpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SpecName.FillWeight = 70F;
this.SpecName.HeaderText = "标称尺度";
this.SpecName.Name = "SpecName";
this.SpecName.ReadOnly = true;
this.RecipeName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeName.DataPropertyName = "RecipeName";
this.RecipeName.FillWeight = 70F;
this.RecipeName.HeaderText = "标称尺度";
this.RecipeName.Name = "RecipeName";
this.RecipeName.ReadOnly = true;
//
// SpecCode
//
this.SpecCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SpecCode.DataPropertyName = "SpecCode";
this.SpecCode.FillWeight = 30F;
this.SpecCode.HeaderText = "Spec编号";
this.SpecCode.Name = "SpecCode";
this.SpecCode.ReadOnly = true;
//
// RGVNo
// DeviceNo
//
this.RGVNo.HeaderText = "小车编号";
this.RGVNo.Name = "RGVNo";
this.RGVNo.ReadOnly = true;
this.RGVNo.Width = 80;
this.DeviceNo.DataPropertyName = "DeviceNo";
this.DeviceNo.HeaderText = "小车编号";
this.DeviceNo.Name = "DeviceNo";
this.DeviceNo.ReadOnly = true;
this.DeviceNo.Width = 80;
//
// Weight
// RawTireWeight
//
this.Weight.HeaderText = "生胎重量";
this.Weight.Name = "Weight";
this.Weight.ReadOnly = true;
this.Weight.Width = 80;
this.RawTireWeight.DataPropertyName = "RawTireWeight";
this.RawTireWeight.HeaderText = "生胎重量";
this.RawTireWeight.Name = "RawTireWeight";
this.RawTireWeight.ReadOnly = true;
this.RawTireWeight.Width = 80;
//
// BaseRubFinishTime
// BaseRubTimeSpan
//
this.BaseRubFinishTime.HeaderText = "基部胶完成时间";
this.BaseRubFinishTime.Name = "BaseRubFinishTime";
this.BaseRubFinishTime.ReadOnly = true;
this.BaseRubFinishTime.Width = 140;
this.BaseRubTimeSpan.DataPropertyName = "BaseRubTimeSpan";
this.BaseRubTimeSpan.HeaderText = "基部胶完成时间";
this.BaseRubTimeSpan.Name = "BaseRubTimeSpan";
this.BaseRubTimeSpan.ReadOnly = true;
this.BaseRubTimeSpan.Width = 140;
//
// MidRubTime
// MidRubTimeSpan
//
this.MidRubTime.HeaderText = "中层胶完成时间（分）";
this.MidRubTime.Name = "MidRubTime";
this.MidRubTime.ReadOnly = true;
this.MidRubTime.Width = 150;
this.MidRubTimeSpan.DataPropertyName = "MidRubTimeSpan";
this.MidRubTimeSpan.HeaderText = "中层胶完成时间";
this.MidRubTimeSpan.Name = "MidRubTimeSpan";
this.MidRubTimeSpan.ReadOnly = true;
this.MidRubTimeSpan.Width = 150;
//
// RowTireFinishTime
// FaceRubTimeSpan
//
this.RowTireFinishTime.HeaderText = "生胎完成时间（分）";
this.RowTireFinishTime.Name = "RowTireFinishTime";
this.RowTireFinishTime.ReadOnly = true;
this.RowTireFinishTime.Width = 140;
//
// Operator
//
this.Operator.DataPropertyName = "Operator";
this.Operator.HeaderText = "操作者用户名";
this.Operator.Name = "Operator";
this.Operator.ReadOnly = true;
this.FaceRubTimeSpan.DataPropertyName = "FaceRubTimeSpan";
this.FaceRubTimeSpan.HeaderText = "生胎完成时间";
this.FaceRubTimeSpan.Name = "FaceRubTimeSpan";
this.FaceRubTimeSpan.ReadOnly = true;
this.FaceRubTimeSpan.Width = 140;
//
// 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.ExportTableButton);
this.ButtonPanel.Controls.Add(this.label6);
this.ButtonPanel.Controls.Add(this.VulcanizationNoCombobox);
this.ButtonPanel.Controls.Add(this.RecipeCodeCombobox);
this.ButtonPanel.Controls.Add(this.label2);
this.ButtonPanel.Controls.Add(this.RgvNoComboBox);
this.ButtonPanel.Controls.Add(this.label5);
this.ButtonPanel.Controls.Add(this.OperatorTextBox);
this.ButtonPanel.Controls.Add(this.DeviceNoCombobox);
this.ButtonPanel.Controls.Add(this.label4);
this.ButtonPanel.Controls.Add(this.SelectEndTime);
this.ButtonPanel.Controls.Add(this.SelectBeginTime);
this.ButtonPanel.Controls.Add(this.IsCheckByTime);
this.ButtonPanel.Controls.Add(this.SelectStartTime);
this.ButtonPanel.Controls.Add(this.label3);
this.ButtonPanel.Controls.Add(this.RecipeCodeTextBox);
this.ButtonPanel.Controls.Add(this.label1);
this.ButtonPanel.Controls.Add(this.SelectReport);
this.ButtonPanel.Location = new System.Drawing.Point(0, 0);
@ -201,43 +202,63 @@ namespace HighWayIot.Winform.UserControlPages
this.ButtonPanel.Size = new System.Drawing.Size(1636, 61);
this.ButtonPanel.TabIndex = 6;
//
// ExportTableButton
//
this.ExportTableButton.Location = new System.Drawing.Point(1026, 13);
this.ExportTableButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ExportTableButton.Name = "ExportTableButton";
this.ExportTableButton.Size = new System.Drawing.Size(103, 39);
this.ExportTableButton.TabIndex = 27;
this.ExportTableButton.Text = "详表导出";
this.ExportTableButton.UseVisualStyleBackColor = true;
this.ExportTableButton.Click += new System.EventHandler(this.ExportTableButton_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(618, 13);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(41, 12);
this.label6.TabIndex = 26;
this.label6.Text = "机位号";
//
// VulcanizationNoCombobox
//
this.VulcanizationNoCombobox.FormattingEnabled = true;
this.VulcanizationNoCombobox.Location = new System.Drawing.Point(665, 9);
this.VulcanizationNoCombobox.Name = "VulcanizationNoCombobox";
this.VulcanizationNoCombobox.Size = new System.Drawing.Size(88, 20);
this.VulcanizationNoCombobox.TabIndex = 25;
//
// RecipeCodeCombobox
//
this.RecipeCodeCombobox.FormattingEnabled = true;
this.RecipeCodeCombobox.Location = new System.Drawing.Point(830, 9);
this.RecipeCodeCombobox.Name = "RecipeCodeCombobox";
this.RecipeCodeCombobox.Size = new System.Drawing.Size(179, 20);
this.RecipeCodeCombobox.TabIndex = 24;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(702, 39);
this.label2.Location = new System.Drawing.Point(606, 39);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 23;
this.label2.Text = "小车编号";
//
// RgvNoComboBox
// DeviceNoCombobox
//
this.RgvNoComboBox.FormattingEnabled = true;
this.RgvNoComboBox.Location = new System.Drawing.Point(761, 35);
this.RgvNoComboBox.Name = "RgvNoComboBox";
this.RgvNoComboBox.Size = new System.Drawing.Size(88, 20);
this.RgvNoComboBox.TabIndex = 22;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(525, 38);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(65, 12);
this.label5.TabIndex = 21;
this.label5.Text = "操作员名称";
//
// OperatorTextBox
//
this.OperatorTextBox.Location = new System.Drawing.Point(596, 34);
this.OperatorTextBox.Name = "OperatorTextBox";
this.OperatorTextBox.Size = new System.Drawing.Size(100, 21);
this.OperatorTextBox.TabIndex = 20;
this.DeviceNoCombobox.FormattingEnabled = true;
this.DeviceNoCombobox.Location = new System.Drawing.Point(665, 35);
this.DeviceNoCombobox.Name = "DeviceNoCombobox";
this.DeviceNoCombobox.Size = new System.Drawing.Size(88, 20);
this.DeviceNoCombobox.TabIndex = 22;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(311, 32);
this.label4.Location = new System.Drawing.Point(382, 23);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(17, 12);
this.label4.TabIndex = 18;
@ -247,51 +268,34 @@ namespace HighWayIot.Winform.UserControlPages
//
this.SelectEndTime.CustomFormat = "yyyy年MM月dd日 HH:mm:ss";
this.SelectEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.SelectEndTime.Location = new System.Drawing.Point(334, 29);
this.SelectEndTime.Location = new System.Drawing.Point(405, 20);
this.SelectEndTime.Name = "SelectEndTime";
this.SelectEndTime.Size = new System.Drawing.Size(185, 21);
this.SelectEndTime.TabIndex = 17;
//
// SelectBeginTime
// SelectStartTime
//
this.SelectBeginTime.CustomFormat = "yyyy年MM月dd日 HH:mm:ss";
this.SelectBeginTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.SelectBeginTime.Location = new System.Drawing.Point(120, 29);
this.SelectBeginTime.Name = "SelectBeginTime";
this.SelectBeginTime.Size = new System.Drawing.Size(185, 21);
this.SelectBeginTime.TabIndex = 16;
this.SelectBeginTime.Value = new System.DateTime(2024, 11, 26, 13, 36, 9, 0);
//
// IsCheckByTime
//
this.IsCheckByTime.AutoSize = true;
this.IsCheckByTime.Location = new System.Drawing.Point(189, 11);
this.IsCheckByTime.Name = "IsCheckByTime";
this.IsCheckByTime.Size = new System.Drawing.Size(120, 16);
this.IsCheckByTime.TabIndex = 15;
this.IsCheckByTime.Text = "是否根据时间判断";
this.IsCheckByTime.UseVisualStyleBackColor = true;
this.SelectStartTime.CustomFormat = "yyyy年MM月dd日 HH:mm:ss";
this.SelectStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.SelectStartTime.Location = new System.Drawing.Point(191, 20);
this.SelectStartTime.Name = "SelectStartTime";
this.SelectStartTime.Size = new System.Drawing.Size(185, 21);
this.SelectStartTime.TabIndex = 16;
this.SelectStartTime.Value = new System.DateTime(2024, 11, 26, 13, 36, 9, 0);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(118, 13);
this.label3.Location = new System.Drawing.Point(120, 24);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 12);
this.label3.TabIndex = 14;
this.label3.Text = "登陆时间：";
//
// RecipeCodeTextBox
//
this.RecipeCodeTextBox.Location = new System.Drawing.Point(596, 7);
this.RecipeCodeTextBox.Name = "RecipeCodeTextBox";
this.RecipeCodeTextBox.Size = new System.Drawing.Size(100, 21);
this.RecipeCodeTextBox.TabIndex = 3;
this.label3.Text = "开始时间：";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(537, 12);
this.label1.Location = new System.Drawing.Point(771, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 2;
@ -305,7 +309,7 @@ namespace HighWayIot.Winform.UserControlPages
this.SelectReport.Name = "SelectReport";
this.SelectReport.Size = new System.Drawing.Size(103, 39);
this.SelectReport.TabIndex = 1;
this.SelectReport.Text = "查询报表";
this.SelectReport.Text = "查询/刷新报表";
this.SelectReport.UseVisualStyleBackColor = true;
this.SelectReport.Click += new System.EventHandler(this.SelectReport_Click);
//
@ -332,27 +336,26 @@ namespace HighWayIot.Winform.UserControlPages
private Panel ButtonPanel;
private Label label4;
private DateTimePicker SelectEndTime;
private DateTimePicker SelectBeginTime;
private CheckBox IsCheckByTime;
private Label label3;
private DateTimePicker SelectStartTime;
private Label label1;
private Button SelectReport;
private Label label5;
private TextBox OperatorTextBox;
private TextBox RecipeCodeTextBox;
private Label label2;
private ComboBox RgvNoComboBox;
private DataGridViewTextBoxColumn Id;
private DataGridViewTextBoxColumn DeviceNo;
private DataGridViewTextBoxColumn BeginTime;
private DataGridViewTextBoxColumn RecipeNo;
private DataGridViewTextBoxColumn SpecName;
private ComboBox DeviceNoCombobox;
private Label label3;
private ComboBox RecipeCodeCombobox;
private Label label6;
private ComboBox VulcanizationNoCombobox;
private DataGridViewTextBoxColumn No;
private DataGridViewTextBoxColumn VulcanizationNo;
private DataGridViewTextBoxColumn StartTime;
private DataGridViewTextBoxColumn RecipeCode;
private DataGridViewTextBoxColumn RecipeName;
private DataGridViewTextBoxColumn SpecCode;
private DataGridViewTextBoxColumn RGVNo;
private DataGridViewTextBoxColumn Weight;
private DataGridViewTextBoxColumn BaseRubFinishTime;
private DataGridViewTextBoxColumn MidRubTime;
private DataGridViewTextBoxColumn RowTireFinishTime;
private DataGridViewTextBoxColumn Operator;
private DataGridViewTextBoxColumn DeviceNo;
private DataGridViewTextBoxColumn RawTireWeight;
private DataGridViewTextBoxColumn BaseRubTimeSpan;
private DataGridViewTextBoxColumn MidRubTimeSpan;
private DataGridViewTextBoxColumn FaceRubTimeSpan;
private Button ExportTableButton;
}
}

87
HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.cs
Unescape Escape View File

@ -6,6 +6,7 @@ using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Net.Http;
@ -18,20 +19,102 @@ namespace HighWayIot.Winform.UserControlPages
{
public partial class DailyReportPage : UserControl
{
/// <summary>
/// 报表服务类
/// </summary>
private ZxDailyReportService _zxDailyReportService = ZxDailyReportService.Instance;
/// <summary>
/// datagridview 数据源
/// 必须使用BindingList， 如果使用LIST，无法实现更改，添加、删除数据源自动更新datagridview
/// </summary>
private BindingList<MonitorDataSource> _monitorDataSources = new BindingList<MonitorDataSource>();
public DailyReportPage()
{
InitializeComponent();
Init();
}
private void Init()
{
ReportDataGridView.AutoGenerateColumns = false;
List<string> recipeCodes = new List<string>()
{
""
};
recipeCodes.AddRange(ZxRecipeService.Instance.GetRecipeInfos().Select(x => x.RecipeCode).ToList());
List<string> workStationNos = new List<string>()
{
""
};
workStationNos.AddRange(ZxReaderSettingService.Instance.GetReaderInfos().Select(x => x.WorkstationNo).ToList());
List<string> deviceNos = new List<string>()
{
""
};
deviceNos.AddRange(ZxTagSettingService.Instance.GetTagInfos().Select(x => x.DeviceNo).ToList());
RecipeCodeCombobox.DataSource = recipeCodes;
VulcanizationNoCombobox.DataSource = workStationNos;
DeviceNoCombobox.DataSource = deviceNos;
SelectStartTime.Value = DateTime.Now.AddDays(-1);
SelectEndTime.Value = DateTime.Now;
ReportDataGridView.DataSource = null;
ReportDataGridView.DataSource = _monitorDataSources;
DataRefresh();
}
private void SelectReport_Click(object sender, EventArgs e)
{
DataRefresh();
}
private void DataRefresh()
{
List<ZxDailyReportEntity> dailyEntities =
_zxDailyReportService.GetDailyReportInfos(x =>
x.StartTime >= SelectStartTime.Value
&& x.StartTime <= SelectEndTime.Value
&& (string.IsNullOrEmpty(RecipeCodeCombobox.Text) || x.RecipeCode == RecipeCodeCombobox.Text)
&& (string.IsNullOrEmpty(VulcanizationNoCombobox.Text) || x.VulcanizationNo == VulcanizationNoCombobox.Text)
&& (string.IsNullOrEmpty(DeviceNoCombobox.Text) || x.DeviceNo.ToString() == DeviceNoCombobox.Text));
_monitorDataSources.Clear();
for (int i = 0; i < dailyEntities.Count; i++)
{
_monitorDataSources.Add(new MonitorDataSource()
{
No = i + 1,
VulcanizationNo = dailyEntities[i].VulcanizationNo,
StartTime = dailyEntities[i].StartTime.ToString("MM月dd日 HH:mm:ss"),
RecipeName = dailyEntities[i].RecipeName,
RecipeCode = dailyEntities[i].RecipeCode,
SpecCode = dailyEntities[i].SpecCode,
DeviceNo = dailyEntities[i].DeviceNo,
RawTireWeight = dailyEntities[i].RawTireWeight ?? 0,
BaseRubTimeSpan = GeneralUtils.DateTimeToString(dailyEntities[i].StartTime, dailyEntities[i].BaseEndTime),
MidRubTimeSpan = GeneralUtils.DateTimeToString(dailyEntities[i].StartTime, dailyEntities[i].MidEndTime),
FaceRubTimeSpan = GeneralUtils.DateTimeToString(dailyEntities[i].StartTime, dailyEntities[i].FaceEndTime),
});
}
}
/// <summary>
/// 导出报表
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ExportTableButton_Click(object sender, EventArgs e)
{
}
}
}

52
HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.resx
Unescape Escape View File

@ -117,40 +117,70 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="No.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DeviceNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="VulcanizationNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="BeginTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="StartTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="RecipeCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="RecipeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RGVNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="DeviceNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="RawTireWeight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="BaseRubFinishTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="BaseRubTimeSpan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MidRubTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="MidRubTimeSpan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RowTireFinishTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="FaceRubTimeSpan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Operator.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="No.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="VulcanizationNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="StartTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DeviceNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RawTireWeight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="BaseRubTimeSpan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MidRubTimeSpan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="FaceRubTimeSpan.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

46
HighWayIot.Winform/UserControlPages/LogPages/ExportPreviewForm.Designer.cs generated
Unescape Escape View File

@ -0,0 +1,46 @@
namespace HighWayIot.Winform.UserControlPages.LogPages
{
partial class ExportPreviewForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// ExportPreviewForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1904, 1041);
this.Name = "ExportPreviewForm";
this.Text = "导出预览";
this.ResumeLayout(false);
}
#endregion
}
}

20
HighWayIot.Winform/UserControlPages/LogPages/ExportPreviewForm.cs
Unescape Escape View File

@ -0,0 +1,20 @@
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.LogPages
{
public partial class ExportPreviewForm : Form
{
public ExportPreviewForm()
{
InitializeComponent();
}
}
}

120
HighWayIot.Winform/UserControlPages/LogPages/ExportPreviewForm.resx
Unescape Escape View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

36
HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.Designer.cs generated
Unescape Escape View File

@ -78,8 +78,8 @@ namespace HighWayIot.Winform.UserControlPages
this.No = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VulcanizationNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.StartTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SpecName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.TireWeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -428,7 +428,7 @@ namespace HighWayIot.Winform.UserControlPages
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(134, 31);
this.label2.TabIndex = 1;
this.label2.Text = "配方编号：";
this.label2.Text = "成品代号：";
//
// label1
//
@ -466,8 +466,8 @@ namespace HighWayIot.Winform.UserControlPages
this.No,
this.VulcanizationNo,
this.StartTime,
this.RecipeCode,
this.RecipeName,
this.SpecName,
this.SpecCode,
this.DeviceNo,
this.TireWeight,
@ -519,25 +519,25 @@ namespace HighWayIot.Winform.UserControlPages
this.StartTime.ReadOnly = true;
this.StartTime.Width = 200;
//
// RecipeCode
//
this.RecipeCode.DataPropertyName = "RecipeCode";
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.RecipeCode.DefaultCellStyle = dataGridViewCellStyle5;
this.RecipeCode.HeaderText = "成品代号";
this.RecipeCode.Name = "RecipeCode";
this.RecipeCode.ReadOnly = true;
this.RecipeCode.Width = 220;
//
// RecipeName
//
this.RecipeName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeName.DataPropertyName = "RecipeName";
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.RecipeName.DefaultCellStyle = dataGridViewCellStyle5;
this.RecipeName.HeaderText = "成品代号";
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.RecipeName.DefaultCellStyle = dataGridViewCellStyle6;
this.RecipeName.HeaderText = "标称尺度";
this.RecipeName.Name = "RecipeName";
this.RecipeName.ReadOnly = true;
this.RecipeName.Width = 220;
//
// SpecName
//
this.SpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.SpecName.DataPropertyName = "SpecName";
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Bold);
this.SpecName.DefaultCellStyle = dataGridViewCellStyle6;
this.SpecName.HeaderText = "标称尺度";
this.SpecName.Name = "SpecName";
this.SpecName.ReadOnly = true;
//
// SpecCode
//
@ -663,8 +663,8 @@ namespace HighWayIot.Winform.UserControlPages
private DataGridViewTextBoxColumn No;
private DataGridViewTextBoxColumn VulcanizationNo;
private DataGridViewTextBoxColumn StartTime;
private DataGridViewTextBoxColumn RecipeCode;
private DataGridViewTextBoxColumn RecipeName;
private DataGridViewTextBoxColumn SpecName;
private DataGridViewTextBoxColumn SpecCode;
private DataGridViewTextBoxColumn DeviceNo;
private DataGridViewTextBoxColumn TireWeight;

22
HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.cs
Unescape Escape View File

@ -29,7 +29,11 @@ namespace HighWayIot.Winform.UserControlPages
/// </summary>
private ZxDailyReportService _zxDailyReportService = ZxDailyReportService.Instance;
private List<MonitorDataSource> monitorEntity = new List<MonitorDataSource>();
/// <summary>
/// datagridview 数据源
/// 必须使用BindingList， 如果使用LIST，无法实现更改，添加、删除数据源自动更新datagridview
/// </summary>
private BindingList<MonitorDataSource> _monitorDataSources = new BindingList<MonitorDataSource>();
public MonitorMainPage()
{
@ -38,6 +42,9 @@ namespace HighWayIot.Winform.UserControlPages
MonitorDataGridView.AutoGenerateColumns = false;
DateTimeRefresh();
MonitorDataGridView.DataSource = null;
MonitorDataGridView.DataSource = _monitorDataSources;
}
/// <summary>
@ -83,17 +90,17 @@ namespace HighWayIot.Winform.UserControlPages
/// </summary>
private void BindData()
{
List<ZxDailyReportEntity> dailyEntity = _zxDailyReportService.Get50DailyReportInfos();
monitorEntity.Clear();
List<ZxDailyReportEntity> dailyEntity = _zxDailyReportService.Get25DailyReportInfos();
_monitorDataSources.Clear();
for(int i = 0; i < dailyEntity.Count; i++)
{
monitorEntity.Add(new MonitorDataSource()
_monitorDataSources.Add(new MonitorDataSource()
{
No = i + 1,
VulcanizationNo = dailyEntity[i].VulcanizationNo,
StartTime = dailyEntity[i].StartTime.ToString("MM月dd日 HH:mm:ss"),
RecipeName = dailyEntity[i].RecipeName,
SpecName = dailyEntity[i].SpecName,
RecipeCode = dailyEntity[i].RecipeCode,
SpecCode = dailyEntity[i].SpecCode,
DeviceNo = dailyEntity[i].DeviceNo,
RawTireWeight = dailyEntity[i].RawTireWeight ?? 0,
@ -102,10 +109,7 @@ namespace HighWayIot.Winform.UserControlPages
FaceRubTimeSpan = GeneralUtils.DateTimeToString(dailyEntity[i].StartTime, dailyEntity[i].FaceEndTime),
});
}
MonitorDataGridView.DataSource = null;
MonitorDataGridView.DataSource = monitorEntity;
}
}
}

4
HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.resx
Unescape Escape View File

@ -126,10 +126,10 @@
<metadata name="StartTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="RecipeCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="RecipeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SpecCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@ -34,6 +34,7 @@ namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
private void init()
{
this.SchedulingDataGridView.DataError += new DataGridViewDataErrorEventHandler(SchedulingDataGridView_DataError);
zxSchedulingEntity = zxSchedulingService.GetSchedulingInfo();
SchedulingDataGridView.AutoGenerateColumns = false;
bindingSource.DataSource = zxSchedulingEntity;
@ -42,6 +43,17 @@ namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
ComboBoxBind();
}
/// <summary>
/// 处理异常数据
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
private void SchedulingDataGridView_DataError(object sender, DataGridViewDataErrorEventArgs e)
{
return;
}
/// <summary>
/// 绑定下拉框数据源
/// </summary>

32
HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.Designer.cs generated
Unescape Escape View File

@ -31,8 +31,8 @@ namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.GetReaderButton = new System.Windows.Forms.Button();
this.ButtonPanel = new System.Windows.Forms.Panel();
this.UpdateReaderButton = new System.Windows.Forms.Button();
@ -99,13 +99,13 @@ namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
//
this.ReaderDataGridView.AllowUserToAddRows = false;
this.ReaderDataGridView.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
this.ReaderDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
this.ReaderDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.ReaderDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.ReaderDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id,
@ -239,13 +239,13 @@ namespace HighWayIot.Winform.UserControlPages.ParamConfigPages
//
this.TagDataGridView.AllowUserToAddRows = false;
this.TagDataGridView.AllowUserToDeleteRows = false;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
this.TagDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
this.TagDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.TagDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.TagDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.RfidId,

8
HighWayIot.Winform/UserControlPages/RecipeConfigPages/AddWeightForm.Designer.cs generated
Unescape Escape View File

@ -63,11 +63,11 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(51, 42);
this.label1.Location = new System.Drawing.Point(51, 41);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.TabIndex = 0;
this.label1.Text = "配方编号：";
this.label1.Text = "编号：";
//
// RecipeCodeTextBox
//
@ -352,7 +352,7 @@
this.Controls.Add(this.label1);
this.Name = "AddWeightForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "添加称量信息";
this.Text = "添加成型信息";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AddWeightForm_FormClosing);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();

4
HighWayIot.Winform/UserControlPages/RecipeConfigPages/AddWeightForm.cs
Unescape Escape View File

@ -183,11 +183,11 @@ namespace HighWayIot.Winform.UserControlPages.RecipeConfigPages
if (zxWeightService.InsertWeightInfo(zxWeightEntity))
{
MessageBox.Show("称量信息添加成功！");
MessageBox.Show("成型信息添加成功！");
}
else
{
MessageBox.Show("称量信息添加失败！请尝试重新添加");
MessageBox.Show("成型信息添加失败！请尝试重新添加或检查数据库连接");
return;
}
OutValue = zxWeightEntity;

192
HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs generated
Unescape Escape View File

@ -54,6 +54,15 @@ namespace HighWayIot.Winform.UserControlPages
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.RecipeDataGridView = new System.Windows.Forms.DataGridView();
this.RId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeSpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeSpecName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SizeKind = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.FixedWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.WeightError = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
@ -145,15 +154,6 @@ namespace HighWayIot.Winform.UserControlPages
this.UpdateWeightButton = new System.Windows.Forms.Button();
this.AddWeightButton = new System.Windows.Forms.Button();
this.DeleteWeightButton = new System.Windows.Forms.Button();
this.RId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeSpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RecipeSpecName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SizeKind = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.FixedWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.WeightError = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.WeightDataGridView)).BeginInit();
this.ButtonPanel.SuspendLayout();
this.groupBox1.SuspendLayout();
@ -393,7 +393,7 @@ namespace HighWayIot.Winform.UserControlPages
this.groupBox1.Size = new System.Drawing.Size(861, 813);
this.groupBox1.TabIndex = 5;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "称量信息";
this.groupBox1.Text = "成型信息";
//
// groupBox2
//
@ -435,6 +435,88 @@ namespace HighWayIot.Winform.UserControlPages
this.RecipeDataGridView.Tag = "";
this.RecipeDataGridView.SelectionChanged += new System.EventHandler(this.RecipeDataGridView_SelectionChanged);
//
// RId
//
this.RId.DataPropertyName = "Id";
this.RId.HeaderText = "ID";
this.RId.Name = "RId";
this.RId.ReadOnly = true;
this.RId.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.RId.Width = 40;
//
// RecipeCode
//
this.RecipeCode.DataPropertyName = "RecipeCode";
this.RecipeCode.FillWeight = 52.74404F;
this.RecipeCode.HeaderText = "成品代号";
this.RecipeCode.Name = "RecipeCode";
this.RecipeCode.ReadOnly = true;
this.RecipeCode.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// RecipeName
//
this.RecipeName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeName.DataPropertyName = "RecipeName";
this.RecipeName.FillWeight = 52.74404F;
this.RecipeName.HeaderText = "标称尺度";
this.RecipeName.Name = "RecipeName";
this.RecipeName.ReadOnly = true;
this.RecipeName.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// RecipeSpecCode
//
this.RecipeSpecCode.DataPropertyName = "RecipeSpecCode";
this.RecipeSpecCode.FillWeight = 52.74404F;
this.RecipeSpecCode.HeaderText = "SPEC编号";
this.RecipeSpecCode.Name = "RecipeSpecCode";
this.RecipeSpecCode.ReadOnly = true;
this.RecipeSpecCode.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// RecipeSpecName
//
this.RecipeSpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeSpecName.DataPropertyName = "RecipeSpecName";
this.RecipeSpecName.FillWeight = 52.74404F;
this.RecipeSpecName.HeaderText = "SPEC名称";
this.RecipeSpecName.Name = "RecipeSpecName";
this.RecipeSpecName.ReadOnly = true;
this.RecipeSpecName.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// SizeKind
//
this.SizeKind.DataPropertyName = "SizeKind";
this.SizeKind.FillWeight = 52.74404F;
this.SizeKind.HeaderText = "寸别";
this.SizeKind.Name = "SizeKind";
this.SizeKind.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.SizeKind.Width = 55;
//
// FixedWidth
//
this.FixedWidth.DataPropertyName = "FixedWidth";
this.FixedWidth.FillWeight = 137.1345F;
this.FixedWidth.HeaderText = "固定胶宽度";
this.FixedWidth.Name = "FixedWidth";
this.FixedWidth.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.FixedWidth.Width = 90;
//
// WeightError
//
this.WeightError.DataPropertyName = "WeightError";
this.WeightError.HeaderText = "重量公差";
this.WeightError.Name = "WeightError";
this.WeightError.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.WeightError.Width = 79;
//
// IsUse
//
this.IsUse.DataPropertyName = "IsUse";
this.IsUse.HeaderText = "启用";
this.IsUse.Name = "IsUse";
this.IsUse.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.IsUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.IsUse.Width = 40;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -1377,7 +1459,7 @@ namespace HighWayIot.Winform.UserControlPages
this.RefreshWeightButton.Name = "RefreshWeightButton";
this.RefreshWeightButton.Size = new System.Drawing.Size(103, 39);
this.RefreshWeightButton.TabIndex = 4;
this.RefreshWeightButton.Text = "刷新称量信息";
this.RefreshWeightButton.Text = "刷新成型信息";
this.RefreshWeightButton.UseVisualStyleBackColor = true;
this.RefreshWeightButton.Click += new System.EventHandler(this.RefreshWeightButton_Click);
//
@ -1388,7 +1470,7 @@ namespace HighWayIot.Winform.UserControlPages
this.UpdateWeightButton.Name = "UpdateWeightButton";
this.UpdateWeightButton.Size = new System.Drawing.Size(103, 39);
this.UpdateWeightButton.TabIndex = 3;
this.UpdateWeightButton.Text = "修改称量信息";
this.UpdateWeightButton.Text = "修改成型信息";
this.UpdateWeightButton.UseVisualStyleBackColor = true;
this.UpdateWeightButton.Click += new System.EventHandler(this.UpdateWeightButton_Click);
//
@ -1399,7 +1481,7 @@ namespace HighWayIot.Winform.UserControlPages
this.AddWeightButton.Name = "AddWeightButton";
this.AddWeightButton.Size = new System.Drawing.Size(103, 39);
this.AddWeightButton.TabIndex = 1;
this.AddWeightButton.Text = "添加称量信息";
this.AddWeightButton.Text = "添加成型信息";
this.AddWeightButton.UseVisualStyleBackColor = true;
this.AddWeightButton.Click += new System.EventHandler(this.AddWeightButton_Click);
//
@ -1411,92 +1493,10 @@ namespace HighWayIot.Winform.UserControlPages
this.DeleteWeightButton.Name = "DeleteWeightButton";
this.DeleteWeightButton.Size = new System.Drawing.Size(103, 39);
this.DeleteWeightButton.TabIndex = 2;
this.DeleteWeightButton.Text = "删除称量信息";
this.DeleteWeightButton.Text = "删除成型信息";
this.DeleteWeightButton.UseVisualStyleBackColor = true;
this.DeleteWeightButton.Click += new System.EventHandler(this.DeleteWeightButton_Click);
//
// RId
//
this.RId.DataPropertyName = "Id";
this.RId.HeaderText = "ID";
this.RId.Name = "RId";
this.RId.ReadOnly = true;
this.RId.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.RId.Width = 40;
//
// RecipeCode
//
this.RecipeCode.DataPropertyName = "RecipeCode";
this.RecipeCode.FillWeight = 52.74404F;
this.RecipeCode.HeaderText = "成品代号";
this.RecipeCode.Name = "RecipeCode";
this.RecipeCode.ReadOnly = true;
this.RecipeCode.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// RecipeName
//
this.RecipeName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeName.DataPropertyName = "RecipeName";
this.RecipeName.FillWeight = 52.74404F;
this.RecipeName.HeaderText = "标称尺度";
this.RecipeName.Name = "RecipeName";
this.RecipeName.ReadOnly = true;
this.RecipeName.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// RecipeSpecCode
//
this.RecipeSpecCode.DataPropertyName = "RecipeSpecCode";
this.RecipeSpecCode.FillWeight = 52.74404F;
this.RecipeSpecCode.HeaderText = "SPEC编号";
this.RecipeSpecCode.Name = "RecipeSpecCode";
this.RecipeSpecCode.ReadOnly = true;
this.RecipeSpecCode.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// RecipeSpecName
//
this.RecipeSpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.RecipeSpecName.DataPropertyName = "RecipeSpecName";
this.RecipeSpecName.FillWeight = 52.74404F;
this.RecipeSpecName.HeaderText = "SPEC名称";
this.RecipeSpecName.Name = "RecipeSpecName";
this.RecipeSpecName.ReadOnly = true;
this.RecipeSpecName.Resizable = System.Windows.Forms.DataGridViewTriState.False;
//
// SizeKind
//
this.SizeKind.DataPropertyName = "SizeKind";
this.SizeKind.FillWeight = 52.74404F;
this.SizeKind.HeaderText = "寸别";
this.SizeKind.Name = "SizeKind";
this.SizeKind.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.SizeKind.Width = 55;
//
// FixedWidth
//
this.FixedWidth.DataPropertyName = "FixedWidth";
this.FixedWidth.FillWeight = 137.1345F;
this.FixedWidth.HeaderText = "固定胶宽度";
this.FixedWidth.Name = "FixedWidth";
this.FixedWidth.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.FixedWidth.Width = 90;
//
// WeightError
//
this.WeightError.DataPropertyName = "WeightError";
this.WeightError.HeaderText = "重量公差";
this.WeightError.Name = "WeightError";
this.WeightError.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.WeightError.Width = 79;
//
// IsUse
//
this.IsUse.DataPropertyName = "IsUse";
this.IsUse.HeaderText = "启用";
this.IsUse.Name = "IsUse";
this.IsUse.Resizable = System.Windows.Forms.DataGridViewTriState.False;
this.IsUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.IsUse.Width = 40;
//
// RecipeConfigPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

41
HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.cs
Unescape Escape View File

@ -65,11 +65,6 @@ namespace HighWayIot.Winform.UserControlPages
/// </summary>
private List<ZxOpenMixMaterialEntity> openMixConfig;
/// <summary>
/// 配方同步实体类
/// </summary>
private ZxMesPlanTransferEntity zxMesPlanTransferEntity;
/// <summary>
/// 配方字段实例
/// </summary>
@ -139,12 +134,21 @@ namespace HighWayIot.Winform.UserControlPages
NowRecipeCode = RecipeDataGridView.Rows[0].Cells["RecipeCode"].Value.ToString();
InitPositionEntities();
if (PlcConnect.IsConnect2)
try
{
//读取SPEC编号
PlcSpecNoLabel.Text = PlcConnect.ReadUInt322("D206").ToString();
//读取SPEC名称
PlcSpecNameLabel.Text = PlcConnect.ReadString2("D290", 10).Trim();
var res = PlcConnect.MelsecInstance2.Read("D200", 1);
if (res.IsSuccess)
{
//读取SPEC编号
PlcSpecNoLabel.Text = PlcConnect.ReadUInt322("D206").ToString();
//读取SPEC名称
PlcSpecNameLabel.Text = PlcConnect.ReadString2("D290", 10).ToString();
}
}
catch
{
PlcSpecNoLabel.Text = "PLC连接失败";
PlcSpecNameLabel.Text = "PLC连接失败";
}
openMixConfig = zxOpenMixMaterialService.GetInfos();
@ -538,11 +542,11 @@ namespace HighWayIot.Winform.UserControlPages
zxRecipePositionParaService.UpdateRecipePositionParaInfo(positionEntity);
}
}
MessageBox.Show("称量信息更新成功！");
MessageBox.Show("成型信息更新成功！");
}
else
{
MessageBox.Show("称量信息更新失败！");
MessageBox.Show("成型信息更新失败！");
}
ParaRefresh();
@ -1112,7 +1116,7 @@ namespace HighWayIot.Winform.UserControlPages
{
return;
}
if (!PlcConnect.IsConnect2)
if (!PlcConnect.MelsecInstance2.Read("D200", 1).IsSuccess)
{
MessageBox.Show("PLC未连接");
return;
@ -1142,7 +1146,7 @@ namespace HighWayIot.Winform.UserControlPages
{
return;
}
if (!PlcConnect.IsConnect2)
if (!PlcConnect.MelsecInstance2.Read("D200", 1).IsSuccess)
{
MessageBox.Show("PLC未连接");
return;
@ -1165,7 +1169,8 @@ namespace HighWayIot.Winform.UserControlPages
/// <param name="e"></param>
private void SyncDataButton_Click(object sender, EventArgs e)
{
RecipeDataSync(zxMesPlanTransferService.GetRecipeInfos(x => x.Uuid != "syncsignal"));
// RecipeDataSync(zxMesPlanTransferService.GetRecipeInfos(x => x.Uuid != "syncsignal"));
zxMesPlanTransferService.SetFlagTrue();
//if (zxMesPlanTransferService.GetFlagState())
//{
// MessageBox.Show("正在同步数据，请稍后");
@ -1197,7 +1202,7 @@ namespace HighWayIot.Winform.UserControlPages
foreach (var newRecipes in sourceEntity)
{
//////////////////////////////更新配方表/////////////////////////////////
var newEneitys = RecipeLists.Where(x => x.RecipeName == newRecipes.RecipeName).ToList();
var newEneitys = RecipeLists.Where(x => x.RecipeCode == newRecipes.RecipeCode).ToList();
if (newEneitys.Count > 0) //有就更新
{
//配方
@ -1215,7 +1220,7 @@ namespace HighWayIot.Winform.UserControlPages
ZxRecipeEntity entity = new ZxRecipeEntity()
{
RecipeName = newRecipes.RecipeName,
RecipeCode = DateTime.Now.ToString("yyyyMMddHHmmssffff"),
RecipeCode = newRecipes.RecipeCode,
RecipeSpecCode = newRecipes.SpecCode,
RecipeSpecName = newRecipes.SpecName,
SizeKind = newRecipes.RimInch,
@ -1227,7 +1232,7 @@ namespace HighWayIot.Winform.UserControlPages
}
/////////////////////////////更新称量信息表////////////////////////////////
string recipeCode = zxRecipeService.GetSingleInfoByRecipeName(newRecipes.RecipeName).RecipeCode;
string recipeCode = newRecipes.RecipeCode;
var material1 = zxMaterialService.GetMaterialInfoByMaterialName(newRecipes.MaterialName1);
var material2 = zxMaterialService.GetMaterialInfoByMaterialName(newRecipes.MaterialName2);
var material3 = zxMaterialService.GetMaterialInfoByMaterialName(newRecipes.MaterialName3);

8
HighWayIot.Winform/UserControlPages/TestPage.cs
Unescape Escape View File

@ -94,9 +94,9 @@ namespace HighWayIot.Winform.UserControlPages
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private async void button2_Click(object sender, EventArgs e)
private void button2_Click(object sender, EventArgs e)
{
var a = await _touchSocketTcpClient.Send($"10.20.48.{RFIDtext.Text}", _RfidDataAnalyse.Send02H(1000));
var a = _touchSocketTcpClient.Send($"10.20.48.{RFIDtext.Text}", _RfidDataAnalyse.Send02H(1000));
LogHelper.Instance.Info($"10.20.48.{RFIDtext.Text} 发送" + (a ? "成功" : "失败"));
}
@ -105,9 +105,9 @@ namespace HighWayIot.Winform.UserControlPages
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private async void button3_Click(object sender, EventArgs e)
private void button3_Click(object sender, EventArgs e)
{
MessageBox.Show(PlcConnect.IsConnect2.ToString());
MessageBox.Show(PlcConnect.MelsecInstance2.Read("D200", 1).IsSuccess.ToString());
}
/// <summary>

12
HighWayIot.sln
Unescape Escape View File

@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Common", "HighWa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Repository", "HighWayIot.Repository\HighWayIot.Repository.csproj", "{D0DC3CFB-6748-4D5E-B56A-76FDC72AB4B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Plc", "HighWayIot.Plc\HighWayIot.Plc.csproj", "{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Winform", "HighWayIot.Winform\HighWayIot.Winform.csproj", "{E36F832C-5F90-491C-B3B7-E94C734FD292}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.TouchSocket", "HighWayIot.TouchSocket\HighWayIot.TouchSocket.csproj", "{DD18A634-1F9C-409A-8C32-C3C81B1B55B5}"
@ -24,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Plc", "HighWayIot.Plc\HighWayIot.Plc.csproj", "{FE3EA2BE-71C5-4F56-8125-E8E5AAA8FB84}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -46,10 +46,6 @@ Global
{D0DC3CFB-6748-4D5E-B56A-76FDC72AB4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0DC3CFB-6748-4D5E-B56A-76FDC72AB4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0DC3CFB-6748-4D5E-B56A-76FDC72AB4B3}.Release|Any CPU.Build.0 = Release|Any CPU
{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EE4C3E2-AC45-4275-8017-E99D70FC1F52}.Release|Any CPU.Build.0 = Release|Any CPU
{E36F832C-5F90-491C-B3B7-E94C734FD292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E36F832C-5F90-491C-B3B7-E94C734FD292}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E36F832C-5F90-491C-B3B7-E94C734FD292}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -62,6 +58,10 @@ Global
{29813574-49C0-4979-A5A6-47EB7C4288A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29813574-49C0-4979-A5A6-47EB7C4288A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29813574-49C0-4979-A5A6-47EB7C4288A0}.Release|Any CPU.Build.0 = Release|Any CPU
{FE3EA2BE-71C5-4F56-8125-E8E5AAA8FB84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE3EA2BE-71C5-4F56-8125-E8E5AAA8FB84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE3EA2BE-71C5-4F56-8125-E8E5AAA8FB84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE3EA2BE-71C5-4F56-8125-E8E5AAA8FB84}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Write Preview
Loading…
Cancel
Save