SoftwareGroup/602_WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清理无用代码

Browse Source
This commit is contained in:
a88359121
2025-07-31 11:18:43 +08:00
parent 03087c0483
commit 2c4be8993c
107 changed files with 1119 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.Models/AGearEntity.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using PLCCommunication;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;
namespace JinYuan.Models
{
JinYuan.Models/Alarm/AlarmData.cs
-5
View File
@@ -1,9 +1,4 @@
using CsvHelper.Configuration.Attributes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/Alarm/AlarmStatus.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
public class AlarmStatus
{
JinYuan.Models/AlarmCountEntry.cs
-4
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/AlarmForm.cs
-5
View File
@@ -1,9 +1,4 @@
using CsvHelper.Configuration.Attributes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/BGearEntity.cs
+610 -613
View File
File diff suppressed because it is too large Load Diff
JinYuan.Models/CPKModel.cs
+1 -11
View File
@@ -1,14 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
//子组大小：这个与计算内的CPK值又非常打的关系，即是分组的样本个数，数据的分组在此处需要说明的是，必须
//是根据实际情况来填写，比如每次抽样为5个，那么子组大小为5个，我们不能随心所欲的任意填写这个值，否则
JinYuan.Models/CPQCPTDate.cs
+20 -24
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace JinYuan.Models
{
@@ -14,19 +10,19 @@ namespace JinYuan.Models
/// <summary>
/// 注液前重量
/// </summary>
public string CTP_PreWeighing_Value { get; set; }
public string CTP_PreWeighing_Value { get; set; }
/// <summary>
/// 保液量
/// </summary>
public string CTP_Liquid_Retention_Value { get; set; }
public string CTP_Liquid_Retention_Value { get; set; }
/// <summary>
/// 注液量
/// </summary>
public string CTP_Filling_Value { get; set; }
public string CTP_Filling_Value { get; set; }
/// <summary>
/// 失液量
/// </summary>
public string CTP_Liquid_Loss_Value { get; set; }
public string CTP_Liquid_Loss_Value { get; set; }
/// <summary>
/// 充氦值
/// </summary>
@@ -34,19 +30,19 @@ namespace JinYuan.Models
/// <summary>
/// 钟罩真空值
/// </summary>
public string CTP_Belljar_Vacuum_Value { get; set; }
public string CTP_Belljar_Vacuum_Value { get; set; }
/// <summary>
/// 钟罩真空时间
/// </summary>
public string CTP_Belljar_Vacuum_Time { get; set; }
public string CTP_Belljar_Vacuum_Time { get; set; }
/// <summary>
/// 钟罩高压值
/// </summary>
public string CTP_Belljar_HighPressure_Value { get; set; }
public string CTP_Belljar_HighPressure_Value { get; set; }
/// <summary>
/// 钟罩高压时间
/// </summary>
public string CTP_Belljar_HighPressure_Time { get; set; }
public string CTP_Belljar_HighPressure_Time { get; set; }
/// <summary>
/// 钟罩循环次数
/// </summary>
@@ -54,7 +50,7 @@ namespace JinYuan.Models
/// <summary>
/// 回氦前真空值
/// </summary>
public string CTP_Pre_Helium_Value { get; set; }
public string CTP_Pre_Helium_Value { get; set; }
/// <summary>
/// 回氦后真空值
/// </summary>
@@ -62,23 +58,23 @@ namespace JinYuan.Models
/// <summary>
/// 平压压力
/// </summary>
public string CTP_Flat_Pressure { get; set; }
public string CTP_Flat_Pressure { get; set; }
/// <summary>
/// 电芯测厚压力
/// </summary>
public string CTP_Cell_Thickness_Pressure { get; set; }
public string CTP_Cell_Thickness_Pressure { get; set; }
/// <summary>
/// 注液后重量
/// </summary>
public string CTQ_PostWeighing_Value { get; set; }
public string CTQ_PostWeighing_Value { get; set; }
/// <summary>
/// 电芯厚度
/// </summary>
public string CTQ_Cell_Thickness { get; set; }
public string CTQ_Cell_Thickness { get; set; }
/// <summary>
/// 终压胶粒高度
/// </summary>
public string CTQ_Finalpress_Rubber_Height { get; set; }
public string CTQ_Finalpress_Rubber_Height { get; set; }
/// <summary>
/// 注液前负压压力
/// </summary>
@@ -104,9 +100,9 @@ namespace JinYuan.Models
/// </summary>
public string CTQ_Finalpress_Rubber_Thickness { get; set; }
}
/// <summary>
/// 进出站上传数据
/// </summary>
/// <summary>
/// 进出站上传数据
/// </summary>
public class EnterandExit
{
/// <summary>
@@ -188,7 +184,7 @@ namespace JinYuan.Models
/// <summary>
/// 采集项数据列表
/// </summary>
public List<Collection> taglist { get; set; }
public List<Collection> taglist { get; set; }
}
@@ -197,7 +193,7 @@ namespace JinYuan.Models
/// <summary>
/// 时间
/// </summary>
public string device_time { get; set; }
public string device_time { get; set; }
/// <summary>
/// 采集项键值对
/// </summary>
JinYuan.Models/Chart12HourData.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
/// <summary>
/// 24小时统计表数据
JinYuan.Models/ChartDataType.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
/// <summary>
/// 不良統計
JinYuan.Models/DataTurnover.cs
-5
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/DeviceOEE.cs
+1 -5
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace JinYuan.Models
{
JinYuan.Models/ElectricEnergy.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
/// <summary>
/// 智能电表
JinYuan.Models/Hourprod.cs
-5
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/Properties/AssemblyInfo.cs
-1
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
JinYuan.Models/SysConfig/ChallengeCode.cs
+1 -6
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System;
namespace JinYuan.Models
{
JinYuan.Models/SysConfig/Device.cs
+9 -13
View File
@@ -2,11 +2,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Security.Policy;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace JinYuan.Models
{
@@ -27,7 +23,7 @@ namespace JinYuan.Models
/// <summary>
/// PLC类型
/// </summary>
public string PLCType { get; set; }
public string PLCType { get; set; }
/// <summary>
/// 当前设备的连接状态
/// </summary>
@@ -37,19 +33,19 @@ namespace JinYuan.Models
/// <summary>
/// 是否是首次连接
/// </summary>
public bool IsFirstConnect { get; set; } = true;
/// <summary>
/// 重连周期
/// </summary>
public int ReConnectTime { get; set; } = 2000;
/// <summary>
/// 休眠时间
/// </summary>
public int SleepTime { get; set; } = 10;
/// <summary>
@@ -75,19 +71,19 @@ namespace JinYuan.Models
/// <summary>
/// 计时器
/// </summary>
public Stopwatch Stopwatch { get; set; }
/// <summary>
/// 所有归档变量的集合
/// </summary>
public List<Variable> StoreVarList { get; set; } = new List<Variable>();
/// <summary>
/// 按工位读取
/// </summary>
public List<Group> WorkVarList { get; set; } = new List<Group>();
/// <summary>
/// 通信组集合
@@ -106,7 +102,7 @@ namespace JinYuan.Models
/// <summary>
/// 定义报警触发和消除事件
/// </summary>
public event Action<bool,Variable> AlarmTrigEvent;
public event Action<bool, Variable> AlarmTrigEvent;
/// <summary>
/// 变量初始化
@@ -142,7 +138,7 @@ namespace JinYuan.Models
}
/// <summary>
/// 索引器，通过键名获取到数据
JinYuan.Models/SysConfig/Enum.cs
+2 -8
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
/// <summary>
/// 所有窗体枚举，小于临界窗体的为固定窗体，不执行关闭
@@ -19,6 +13,6 @@ namespace JinYuan.Models
数据追溯,
参数设置,
系统设置,
用户管理
用户管理
}
}
JinYuan.Models/SysConfig/Group.cs
+2 -6
View File
@@ -1,9 +1,5 @@
using MiniExcelLibs.Attributes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
@@ -19,7 +15,7 @@ namespace JinYuan.Models
/// <summary>
/// 起始地址
/// </summary>
public string Start { get; set; }
public string Start { get; set; }
/// <summary>
/// 长度
/// </summary>
@@ -33,7 +29,7 @@ namespace JinYuan.Models
/// 是否需要反馈结果到PLC
/// </summary>
public bool IsFeedbackPlc { get; set; }
/// <summary>
/// 是否启用
/// </summary>
JinYuan.Models/SysConfig/ParamBase.cs
-5
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/SysConfig/ParamList.cs
-5
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/SysConfig/ProductModel.cs
-5
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
JinYuan.Models/SysConfig/ProductModelParam.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
/// <summary>
/// 产品型号参数范围
JinYuan.Models/SysConfig/SysAdmin.cs
+1 -6
View File
@@ -1,9 +1,4 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
@@ -12,7 +7,7 @@ namespace JinYuan.Models
/// </summary>
public class SysAdmin
{
[SugarColumn(IsPrimaryKey = true,IsIgnore =true)]
[SugarColumn(IsPrimaryKey = true, IsIgnore = true)]
public int LoginId { get; set; }
public string LoginName { get; set; }
public string LoginPwd { get; set; }
JinYuan.Models/SysConfig/SysConfig.cs
+3 -9
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
public class SysConfig
{
@@ -46,7 +40,7 @@ namespace JinYuan.Models
/// <summary>
/// MES/非MES模式切换
/// </summary>
public bool MesModeSwitching { get; set;}
public bool MesModeSwitching { get; set; }
/// <summary>
/// 切屏
/// </summary>
@@ -64,6 +58,6 @@ namespace JinYuan.Models
/// </summary>
public bool SaveThreadTime { get; set; }
}
}
JinYuan.Models/SysConfig/SysLog.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
namespace JinYuan.Models
{
public class SysLog
{
JinYuan.Models/SysConfig/Variable.cs
+5 -11
View File
@@ -1,10 +1,4 @@
using MiniExcelLibs.Attributes;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JinYuan.Models
{
@@ -17,7 +11,7 @@ namespace JinYuan.Models
/// 变量名称
/// </summary>
public string VarName { get; set; }
/// <summary>
/// 变量地址
/// </summary>
@@ -29,7 +23,7 @@ namespace JinYuan.Models
/// <summary>
/// 数据类型
/// </summary>
public string DataType { get; set; }
public string DataType { get; set; }
/// <summary>
/// 偏移或长度
/// </summary>
@@ -37,7 +31,7 @@ namespace JinYuan.Models
/// <summary>
/// 所属通信组名称
/// </summary>
public string GroupName { get; set; }
public string GroupName { get; set; }
/// <summary>
/// 备注说明
/// </summary>
@@ -45,11 +39,11 @@ namespace JinYuan.Models
/// <summary>
/// 是否上升沿报警
/// </summary>
public bool PosAlarm { get; set; }
public bool PosAlarm { get; set; }
/// <summary>
/// 是否下降沿报警
/// </summary>
public bool NegAlarm { get; set;}
public bool NegAlarm { get; set; }
/// <summary>
/// 转换系数
/// </summary>