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

change - 更改配方字段信息

Browse Source
master
SoulStar 10 months ago
parent c3fb4d5f51
commit d979a53e14
13 changed files with 1393 additions and 944 deletions
Show Stats Download Patch File Download Diff File

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

@ -7,6 +7,9 @@ using System.Threading.Tasks;
namespace HighWayIot.Plc.PlcHelper namespace HighWayIot.Plc.PlcHelper
{ {
/// <summary>
/// PLC工位识别工位读取
/// </summary>
public class WorkStationHelper public class WorkStationHelper
{ {
/// <summary> /// <summary>

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

@ -62,6 +62,7 @@
<Compile Include="domain\ZxMaterialTypeEntity.cs" /> <Compile Include="domain\ZxMaterialTypeEntity.cs" />
<Compile Include="domain\ZxMaterialChildTypeEntity.cs" /> <Compile Include="domain\ZxMaterialChildTypeEntity.cs" />
<Compile Include="domain\ZxMaterialEntity.cs" /> <Compile Include="domain\ZxMaterialEntity.cs" />
<Compile Include="domain\ZxRecipePositionParaEntity.cs" />
<Compile Include="domain\ZxTagSettingEntity.cs" /> <Compile Include="domain\ZxTagSettingEntity.cs" />
<Compile Include="domain\ZxRecipeEntity.cs" /> <Compile Include="domain\ZxRecipeEntity.cs" />
<Compile Include="domain\ZxRecipeParaEntity.cs" /> <Compile Include="domain\ZxRecipeParaEntity.cs" />
@ -69,6 +70,7 @@
<Compile Include="domain\ZxReaderSettingEntity.cs" /> <Compile Include="domain\ZxReaderSettingEntity.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Repository.cs" /> <Compile Include="Repository.cs" />
<Compile Include="service\ZxRecipePositionParaService.cs" />
<Compile Include="service\ZxTagSettingService.cs" /> <Compile Include="service\ZxTagSettingService.cs" />
<Compile Include="service\ZxReaderSettingService.cs" /> <Compile Include="service\ZxReaderSettingService.cs" />
<Compile Include="service\SysLogService.cs" /> <Compile Include="service\SysLogService.cs" />

296
HighWayIot.Repository/domain/ZxRecipeParaEntity.cs
Unescape Escape View File

@ -11,7 +11,6 @@ namespace Models
public class ZxRecipeParaEntity public class ZxRecipeParaEntity
{ {
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
@ -20,333 +19,116 @@ namespace Models
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 备 注:配方代码 /// 备 注:关联配方号
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "recipe_code")] [SugarColumn(ColumnName = "recipe_code")]
public string RecipeCode { get; set; } = null; public string RecipeCode { get; set; } = string.Empty;
/// <summary>
/// 备 注:是否删除
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "is_deleted")]
public bool? IsDeleted { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P1")] [SugarColumn(ColumnName = "P1")]
public int? E1P1 { get; set; } public int? P1 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P2")] [SugarColumn(ColumnName = "P2")]
public int? E1P2 { get; set; } public int? P2 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P3")] [SugarColumn(ColumnName = "P31")]
public int? E1P3 { get; set; } public int? P31 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P4")] [SugarColumn(ColumnName = "P32")]
public int? E1P4 { get; set; } public int? P32 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P5")] [SugarColumn(ColumnName = "P41")]
public int? E1P5 { get; set; } public int? P41 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P6")] [SugarColumn(ColumnName = "P42")]
public int? E1P6 { get; set; } public int? P42 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P7")] [SugarColumn(ColumnName = "P51")]
public int? E1P7 { get; set; } public int? P51 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P8")] [SugarColumn(ColumnName = "P52")]
public int? E1P8 { get; set; } public int? P52 { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:钢圈尺寸
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P9")] [SugarColumn(ColumnName = "rim_inch")]
public int? E1P9 { get; set; } public int? RimInch { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:灯标宽度
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P10")] [SugarColumn(ColumnName = "light_width")]
public int? E1P10 { get; set; } public int? LightWidth { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:减速距离
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P11")] [SugarColumn(ColumnName = "slow_distance")]
public int? E1P11 { get; set; } public int? SlowDistance { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:停止距离
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P12")] [SugarColumn(ColumnName = "stop_distance")]
public int? E1P12 { get; set; } public int? StopDistance { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:胎体重量
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P13")] [SugarColumn(ColumnName = "tire_weight")]
public int? E1P13 { get; set; } public int? TireWeight { get; set; }
/// <summary> /// <summary>
/// 备 注: /// 备 注:规格名
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P14")] [SugarColumn(ColumnName = "spec_name")]
public int? E1P14 { get; set; } public string SpecName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 备 注: /// 备 注:规格号
/// 默认值: /// 默认值:
///</summary> ///</summary>
[SugarColumn(ColumnName = "E1P15")] [SugarColumn(ColumnName = "spec_code")]
public int? E1P15 { get; set; } public int? SpecCode { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P1")]
public int? E2P1 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P2")]
public int? E2P2 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P3")]
public int? E2P3 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P4")]
public int? E2P4 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P5")]
public int? E2P5 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P6")]
public int? E2P6 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P7")]
public int? E2P7 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P8")]
public int? E2P8 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P9")]
public int? E2P9 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P10")]
public int? E2P10 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P11")]
public int? E2P11 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P12")]
public int? E2P12 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P13")]
public int? E2P13 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P14")]
public int? E2P14 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2P15")]
public int? E2P15 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P1")]
public int? E3P1 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P2")]
public int? E3P2 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P3")]
public int? E3P3 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P4")]
public int? E3P4 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P5")]
public int? E3P5 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P6")]
public int? E3P6 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P7")]
public int? E3P7 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P8")]
public int? E3P8 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P9")]
public int? E3P9 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P10")]
public int? E3P10 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P11")]
public int? E3P11 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P12")]
public int? E3P12 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P13")]
public int? E3P13 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P14")]
public int? E3P14 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3P15")]
public int? E3P15 { get; set; }
} }

128
HighWayIot.Repository/domain/ZxRecipePositionParaEntity.cs
Unescape Escape View File

@ -0,0 +1,128 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.domain
{
/// <summary>
///
///</summary>
[SugarTable("zx_recipe_position_para")]
public class ZxRecipePositionParaEntity
{
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E1")]
public int? E1 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E2")]
public int? E2 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E3")]
public int? E3 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E4")]
public int? E4 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E5")]
public int? E5 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E6")]
public int? E6 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E7")]
public int? E7 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E8")]
public int? E8 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E9")]
public int? E9 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E10")]
public int? E10 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E11")]
public int? E11 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E12")]
public int? E12 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E13")]
public int? E13 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E14")]
public int? E14 { get; set; }
/// <summary>
/// 备 注:
/// 默认值:
///</summary>
[SugarColumn(ColumnName = "E15")]
public int? E15 { get; set; }
}
}

10
HighWayIot.Repository/service/ZxRecipeParaService.cs
Unescape Escape View File

@ -38,7 +38,7 @@ namespace HighWayIot.Repository.service
} }
catch (Exception ex) catch (Exception ex)
{ {
log.Error("用户信息获取异常", ex); log.Error("配方信息获取异常", ex);
return null; return null;
} }
} }
@ -51,12 +51,12 @@ namespace HighWayIot.Repository.service
{ {
try try
{ {
List<ZxRecipeParaEntity> entity = _repository.GetList(x => x.IsDeleted == false); List<ZxRecipeParaEntity> entity = _repository.GetList();
return entity; return entity;
} }
catch (Exception ex) catch (Exception ex)
{ {
log.Error("用户信息获取异常", ex); log.Error("配方信息获取异常", ex);
return null; return null;
} }
} }
@ -70,12 +70,12 @@ namespace HighWayIot.Repository.service
{ {
try try
{ {
List<ZxRecipeParaEntity> entity = _repository.GetList(x => x.IsDeleted == false && x.RecipeCode == recipeCode); List<ZxRecipeParaEntity> entity = _repository.GetList(x => x.RecipeCode == recipeCode);
return entity; return entity;
} }
catch (Exception ex) catch (Exception ex)
{ {
log.Error("用户信息获取异常", ex); log.Error("配方信息获取异常", ex);
return null; return null;
} }
} }

118
HighWayIot.Repository/service/ZxRecipePositionParaService.cs
Unescape Escape View File

@ -0,0 +1,118 @@
using HighWayIot.Log4net;
using HighWayIot.Repository.domain;
using Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.service
{
public class ZxRecipePositionParaService
{
private static readonly Lazy<ZxRecipePositionParaService> lazy = new Lazy<ZxRecipePositionParaService>(() => new ZxRecipePositionParaService());
public static ZxRecipePositionParaService Instance
{
get
{
return lazy.Value;
}
}
private LogHelper log = LogHelper.Instance;
Repository<ZxRecipePositionParaEntity> _repository => new Repository<ZxRecipePositionParaEntity>("sqlserver");
/// <summary>
/// 查询工位配方字段信息
/// </summary>
/// <returns></returns>
public List<ZxRecipePositionParaEntity> GetRecipePositionParaInfos()
{
try
{
List<ZxRecipePositionParaEntity> entity = _repository.GetList();
return entity;
}
catch (Exception ex)
{
log.Error("工位配方字段信息获取异常", ex);
return null;
}
}
/// <summary>
/// 根据ID查询工位配方字段信息
/// </summary>
/// <param name="id">工位配方编号</param>
/// <returns></returns>
public ZxRecipePositionParaEntity GetRecipePositionParaInfoById(int id)
{
try
{
ZxRecipePositionParaEntity entity = _repository.GetById(id);
return entity;
}
catch (Exception ex)
{
log.Error("工位配方字段信息获取异常", ex);
return new ZxRecipePositionParaEntity();
}
}
/// <summary>
/// 修改工位配方字段信息
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public bool UpdateRecipePositionParaInfo(ZxRecipePositionParaEntity entity)
{
try
{
return _repository.Update(entity);
}
catch (Exception ex)
{
log.Error("工位配方字段信息修改异常", ex);
return false;
}
}
/// <summary>
/// 添加工位配方字段信息
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public bool InsertRecipePositionParaInfo(ZxRecipePositionParaEntity entity)
{
try
{
return _repository.Insert(entity);
}
catch (Exception ex)
{
log.Error("工位配方字段信息修改异常", ex);
return false;
}
}
/// <summary>
/// ID删除工位配方字段信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public bool DeleteRecipePositionParaInfoById(int id)
{
try
{
return _repository.DeleteById(id);
}
catch (Exception ex)
{
log.Error("工位配方字段信息删除异常", ex);
return false;
}
}
}
}

138
HighWayIot.Repository/service/ZxRecipePositionParaService.cs.cs
Unescape Escape View File

@ -0,0 +1,138 @@
using HighWayIot.Log4net;
using Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using HighWayIot.Repository.domain;
namespace HighWayIot.Repository.service
{
public class ZxRecipePositionParaService
{
private static readonly Lazy<ZxRecipePositionParaService> lazy = new Lazy<ZxRecipePositionParaService>(() => new ZxRecipePositionParaService());
public static ZxRecipePositionParaService Instance
{
get
{
return lazy.Value;
}
}
private LogHelper log = LogHelper.Instance;
Repository<ZxRecipePositionParaEntity> _repository => new Repository<ZxRecipePositionParaEntity>("sqlserver");
/// <summary>
/// 查询工位配方字段信息
/// </summary>
/// <returns></returns>
public List<ZxRecipePositionParaEntity> GetRecipePositionParaInfos()
{
try
{
List<ZxRecipePositionParaEntity> entity = _repository.GetList();
return entity;
}
catch (Exception ex)
{
log.Error("工位配方信息获取异常", ex);
return null;
}
}
/// <summary>
/// 查询工位配方字段信息
/// </summary>
/// <returns></returns>
public List<ZxRecipePositionParaEntity> GetRecipePositionParaInfoByRecipeCode()
{
try
{
List<ZxRecipePositionParaEntity> entity = _repository.GetList();
return entity;
}
catch (Exception ex)
{
log.Error("工位配方信息获取异常", ex);
return null;
}
}
/// <summary>
/// 根据工位配方号查询工位配方字段信息
/// </summary>
/// <param name="recipeCode">工位配方编号</param>
/// <returns></returns>
public List<ZxRecipePositionParaEntity> GetRecipePositionParaInfoByRecipeCode(int positionCode)
{
try
{
List<ZxRecipePositionParaEntity> entity = _repository.GetList(x => x.ParaCode == positionCode);
return entity;
}
catch (Exception ex)
{
log.Error("工位配方信息获取异常", ex);
return null;
}
}
/// <summary>
/// 修改工位配方字段信息
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public bool UpdateRecipePositionParaInfo(ZxRecipePositionParaEntity entity)
{
try
{
return _repository.Update(entity);
}
catch (Exception ex)
{
log.Error("工位配方字段信息修改异常", ex);
return false;
}
}
/// <summary>
/// 添加工位配方字段信息
/// </summary>
/// <param name="entity"></param>
/// <returns></returns>
public bool InsertRecipePositionParaInfo(ZxRecipePositionParaEntity entity)
{
try
{
return _repository.Insert(entity);
}
catch (Exception ex)
{
log.Error("工位配方字段信息修改异常", ex);
return false;
}
}
/// <summary>
/// ID删除工位配方字段信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public bool DeleteRecipePositionParaInfoById(int id)
{
try
{
return _repository.DeleteById(id);
}
catch (Exception ex)
{
log.Error("工位配方字段信息删除异常", ex);
return false;
}
}
}
}

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

@ -53,15 +53,24 @@ namespace HighWayIot.TouchSocket
};//有客户端断开连接 };//有客户端断开连接
tcpClient.Received = async (client, e) => tcpClient.Received = async (client, e) =>
{ {
GetMessageAction.Invoke(e.ByteBlock.Span.ToArray(), client.IP); GetMessageAction.Invoke(e.ByteBlock.Span.ToArray(), client.IP);
};
}; //接收信号
await tcpClient.SetupAsync(new TouchSocketConfig() await tcpClient.SetupAsync(new TouchSocketConfig()
.SetRemoteIPHost($"{ip}:{port}") .SetRemoteIPHost($"{ip}:{port}")
.ConfigureContainer(a => .ConfigureContainer(a =>
{ {
a.AddConsoleLogger();//添加一个日志注入 a.AddConsoleLogger();//添加一个日志注入
})); })
.ConfigurePlugins(a =>
{
a.UseTcpReconnection()
.UsePolling(TimeSpan.FromSeconds(1));
})
);
Result result = Result.Default; //不断尝试重连 Result result = Result.Default; //不断尝试重连
do do

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

@ -33,7 +33,7 @@ namespace HighWayIot.Winform.Business
{ {
return int.TryParse(text, out int result) ? (int?)result : null; return int.TryParse(text, out int result) ? (int?)result : null;
} }
public static string IntEmptyOrToString(int? value) public static string IntEmptyOrToString(int? value)
{ {
if (value == null) if (value == null)

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

@ -54,6 +54,8 @@ namespace HighWayIot.Winform.MainForm
this.EquipMaterialBindingStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.EquipMaterialBindingStripItem = new System.Windows.Forms.ToolStripMenuItem();
this.TestMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TestMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DeviceDataManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeviceDataManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DeviceParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.UserControlTabs = new System.Windows.Forms.TabControl(); this.UserControlTabs = new System.Windows.Forms.TabControl();
this.ClosePageButton = new System.Windows.Forms.Button(); this.ClosePageButton = new System.Windows.Forms.Button();
this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusStrip1 = new System.Windows.Forms.StatusStrip();
@ -61,13 +63,13 @@ namespace HighWayIot.Winform.MainForm
this.SplitLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.SplitLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.StripLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.StripLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.NowLoginUserName = new System.Windows.Forms.ToolStripStatusLabel(); this.NowLoginUserName = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.LogInformation = new System.Windows.Forms.ToolStripStatusLabel();
this.StripLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); this.StripLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components); this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components);
this.DataRefreshTimer = new System.Windows.Forms.Timer(this.components); this.DataRefreshTimer = new System.Windows.Forms.Timer(this.components);
this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SplitLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.DeviceParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SplitLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
this.MainMenu.SuspendLayout(); this.MainMenu.SuspendLayout();
this.statusStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -87,7 +89,7 @@ namespace HighWayIot.Winform.MainForm
this.MainMenu.Location = new System.Drawing.Point(0, 0); this.MainMenu.Location = new System.Drawing.Point(0, 0);
this.MainMenu.Name = "MainMenu"; this.MainMenu.Name = "MainMenu";
this.MainMenu.Padding = new System.Windows.Forms.Padding(5, 1, 0, 1); this.MainMenu.Padding = new System.Windows.Forms.Padding(5, 1, 0, 1);
this.MainMenu.Size = new System.Drawing.Size(1904, 24); this.MainMenu.Size = new System.Drawing.Size(1475, 24);
this.MainMenu.TabIndex = 1; this.MainMenu.TabIndex = 1;
this.MainMenu.Text = "menuStrip1"; this.MainMenu.Text = "menuStrip1";
// //
@ -236,6 +238,19 @@ namespace HighWayIot.Winform.MainForm
this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(68, 22); this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(68, 22);
this.DeviceDataManageToolStripMenuItem.Text = "参数管理"; this.DeviceDataManageToolStripMenuItem.Text = "参数管理";
// //
// RFIDParamManageToolStripMenuItem
//
this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem";
this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置";
this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
//
// DeviceParamManageToolStripMenuItem
//
this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem";
this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置";
//
// UserControlTabs // UserControlTabs
// //
this.UserControlTabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.UserControlTabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -246,7 +261,7 @@ namespace HighWayIot.Winform.MainForm
this.UserControlTabs.Margin = new System.Windows.Forms.Padding(0); this.UserControlTabs.Margin = new System.Windows.Forms.Padding(0);
this.UserControlTabs.Name = "UserControlTabs"; this.UserControlTabs.Name = "UserControlTabs";
this.UserControlTabs.SelectedIndex = 0; this.UserControlTabs.SelectedIndex = 0;
this.UserControlTabs.Size = new System.Drawing.Size(1905, 995); this.UserControlTabs.Size = new System.Drawing.Size(1476, 817);
this.UserControlTabs.TabIndex = 3; this.UserControlTabs.TabIndex = 3;
// //
// ClosePageButton // ClosePageButton
@ -256,7 +271,7 @@ namespace HighWayIot.Winform.MainForm
this.ClosePageButton.Cursor = System.Windows.Forms.Cursors.Hand; this.ClosePageButton.Cursor = System.Windows.Forms.Cursors.Hand;
this.ClosePageButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.ClosePageButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClosePageButton.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.ClosePageButton.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
this.ClosePageButton.Location = new System.Drawing.Point(1884, 1); this.ClosePageButton.Location = new System.Drawing.Point(1455, 1);
this.ClosePageButton.Name = "ClosePageButton"; this.ClosePageButton.Name = "ClosePageButton";
this.ClosePageButton.Size = new System.Drawing.Size(20, 20); this.ClosePageButton.Size = new System.Drawing.Size(20, 20);
this.ClosePageButton.TabIndex = 4; this.ClosePageButton.TabIndex = 4;
@ -271,12 +286,14 @@ namespace HighWayIot.Winform.MainForm
this.SplitLabel1, this.SplitLabel1,
this.StripLabel1, this.StripLabel1,
this.NowLoginUserName, this.NowLoginUserName,
this.toolStripStatusLabel1, this.SplitLabel2,
this.LogInformation,
this.SplitLabel3,
this.StripLabel2, this.StripLabel2,
this.TimeStripLabel}); this.TimeStripLabel});
this.statusStrip1.Location = new System.Drawing.Point(0, 1019); this.statusStrip1.Location = new System.Drawing.Point(0, 841);
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1904, 22); this.statusStrip1.Size = new System.Drawing.Size(1475, 22);
this.statusStrip1.TabIndex = 5; this.statusStrip1.TabIndex = 5;
this.statusStrip1.Text = "statusStrip1"; this.statusStrip1.Text = "statusStrip1";
// //
@ -304,12 +321,12 @@ namespace HighWayIot.Winform.MainForm
this.NowLoginUserName.Size = new System.Drawing.Size(31, 17); this.NowLoginUserName.Size = new System.Drawing.Size(31, 17);
this.NowLoginUserName.Text = "N/A"; this.NowLoginUserName.Text = "N/A";
// //
// toolStripStatusLabel1 // LogInformation
// //
this.toolStripStatusLabel1.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right))); this.LogInformation.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; this.LogInformation.Name = "LogInformation";
this.toolStripStatusLabel1.Size = new System.Drawing.Size(1532, 17); this.LogInformation.Size = new System.Drawing.Size(1064, 17);
this.toolStripStatusLabel1.Spring = true; this.LogInformation.Spring = true;
// //
// StripLabel2 // StripLabel2
// //
@ -332,25 +349,23 @@ namespace HighWayIot.Winform.MainForm
// //
this.DataRefreshTimer.Tick += new System.EventHandler(this.DataRefreshTimer_Tick); this.DataRefreshTimer.Tick += new System.EventHandler(this.DataRefreshTimer_Tick);
// //
// RFIDParamManageToolStripMenuItem // SplitLabel2
// //
this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem"; this.SplitLabel2.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.SplitLabel2.Name = "SplitLabel2";
this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置"; this.SplitLabel2.Size = new System.Drawing.Size(4, 17);
this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
// //
// DeviceParamManageToolStripMenuItem // SplitLabel3
// //
this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem"; this.SplitLabel3.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Left;
this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.SplitLabel3.Name = "SplitLabel3";
this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置"; this.SplitLabel3.Size = new System.Drawing.Size(4, 17);
this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick);
// //
// BaseForm // BaseForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1904, 1041); this.ClientSize = new System.Drawing.Size(1475, 863);
this.Controls.Add(this.statusStrip1); this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.ClosePageButton); this.Controls.Add(this.ClosePageButton);
this.Controls.Add(this.UserControlTabs); this.Controls.Add(this.UserControlTabs);
@ -388,7 +403,7 @@ namespace HighWayIot.Winform.MainForm
private ToolStripStatusLabel StripLabel1; private ToolStripStatusLabel StripLabel1;
private ToolStripStatusLabel SplitLabel1; private ToolStripStatusLabel SplitLabel1;
private ToolStripStatusLabel NowLoginUserName; private ToolStripStatusLabel NowLoginUserName;
private ToolStripStatusLabel toolStripStatusLabel1; private ToolStripStatusLabel LogInformation;
private ToolStripStatusLabel StripLabel2; private ToolStripStatusLabel StripLabel2;
private ToolStripStatusLabel TimeStripLabel; private ToolStripStatusLabel TimeStripLabel;
private Timer TimeDisplayTimer; private Timer TimeDisplayTimer;
@ -405,5 +420,7 @@ namespace HighWayIot.Winform.MainForm
private Timer DataRefreshTimer; private Timer DataRefreshTimer;
private ToolStripMenuItem RFIDParamManageToolStripMenuItem; private ToolStripMenuItem RFIDParamManageToolStripMenuItem;
private ToolStripMenuItem DeviceParamManageToolStripMenuItem; private ToolStripMenuItem DeviceParamManageToolStripMenuItem;
private ToolStripStatusLabel SplitLabel2;
private ToolStripStatusLabel SplitLabel3;
} }
} }

