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

20260708

Browse Source
This commit is contained in:
Administrator
2026-07-08 10:58:42 +08:00
parent 053a90d34f
commit 7d7d6bc3bf
21 changed files with 1528 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitee/ISSUE_TEMPLATE.zh-CN.md
-13
View File
@@ -1,13 +0,0 @@
### 该问题是怎么引起的？
### 重现步骤
### 报错信息
.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
-12
View File
@@ -1,12 +0,0 @@
### 相关的Issue
### 原因（目的、解决的问题等）
### 描述（做了什么，变更了什么）
### 测试用例（新增、改动、可能影响的功能）
JinYuan.ControlCenter/ControlCenter.cs
+83
View File
@@ -14,6 +14,7 @@ using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.ComTypes;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -106,6 +107,7 @@ namespace JinYuan.ControlCenters
{
GetAlarmData();
GetSafeEqptData();
InitFunc();
IntiDevice();
Timer_RefreshData = new System.Timers.Timer(1000);
@@ -897,9 +899,11 @@ namespace JinYuan.ControlCenters
{
UploadEquEnergy();//电表
//UPloadAnemograph();//风速仪
ShowSafeEqptEven_Run(); //安全装置状态
});
Regular = 0;
}
if (TotalNum > 4)
{
GetEnergyData();
@@ -1500,6 +1504,22 @@ namespace JinYuan.ControlCenters
}
List<AlarmForm> listSafeEqptForm = null;
public void GetSafeEqptData()
{
//加载PLC安全装置状态文件
try
{
string strFileName = System.Environment.CurrentDirectory + "\\安全装置报警寄存器对应表.csv";
listSafeEqptForm = CSVHelper<AlarmForm>.ReadCSV(strFileName);
}
catch (Exception ex)
{
MessageBox.Show("加载安装装置报警文件失败！");
}
}
/// <summary>
/// 报警信息读取
/// </summary>
@@ -1655,6 +1675,69 @@ namespace JinYuan.ControlCenters
}
}
List<AlarmData> safeEqptStatus = new List<AlarmData>();
List<AlarmStatus> listSafeEqptStatus = null;
private void ShowSafeEqptEven_Run()
{
if (CommonMethods.IsRun && CommonMethods.plcDevice.IsConnected)
{
string Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
JYResult<byte[]> resByte = CommonMethods.PlcLink.ReadValue<JYResult<byte[]>>("D1000", Data_Type.ArrByte, 8);
if (resByte.IsSuccess && resByte != null)
{
if (resByte == null) { return; }
//如果未配置报警地址信息返回 TODO
if (listSafeEqptForm == null) { return; }
int startPlcAddr = 1000;
listSafeEqptStatus = PLCAlarmParseHelper.OmronFinsByte2Status(startPlcAddr, resByte.Content);
//4.判定有不良后，关联AlarmStatus 和AlarmForm
if (listSafeEqptStatus == null) { return; } //状态信息为空返回
//如果有报警，获取报警信息
var josnTxtMsg = $"{Date}:获取PLC安全设备运行状态:\r\n";
for (int i = 0; i < listSafeEqptStatus.Count; i++)
{
josnTxtMsg += $"plc_addr={listSafeEqptStatus[i].PLCAdress},status={listSafeEqptStatus[i].Status}\r\n";
}
TxtHelper.WriteTxt($@"{CommonMethods.strMesLogspath}\{DateTime.Now.ToString("yyyyMMdd")}\设备运行状态\{DateTime.Now.ToString("HH")}.txt", josnTxtMsg);
//关联表单数据和报警记录，获取报警信息
safeEqptStatus = listSafeEqptStatus
.Join(listSafeEqptForm
, s => s.PLCAdress
, f => f.PLCAdress
, (s, f) => new AlarmData()
{
PLCAdress = s.PLCAdress,
AlarmCode = f.AlarmCode,
AlarmContent = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
AlarmDesc = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
AlarmType = "安全装置",
AlarmState = s.Status?"0":"1", //mes 要求0是异常，1是正常
StartTime = Date,
EndTime = Date,
Flag = 0
}).ToList();
if (safeEqptStatus.Count > 0)
{
List<SafeEqptCode> safeEqptCodeLists = new List<SafeEqptCode>();
safeEqptStatus.ForEach(r =>
{
if (CommonMethods.sysConfig.MesModeSwitching)
{
var item = new SafeEqptCode();
item.equipNum = r.AlarmCode;
item.status = r.AlarmState;
safeEqptCodeLists.Add(item);
}
});
MESDataCombin.SafeEqptAlarm(Date, safeEqptCodeLists);
}
}
}
}
/// <summary>
/// 报警保存
JinYuan.ControlCenter/ControlCenter_Plc.cs
+33 -5
View File
@@ -373,6 +373,7 @@ namespace JinYuan.ControlCenters
List<short> listRes = GetList<short>(3, 0);//进站电芯反馈结果
byte[] bytes = bArrays.Content.ByteReverse();//高低位转换
byte[] bytes1 = bArrays.Content;
// 从D2200开始
#region 数据解析
@@ -1831,14 +1832,18 @@ namespace JinYuan.ControlCenters
//芯包信息1 D3300~D3326
//芯包信息2 D3330~D3356
//芯包信息3 D3360~D3386
for (int j = 0; j < 20; j++)
for (int j = 0; j < 27; j++)
{
m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
}
//3400
// CCD
m.CCD_Data[i, 19] = ShortLib.GetShortFromByteArray(bArrays.Content, 600 + i * 30 * 2 + 20, DataFormat.CDAB);
//3400 3430 3460
m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB).ToString();
//3401 3431 3461
m.ThicknessResult1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
//3500
//3500 3530 3560
m.flatness_setpoint = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 30 * 2, DataFormat.CDAB).ToString();
m.flatness_actual = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
//厚度3400
@@ -1856,7 +1861,7 @@ namespace JinYuan.ControlCenters
//{
// m.CCD_NgNo[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 2200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
//}
for (int j = 0; j < 20; j++)
for (int j = 0; j < 27; j++)
{
m.CCD_NgNo[i, j] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, (7800 * 2 + j * 40 * 2 + i * 2 * 1000), 20 * 2, System.Text.Encoding.ASCII).
Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
@@ -1939,6 +1944,14 @@ namespace JinYuan.ControlCenters
m.CCD18 = m.CCD_Data[i, 17];
m.CCD19 = m.CCD_Data[i, 18];
m.CCD20 = m.CCD_Data[i, 19];
m.CCD21 = m.CCD_Data[i, 20];
m.CCD22 = m.CCD_Data[i, 21];
m.CCD23 = m.CCD_Data[i, 22];
m.CCD24 = m.CCD_Data[i, 23];
m.CCD25 = m.CCD_Data[i, 24];
m.CCD26 = m.CCD_Data[i, 25];
m.CCD27 = m.CCD_Data[i, 26];
m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 0 ? "NG" : "缺图");
m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图");
m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图");
@@ -1959,7 +1972,13 @@ namespace JinYuan.ControlCenters
m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 0 ? "NG" : "缺图");
m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图");
m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图");
m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图");
m.CCDResult22 = m.CCD_Data[i, 21] == 9 ? "OK" : (m.CCD_Data[i, 21] == 1 ? "NG" : "缺图"); //总结果
m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 0 ? "NG" : "缺图");
m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 0 ? "NG" : "缺图");
m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 0 ? "NG" : "缺图");
m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 0 ? "NG" : "缺图");
m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 0 ? "NG" : "缺图");
m.CCD1NgCode = m.CCD_NgNo[i, 0];
m.CCD2NgCode = m.CCD_NgNo[i, 1];
m.CCD3NgCode = m.CCD_NgNo[i, 2];
@@ -1978,6 +1997,15 @@ namespace JinYuan.ControlCenters
m.CCD16NgCode = m.CCD_NgNo[i, 15];
m.CCD17NgCode = m.CCD_NgNo[i, 16];
m.CCD18NgCode = m.CCD_NgNo[i, 17];
m.CCD19NgCode = m.CCD_NgNo[i, 18];
m.CCD20NgCode = m.CCD_NgNo[i, 19];
m.CCD21NgCode = m.CCD_NgNo[i, 20];
m.CCD22NgCode = m.CCD_NgNo[i, 21];
m.CCD23NgCode = m.CCD_NgNo[i, 22];
m.CCD24NgCode = m.CCD_NgNo[i, 23];
m.CCD25NgCode = m.CCD_NgNo[i, 24];
m.CCD26NgCode = m.CCD_NgNo[i, 25];
m.CCD27NgCode = m.CCD_NgNo[i, 26];
#endregion
m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
JinYuan.ControlCenter/MES/MESDataCombin.cs
+46
View File
@@ -108,6 +108,52 @@ namespace JinYuan.ControlCenters
#endregion
#region 11、安全装置状态
/// <summary>
/// 安全装置状态
/// </summary>
/// <param name="strStatus"></param>
/// <returns></returns>
public static string SafeEqptAlarm(string StartDate, List<SafeEqptCode> safeEqptCodeLists = null)
{
var nowTime = DateTime.Now;
string resJson = "";
string josnTxtMsg = string.Empty;
string Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
try
{
//SafeEqptStatusParam statusParam = new SafeEqptStatusParam();
//statusParam.siteCode = CommonMethods.mesConfig.siteCode;
//statusParam.lineCode = CommonMethods.mesConfig.lineCode;
//statusParam.equipNum = CommonMethods.mesConfig.equipNum;
//statusParam.userName = CommonMethods.mesConfig.mesUserName;
//statusParam.seatId = "";
//statusParam.recordDate = StartDate;
//statusParam.uploadTime = Date;
//statusParam.safeEqptCodeList = safeEqptCodeLists;
//string SendJosn = JsonConvert.SerializeObject(statusParam);
var sw = new Stopwatch();
for (int i = 0; i < safeEqptCodeLists.Count; i++)
{
string SendJosn = JsonConvert.SerializeObject(safeEqptCodeLists[i]);
sw.Start();
resJson = MESApiHelper.HttpPostJsonAPI(CommonMethods.mesConfig.SafeEqptStatusMesUrl, SendJosn);
sw.Stop();
josnTxtMsg = $"{nowTime.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用MES安全设备运行状态接口:{CommonMethods.mesConfig.SafeEqptStatusMesUrl},请求数据为:{SendJosn},\n{nowTime.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resJson}";
TxtHelper.WriteTxt($@"{CommonMethods.strMesLogspath}\{nowTime.ToString("yyyyMMdd")}\设备运行状态\{nowTime.ToString("HH")}.txt", josnTxtMsg);
}
}
catch (Exception ex)
{
LoggerHelp.WriteEX("调用MES安全设备运行状态接口", ex);
}
return resJson;
}
#endregion
}
}
JinYuan.MES/MesDataProcess.cs
+9 -3
View File
@@ -1233,7 +1233,8 @@ namespace JinYuan.MES
datavolist.Add(new TagDataVOListItem()
{
tagCode = keys[0],
tagValue = temp == null ? "0" : temp.ToString(),//m
//tagValue = temp == null ? "0" : temp.ToString(),//m
tagValue = temp == null ? "0" : (temp.ToString()=="OK"?"1":"0"),//m
tagTime = DateTime.Now.ToString(),
tagCalculateResult = "Y",
tagRemark = keys[2]
@@ -1306,7 +1307,7 @@ namespace JinYuan.MES
// 生产型号
datavolist.Add(new TagDataVOListItem()
{
tagCode = "product_model",
tagCode = "PRODUCTION_MODEL_WGJC",
tagValue = payload1.materialCode,
tagTime = DateTime.Now.ToString(),
tagCalculateResult = "",
@@ -1686,7 +1687,12 @@ namespace JinYuan.MES
{
if (res1.category == null)
{
mesResType = MesResType.B;
if (res1.code== "EVEDL_PM_0406")
{
mesResType = MesResType.C;
}
else
mesResType = MesResType.B;
MesMessage = res1.message;
}
else
JinYuan.MES/Models/EqpStatusParam.cs
+59
View File
@@ -60,4 +60,63 @@ namespace JinYuan.MES.Models
/// </summary>
public string faultCode { get; set; }
}
public class SafeEqptStatusParam
{
/// <summary>
/// 工厂代码
/// </summary>
public string siteCode { get; set; }
/// <summary>
/// 产线编号
/// </summary>
public string lineCode { get; set; }
/// <summary>
/// 设备编号
/// </summary>
public string equipNum { get; set; }
/// <summary>
///
/// </summary>
public string materialCode { get; set; }
/// <summary>
/// 员工账号
/// </summary>
public string userName { get; set; }
/// <summary>
/// 库位ID
/// </summary>
public string seatId { get; set; }
/// <summary>
/// 采集时间
/// </summary>
public string recordDate { get; set; }
/// <summary>
/// 设备状态 。Run：（正常运行）、Alert：（故障调试）、Idle：（闲置待机）、Maintain（停止运行）
/// </summary>
public string statusCode { get; set; }
/// <summary>
/// 状态变更时间
/// </summary>
public string uploadTime { get; set; }
/// <summary>
/// 唯一标识符号
/// </summary>
public string guid { get; set; }
public List<SafeEqptCode> safeEqptCodeList { get; set; }
}
public class SafeEqptCode
{
/// <summary>
/// 安全装置编码
/// </summary>
public string equipNum { get; set; }
/// <summary>
/// 设备状态
/// </summary>
public string status { get; set; }
}
}
JinYuan.Models/BGearEntity.cs
+29 -5
View File
@@ -20,8 +20,8 @@ namespace JinYuan.Models
public short[,] list_pan = new short[3, 1];//物流线托盘码
//
public int[,] CCD_Data = new int[3, 20];//芯包CCD信息1,2,3
public string[,] CCD_NgNo = new string[3, 20];//芯包不良编码信息1,2,3
public int[,] CCD_Data = new int[3, 27];//芯包CCD信息1,2,3
public string[,] CCD_NgNo = new string[3, 27];//芯包不良编码信息1,2,3
// public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3
// public int[,] Thickness_PLCData = new int[3, 3];//电芯3_厚度数据OKNG1,2,3 与ccd一样 1 OK，0 NG，2 缺图
/// <summary>
@@ -71,6 +71,13 @@ namespace JinYuan.Models
public int CCD18 { get; set; }
public int CCD19 { get; set; }
public int CCD20 { get; set; }
public int CCD21 { get; set; }
public int CCD22 { get; set; }
public int CCD23 { get; set; }
public int CCD24 { get; set; }
public int CCD25 { get; set; }
public int CCD26 { get; set; }
public int CCD27 { get; set; }
public string CCD1NgCode { get; set; }
public string CCD2NgCode { get; set; }
public string CCD3NgCode { get; set; }
@@ -92,7 +99,16 @@ namespace JinYuan.Models
/// 二维码ng 不良编号
/// </summary>
public string CCD18NgCode { get; set; }
public string CCD19NgCode { get; set; }
public string CCD20NgCode { get; set; }
public string CCD21NgCode { get; set; }
public string CCD22NgCode { get; set; }
public string CCD23NgCode { get; set; }
public string CCD24NgCode { get; set; }
public string CCD25NgCode { get; set; }
public string CCD26NgCode { get; set; }
public string CCD27NgCode { get; set; }
/// <summary>
/// <summary>
/// 电芯1_厚度数据1
/// </summary>
@@ -142,7 +158,13 @@ namespace JinYuan.Models
public string CCDResult18 { get; set; }
public string CCDResult19 { get; set; }
public string CCDResult20 { get; set; }
public string CCDResult21 { get; set; }
public string CCDResult22 { get; set; }
public string CCDResult23 { get; set; }
public string CCDResult24 { get; set; }
public string CCDResult25 { get; set; }
public string CCDResult26 { get; set; }
public string CCDResult27 { get; set; }
/// <summary>
/// 芯包条码
@@ -212,6 +234,8 @@ namespace JinYuan.Models
public string SM_cutting_frequency { get; set; }
public string SM_cutting_speed { get; set; }
public string SM_dust_removal_wind_speed { get; set; }
public string barcode_match_result { get; set; }
public string ng_code_summary { get; set; }
}
}
JinYuan.VirtualDataLibrary/DBSQL.cs
+30 -30
View File
@@ -118,32 +118,32 @@ namespace JinYuan.VirtualDataLibrary
strSql = @"SELECT CONVERT(varchar,[CSBYHASCANNINGTIME], 120) 时间
,[CSBYHPROCESSNAME] 工序名
,[CSBYHSCHEDULE] 班次
,[CSBYHCODEA] 电芯码
,[BarCode] 电芯码
,[CSBYHOUTSTATIONJUDGMENTRESULT] 出站判定结果
,[Remark] 备注
,[RethrowNum] 复投次数
,[CCDResult1] 电芯CCD1结果
,[CCDResult2] 电芯CCD2结果
,[CCDResult3] 电芯CCD3结果
,[CCDResult4] 电芯CCD4结果
,[CCDResult5] 电芯CCD5结果
,[CCDResult6] 电芯CCD6结果
,[CCDResult7] 电芯CCD7结果
,[CCDResult8] 电芯CCD8结果
,[CCDResult9] 电芯CCD9结果
,[CCDResult10] 电芯CCD10结果
,[CCDResult11] 电芯CCD11结果
,[CCDResult12] 电芯CCD12结果
,[CCDResult13] 电芯CCD13结果
,[CCDResult14] 电芯CCD14结果
,[CCDResult15] 电芯CCD15结果
,[CCDResult16] 电芯CCD16结果
,[CCDResult17] 电芯CCD17结果
,[CCDResult18] 电芯CCD18结果
,[CCDResult19] 电芯CCD19结果
,[CCDResult20] 电芯CCD20结果
,[CCDResult1] 正面
,[CCDResult2] 反面
,[CCDResult3] 左侧面
,[CCDResult4] 右侧面
,[CCDResult5] 顶面
,[CCDResult6] 底面
,[CCDResult7] 底DE1
,[CCDResult8] 底DE2
,[CCDResult9] 底DE3
,[CCDResult10] 底DE4
,[CCDResult11] 中ME1
,[CCDResult12] 中ME2
,[CCDResult13] 中ME3
,[CCDResult14] 中ME4
,[CCDResult15] 正极柱
,[CCDResult16] 负极柱
,[CCDResult17] 防爆阀
,[CCDResult18] 二维码
,[CCDResult19] 厚度
,[CCDResult20] 平面度
,[CCDResult21] 电芯CCD21结果
,[CCDResult22] 电芯CCD22结果
,[CCDResult22] 外观检测总结果
,[CCDResult23] 电芯CCD23结果
,[CCDResult24] 电芯CCD24结果
,[CCDResult25] 电芯CCD25结果
@@ -219,12 +219,12 @@ namespace JinYuan.VirtualDataLibrary
public string GetStaticByDay(string startDateTime, string endDateTime)
{
string strSql = $@" SELECT CONVERT(varchar(13),TestTime,120) 时间, ProdIn 总数, ProdOut OK总数,Ppm PPM均值,
cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
cast(case when ProdIn>0 then (ROUND(cast(isnull(ProdOut,0) as float)/cast(isnull(ProdIn,0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
FROM Hourprod WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}' GROUP BY TestTime,ProdOut,ProdIn,Ppm,JiaDL
UNION ALL
SELECT '合计' as '时间', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT FDate,sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(PPM) Ppm,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL,
cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率 FROM Hourprod
WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}' GROUP BY FDate) as t ";
@@ -240,12 +240,12 @@ namespace JinYuan.VirtualDataLibrary
public string GetStaticByWeek(string startDateTime, string endDateTime)
{
string strSql = $@" SELECT convert(char(10), TestTime, 120) 月份, sum(ProdIn) 总数, sum(ProdOut) OK总数,AVG(Ppm) PPM均值,
cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
cast(case when sum(ProdIn)>0 then (ROUND(cast(isnull(SUM(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
FROM Hourprod WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}' GROUP BY convert(char(10), TestTime, 120),JiaDL
UNION ALL
SELECT '合计' as '月份', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(Ppm) Ppm,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL,
cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10))+'%' 优率 FROM Hourprod
WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}') as t ";
return strSql;
@@ -261,12 +261,12 @@ namespace JinYuan.VirtualDataLibrary
public string GetStaticByMonth(string startDateTime, string endDateTime)
{
string strSql = $@" SELECT convert(char(7), TestTime, 120) 月份, sum(ProdIn) 总数, sum(ProdOut) OK总数,AVG(Ppm) PPM均值,
cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
cast(case when sum(ProdIn)>0 then (ROUND(cast(isnull(SUM(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
FROM Hourprod WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}' GROUP BY convert(char(7), TestTime, 120),JiaDL
UNION ALL
SELECT '合计' as '月份', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(Ppm) Ppm,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL,
cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10))+'%' 优率 FROM Hourprod
WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}') as t ";
return strSql;
@@ -298,12 +298,12 @@ namespace JinYuan.VirtualDataLibrary
}
string strsql = $@" SELECT CONVERT(varchar(13),TestTime,120) 时间, ProdIn 总数, ProdOut OK总数,Ppm PPM均值,
cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
cast(case when ProdIn>0 then (ROUND(cast(isnull(ProdOut,0) as float)/cast(isnull(ProdIn,0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
FROM Hourprod WHERE TestTime BETWEEN '{sDateTime1}' AND '{sDateTime2}' GROUP BY TestTime,ProdOut,ProdIn,Ppm,JiaDL
UNION ALL
SELECT '合计' as '时间', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT FDate,sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(Ppm) Ppm,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL,
cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL,
cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率 FROM Hourprod
WHERE TestTime BETWEEN '{sDateTime1}' AND '{sDateTime2}' GROUP BY FDate) as t ";
return strsql;
JinYuan.VirtualDataLibrary/MesConfig.cs
+5
View File
@@ -189,5 +189,10 @@ namespace JinYuan.VirtualDataLibrary
/// </summary>
public string OkNgParamMesUrl = "http://10.17.128.206/core/api/public/eve/pm/eqm/new/grading";
/// <summary>
/// 安全设备运行状态
/// </summary>
public string SafeEqptStatusMesUrl = "http://10.22.161.62:804/device-status";
}
}
LargeSquareOne/Config/Configure.ini
+12 -11
View File
@@ -23,19 +23,20 @@ MES/
白夜班交替时间=20:30:00
MES日志保存路径=D:\APILog
存储服务器IP地址=192.168.2.108
员工权限校验=http://10.22.160.141/core/api/public/equipment/base/user/login/verify
设备参数设定值请求=http://10.22.160.141/core/api/public/param/setting/request
设备参数设定值变更=http://10.22.160.141/core/api/public/param/setting/change
产品进站=http://10.22.160.141/core/api/public/formation/section/arrival/bz
产品过程加工参数=http://10.22.160.141/core/api/public/product/process/param/new/process
产品结果加工参数=http://10.22.160.141/core/api/public/product/process/param/new/result
产品出站=http://10.22.160.141/core/api/public/eve/pm/formation-section
设备报警=http://10.22.160.141/core/api/public/equipment/alarm/currency
设备状态=http://10.22.160.141/core/api/public/eve/pm/eqm/run/status/operation
能耗=http://10.22.160.141/core/api/public/eve/pm/energy/consumption/collection/submit
员工权限校验=http://10.22.160.1/core/api/public/equipment/base/user/login/verify
设备参数设定值请求=http://10.22.160.1/core/api/public/param/setting/request
设备参数设定值变更=http://10.22.160.1/core/api/public/param/setting/change
产品进站=http://10.22.160.2/core/api/public/formation/section/arrival
产品过程加工参数=http://10.22.160.1/core/api/public/product/process/param/new/process
产品结果加工参数=http://10.22.160.3/core/api/public/product/process/param/new/result
产品出站=http://10.22.160.1/core/api/public/eve/pm/formation-section/bz
设备报警=http://10.22.160.1/core/api/public/equipment/alarm/currency
设备状态=http://10.22.160.1/core/api/public/eve/pm/eqm/run/status/operation
能耗=http://10.22.160.1/core/api/public/eve/pm/energy/consumption/collection/submit
风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
分档参数=http://10.22.160.141/core/api/public/eve/pm/eqm/new/grading
分档参数=http://10.22.160.1/core/api/public/eve/pm/eqm/new/grading
安全设备状态=http://10.22.161.62:804/device-status
guid=a270c7d2-9cbd-4739-9a0b-0709b5813332
DeviceState=1
run_AlarmMark=0
LargeSquareOne/FrmAlarmLog.cs
-1
View File
@@ -32,7 +32,6 @@ namespace LargeSquareOne
}
else
{
int rowCount = this.dgv_Log.Rows.Add();
this.dgv_Log.Rows[rowCount].Cells[0].Value = CurrentTime;
this.dgv_Log.Rows[rowCount].Cells[1].Value = isError ? "错误" : "信息";
LargeSquareOne/FrmDataMonitor.Designer.cs
Generated
+35 -25
View File
@@ -63,6 +63,7 @@
this.rtb_Info = new System.Windows.Forms.RichTextBox();
this.groupBoxEX5 = new JinYuan.ControlLib.GroupBoxEX();
this.dgvBlankingData = new System.Windows.Forms.DataGridView();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -90,12 +91,12 @@
this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column114 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.平面度 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column147 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column34 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column35 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column102 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.tableLayoutPanel1.SuspendLayout();
this.groupBoxEX3.SuspendLayout();
this.groupBoxEX2.SuspendLayout();
@@ -127,7 +128,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.37666F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 477F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1080);
this.tableLayoutPanel1.Size = new System.Drawing.Size(1920, 1061);
this.tableLayoutPanel1.TabIndex = 0;
//
// groupBoxEX3
@@ -146,7 +147,7 @@
this.groupBoxEX3.Margin = new System.Windows.Forms.Padding(2);
this.groupBoxEX3.Name = "groupBoxEX3";
this.groupBoxEX3.Padding = new System.Windows.Forms.Padding(2);
this.groupBoxEX3.Size = new System.Drawing.Size(343, 271);
this.groupBoxEX3.Size = new System.Drawing.Size(343, 262);
this.groupBoxEX3.TabIndex = 14;
this.groupBoxEX3.TabStop = false;
this.groupBoxEX3.Text = "操作设置";
@@ -232,11 +233,11 @@
this.groupBoxEX2.Controls.Add(this.lVConfigRange);
this.groupBoxEX2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxEX2.ForeColor = System.Drawing.Color.White;
this.groupBoxEX2.Location = new System.Drawing.Point(2, 277);
this.groupBoxEX2.Location = new System.Drawing.Point(2, 268);
this.groupBoxEX2.Margin = new System.Windows.Forms.Padding(2);
this.groupBoxEX2.Name = "groupBoxEX2";
this.groupBoxEX2.Padding = new System.Windows.Forms.Padding(2);
this.groupBoxEX2.Size = new System.Drawing.Size(343, 323);
this.groupBoxEX2.Size = new System.Drawing.Size(343, 313);
this.groupBoxEX2.TabIndex = 13;
this.groupBoxEX2.TabStop = false;
this.groupBoxEX2.Text = "参数";
@@ -258,7 +259,7 @@
this.lVConfigRange.Margin = new System.Windows.Forms.Padding(2);
this.lVConfigRange.Name = "lVConfigRange";
this.lVConfigRange.OwnerDraw = true;
this.lVConfigRange.Size = new System.Drawing.Size(339, 300);
this.lVConfigRange.Size = new System.Drawing.Size(339, 290);
this.lVConfigRange.TabIndex = 2;
this.lVConfigRange.UseCompatibleStateImageBehavior = false;
this.lVConfigRange.View = System.Windows.Forms.View.Details;
@@ -302,7 +303,7 @@
this.groupBoxEX4.Name = "groupBoxEX4";
this.groupBoxEX4.Padding = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel1.SetRowSpan(this.groupBoxEX4, 2);
this.groupBoxEX4.Size = new System.Drawing.Size(1569, 598);
this.groupBoxEX4.Size = new System.Drawing.Size(1569, 579);
this.groupBoxEX4.TabIndex = 15;
this.groupBoxEX4.TabStop = false;
this.groupBoxEX4.Text = "进站";
@@ -363,7 +364,7 @@
this.dgvFeedingData.RowHeadersWidth = 60;
this.dgvFeedingData.RowTemplate.Height = 23;
this.dgvFeedingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvFeedingData.Size = new System.Drawing.Size(1565, 575);
this.dgvFeedingData.Size = new System.Drawing.Size(1565, 556);
this.dgvFeedingData.TabIndex = 10;
this.dgvFeedingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvFeedingData_CellContentClick);
this.dgvFeedingData.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvFeedingData_RowPrePaint);
@@ -437,7 +438,7 @@
this.groupBoxEX1.Controls.Add(this.rtb_Info);
this.groupBoxEX1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxEX1.ForeColor = System.Drawing.Color.White;
this.groupBoxEX1.Location = new System.Drawing.Point(2, 604);
this.groupBoxEX1.Location = new System.Drawing.Point(2, 585);
this.groupBoxEX1.Margin = new System.Windows.Forms.Padding(2);
this.groupBoxEX1.Name = "groupBoxEX1";
this.groupBoxEX1.Padding = new System.Windows.Forms.Padding(2);
@@ -468,7 +469,7 @@
this.groupBoxEX5.Controls.Add(this.dgvBlankingData);
this.groupBoxEX5.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxEX5.ForeColor = System.Drawing.Color.White;
this.groupBoxEX5.Location = new System.Drawing.Point(349, 604);
this.groupBoxEX5.Location = new System.Drawing.Point(349, 585);
this.groupBoxEX5.Margin = new System.Windows.Forms.Padding(2);
this.groupBoxEX5.Name = "groupBoxEX5";
this.groupBoxEX5.Padding = new System.Windows.Forms.Padding(2);
@@ -524,6 +525,7 @@
this.Column112,
this.Column113,
this.Column114,
this.平面度,
this.Column147,
this.Column34,
this.Column35,
@@ -562,6 +564,14 @@
this.dgvBlankingData.TabIndex = 10;
this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick);
//
// imageList1
//
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
this.imageList1.Images.SetKeyName(0, "info.png");
this.imageList1.Images.SetKeyName(1, "error.png");
this.imageList1.Images.SetKeyName(2, "warning.png");
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.HeaderText = "序号";
@@ -590,7 +600,7 @@
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "BarCode";
this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码";
this.dataGridViewTextBoxColumn5.HeaderText = "电芯码";
this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
@@ -731,38 +741,45 @@
// Column110
//
this.Column110.DataPropertyName = "CCDResult15";
this.Column110.HeaderText = "极柱(POS/NEG)";
this.Column110.HeaderText = "正极柱(POS/NEG)";
this.Column110.Name = "Column110";
this.Column110.ReadOnly = true;
//
// Column111
//
this.Column111.DataPropertyName = "CCDResult16";
this.Column111.HeaderText = "防爆阀(PRO)";
this.Column111.HeaderText = "负极柱(POS/NEG)";
this.Column111.Name = "Column111";
this.Column111.ReadOnly = true;
//
// Column112
//
this.Column112.DataPropertyName = "CCDResult17";
this.Column112.HeaderText = "厚度1";
this.Column112.HeaderText = "防爆阀(PRO)";
this.Column112.Name = "Column112";
this.Column112.ReadOnly = true;
//
// Column113
//
this.Column113.DataPropertyName = "CCDResult18";
this.Column113.HeaderText = "厚度2";
this.Column113.HeaderText = "二维码";
this.Column113.Name = "Column113";
this.Column113.ReadOnly = true;
//
// Column114
//
this.Column114.DataPropertyName = "CCDResult19";
this.Column114.HeaderText = "厚度3";
this.Column114.HeaderText = "厚度";
this.Column114.Name = "Column114";
this.Column114.ReadOnly = true;
//
// 平面度
//
this.平面度.DataPropertyName = "CCDResult20";
this.平面度.HeaderText = "平面度";
this.平面度.Name = "平面度";
this.平面度.ReadOnly = true;
//
// Column147
//
this.Column147.DataPropertyName = "RethrowNum";
@@ -806,21 +823,13 @@
this.Column22.ReadOnly = true;
this.Column22.Width = 150;
//
// imageList1
//
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
this.imageList1.Images.SetKeyName(0, "info.png");
this.imageList1.Images.SetKeyName(1, "error.png");
this.imageList1.Images.SetKeyName(2, "warning.png");
//
// FrmDataMonitor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(1920, 1080);
this.ClientSize = new System.Drawing.Size(1920, 1061);
this.Controls.Add(this.tableLayoutPanel1);
this.DoubleBuffered = true;
this.Font = new System.Drawing.Font("微软雅黑", 10.5F);
@@ -898,6 +907,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column112;
private System.Windows.Forms.DataGridViewTextBoxColumn Column113;
private System.Windows.Forms.DataGridViewTextBoxColumn Column114;
private System.Windows.Forms.DataGridViewTextBoxColumn 平面度;
private System.Windows.Forms.DataGridViewTextBoxColumn Column147;
private System.Windows.Forms.DataGridViewTextBoxColumn Column34;
private System.Windows.Forms.DataGridViewTextBoxColumn Column35;
LargeSquareOne/FrmDataMonitor.resx
+4 -1
View File
@@ -174,6 +174,9 @@
<metadata name="Column97.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="平面度.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column147.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -197,7 +200,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
DQAAAk1TRnQBSQFMAgEBAwEAAZgBAgGYAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
DQAAAk1TRnQBSQFMAgEBAwEAAaABAgGgAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2
LargeSquareOne/FrmHistory.Designer.cs
Generated
+59 -59
View File
@@ -28,9 +28,6 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -46,6 +43,9 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.panelEnhanced1 = new JinYuan.ControlLib.PanelEnhanced();
this.tabControlPlus1 = new HML.TabControlPlus();
this.tabPagePlus1 = new HML.TabPagePlus();
@@ -60,7 +60,6 @@
this.label3 = new System.Windows.Forms.Label();
this.dtp_End = new System.Windows.Forms.DateTimePicker();
this.label1 = new System.Windows.Forms.Label();
this.dgv_Main = new System.Windows.Forms.DataGridView();
this.tabPagePlus2 = new HML.TabPagePlus();
this.tabControlPlus2 = new HML.TabControlPlus();
this.tabPagePlus4 = new HML.TabPagePlus();
@@ -108,6 +107,7 @@
this.dtp_AlarmTimeEnd = new System.Windows.Forms.DateTimePicker();
this.label12 = new System.Windows.Forms.Label();
this.dgv_AlarmData = new System.Windows.Forms.DataGridView();
this.dgv_Main = new System.Windows.Forms.DataGridView();
this.panelEnhanced1.SuspendLayout();
this.tabControlPlus1.SuspendLayout();
this.tabPagePlus1.SuspendLayout();
@@ -115,7 +115,6 @@
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).BeginInit();
this.tabPagePlus2.SuspendLayout();
this.tabControlPlus2.SuspendLayout();
this.tabPagePlus4.SuspendLayout();
@@ -140,6 +139,7 @@
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgv_AlarmData)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).BeginInit();
this.SuspendLayout();
//
// panelEnhanced1
@@ -338,58 +338,6 @@
this.label1.TabIndex = 12;
this.label1.Text = "开始时间";
//
// dgv_Main
//
this.dgv_Main.AllowUserToAddRows = false;
this.dgv_Main.AllowUserToDeleteRows = false;
this.dgv_Main.AllowUserToResizeColumns = false;
this.dgv_Main.AllowUserToResizeRows = false;
this.dgv_Main.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
this.dgv_Main.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.dgv_Main.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgv_Main.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_Main.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dgv_Main.ColumnHeadersHeight = 45;
this.dgv_Main.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgv_Main.DefaultCellStyle = dataGridViewCellStyle2;
this.dgv_Main.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgv_Main.EnableHeadersVisualStyles = false;
this.dgv_Main.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
this.dgv_Main.Location = new System.Drawing.Point(0, 0);
this.dgv_Main.MultiSelect = false;
this.dgv_Main.Name = "dgv_Main";
this.dgv_Main.ReadOnly = true;
this.dgv_Main.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_Main.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dgv_Main.RowHeadersWidth = 45;
this.dgv_Main.RowTemplate.Height = 23;
this.dgv_Main.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgv_Main.Size = new System.Drawing.Size(1603, 628);
this.dgv_Main.TabIndex = 5;
this.dgv_Main.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_Main_RowPostPaint);
this.dgv_Main.Paint += new System.Windows.Forms.PaintEventHandler(this.dgv_Main_Paint);
//
// tabPagePlus2
//
this.tabPagePlus2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
@@ -1225,6 +1173,58 @@
this.dgv_AlarmData.TabIndex = 5;
this.dgv_AlarmData.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_AlarmData_RowPostPaint);
//
// dgv_Main
//
this.dgv_Main.AllowUserToAddRows = false;
this.dgv_Main.AllowUserToDeleteRows = false;
this.dgv_Main.AllowUserToResizeColumns = false;
this.dgv_Main.AllowUserToResizeRows = false;
this.dgv_Main.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
this.dgv_Main.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
this.dgv_Main.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgv_Main.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_Main.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dgv_Main.ColumnHeadersHeight = 45;
this.dgv_Main.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgv_Main.DefaultCellStyle = dataGridViewCellStyle2;
this.dgv_Main.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgv_Main.EnableHeadersVisualStyles = false;
this.dgv_Main.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
this.dgv_Main.Location = new System.Drawing.Point(0, 0);
this.dgv_Main.MultiSelect = false;
this.dgv_Main.Name = "dgv_Main";
this.dgv_Main.ReadOnly = true;
this.dgv_Main.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_Main.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dgv_Main.RowHeadersWidth = 45;
this.dgv_Main.RowTemplate.Height = 23;
this.dgv_Main.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgv_Main.Size = new System.Drawing.Size(1603, 628);
this.dgv_Main.TabIndex = 5;
this.dgv_Main.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_Main_RowPostPaint);
this.dgv_Main.Paint += new System.Windows.Forms.PaintEventHandler(this.dgv_Main_Paint);
//
// FrmHistory
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -1244,7 +1244,6 @@
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).EndInit();
this.tabPagePlus2.ResumeLayout(false);
this.tabControlPlus2.ResumeLayout(false);
this.tabPagePlus4.ResumeLayout(false);
@@ -1274,6 +1273,7 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dgv_AlarmData)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).EndInit();
this.ResumeLayout(false);
}
@@ -1289,7 +1289,6 @@
private System.Windows.Forms.Label label1;
private JinYuan.ControlLib.PanelEnhanced panelEnhanced1;
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.DataGridView dgv_Main;
private HML.TabControlPlus tabControlPlus1;
private HML.TabPagePlus tabPagePlus1;
private HML.TabPagePlus tabPagePlus2;
@@ -1341,5 +1340,6 @@
private System.Windows.Forms.DataGridView dgv_AlarmData;
private System.Windows.Forms.TextBox txtBarCode;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.DataGridView dgv_Main;
}
}
LargeSquareOne/FrmHistory.cs
+2 -2
View File
@@ -455,9 +455,9 @@ namespace LargeSquareOne
TimeSpan timeSpan = endDateTime - startDateTime;
if (timeSpan.TotalDays > 1.0)
if (timeSpan.TotalDays > 31.0)
{
return OperateResult.CreateFailResult<DataTable>("查询范围不能超过1天");
return OperateResult.CreateFailResult<DataTable>("查询范围不能超过31天");
}
DataTable dataTable = CommonMethods.db.QueryDataTable(CommonMethods.dBSQL.SelectHostAlarmData(start, end, alarmType));
LargeSquareOne/FrmMain.Designer.cs
Generated
+1
View File
@@ -125,6 +125,7 @@
this.lbl_Title.ForeColor = System.Drawing.Color.White;
this.lbl_Title.Image = global::LargeSquareOne.Properties.Resources.Current;
this.lbl_Title.Name = "lbl_Title";
this.lbl_Title.Click += new System.EventHandler(this.lbl_Title_Click);
//
// label7
//
LargeSquareOne/FrmMain.cs
+7 -2
View File
@@ -204,7 +204,7 @@ namespace LargeSquareOne
CommonMethods.mesConfig.StatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "设备状态", "0");
CommonMethods.mesConfig.WattrMeterUrl = IniConfigHelper.ReadIniData("MES配置", "能耗", "0");
CommonMethods.mesConfig.CollectData = IniConfigHelper.ReadIniData("MES配置", "风速仪", "0");
CommonMethods.mesConfig.SafeEqptStatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "安全设备状态", "0");
//CommonMethods.ProdDRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDRFIDNgQty", "0"));
//CommonMethods.ProdDXNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDXNgQty", "0"));
//CommonMethods.ProdGRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdGRFIDNgQty", "0"));
@@ -630,7 +630,7 @@ namespace LargeSquareOne
/// 通用窗体切换
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <param name="e"></param>
private void CommonNaviButton_Click(object sender, EventArgs e)
{
if (sender is NaviButton2 navi)
@@ -1043,6 +1043,11 @@ namespace LargeSquareOne
CommonMethods.IsLoginOk = false;
}
}
private void lbl_Title_Click(object sender, EventArgs e)
{
}
}
#region 消息筛选器
LargeSquareOne/FrmMain.resx
+1111 -1111
View File
File diff suppressed because it is too large Load Diff
LargeSquareOne/FrmMain.zh-CN.resx
+3 -3
View File
@@ -5051,13 +5051,13 @@
</value>
</data>
<data name="MainPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>1874, 910</value>
<value>1874, 891</value>
</data>
<data name="CorePanel.Size" type="System.Drawing.Size, System.Drawing">
<value>1920, 936</value>
<value>1920, 917</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1920, 1080</value>
<value>1920, 1061</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
采集项与PLC地址.xlsx
BIN
View File
Binary file not shown.