1252
HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

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

@ -22,47 +22,57 @@ namespace HighWayIot.Winform.UserControlPages
/// <summary> /// <summary>
/// 配方服务类实例 /// 配方服务类实例
/// </summary> /// </summary>
ZxRecipeService zxRecipeService = ZxRecipeService.Instance; private ZxRecipeService zxRecipeService = ZxRecipeService.Instance;
/// <summary> /// <summary>
/// 称重服务类实例 /// 称重服务类实例
/// </summary> /// </summary>
ZxWeightService zxWeightService = ZxWeightService.Instance; private ZxWeightService zxWeightService = ZxWeightService.Instance;
/// <summary> /// <summary>
/// 配方服务类实例 /// 配方服务类实例
/// </summary> /// </summary>
ZxMaterialService zxMaterialService = ZxMaterialService.Instance; private ZxMaterialService zxMaterialService = ZxMaterialService.Instance;
/// <summary> /// <summary>
/// 配方字段服务类实例 /// 配方字段服务类实例
/// </summary> /// </summary>
ZxRecipeParaService zxRecipeParaService = ZxRecipeParaService.Instance; private ZxRecipeParaService zxRecipeParaService = ZxRecipeParaService.Instance;
/// <summary>
/// 工位配方字段服务类实例
/// </summary>
private ZxRecipePositionParaService zxRecipePositionParaService = ZxRecipePositionParaService.Instance;
/// <summary> /// <summary>
/// 配方字段实例 /// 配方字段实例
/// </summary> /// </summary>
ZxRecipeParaEntity zxRecipeParaEntity = new ZxRecipeParaEntity(); private ZxRecipeParaEntity zxRecipeParaEntity = new ZxRecipeParaEntity();
/// <summary>
/// 工位配方字段实例
/// </summary>
private ZxRecipePositionParaEntity zxRecipePositionParaEntity = new ZxRecipePositionParaEntity();
/// <summary> /// <summary>
/// 配方字段实例剪切板 /// 配方字段实例剪切板
/// </summary> /// </summary>
ZxRecipeParaEntity zxRecipeParaEntityCut; private ZxRecipeParaEntity zxRecipeParaEntityCut;
/// <summary> /// <summary>
/// 称重DataGridView数据源 /// 称重DataGridView数据源
/// </summary> /// </summary>
List<WeightDataSourceEntity> weightDataSourceEntities; private List<WeightDataSourceEntity> weightDataSourceEntities;
/// <summary> /// <summary>
/// 配方列表 /// 配方列表
/// </summary> /// </summary>
List<ZxRecipeEntity> RecipeLists; private List<ZxRecipeEntity> RecipeLists;
/// <summary> /// <summary>
/// 称量列表 /// 称量列表
/// </summary> /// </summary>
List<ZxWeightEntity> WeightLists; private List<ZxWeightEntity> WeightLists;
public RecipeConfigPage() public RecipeConfigPage()
{ {
@ -368,20 +378,17 @@ namespace HighWayIot.Winform.UserControlPages
{ {
string s = RecipeDataGridView.CurrentRow.Cells["RecipeCode"].Value.ToString(); string s = RecipeDataGridView.CurrentRow.Cells["RecipeCode"].Value.ToString();
if (MessageBox.Show($"确定要保存配方编号为 [{s}] 的配方的参数？", "确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) //if (MessageBox.Show($"确定要保存配方编号为 [{s}] 的配方的参数？", "确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
{ //{
return; // return;
} //}
ZxRecipeParaEntity entity = GetParaValue(); ZxRecipePositionParaEntity entity = GetParaValue();
entity.IsDeleted = false;
entity.RecipeCode = s;
zxRecipeParaEntity = entity;
var paraData = zxRecipeParaService.GetRecipeParaInfoByRecipeCode(zxRecipeParaEntity.RecipeCode); var paraData = zxRecipeParaService.GetRecipeParaInfoByRecipeCode(zxRecipeParaEntity.RecipeCode);
int flag = GetSelectIndex();
//没有就插入 //没有就插入
if (paraData.Count == 0) if (paraData.Count == 0)
{ {
@ -421,7 +428,7 @@ namespace HighWayIot.Winform.UserControlPages
/// <param name="e"></param> /// <param name="e"></param>
private void CopyParaButton_Click(object sender, EventArgs e) private void CopyParaButton_Click(object sender, EventArgs e)
{ {
zxRecipeParaEntityCut = GetParaValue(); //zxRecipeParaEntityCut = GetParaValue();
NowCopyLabel.Text = RecipeDataGridView.CurrentRow.Cells["RecipeCode"].Value.ToString(); NowCopyLabel.Text = RecipeDataGridView.CurrentRow.Cells["RecipeCode"].Value.ToString();
} }
@ -437,7 +444,7 @@ namespace HighWayIot.Winform.UserControlPages
MessageBox.Show("剪切板为空！"); MessageBox.Show("剪切板为空！");
return; return;
} }
SetParaValue(zxRecipeParaEntityCut); //SetParaValue(zxRecipeParaEntityCut);
} }
/// <summary> /// <summary>
@ -452,7 +459,7 @@ namespace HighWayIot.Winform.UserControlPages
if (MessageBox.Show("是否要清空前端数据", "", MessageBoxButtons.YesNo) == DialogResult.OK) if (MessageBox.Show("是否要清空前端数据", "", MessageBoxButtons.YesNo) == DialogResult.OK)
{ {
SetParaValue(new ZxRecipeParaEntity()); //SetParaValue(new ZxRecipeParaEntity());
} }
} }
@ -473,22 +480,23 @@ namespace HighWayIot.Winform.UserControlPages
WeightDataGridView.DataSource = null; WeightDataGridView.DataSource = null;
WeightDataGridView.DataSource = weightDataSourceEntities; WeightDataGridView.DataSource = weightDataSourceEntities;
//设置参数
var paraData = zxRecipeParaService.GetRecipeParaInfoByRecipeCode(s); var paraData = zxRecipeParaService.GetRecipeParaInfoByRecipeCode(s);
//没有就全0 //没有就全0
if (paraData.Count == 0) if (paraData.Count == 0)
{ {
SetParaValue(new ZxRecipeParaEntity()); //SetParaValue(new ZxRecipeParaEntity());
} }
//有就显示 //有就显示
else if (paraData.Count == 1) else if (paraData.Count == 1)
{ {
SetParaValue(paraData[0]); //SetParaValue(paraData[0]);
} }
//有多条设为第一条 //有多条设为第一条
else else
{ {
MessageBox.Show("存在多条未删除的相同配方字段信息！将设置为第一条，请检查数据库。"); MessageBox.Show("存在多条未删除的相同配方字段信息！将设置为第一条，请检查数据库。");
SetParaValue(paraData[0]); //SetParaValue(paraData[0]);
} }
} }
@ -534,71 +542,155 @@ namespace HighWayIot.Winform.UserControlPages
} }
/// <summary> /// <summary>
/// 设置配方字段值 /// 设置显示的配方字段值
/// </summary> /// </summary>
/// <param name="entity"></param> /// <param name="entity"></param>
private void SetParaValue(ZxRecipeParaEntity entity) private void SetParaValue(ZxRecipePositionParaEntity entity)
{ {
zxRecipeParaEntity = entity; E1TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E1);
E1P1TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P1); E2TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E2);
E1P2TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P2); E3TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E3);
E1P3TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P3); E4TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E4);
E1P4TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E1P4); E5TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E5);
E2P1TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P1); E6TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E6);
E2P2TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P2); E7TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E7);
E2P3TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P3); E8TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E8);
E2P4TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E2P4); E9TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E9);
E3P1TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P1); E10TextBox.Text = GeneralUtils.IntEmptyOrToString(entity.E10);
E3P2TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P2);
E3P3TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P3);
E3P4TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P4);
E3P5CheckBox.Checked = zxRecipeParaEntity.E3P5 == 1;
E3P6TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P6);
E3P7TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P7);
E3P8TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P8);
E3P9TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P9);
E3P10TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P10);
E3P11TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P11);
E3P12TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P12);
E3P13TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P13);
E3P14TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P14);
E3P15TextBox.Text = GeneralUtils.IntEmptyOrToString(zxRecipeParaEntity.E3P15);
} }
/// <summary> /// <summary>
/// 获取界面上的配方参数 /// 获取界面上的配方参数
/// </summary> /// </summary>
/// <returns>获取到的配方参数值</returns> /// <returns>获取到的配方参数值</returns>
private ZxRecipeParaEntity GetParaValue() private ZxRecipePositionParaEntity GetParaValue()
{ {
ZxRecipeParaEntity entity = new ZxRecipeParaEntity() ZxRecipePositionParaEntity entity = new ZxRecipePositionParaEntity()
{ {
E1P1 = GeneralUtils.StringNullOrToInt(E1P1TextBox.Text), E1 = GeneralUtils.StringNullOrToInt(E1TextBox.Text),
E1P2 = GeneralUtils.StringNullOrToInt(E1P2TextBox.Text), E2 = GeneralUtils.StringNullOrToInt(E2TextBox.Text),
E1P3 = GeneralUtils.StringNullOrToInt(E1P3TextBox.Text), E3 = GeneralUtils.StringNullOrToInt(E3TextBox.Text),
E1P4 = GeneralUtils.StringNullOrToInt(E1P4TextBox.Text), E4 = GeneralUtils.StringNullOrToInt(E4TextBox.Text),
E2P1 = GeneralUtils.StringNullOrToInt(E2P1TextBox.Text), E5 = GeneralUtils.StringNullOrToInt(E5TextBox.Text),
E2P2 = GeneralUtils.StringNullOrToInt(E2P2TextBox.Text), E6 = GeneralUtils.StringNullOrToInt(E6TextBox.Text),
E2P3 = GeneralUtils.StringNullOrToInt(E2P3TextBox.Text), E7 = GeneralUtils.StringNullOrToInt(E7TextBox.Text),
E2P4 = GeneralUtils.StringNullOrToInt(E2P4TextBox.Text), E8 = GeneralUtils.StringNullOrToInt(E8TextBox.Text),
E3P1 = GeneralUtils.StringNullOrToInt(E3P1TextBox.Text), E9 = GeneralUtils.StringNullOrToInt(E9TextBox.Text),
E3P2 = GeneralUtils.StringNullOrToInt(E3P2TextBox.Text), E10 = GeneralUtils.StringNullOrToInt(E10TextBox.Text)
E3P3 = GeneralUtils.StringNullOrToInt(E3P3TextBox.Text),
E3P4 = GeneralUtils.StringNullOrToInt(E3P4TextBox.Text),
E3P5 = E3P5CheckBox.Checked ? 1 : 0,
E3P6 = GeneralUtils.StringNullOrToInt(E3P6TextBox.Text),
E3P7 = GeneralUtils.StringNullOrToInt(E3P7TextBox.Text),
E3P8 = GeneralUtils.StringNullOrToInt(E3P8TextBox.Text),
E3P9 = GeneralUtils.StringNullOrToInt(E3P9TextBox.Text),
E3P10 = GeneralUtils.StringNullOrToInt(E3P10TextBox.Text),
E3P11 = GeneralUtils.StringNullOrToInt(E3P11TextBox.Text),
E3P12 = GeneralUtils.StringNullOrToInt(E3P12TextBox.Text),
E3P13 = GeneralUtils.StringNullOrToInt(E3P13TextBox.Text),
E3P14 = GeneralUtils.StringNullOrToInt(E3P14TextBox.Text),
E3P15 = GeneralUtils.StringNullOrToInt(E3P15TextBox.Text),
}; };
return entity; return entity;
} }
/// <summary>
/// 工位改变
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void PositionRadioBoxChange(object sender, EventArgs e)
{
RadioButton s = sender as RadioButton;
if (s.Checked)
{
int flag = GetSelectIndex();
switch (flag)
{
case 1:
SetParaViewById(zxRecipeParaEntity.P1);
break;
case 2:
SetParaViewById(zxRecipeParaEntity.P2);
break;
case 31:
SetParaViewById(zxRecipeParaEntity.P31);
break;
case 32:
SetParaViewById(zxRecipeParaEntity.P32);
break;
case 41:
SetParaViewById(zxRecipeParaEntity.P41);
break;
case 42:
SetParaViewById(zxRecipeParaEntity.P42);
break;
case 51:
SetParaViewById(zxRecipeParaEntity.P51);
break;
case 52:
SetParaViewById(zxRecipeParaEntity.P52);
break;
case 0:
SetParaViewById(0);
break;
default:
SetParaViewById(0);
break;
}
}
}
private void SetParaViewById(int? id)
{
zxRecipePositionParaEntity = zxRecipePositionParaService.GetRecipePositionParaInfoById(id ?? 0);
SetParaValue(zxRecipePositionParaEntity);
}
/// <summary>
/// 获取选择的工位包边
/// </summary>
/// <returns>选的不对劲就返回0</returns>
private int GetSelectIndex()
{
if (Position1RadioButton.Checked)
{
return 1;
}
if (Position2RadioButton.Checked)
{
return 2;
}
if (Position3RadioButton.Checked)
{
if (BodyRadioButton.Checked)
{
return 31;
}
if (SideRadioButton.Checked)
{
return 32;
}
}
if (Position4RadioButton.Checked)
{
if (BodyRadioButton.Checked)
{
return 41;
}
if (SideRadioButton.Checked)
{
return 42;
}
}
if (Position5RadioButton.Checked)
{
if (BodyRadioButton.Checked)
{
return 51;
}
if (SideRadioButton.Checked)
{
return 52;
}
}
return 0;
}
} }
} }

60
HighWayIot.Winform/UserControlPages/RecipeConfigPages/RecipeConfigPage.resx
Unescape Escape View File

@ -150,6 +150,66 @@
<metadata name="WeightIsUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="WeightIsUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MaterialCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MaterialName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MaterialType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="MaterialChildType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SetThickness.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SetWidth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SetLayer.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SetWeight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SetError.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="WeightIsUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RId.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="RecipeSpecCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RecipeSpecName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="SizeKind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="FixedWidth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="WeightError.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="IsUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="RId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="RId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>

Write Preview
Loading…
Cancel
Save