dsuser/ds-628-sx-swj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
ds-628-sx-swj
2024-09-28 12:31:17 +08:00
parent 7e26d6d230
commit 43cd5aae79
22 changed files with 4077 additions and 2542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.ControlCenter/ControlCenter.cs
+17 -9
View File
@@ -255,11 +255,13 @@ namespace JinYuan.ControlCenters
{
if (device.IsConnected)
{
Thread.Sleep(1000);
//读取
JYResult result = CommonMethods.PlcLink.ReadValue<JYResult<short>>("D100", Data_Type.Short);
if (result.IsSuccess)
{
device.ErrorTimes = 0;
JYResult res = CommonMethods.PlcLink.WriteValue("D100", 1, Data_Type.Short);
if (!res.IsSuccess)
{
@@ -941,11 +943,11 @@ namespace JinYuan.ControlCenters
UpTotalCount(null);
});
CommonMethods.TotalQty = CommonMethods.PlcLink.ReadInt32("D11");
CommonMethods.ProOKQty = CommonMethods.PlcLink.ReadInt32("D13");
CommonMethods.TotalQty = CommonMethods.PlcLink.ReadInt32("D15");//生产总数
CommonMethods.ProOKQty = CommonMethods.PlcLink.ReadInt32("D17");//良品总数
CommonMethods.Ppm = CommonMethods.PlcLink.ReadInt32("D8");
CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadFloat("D6").ToString("F2"));
CommonMethods.Ppm = CommonMethods.PlcLink.ReadInt32("D13");//PPM
CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadFloat("D11").ToString("F2"));//稼动率
#region 开机时间/运行时间
CommonMethods.PlcOpenAndRunTime = GetList<int>(6, 0);
@@ -976,7 +978,12 @@ namespace JinYuan.ControlCenters
string strErr = "";
DateTime dateTime = DateTime.Now;
string strDate = dateTime.ToString("yyyy-MM-dd");
int min = dateTime.Minute;
int Hour = dateTime.Hour;
if(min < 30)
{
Hour -= 1;
}
//if (dateTime.Hour >= 30)
//{
// Hour += 1;
@@ -993,7 +1000,7 @@ namespace JinYuan.ControlCenters
Hourprod mh = new Hourprod();
mh.FDate = strDate;
mh.FHour = Hour - 1;
mh.FHour = Hour ;
mh.ProdIn = ProdCurrAllQty;
mh.ProdOut = ProdCurrOKQty;
mh.TestTime = DateTime.Now;
@@ -1075,17 +1082,18 @@ namespace JinYuan.ControlCenters
/// <returns></returns>
private int GetToDayHourQty(int hour, bool flag)
{
//D1052
try
{
string strAddr = "";
if (flag)//产出
if (flag)//投入
{
strAddr = "D" + (1040 + hour);
strAddr = "D" + (1032 + hour);
}
else//良品数
else//产出
{
strAddr = "D" + (1070 + hour);
strAddr = "D" + (1062 + hour);
}
int ProdNGQty = CommonMethods.PlcLink.ReadInt16(strAddr);
return ProdNGQty;
JinYuan.ControlCenter/ControlCenter_Plc.cs
+349 -218
View File
@@ -48,8 +48,9 @@ namespace JinYuan.ControlCenters
sw2.Restart();
//解析数据
List<AGearEntity> list = new List<AGearEntity>();//实体
List<string> listBarCode = GetList<string>(2, "");//电芯条码
List<short> listRes = GetList<short>(2, 0);//进站电芯反馈结果
List<string> listBarCode = GetList<string>(4, "");//电芯条码
//List<string> listNum = GetList<string>(1, "");//进站磁悬浮动子编号
List<short> listRes = GetList<short>(4, 0);//进站电芯反馈结果
byte[] bytes = bArrays.Content.ByteReverse();//高低位转换
@@ -58,18 +59,25 @@ namespace JinYuan.ControlCenters
//电芯反馈结果
listRes[0] = ShortLib.GetShortFromByteArray(bArrays.Content, 0, DataFormat.CDAB);
listRes[1] = ShortLib.GetShortFromByteArray(bArrays.Content, 0 + 2, DataFormat.CDAB);
listRes[2] = ShortLib.GetShortFromByteArray(bArrays.Content, 0 + 4, DataFormat.CDAB);
listRes[3] = ShortLib.GetShortFromByteArray(bArrays.Content, 0 + 6, DataFormat.CDAB);
//电芯条码
//从bytes读取第二位参数到第三位参数的内容 0-19 第四位参数为格式 第五位为规则
listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 200, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 240, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 280, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
listBarCode[3] = StringLib.GetStringFromByteArrayByEncoding(bytes, 320, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
//listBarCode[0] = "5590101D14E9400002";
//listBarCode[1] = "5590101D14E9400001";
//listBarCode[2] = "5590101D14E9400002";
//listBarCode[3] = "5590101D14E9400001";
List<string> MesMessage = new List<string>();
List<MesResType> mesResType = new List<MesResType>();
for (int i = 0; i < 2; i++)
if (CommonMethods.mesConfig.isUpMes)
{
AGearEntity m = new AGearEntity();
if (CommonMethods.mesConfig.isUpMes)
for (int i = 0; i < 4; i++)
{
List<string> listBar = new List<string>();
//foreach (var e in listBarCode)
@@ -85,62 +93,144 @@ namespace JinYuan.ControlCenters
string userName = CommonMethods.mesConfig.mesUserName;
//int type = 1;
//string materialLotCodeLocator = "";
string MesMessage1 = "";
MesResType mesResType1 = MesResType.A;
string MesMessage1 ="";
MesResType mesResType1 =MesResType.A;
bool Res = CommonMethods.hbgMes.SingleCellInStation(url, siteCode, lineCode, equipNum, materialCode, userName, listBar[0], ref MesMessage1, ref mesResType1);
if (Res)
{
listRes[0] = 1;
listRes[1] = 1;
m.Remark = MesMessage1;
listRes[2] = 1;
listRes[3] = 1;
}
else
{
switch (mesResType1)
{
for (int j = 0; j < 4; j++)
{
case MesResType.A:// 停线，设备报警停机
listRes[i] = 10;
m.Remark = MesMessage1;
break;
case MesResType.B:
listRes[i] = 9;
m.Remark = MesMessage1;
break;
case MesResType.C:
listRes[i] = 1;
m.Remark = MesMessage1;
break;
}
switch (mesResType1)
{
case MesResType.A:// 停线，设备报警停机
listRes[j] = 10;
break;
case MesResType.B:
listRes[j] = 9;
break;
case MesResType.C:
listRes[j] = 1;
break;
}
}
}
}
else
{
m.Remark = "非Mes上传状态";
}
}
for (int i = 0; i < 4; i++)
{
try
{
{
AGearEntity m = new AGearEntity();
//m.MaglevNum = listNum[0];
m.ID = i + 1;
m.CNum = "i";
m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
m.BarCode = listBarCode[i];
m.Result = listRes[i];
//m.Remark = "无";
m.Remark = "无";
list.Add(m);
}
catch (Exception ex)
{
LogHelper.Instance.WriteError($"卷芯进站线程数据解析：{ex}", "SysErrorLog");
}
}
#endregion
}
#endregion
{
//for (int i = 0; i < 2; i++)
//{
// AGearEntity m = new AGearEntity();
// try
// {
// m.ChannelNo = i + 1;
// m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// m.DiRFID = listDiRFID[i];
// m.GaoRFID = listGaoRFID[i];
// m.YaLiValue = Convert.ToDecimal(listYaLiValue[i].ToString("f3"));
// if (listBuPing[i] == 0)
// {
// m.DiRFID = "NG";
// m.GaoRFID = "NG";
// m.BarCode = "NG";
// m.Result = "NOT";
// m.Remark = "无部品状态";
// listRes[i] = 10;
// }
// else //有部品状态
// {
// if (String.IsNullOrEmpty(m.DiRFID) || m.DiRFID.Trim() == "ERROR") //地托杯没码
// {
// m.DiRFID = "NG";
// m.BarCode = "NG";
// m.Result = "NG";
// m.Remark = "低托杯码NG";
// listRes[i] = 3;
// }
// else
// {
// //从服务器数据库以托杯码获取卷芯码——————————————————
// var result3 = CommonMethods.dbServer.Query<DataTurnover>(it => it.containerCode == m.DiRFID);
// if (result3 != null)
// {
// m.BarCode = result3.identification.ToString();
// if (m.BarCode.Trim() == "NoCode" || m.BarCode.Trim() == "NG" || m.BarCode.Trim() == "ERROR" || m.BarCode.Trim() == "" || m.BarCode.Trim() == "0000000000000000")
// {
// m.Result = "NG";
// m.BarCode = "NG";
// m.Remark = "上工序卷芯码异常";
// listRes[i] = 2;
// }
// else
// {
// if (String.IsNullOrEmpty(m.GaoRFID) || m.GaoRFID.Trim() == "ERROR")
// {
// m.GaoRFID = "NG";
// m.Result = "NG";
// m.Remark = "高托杯码NG";
// listRes[i] = 3;
// }
// else
// {
// m.Result = "OK";
// m.Remark = "良品";
// string strErr = "";
// listRes[i] = GetResult(m, ref strErr);
// m.Result = listRes[i] == 1 ? "OK" : "NG";
// listRes[i] = 1;
// }
// }
// }
// else
// {
// m.BarCode = "NG";
// m.Result = "NG";
// m.Remark = "未查询到此托杯码";
// listRes[i] = 4;
// }
// }
// }
// list.Add(m);
// }
// catch (Exception ex)
// {
// LogHelper.Instance.WriteError($"卷芯进站线程数据解析：{ex}", "SysErrorLog");
// }
//}
}
//写入·结果反馈
JYResult result = CommonMethods.PlcLink.WriteValue("D2100", listRes.ToArray(), Data_Type.ArrShort);//判断结果写入PLC
JYResult result = CommonMethods.PlcLink.WriteValue("D2010", listRes.ToArray(), Data_Type.ArrShort);//判断结果写入PLC
if (result != null)
{
string strres = $"卷心工位发送给PLC: D2100={listRes[0]},D2101={listRes[1]},";
string strres = $"卷心工位发送给PLC: D2010={listRes[0]},D2011={listRes[1]},D2012={listRes[2]},D2013={listRes[3]},";
CommonMethods.AddDataMonitorLog(0, strres);
}
@@ -192,7 +282,7 @@ namespace JinYuan.ControlCenters
DataTurnover server = new DataTurnover
{
equipNum = CommonMethods.mesConfig.equipNum,
containerCode = m.MaglevNum,
containerCode = m.BarCode,
identification = m.BarCode,
message = m.Result,
Time = DateTime.Now,
@@ -250,158 +340,200 @@ namespace JinYuan.ControlCenters
}
if (bArrays.IsSuccess && bArrays.Content != null)
{
//解析数据
Random random = new Random();
//解析数据
sw2.Restart();
#region 数据变量定义
List<BGearEntity> list = new List<BGearEntity>();//实体
short[] MyRes = new short[2];//AB反馈结果
//List<string> ScanTime = GetList<string>(2,"");//AB芯包扫码时间
//List<string> listBatCode = GetList<string>(2,"");//AB芯包条码
//List<short> list_Data1 = GetList<short>(23, 0);//芯包信息1
//List<List<short>> List_list_Data1 = GetList<List<short>>(2, list_Data1);//AB芯包信息1列表
//List<short> list_CutNO = GetList<short>(2, 0);//电芯极耳切刀编号
//List<List<short>> List_list_CutNO = GetList<List<short>>(2, list_CutNO);//电芯极耳切刀编号列表
//List<string> list_Process = GetList<string>(5, "");//电芯工序信息
//List<List<string>> List_list_Process = GetList<List<string>>(2, list_Process);//AB电芯工序信息列表
//List<float> list_Data2 = GetList<float>(65, 0);//芯包信息2
//List<List<float>> List_list_Data2 = GetList<List<float>>(2, list_Data2);//AB芯包信息2列表
#endregion
#endregion
//高低位转换
byte[] bytes = bArrays.Content.ByteReverse();
byte[] bytes1 = bArrays.Content;
#region 数据解析
//D3100起
//反馈结果
#region 电芯解析
//D3100起
//电芯解析
#region 上传MES
for (int i = 0; i < 2; i++)
{
BGearEntity m = new BGearEntity();
{
try
{
BGearEntity m = new BGearEntity();
if (i == 0)
{
//A检测结果 D3240~D3266
for (int j = 0; j < 27; j++)
{
//序号
for(int j = 0; j < 2; j++)
{
m.list_Result[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB);
m.MyNo[j] = j + 1;
}
//A检测值 D3267~D3353
for (int j = 0; j < 44; j++)
//A芯包信息1 D3240~D3262
for (int j = 0; j < 23; j++)
{
m.list_Value[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 334 + j * 4, DataFormat.CDAB);
m.list_Data1[i,j] = ShortLib.GetShortFromByteArray(bArrays.Content, 280 + j * 2, DataFormat.CDAB);
}
//A压缩空气用量 D3355
for (int j = 0; j < 1; j++)
//A电芯极耳切刀编号 D3263~D3265
for (int j = 0; j < 2; j++)
{
m.list_CompressedAir[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 510 + j * 4, DataFormat.CDAB);
m.list_CutNO[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 326 + j * 4, DataFormat.CDAB);
}
//A工序信息 D3357~D3367
for (int j = 0; j < 6; j++)
//A电芯工序信息 D3267~D3273
for (int j = 0; j < 4; j++)
{
m.list_Procedure[i, j] = StringLib.GetStringFromByteArrayByEncoding(bytes, 514 + 4 * j, 4, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
m.list_Process[i, j] = StringLib.GetStringFromByteArrayByEncoding(bytes, 334 + 4 * j, 4, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
}
//电芯A异常反馈信息
m.list_Process[i, 3] = "";
//A芯包信息2 D3278~D3406
for (int j = 0; j < 64; j++)
{
m.list_Data2[i,j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 356 + j * 4, DataFormat.CDAB);
}
//A芯包背面极耳撕裂裂纹检测结果（mm)
m.list_Data2[i, 64] = FloatLib.GetFloatFromByteArray(bArrays.Content, 350, DataFormat.CDAB);
}
else
{
//B检测结果 D3369~D3395
for (int j = 0; j < 27; j++)
//B芯包信息1 D3407~D3429
for (int j = 0; j < 23; j++)
{
m.list_Result[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 538 + j * 2, DataFormat.CDAB);
m.list_Data1[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 614 + j * 2, DataFormat.CDAB);
}
//B检测值 D3397~D3483
for (int j = 0; j < 44; j++)
//B电芯极耳切刀编号 D3431~D3433
for (int j = 0; j < 2; j++)
{
m.list_Value[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 594 + j * 4, DataFormat.CDAB);
m.list_CutNO[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 662 + j * 4, DataFormat.CDAB);
}
//B压缩空气用量 D3487
for (int j = 0; j < 1; j++)
//B电芯工序信息 D3435~D3443
for (int j = 0; j < 5; j++)
{
m.list_CompressedAir[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 774 + j * 4, DataFormat.CDAB);
m.list_Process[i, j] = StringLib.GetStringFromByteArrayByEncoding(bytes, 670 + 4 * j, 4, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
}
//B工序信息 D3489~D3499
for (int j = 0; j < 6; j++)
//B芯包信息2 D3445~D3573
for (int j = 0; j < 65; j++)
{
m.list_Procedure[i, j] = StringLib.GetStringFromByteArrayByEncoding(bytes, 778 + 4 * j, 4, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
m.list_Data2[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 690 + j * 4, DataFormat.CDAB);
}
}
//芯包扫码时间
//m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//芯包条码 D3200~D3239
m.listBatCode[i] = StringLib.GetStringFromByteArrayByEncoding(bytes, 200 + 40 * i, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
m.listBatCode[i] = StringLib.GetStringFromByteArrayByEncoding(bytes, 200 + 40 * i, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
m.ChannelNo = i + 1;
m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//m.Result = 1;
m.Code = m.listBatCode[i];
m.EarPolarityResult = m.list_Result[i, 0];
m.PolarityOfConnectingResult = m.list_Result[i, 1];
m.ConnectingPieceFrontAndBackResult = m.list_Result[i, 2];
m.TwoCorePackageSpacingResult = m.list_Result[i, 3];
m.TwoCorePackageSpacingJudgeResult = m.list_Result[i, 4];
m.TwoCorePackageBetweenConnectingPieceResult = m.list_Result[i, 5];
m.TwoConnectingPieceJudgeResult = m.list_Result[i, 6];
m.CopperWeldingStationNumber = m.list_Result[i, 7];
m.CopperWeldingHeadCount = m.list_Result[i, 8];
m.CopperWeldingTailCount = m.list_Result[i, 9];
m.AluminiumWeldingStationNumber = m.list_Result[i, 10];
m.AluminiumWeldingHeadCount = m.list_Result[i, 11];
m.AluminiumWeldingTailCount = m.list_Result[i, 12];
m.WeldingSizeInspectionResult = m.list_Result[i, 13];
m.WeldingPositionJudgmentResult = m.list_Result[i, 14];
m.NumberOfSolderJointsResult = m.list_Result[i, 15];
m.WeldingDepthDetectionResult = m.list_Result[i, 16];
m.JudgmentResultsOfPreWeldAndFinalWeldPositions = m.list_Result[i, 17];
m.FrontEarTearJudgmentResult = m.list_Result[i, 18];
m.BackEarTearJudgmentResult = m.list_Result[i, 19];
m.FrontEarFoldingTestResult = m.list_Result[i, 20];
m.BackEarFoldingTestResult = m.list_Result[i, 21];
m.FrontEarGlueCoverEarTestResult = m.list_Result[i, 22];
m.BackEarGlueCoverEarTestResult = m.list_Result[i, 23];
m.FrontGlueEarTearResult = m.list_Result[i, 24];
m.BackGlueEarTearResult = m.list_Result[i, 25];
m.OutboundJudgmentResult = m.list_Result[i, 26];
m.TwoCorePackagConnectingPieceDistance = m.list_Value[i, 0];
m.TwoConnectingPieceDistance = m.list_Value[i, 1];
m.CopperWeldingPressureMaxValue = m.list_Value[i, 2];
m.CopperWeldingPressureMinValue = m.list_Value[i, 3];
m.CopperWeldingPowerMaxValue = m.list_Value[i, 4];
m.CopperWeldingPowerMinValue = m.list_Value[i, 5];
m.CopperWeldingEnergyMaxValue = m.list_Value[i, 6];
m.CopperWeldingEnergyMinValue = m.list_Value[i, 7];
m.CopperWeldingAmplitudeMaxValue = m.list_Value[i, 8];
m.CopperWeldingAmplitudeMinValue = m.list_Value[i, 9];
m.CopperWeldingPressureValue1 = m.list_Value[i, 10];
m.CopperWeldingPowerValue1 = m.list_Value[i, 11];
m.CopperWeldingEnergyValue1 = m.list_Value[i, 12];
m.CopperWeldingAmplitudeValue1 = m.list_Value[i, 13];
m.CopperWeldingTimeValue1 = m.list_Value[i, 14];
m.CopperWeldingPowerValue2 = m.list_Value[i, 15];
m.CopperWeldingEnergyValue2 = m.list_Value[i, 16];
m.CopperWeldingAmplitudeValue2 = m.list_Value[i, 17];
m.CopperWeldingTimeValue2 = m.list_Value[i, 18];
m.AluminiumWeldingPressureMaxValue = m.list_Value[i, 19];
m.AluminiumWeldingPressureMinValue = m.list_Value[i, 20];
m.AluminiumWeldingPowerMaxValue = m.list_Value[i, 21];
m.AluminiumWeldingPowerMinValue = m.list_Value[i, 22];
m.AluminiumWeldingEnergyMaxValue = m.list_Value[i, 23];
m.AluminiumWeldingEnergyMinValue = m.list_Value[i, 24];
m.AluminiumWeldingAmplitudeMaxValue = m.list_Value[i, 25];
m.AluminiumWeldingAmplitudeMinValue = m.list_Value[i, 26];
m.AluminiumWeldingPressureValue1 = m.list_Value[i, 27];
m.AluminiumWeldingPowerValue1 = m.list_Value[i, 28];
m.AluminiumWeldingEnergyValue1 = m.list_Value[i, 29];
m.AluminiumWeldingAmplitudeValue1 = m.list_Value[i, 30];
m.AluminiumWeldingTimeValue1 = m.list_Value[i, 31];
m.TopToSolderPrintSpacing = m.list_Value[i, 32];
m.EarToWeldingDistanceW = m.list_Value[i, 33];
m.EarToWeldingDistanceH = m.list_Value[i, 34];
m.TwoWeldingDistance = m.list_Value[i, 35];
m.PreWeldAndFinalWeldDistanceW = m.list_Value[i, 36];
m.PreWeldAndFinalWeldDistanceH = m.list_Value[i, 37];
m.FrontEarTearResult = m.list_Value[i, 38];
m.BackEarTearResult = m.list_Value[i, 39];
m.FrontEarGlueCoverEarValue = m.list_Value[i, 40];
m.BackEarGlueCoverEarValue = m.list_Value[i, 41];
m.FrontGlueEarTearValue = m.list_Value[i, 42];
m.BackGlueEarTearValue = m.list_Value[i, 43];
m.CompressedAirConsumption = m.list_CompressedAir[i, 0];
m.ProcessName = "超声波终焊接机";
m.ShiftSchedule = CommonMethods.strClass;
m.StationEntryTime = m.list_Procedure[i, 2];
m.ExitTime = m.list_Procedure[i, 3];
m.AbnormalFeedbackInformation = m.list_Procedure[i, 4];
m.ScanningTime = m.list_Procedure[i, 5];
m.ChannelNo = m.MyNo[i];
//m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
m.Result = 1; //反馈结果，需要上位机->PLC，D3100和D3101
m.CSBYHASCANNINGTIME = m.ScanTime[i];
m.CSBYHCODEA = m.listBatCode[i];
m.CSBYHWEIGHTNOA1 = m.list_Data1[i, 0];
m.CSBYHWEIGHTRESULTA1 = m.list_Data1[i, 1];
m.RingA = m.list_Data1[i, 2];
m.CSBYHTHICKNESSTESTSTATIONNOA = m.list_Data1[i, 3];
m.CSBYHTHICKNESSTESTJUDGERESULTA = m.list_Data1[i, 4];
m.CSBYHPOLARITYRESULTA = m.list_Data1[i, 5];
m.CSBYHTOOLNOA = m.list_Data1[i, 6];
m.CSBYHCUWELDINGSTATIONNOA = m.list_Data1[i, 7];
m.CSBYHCUWELDHEADCOUNTA = m.list_Data1[i, 8];
m.CSBYHCUWELDBASECOUNTA = m.list_Data1[i, 9];
m.CSBYHALWELDINGSTATIONNOA = m.list_Data1[i, 10];
m.CSBYHALWELDHEADCOUNTA = m.list_Data1[i, 11];
m.CSBYHALWELDBASECOUNTA = m.list_Data1[i, 12];
m.CSBYHCUTABCUTTERCOUNTA = m.list_Data1[i, 13];
m.CSBYHALTABCUTTERCOUNTA = m.list_Data1[i, 14];
m.CSBYHCUTADHESIONJUDGERESULTA = m.list_Data1[i, 15];
m.CSBYHCUTBURRJUDGERESULTA = m.list_Data1[i, 16];
m.CSBYHSOLDERJUDGERESULTA = m.list_Data1[i, 17];
m.CSBYHFRONTEARCRACKLEJUDGERESULTA = m.list_Data1[i, 18];
m.CSBYHBACKEARCRACKLEJUDGERESULTA = m.list_Data1[i, 19];
m.CSBYHFRONTEARFLODINGRESULTA = m.list_Data1[i, 20];
m.CSBYHBACKEARFLODINGRESULTA = m.list_Data1[i, 21];
m.CSBYHOUTSTATIONJUDGMENTRESULT = m.list_Data1[i, 22];
m.CSBYHCUTABCUTTERNOA = m.list_CutNO[i, 0];
m.CSBYHALTABCUTTERNOA = m.list_CutNO[i, 1];
m.CSBYHPROCESSNAME = m.list_Process[i, 0];
m.CSBYHSCHEDULE = m.list_Process[i, 1];
m.CSBYHINSTATIONTIME = m.list_Process[i, 2];
m.CSBYHOUTSTATIONTIME = m.list_Process[i, 3];
m.CSBYHWEIGHTA1MAXSETTING = m.list_Data2[i, 0];
m.CSBYHWEIGHTA1MINSETTING = m.list_Data2[i, 1];
m.CSBYHWEIGHTA1 = m.list_Data2[i, 2];
m.CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA = m.list_Data2[i, 3];
m.CSBYHTHICKNESSTESTPRESSUREMINSETTINGA = m.list_Data2[i, 4];
m.CSBYHTHICKNESSTESTPRESSUREA = m.list_Data2[i, 5];
m.CSBYHTHICKNESSTESTPRESSURESIZEA = m.list_Data2[i, 6];
m.CSBYHTHICKNESSTESTPRESSUREMAXSIZEA = m.list_Data2[i, 7];
m.CSBYHTHICKNESSTESTPRESSUREMINSIZEA = m.list_Data2[i, 8];
m.CSBYHCUWELDINGPRESSUREMAXSETTING = m.list_Data2[i, 9];
m.CSBYHCUWELDINGPRESSUREMINSETTING = m.list_Data2[i, 10];
m.CSBYHCUWELDINGPOWERMAXSETTING = m.list_Data2[i, 11];
m.CSBYHCUWELDINGPOWERMINSETTING = m.list_Data2[i, 12];
m.CSBYHCUWELDINGENERGYMAXSETTING = m.list_Data2[i, 13];
m.CSBYHCUWELDINGENERGYMINSETTING = m.list_Data2[i, 14];
m.CSBYHCUWELDINGAMPLITUDEMAXSETTING = m.list_Data2[i, 15];
m.CSBYHCUWELDINGAMPLITUDEMINSETTING = m.list_Data2[i, 16];
m.CSBYHCUPRESSUREA1 = m.list_Data2[i, 17];
m.CSBYHCUPOWERA1 = m.list_Data2[i, 18];
m.CSBYHCUENERGYA1 = m.list_Data2[i, 19];
m.CSBYHCUAMPLITUDEA1 = m.list_Data2[i, 20];
m.CSBYHCUTIMEA1 = m.list_Data2[i, 21];
m.CSBYHCUPRESSUREA2 = m.list_Data2[i, 22];
m.CSBYHCUPOWERA2 = m.list_Data2[i, 23];
m.CSBYHCUENERGYA2 = m.list_Data2[i, 24];
m.CSBYHCUAMPLITUDEA2 = m.list_Data2[i, 25];
m.CSBYHCUTIMEA2 = m.list_Data2[i, 26];
m.CSBYHCUPRESSUREA3 = m.list_Data2[i, 27];
m.CSBYHCUPOWERA3 = m.list_Data2[i, 28];
m.CSBYHCUENERGYA3 = m.list_Data2[i, 29];
m.CSBYHCUAMPLITUDEA3 = m.list_Data2[i, 30];
m.CSBYHCUTIMEA3 = m.list_Data2[i, 31];
m.CSBYHALWELDINGPRESSUREMAXSETTING = m.list_Data2[i, 32];
m.CSBYHALWELDINGPRESSUREMINSETTING = m.list_Data2[i, 33];
m.CSBYHALWELDINGPOWERMAXSETTING = m.list_Data2[i, 34];
m.CSBYHALWELDINGPOWERMINSETTING = m.list_Data2[i, 35];
m.CSBYHALWELDINGENERGYMAXSETTING = m.list_Data2[i, 36];
m.CSBYHALWELDINGENERGYMINSETTING = m.list_Data2[i, 37];
m.CSBYHALWELDINGAMPLITUDEMAXSETTING = m.list_Data2[i, 38];
m.CSBYHALWELDINGAMPLITUDEMINSETTING = m.list_Data2[i, 39];
m.CSBYHALPRESSUREA1 = m.list_Data2[i, 40];
m.CSBYHALPOWERA1 = m.list_Data2[i, 41];
m.CSBYHALENERGYA1 = m.list_Data2[i, 42];
m.CSBYHALAMPLITUDEA1 = m.list_Data2[i, 43];
m.CSBYHALTIMEA1 = m.list_Data2[i, 44];
m.CSBYHALPRESSUREA2 = m.list_Data2[i, 45];
m.CSBYHALPOWERA2 = m.list_Data2[i, 46];
m.CSBYHALENERGYA2 = m.list_Data2[i, 47];
m.CSBYHALAMPLITUDEA2 = m.list_Data2[i, 48];
m.CSBYHALTIMEA2 = m.list_Data2[i, 49];
m.CSBYHALPRESSUREA3 = m.list_Data2[i, 50];
m.CSBYHALPOWERA3 = m.list_Data2[i, 51];
m.CSBYHALENERGYA3 = m.list_Data2[i, 52];
m.CSBYHALAMPLITUDEA3 = m.list_Data2[i, 53];
m.CSBYHALTIMEA3 = m.list_Data2[i, 54];
m.CSBYHCUTABLENGTHA = m.list_Data2[i, 55];
m.CSBYHCUTABWIDTHA = m.list_Data2[i, 56];
m.CSBYHALTABLENGTHA = m.list_Data2[i, 57];
m.CSBYHALTABWIDTHA = m.list_Data2[i, 58];
m.CSBYHCUTADHESIONRESULTA = m.list_Data2[i, 59];
m.CSBYHCUTBURRRESULTA = m.list_Data2[i, 60];
m.CSBYHTOPTOSOLDERDISTANCEA = m.list_Data2[i, 61];
m.CSBYHSOLDERTOEARDISTANCEA = m.list_Data2[i, 62];
m.CSBYHFRONTEARCRACKLERESULTA = m.list_Data2[i, 63];
m.CSBYHBACKEARCRACKLERESULTA = m.list_Data2[i, 64];
list.Add(m);
@@ -418,77 +550,79 @@ namespace JinYuan.ControlCenters
{
m.Flag = 0;
}
if (CommonMethods.mesConfig.isUpMes)
{
string url = CommonMethods.mesConfig.OutStationMesUrl;
string siteCode = CommonMethods.mesConfig.siteCode;
string lineCode = CommonMethods.mesConfig.lineCode;
string equipNum = CommonMethods.mesConfig.equipNum;
string materialCode = CommonMethods.mesConfig.MaterialCode;
string userName = CommonMethods.mesConfig.mesUserName;
int type = 1;
//int type = 1;
//string materialLotCodeLocator = "";
List<string> MesMessage = GetList<string>(2, "");
List<MesResType> mesResType = GetMesType(2);
bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, list, ref MesMessage, ref mesResType);
//bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,)
if (Res)
{
m.listRes[0] = 1;
m.listRes[1] = 1;
MyRes[0] = m.listRes[0];
MyRes[1] = m.listRes[0];
}
else
{
switch (mesResType[i])
{
case MesResType.A:// 停线，设备报警停机
m.listRes[i] = 10;
MyRes[i] = m.listRes[i];
break;
case MesResType.B:
m.listRes[i] = 9;
MyRes[i] = m.listRes[i];
break;
case MesResType.C:
m.listRes[i] = 1;
MyRes[i] = m.listRes[i];
break;
}
}
}
else
{
JYResult Result1 = CommonMethods.PlcLink.WriteValue("D80", 2, Data_Type.Short);//反馈PLC结果
JYResult Result2 = CommonMethods.PlcLink.WriteValue("D81", 2, Data_Type.Short);//反馈PLC结果
JYResult Result3 = CommonMethods.PlcLink.WriteValue("D82", 2, Data_Type.Short);//反馈PLC结果
JYResult Result4 = CommonMethods.PlcLink.WriteValue("D83", 2, Data_Type.Short);//反馈PLC结果
JYResult Result5 = CommonMethods.PlcLink.WriteValue("D84", 2, Data_Type.Short);//反馈PLC结果
JYResult Result6 = CommonMethods.PlcLink.WriteValue("D85", 2, Data_Type.Short);//反馈PLC结果
JYResult Result7 = CommonMethods.PlcLink.WriteValue("D86", 2, Data_Type.Short);//反馈PLC结果
}
}
catch (Exception ex)
{
LogHelper.Instance.WriteError($"卷芯进站线程数据解析：{ex}", "SysErrorLog");
}
if (CommonMethods.mesConfig.isUpMes)
{
string url = CommonMethods.mesConfig.OutStationMesUrl;
string siteCode = CommonMethods.mesConfig.siteCode;
string lineCode = CommonMethods.mesConfig.lineCode;
string equipNum = CommonMethods.mesConfig.equipNum;
string materialCode = CommonMethods.mesConfig.MaterialCode;
string userName = CommonMethods.mesConfig.mesUserName;
int type = 1;
//int type = 1;
//string materialLotCodeLocator = "";
List<string> MesMessage = GetList<string>(2, "");
List<MesResType> mesResType = GetMesType(2);
bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, list, ref MesMessage, ref mesResType);
//bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,)
if (Res)
{
m.listRes[0] = 1;
m.listRes[1] = 1;
MyRes[0] = m.listRes[0];
MyRes[1] = m.listRes[0];
m.Remark = MesMessage[0];
}
else
{
for (int j = 0; j < 2; j++)
{
switch (mesResType[i])
{
case MesResType.A:// 停线，设备报警停机
m.listRes[j] = 10;
MyRes[j] = m.listRes[j];
m.Remark = MesMessage[j];
break;
case MesResType.B:
m.listRes[j] = 9;
MyRes[j] = m.listRes[j];
m.Remark = MesMessage[j];
break;
case MesResType.C:
m.listRes[j] = 1;
MyRes[j] = m.listRes[j];
m.Remark = MesMessage[j];
break;
}
}
}
//string url= CommonMethods.mesConfig.
//bool Res1=CommonMethods.hbgMes.ProducResultParam()
}
}
#endregion
JYResult result1 = null;
JYResult result2 = null;
if (pf.IsFeedbackPlc)
{
result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[1].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC
result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC
result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC
result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC
}
JYResult result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0
CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result3.IsSuccess},{MyRes[0]},{MyRes[1]}");
LogHelper.Instance.WriteLog($"发送信息给PLC:{result3.IsSuccess},{MyRes[0]},{MyRes[1]}");
CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}");
LogHelper.Instance.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]}");
//数据存储 - 异步处理
Task.Run(() =>
@@ -500,11 +634,8 @@ namespace JinYuan.ControlCenters
////输出下料数据处理耗时：
CommonMethods.AddDataMonitorLog(0, $"卷芯进站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
}
}
/// <summary>
/// 电池结果判断
/// </summary>
@@ -556,8 +687,8 @@ namespace JinYuan.ControlCenters
DataTurnover server = new DataTurnover
{
equipNum = CommonMethods.mesConfig.equipNum,
//containerCode = m.BarCode,
identification = m.Code,
containerCode = m.listBatCode[0],
identification = m.listBatCode[1],
message = m.Result,
Time = DateTime.Now,
};
@@ -565,12 +696,12 @@ namespace JinYuan.ControlCenters
try
{
//int b1 = CommonMethods.dbServer.Delete<DataTurnover>(it => it.containerCode == m.RFID);
// bool res = CommonMethods.dbServer.AddReturnBool<DataTurnover>(server);
//strRes += res == true ? ",远存Yes" : ",远存No";
//bool res = CommonMethods.dbServer.AddReturnBool<DataTurnover>(server);
//strRes += res == true ? ",远存Yes" : ",远存No";
}
catch (Exception ex)
{
//JYResult result = CommonMethods.PlcLink.WriteValue("D80", 1, Data_Type.Short);//反馈PLC结果
JYResult result = CommonMethods.PlcLink.WriteValue("D80", 1, Data_Type.Short);//反馈PLC结果
//CommonMethods.AddDataMonitorLog(1, $"服务器连接失败!解决办法：1、请检查MES网络，2、查看服务器是否正常！");
//LogHelper.Instance.WriteError($"服务器连接失败：{ex}", "系统报错");
}
@@ -582,8 +713,8 @@ namespace JinYuan.ControlCenters
{
strRes = ",不存储";
}
//m.Remark = m.Remark + strRes;
//Blist[i].Remark = m.Remark;
m.Remark = m.Remark + strRes;
Blist[i].Remark = m.Remark;
i++;
}
JinYuan.ControlCenter/ControlCenter_Total.cs
+10 -10
View File
@@ -191,10 +191,10 @@ namespace JinYuan.ControlCenters
if (CommonMethods.Lst_DefectTypeQty.Count <= 0)
{
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "极性不良", DataCount = 0 });
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "极性检测不良", DataCount = 0 });
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "称重不良", DataCount = 0 });
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "测厚压力值1不良", DataCount = 0 });
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "测厚压力值2不良", DataCount = 0 });
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "铜极耳剪切不良", DataCount = 0 });
CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "铝极耳剪切不良", DataCount = 0 });
//CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "厚度不良", DataCount = 0 });
//CommonMethods.Lst_DefectTypeQty.Add(new ChartDataType { DataType = "焊前CCD正极耳顶面不良", DataCount = 0 });
}
@@ -206,16 +206,16 @@ namespace JinYuan.ControlCenters
{
try
{
int ProdDRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D3196");//极性不良
int ProdDXNgQty = CommonMethods.PlcLink.ReadInt16("D3197");//称重不良
int ProdGRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D3198");//测厚压力值1不良
int ProdYLZNgQty = CommonMethods.PlcLink.ReadInt16("D3199");//测厚压力值2不良
int ProdDRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D1000");//极性不良
int ProdDXNgQty = CommonMethods.PlcLink.ReadInt16("D1002");//称重不良
int ProdGRFIDNgQty = CommonMethods.PlcLink.ReadInt16("D1006");//测厚压力值1不良
int ProdYLZNgQty = CommonMethods.PlcLink.ReadInt16("D1004");//测厚压力值2不良
//從PLC讀取數據賦值給到NGList
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "极性不良").FirstOrDefault().DataCount = ProdDRFIDNgQty;
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "极性检测不良").FirstOrDefault().DataCount = ProdDRFIDNgQty;
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "称重不良").FirstOrDefault().DataCount = ProdDXNgQty;
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "测厚压力值1不良").FirstOrDefault().DataCount = ProdGRFIDNgQty;
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "测厚压力值2不良").FirstOrDefault().DataCount = ProdYLZNgQty;
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "铜极耳剪切不良").FirstOrDefault().DataCount = ProdGRFIDNgQty;
CommonMethods.Lst_DefectTypeQty.Where(p => p.DataType == "铝极耳剪切不良").FirstOrDefault().DataCount = ProdYLZNgQty;
}
catch (Exception ex)
{
JinYuan.MES/MesDataProcess.cs
+1202 -244
View File
File diff suppressed because it is too large Load Diff
JinYuan.MES/Models/ProductResultParameters.cs
+9 -6
View File
@@ -22,7 +22,7 @@ namespace JinYuan.MES.Models
/// <summary>
/// 设备数据
/// </summary>
public string payload { get; set; }
public string payload { get; set; }
}
/// <summary>
@@ -30,6 +30,8 @@ namespace JinYuan.MES.Models
/// </summary>
public class Payload1
{
/// <summary>
/// 工厂代码
/// </summary>
@@ -69,16 +71,14 @@ namespace JinYuan.MES.Models
/// <summary>
/// 条码数组
/// </summary>
public IdentificationListItem identification { get; set; }
/// <summary>
/// 采集数组
/// </summary>
public List<TagDataVOListItem> tagDataVOList { get; set; }
}
public class IdentificationListItem
{
/// <summary>
/// /// <summary>
/// 条码
/// </summary>
public string identification { get; set; }
@@ -86,7 +86,10 @@ namespace JinYuan.MES.Models
/// 质量状态 各产品所有参数的整体判断结果（Y/N）
/// </summary>
public string qualityStatus { get; set; }
/// <summary>
/// 采集数组
/// </summary>
}
JinYuan.Models/AGearEntity.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace JinYuan.Models
/// <summary>
/// 进站磁悬浮动子编号
/// </summary>MaglevNum
public short MaglevNum { get; set; }
//public System.String MaglevNum { get; set; }
/// <summary>
/// 进站电芯反馈结果
/// </summary>
JinYuan.Models/BGearEntity.cs
+221 -149
View File
@@ -8,12 +8,15 @@ namespace JinYuan.Models
/// </summary>
public class BGearEntity
{
public int[] MyNo = new int[2];//AB序号
public short[] listRes = new short[2];//AB反馈结果
public string[] ScanTime = new string[2];//AB芯包扫码时间
public string[] listBatCode = new string[2];//AB芯包条码
public short[,] list_Result = new short[2, 27];//检测结果
public float[,] list_Value = new float[2, 44];//检测值
public short[,] list_CompressedAir = new short[2, 1];//压缩空气用量
public string[,] list_Procedure = new string[2, 6];//工序信息
public short[,] list_Data1 = new short[2,23];//芯包信息1
public short[,] list_CutNO = new short[2,2];//电芯极耳切刀编号
public string[,] list_Process = new string[2,5];//电芯工序信息
public float[,] list_Data2 = new float[2, 65];//芯包信息2
/// <summary>
/// 通道号
@@ -26,10 +29,10 @@ namespace JinYuan.Models
public System.String TestTime { get; set; }
/// <summary>
/// 芯包扫码时间
/// A芯包扫码时间
/// </summary>
//[SugarColumn(IsPrimaryKey = false)]
//public System.String ST { get; set; }
[SugarColumn(IsPrimaryKey = false)]
public System.String CSBYHASCANNINGTIME { get; set; }
/// <summary>
/// 反馈结果
@@ -38,319 +41,387 @@ namespace JinYuan.Models
/// <summary>
/// 芯包条码
/// </summary>
public string Code { get; set; }
public string CSBYHCODEA { get; set; }
/// <summary>
/// 电芯极耳极性检测结果
/// 芯包称重1工位号
/// </summary>
public short EarPolarityResult { get; set; }
public short CSBYHWEIGHTNOA1 { get; set; }
/// <summary>
/// 连接片极性检测结果
/// 芯包重量1判定结果
/// </summary>
public short PolarityOfConnectingResult { get; set; }
public short CSBYHWEIGHTRESULTA1 { get; set; }
/// <summary>
/// 连接片正反检测结果
/// 环轨编号
/// </summary>
public short ConnectingPieceFrontAndBackResult { get; set; }
public short RingA { get; set; }
/// <summary>
/// 两芯包间距检测结果
/// 芯包侧厚工位号
/// </summary>
public short TwoCorePackageSpacingResult { get; set; }
public short CSBYHTHICKNESSTESTSTATIONNOA { get; set; }
/// <summary>
/// 两芯包间距检测判定结果
/// 芯包侧厚判定结果
/// </summary>
public short TwoCorePackageSpacingJudgeResult { get; set; }
public short CSBYHTHICKNESSTESTJUDGERESULTA { get; set; }
/// <summary>
/// 两芯包边缘与连接片边缘距离判定结果
/// 芯包极性检测结果
/// </summary>
public short TwoCorePackageBetweenConnectingPieceResult { get; set; }
public short CSBYHPOLARITYRESULTA { get; set; }
/// <summary>
/// 两连接片间距离判定结果
/// 芯包治具号
/// </summary>
public short TwoConnectingPieceJudgeResult { get; set; }
public short CSBYHTOOLNOA { get; set; }
/// <summary>
/// 电芯铜焊接工位号
/// 芯包铜焊接工位号
/// </summary>
public short CopperWeldingStationNumber { get; set; }
public short CSBYHCUWELDINGSTATIONNOA { get; set; }
/// <summary>
/// 电芯铜焊焊头次数
/// 芯包铜焊焊头次数
/// </summary>
public short CopperWeldingHeadCount { get; set; }
public short CSBYHCUWELDHEADCOUNTA { get; set; }
/// <summary>
/// 电芯铜焊焊座次数
/// 芯包铜焊焊座次数
/// </summary>
public short CopperWeldingTailCount { get; set; }
public short CSBYHCUWELDBASECOUNTA { get; set; }
/// <summary>
/// 电芯铝焊接工位号
/// 芯包铝焊接工位号
/// </summary>
public short AluminiumWeldingStationNumber { get; set; }
public short CSBYHALWELDINGSTATIONNOA { get; set; }
/// <summary>
/// 电芯铝焊焊头次数
/// 芯包铝焊焊头次数
/// </summary>
public short AluminiumWeldingHeadCount { get; set; }
public short CSBYHALWELDHEADCOUNTA { get; set; }
/// <summary>
/// 电芯铝焊焊座次数
/// 芯包铝焊焊座次数
/// </summary>
public short AluminiumWeldingTailCount { get; set; }
public short CSBYHALWELDBASECOUNTA { get; set; }
/// <summary>
/// 电芯焊印尺寸检测结果
/// 电芯铜极耳切刀使用次数
/// </summary>
public short WeldingSizeInspectionResult { get; set; }
public short CSBYHCUTABCUTTERCOUNTA { get; set; }
/// <summary>
/// 电芯焊印位置判断结果
/// 电芯铝极耳切刀使用次数
/// </summary>
public short WeldingPositionJudgmentResult { get; set; }
public short CSBYHALTABCUTTERCOUNTA { get; set; }
/// <summary>
/// 电芯焊点数量检测结果
/// 电芯裁切粘连判定结果
/// </summary>
public short NumberOfSolderJointsResult { get; set; }
public short CSBYHCUTADHESIONJUDGERESULTA { get; set; }
/// <summary>
/// 电芯焊点深度检测结果
/// 电芯裁切毛刺判定结果
/// </summary>
public short WeldingDepthDetectionResult { get; set; }
public short CSBYHCUTBURRJUDGERESULTA { get; set; }
/// <summary>
/// 电芯预焊焊印与终焊焊印位置判断结果
/// 芯包焊印位置判定结果
/// </summary>
public short JudgmentResultsOfPreWeldAndFinalWeldPositions { get; set; }
public short CSBYHSOLDERJUDGERESULTA { get; set; }
/// <summary>
/// 电芯正面极耳撕裂判定结果
/// 芯包正面极耳撕裂判定结果
/// </summary>
public short FrontEarTearJudgmentResult { get; set; }
public short CSBYHFRONTEARCRACKLEJUDGERESULTA { get; set; }
/// <summary>
/// 电芯背面极耳撕裂判定结果
/// 芯包背面极耳撕裂判定结果
/// </summary>
public short BackEarTearJudgmentResult { get; set; }
public short CSBYHBACKEARCRACKLEJUDGERESULTA { get; set; }
/// <summary>
/// 电芯正面极耳翻折检测结果
/// 芯包正面极耳翻折检测结果
/// </summary>
public short FrontEarFoldingTestResult { get; set; }
public short CSBYHFRONTEARFLODINGRESULTA { get; set; }
/// <summary>
/// 电芯背面极耳翻折检测结果
/// 芯包背面极耳翻折检测结果
/// </summary>
public short BackEarFoldingTestResult { get; set; }
public short CSBYHBACKEARFLODINGRESULTA { get; set; }
/// <summary>
/// 电芯正面极耳胶覆盖极耳检测结果
/// 电芯A/B出站判定结果
/// </summary>
public short FrontEarGlueCoverEarTestResult { get; set; }
public short CSBYHOUTSTATIONJUDGMENTRESULT { get; set; }
/// <summary>
/// 电芯背面极耳胶覆盖极耳检测结果
/// 电芯铜极耳切刀编号
/// </summary>
public short BackEarGlueCoverEarTestResult { get; set; }
public short CSBYHCUTABCUTTERNOA { get; set; }
/// <summary>
/// 电芯正面贴胶后极耳撕裂检测结果
/// 电芯铝极耳切刀编号
/// </summary>
public short FrontGlueEarTearResult { get; set; }
public short CSBYHALTABCUTTERNOA { get; set; }
/// <summary>
/// 电芯背面贴胶后极耳撕裂检测结果
/// 电芯A/B工序名
/// </summary>
public short BackGlueEarTearResult { get; set; }
public string CSBYHPROCESSNAME { get; set; }
/// <summary>
/// 出站判定结果
/// 电芯A/B班次
/// </summary>
public short OutboundJudgmentResult { get; set; }
public string CSBYHSCHEDULE { get; set; }
/// <summary>
/// 两芯包边缘与连接片边缘距离(mm)
/// 电芯A/B进站时间
/// </summary>
public float TwoCorePackagConnectingPieceDistance { get; set; }
public string CSBYHINSTATIONTIME { get; set; }
/// <summary>
/// 两连接片间距离(mm)
/// 电芯A/B出站时间
/// </summary>
public float TwoConnectingPieceDistance { get; set; }
public string CSBYHOUTSTATIONTIME { get; set; }
/// <summary>
/// 电芯A/B异常反馈信息
/// </summary>
public string CSBYHABNORMALINFORMATION { get; set; }
/// <summary>
/// 芯包重量1设定值最大值（g）
/// </summary>
public float CSBYHWEIGHTA1MAXSETTING { get; set; }
/// <summary>
/// 芯包重量1设定值最小值（g）
/// </summary>
public float CSBYHWEIGHTA1MINSETTING { get; set; }
/// <summary>
/// 芯包重量1（g）
/// </summary>
public float CSBYHWEIGHTA1 { get; set; }
/// <summary>
/// 芯包侧厚压力（Kg)设定最大值
/// </summary>
public float CSBYHTHICKNESSTESTPRESSUREMAXSETTINGA { get; set; }
/// <summary>
/// 芯包侧厚压力（Kg)设定最小值
/// </summary>
public float CSBYHTHICKNESSTESTPRESSUREMINSETTINGA { get; set; }
/// <summary>
/// 芯包侧厚压力实际值
/// </summary>
public float CSBYHTHICKNESSTESTPRESSUREA { get; set; }
/// <summary>
/// 芯包侧厚尺寸（mm)
/// </summary>
public float CSBYHTHICKNESSTESTPRESSURESIZEA { get; set; }
/// <summary>
/// 芯包侧厚最大尺寸（mm)
/// </summary>
public float CSBYHTHICKNESSTESTPRESSUREMAXSIZEA { get; set; }
/// <summary>
/// 芯包侧厚最小尺寸（mm)
/// </summary>
public float CSBYHTHICKNESSTESTPRESSUREMINSIZEA { get; set; }
/// <summary>
/// 铜焊接压力(Psi)设定值最大值
/// </summary>
public float CopperWeldingPressureMaxValue { get; set; }
public float CSBYHCUWELDINGPRESSUREMAXSETTING { get; set; }
/// <summary>
/// 铜焊接压力(Psi)设定值最小值
/// </summary>
public float CopperWeldingPressureMinValue { get; set; }
public float CSBYHCUWELDINGPRESSUREMINSETTING { get; set; }
/// <summary>
/// 铜焊接功率(%)设定值最大值
/// </summary>
public float CopperWeldingPowerMaxValue { get; set; }
public float CSBYHCUWELDINGPOWERMAXSETTING { get; set; }
/// <summary>
/// 铜焊接功率(%)设定值最小值
/// </summary>
public float CopperWeldingPowerMinValue { get; set; }
public float CSBYHCUWELDINGPOWERMINSETTING { get; set; }
/// <summary>
/// 铜焊接能量(%)设定值最大值
/// </summary>
public float CopperWeldingEnergyMaxValue { get; set; }
public float CSBYHCUWELDINGENERGYMAXSETTING { get; set; }
/// <summary>
/// 铜焊接能量(%)设定最小值
/// 铜焊接能量(%)设定值最小值
/// </summary>
public float CopperWeldingEnergyMinValue { get; set; }
public float CSBYHCUWELDINGENERGYMINSETTING { get; set; }
/// <summary>
/// 铜焊接振幅(%)设定值最大值
/// </summary>
public float CopperWeldingAmplitudeMaxValue { get; set; }
public float CSBYHCUWELDINGAMPLITUDEMAXSETTING { get; set; }
/// <summary>
/// 铜焊接振幅(%)设定值最小值
/// </summary>
public float CopperWeldingAmplitudeMinValue { get; set; }
public float CSBYHCUWELDINGAMPLITUDEMINSETTING { get; set; }
/// <summary>
/// 电芯铜焊焊接压力(Psi)实际值1
/// 芯包铜焊焊接压力(Psi)实际值1
/// </summary>
public float CopperWeldingPressureValue1 { get; set; }
public float CSBYHCUPRESSUREA1 { get; set; }
/// <summary>
/// 电芯铜焊接功率(W)实际值1
/// 芯包铜焊接功率(W)实际值1
/// </summary>
public float CopperWeldingPowerValue1 { get; set; }
public float CSBYHCUPOWERA1 { get; set; }
/// <summary>
/// 电芯铜焊焊接能量(J)实际值1
/// 芯包铜焊焊接能量(J)实际值1
/// </summary>
public float CopperWeldingEnergyValue1 { get; set; }
public float CSBYHCUENERGYA1 { get; set; }
/// <summary>
/// 电芯铜焊焊接振幅(%)实际值1
/// 芯包铜焊焊接振幅(%)实际值1
/// </summary>
public float CopperWeldingAmplitudeValue1 { get; set; }
public float CSBYHCUAMPLITUDEA1 { get; set; }
/// <summary>
/// 电芯铜焊焊接时间(ms)实际值1
/// 芯包铜焊焊接时间(ms)实际值1
/// </summary>
public float CopperWeldingTimeValue1 { get; set; }
public float CSBYHCUTIMEA1 { get; set; }
/// <summary>
/// 电芯铜焊接功率(W)实际值2
/// 芯包铜焊焊接压力(Psi)实际值2
/// </summary>
public float CopperWeldingPowerValue2 { get; set; }
public float CSBYHCUPRESSUREA2 { get; set; }
/// <summary>
/// 电芯铜焊焊接能量(J)实际值2
/// 芯包铜焊接功率A(W)实际值2
/// </summary>
public float CopperWeldingEnergyValue2 { get; set; }
public float CSBYHCUPOWERA2 { get; set; }
/// <summary>
/// 电芯铜焊焊接振幅(%)实际值2
/// 芯包铜焊焊接能量(J)实际值2
/// </summary>
public float CopperWeldingAmplitudeValue2 { get; set; }
public float CSBYHCUENERGYA2 { get; set; }
/// <summary>
/// 电芯铜焊焊接时间(ms)实际值2
/// 芯包铜焊焊接振幅(%)实际值2
/// </summary>
public float CopperWeldingTimeValue2 { get; set; }
public float CSBYHCUAMPLITUDEA2 { get; set; }
/// <summary>
/// 芯包铜焊焊接时间(ms)实际值2
/// </summary>
public float CSBYHCUTIMEA2 { get; set; }
/// <summary>
/// 芯包铜焊焊接压力(Psi)实际值3
/// </summary>
public float CSBYHCUPRESSUREA3 { get; set; }
/// <summary>
/// 芯包铜焊接功率A(W)实际值3
/// </summary>
public float CSBYHCUPOWERA3 { get; set; }
/// <summary>
/// 芯包铜焊焊接能量(J)实际值3
/// </summary>
public float CSBYHCUENERGYA3 { get; set; }
/// <summary>
/// 芯包铜焊焊接振幅(%)实际值3
/// </summary>
public float CSBYHCUAMPLITUDEA3 { get; set; }
/// <summary>
/// 芯包铜焊焊接时间(ms)实际值3
/// </summary>
public float CSBYHCUTIMEA3 { get; set; }
/// <summary>
/// 铝焊接压力(Psi)设定值最大值
/// </summary>
public float AluminiumWeldingPressureMaxValue { get; set; }
public float CSBYHALWELDINGPRESSUREMAXSETTING { get; set; }
/// <summary>
/// 铝焊接压力(Psi)设定值最小值
/// </summary>
public float AluminiumWeldingPressureMinValue { get; set; }
public float CSBYHALWELDINGPRESSUREMINSETTING { get; set; }
/// <summary>
/// 铝焊接功率(%)设定值最大值
/// </summary>
public float AluminiumWeldingPowerMaxValue { get; set; }
public float CSBYHALWELDINGPOWERMAXSETTING { get; set; }
/// <summary>
/// 铝焊接功率(%)设定值最小值
/// </summary>
public float AluminiumWeldingPowerMinValue { get; set; }
public float CSBYHALWELDINGPOWERMINSETTING { get; set; }
/// <summary>
/// 铝焊接能量(%)设定值最大值
/// </summary>
public float AluminiumWeldingEnergyMaxValue { get; set; }
public float CSBYHALWELDINGENERGYMAXSETTING { get; set; }
/// <summary>
/// 铝焊接能量(%)设定值最小值
/// </summary>
public float AluminiumWeldingEnergyMinValue { get; set; }
public float CSBYHALWELDINGENERGYMINSETTING { get; set; }
/// <summary>
/// 铝焊接振幅(%)设定值最大值
/// </summary>
public float AluminiumWeldingAmplitudeMaxValue { get; set; }
public float CSBYHALWELDINGAMPLITUDEMAXSETTING { get; set; }
/// <summary>
/// 铝焊接振幅(%)设定值最小值
/// </summary>
public float AluminiumWeldingAmplitudeMinValue { get; set; }
public float CSBYHALWELDINGAMPLITUDEMINSETTING { get; set; }
/// <summary>
/// 电芯铝焊焊接压力(Psi)实际值1
/// 芯包铝焊焊接压力(Psi)实际值1
/// </summary>
public float AluminiumWeldingPressureValue1 { get; set; }
public float CSBYHALPRESSUREA1 { get; set; }
/// <summary>
/// 电芯铝焊接功率(W)实际值1
/// 芯包铝焊接功率(W)实际值1
/// </summary>
public float AluminiumWeldingPowerValue1 { get; set; }
public float CSBYHALPOWERA1 { get; set; }
/// <summary>
/// 电芯铝焊焊接能量(J)实际值1
/// 芯包铝焊焊接能量(J)实际值1
/// </summary>
public float AluminiumWeldingEnergyValue1 { get; set; }
public float CSBYHALENERGYA1 { get; set; }
/// <summary>
/// 电芯铝焊焊接振幅(%)实际值1
/// 芯包铝焊焊接振幅(%)实际值1
/// </summary>
public float AluminiumWeldingAmplitudeValue1 { get; set; }
public float CSBYHALAMPLITUDEA1 { get; set; }
/// <summary>
/// 电芯铝焊焊接时间(ms)实际值1
/// 芯包铝焊焊接时间(ms)实际值1
/// </summary>
public float AluminiumWeldingTimeValue1 { get; set; }
public float CSBYHALTIMEA1 { get; set; }
/// <summary>
/// 电芯芯包顶部到焊印间距（mm)
/// 芯包铝焊焊接压力(Psi)实际值2
/// </summary>
public float TopToSolderPrintSpacing { get; set; }
public float CSBYHALPRESSUREA2 { get; set; }
/// <summary>
/// 电芯极耳边缘到焊印边缘距离（宽度方向）(mm）
/// 芯包铝焊接功率(W)实际值2
/// </summary>
public float EarToWeldingDistanceW { get; set; }
public float CSBYHALPOWERA2 { get; set; }
/// <summary>
/// 电芯极耳边缘到焊印边缘距离（高度方向）（mm）
/// 芯包铝焊焊接能量(J)实际值2
/// </summary>
public float EarToWeldingDistanceH { get; set; }
public float CSBYHALENERGYA2 { get; set; }
/// <summary>
/// 电芯两焊印间距(mm)
/// 芯包铝焊焊接振幅(%)实际值2
/// </summary>
public float TwoWeldingDistance { get; set; }
public float CSBYHALAMPLITUDEA2 { get; set; }
/// <summary>
/// 电芯预焊焊印边缘与终焊焊印边缘距离（宽度方向）（mm)
/// 芯包铝焊焊接时间(ms)实际值2
/// </summary>
public float PreWeldAndFinalWeldDistanceW { get; set; }
public float CSBYHALTIMEA2 { get; set; }
/// <summary>
/// 电芯预焊焊印边缘与终焊焊印边缘距离（高度方向）（mm)
/// 芯包铝焊焊接压力(Psi)实际值3
/// </summary>
public float PreWeldAndFinalWeldDistanceH { get; set; }
public float CSBYHALPRESSUREA3 { get; set; }
/// <summary>
/// 电芯正面极耳撕裂裂纹检测结果（mm)
/// 芯包铝焊接功率(W)实际值3
/// </summary>
public float FrontEarTearResult { get; set; }
public float CSBYHALPOWERA3 { get; set; }
/// <summary>
/// 电芯背面极耳撕裂裂纹检测结果（mm)
/// 芯包铝焊焊接能量(J)实际值3
/// </summary>
public float BackEarTearResult { get; set; }
public float CSBYHALENERGYA3 { get; set; }
/// <summary>
/// 电芯正面极耳胶覆盖极耳检测值
/// 芯包铝焊焊接振幅(%)实际值3
/// </summary>
public float FrontEarGlueCoverEarValue { get; set; }
public float CSBYHALAMPLITUDEA3 { get; set; }
/// <summary>
/// 电芯背面极耳胶覆盖极耳检测值
/// 芯包铝焊焊接时间(ms)实际值3
/// </summary>
public float BackEarGlueCoverEarValue { get; set; }
public float CSBYHALTIMEA3 { get; set; }
/// <summary>
/// 电芯正面贴胶后极耳撕裂检测值
/// 电芯铜极极耳长度(mm)
/// </summary>
public float FrontGlueEarTearValue { get; set; }
public float CSBYHCUTABLENGTHA { get; set; }
/// <summary>
/// 电芯背面贴胶后极耳撕裂检测值
/// 电芯铜极极耳宽度(mm)
/// </summary>
public float BackGlueEarTearValue { get; set; }
public float CSBYHCUTABWIDTHA { get; set; }
/// <summary>
/// 压缩空气用量
/// 电芯铝极极耳长度(mm)
/// </summary>
public short CompressedAirConsumption { get; set; }
public float CSBYHALTABLENGTHA { get; set; }
/// <summary>
/// 工序名
/// 电芯铝极极耳宽度(mm)
/// </summary>
public string ProcessName { get; set; }
public float CSBYHALTABWIDTHA { get; set; }
/// <summary>
/// 班次
/// 电芯裁切粘连结果（mm2）
/// </summary>
public string ShiftSchedule { get; set; }
public float CSBYHCUTADHESIONRESULTA { get; set; }
/// <summary>
/// 进站时间
/// 电芯裁切毛刺结果（mm）
/// </summary>
public string StationEntryTime { get; set; }
public float CSBYHCUTBURRRESULTA { get; set; }
/// <summary>
/// 出站时间
/// 芯包顶部到焊印间距（mm)
/// </summary>
public string ExitTime { get; set; }
public float CSBYHTOPTOSOLDERDISTANCEA { get; set; }
/// <summary>
/// 异常反馈信息
/// 芯包焊印边缘到极耳边缘间距（mm)
/// </summary>
public string AbnormalFeedbackInformation { get; set; }
public float CSBYHSOLDERTOEARDISTANCEA { get; set; }
/// <summary>
/// 电芯扫码时间
/// 芯包正面极耳撕裂裂纹检测结果（mm)
/// </summary>
public string ScanningTime { get; set; }
public float CSBYHFRONTEARCRACKLERESULTA { get; set; }
/// <summary>
/// 芯包背面极耳撕裂裂纹检测结果（mm)
/// </summary>
public float CSBYHBACKEARCRACKLERESULTA { get; set; }
/// <summary>
/// 标志
@@ -360,5 +431,6 @@ namespace JinYuan.Models
/// 备注
/// </summary>
public string Remark { get; set; }
}
}
JinYuan.Models/DataTurnover.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace JinYuan.Models
/// 托杯码
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public short containerCode { get; set; }
public System.String containerCode { get; set; }
/// <summary>
/// 电芯码
LargeSquareOne/Config/Configure.ini
+1 -1
View File
@@ -17,7 +17,7 @@ MES/
[MES配置]
工厂代码=60J
产线编号=MW-601
设备编号=601UFW01
设备编号=601UPW01
智能电表编号=1,2
白夜班交替时间=20:30:00
MES日志保存路径=D:\APILog
LargeSquareOne/FrmDataMonitor.Designer.cs
Generated
+1003 -765
View File
File diff suppressed because it is too large Load Diff
LargeSquareOne/FrmDataMonitor.cs
-10
View File
@@ -377,13 +377,8 @@ namespace LargeSquareOne
}
}
int index = this.dgvFeedingData.Rows.Count - 1;
// 设置最新行为活动行 (当前行)
this.dgvFeedingData.CurrentCell = this.dgvFeedingData.Rows[this.dgvFeedingData.Rows.Count - 1].Cells[0];
for (int i = 0; i < list.Count; i++)
{
this.dgvFeedingData.Rows[index - i].Cells[0].Value = index + 1 - i;
}
}
}
catch (Exception ex)
@@ -421,16 +416,11 @@ namespace LargeSquareOne
}
}
int index = this.dgvBlankingData.Rows.Count - 1;
// 设置最新行为活动行 (当前行)
this.dgvBlankingData.CurrentCell = this.dgvBlankingData.Rows[this.dgvBlankingData.Rows.Count - 1].Cells[0];
//int index = this.dgvBlankingData.Rows.Count - 1;
////this.dgvBlankingData.FirstDisplayedScrollingRowIndex = index;
for (int i = 0; i < list.Count; i++)
{
this.dgvBlankingData.Rows[index - i].Cells[0].Value = index + 1 - i;
}
//// 设置最新行为活动行 (当前行)
//this.dgvBlankingData.CurrentCell = this.dgvBlankingData.Rows[index].Cells[1];
//this.dgvBlankingData.BeginEdit(true);
LargeSquareOne/FrmDataMonitor.resx
+61 -1
View File
@@ -132,6 +132,9 @@
<metadata name="InResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column103.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -378,6 +381,63 @@
<metadata name="Column83.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column84.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column85.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column86.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column87.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column88.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column89.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column90.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column91.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column92.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column93.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column94.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column95.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column96.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column97.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column98.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column99.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column100.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column101.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column102.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -389,7 +449,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
DQAAAk1TRnQBSQFMAgEBAwEAAfgBAQH4AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
DQAAAk1TRnQBSQFMAgEBAwEAAegBAQHoAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2
LargeSquareOne/FrmMain.Designer.cs
Generated
+15 -15
View File
@@ -32,7 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
this.MiddlePanel = new System.Windows.Forms.Panel();
this.label8 = new System.Windows.Forms.Label();
this.led_EMCState = new SeeSharpTools.JY.GUI.LED();
this.led_StopState = new SeeSharpTools.JY.GUI.LED();
this.lbl_Title = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -102,7 +102,7 @@
resources.ApplyResources(this.MiddlePanel, "MiddlePanel");
this.MiddlePanel.BackColor = System.Drawing.Color.Transparent;
this.MiddlePanel.Controls.Add(this.label8);
this.MiddlePanel.Controls.Add(this.led_EMCState);
this.MiddlePanel.Controls.Add(this.led_StopState);
this.MiddlePanel.Controls.Add(this.lbl_Title);
this.MiddlePanel.Controls.Add(this.label7);
this.MiddlePanel.Controls.Add(this.label5);
@@ -129,19 +129,19 @@
this.label8.ForeColor = System.Drawing.Color.White;
this.label8.Name = "label8";
//
// led_EMCState
// led_StopState
//
resources.ApplyResources(this.led_EMCState, "led_EMCState");
this.led_EMCState.BlinkColor = System.Drawing.Color.Lime;
this.led_EMCState.BlinkInterval = 1000;
this.led_EMCState.BlinkOn = false;
this.led_EMCState.Cursor = System.Windows.Forms.Cursors.Arrow;
this.led_EMCState.Interacton = SeeSharpTools.JY.GUI.LED.InteractionStyle.Indicator;
this.led_EMCState.Name = "led_EMCState";
this.led_EMCState.OffColor = System.Drawing.Color.Gray;
this.led_EMCState.OnColor = System.Drawing.Color.Lime;
this.led_EMCState.Style = SeeSharpTools.JY.GUI.LED.LedStyle.Circular;
this.led_EMCState.Value = false;
resources.ApplyResources(this.led_StopState, "led_StopState");
this.led_StopState.BlinkColor = System.Drawing.Color.Red;
this.led_StopState.BlinkInterval = 1000;
this.led_StopState.BlinkOn = false;
this.led_StopState.Cursor = System.Windows.Forms.Cursors.Arrow;
this.led_StopState.Interacton = SeeSharpTools.JY.GUI.LED.InteractionStyle.Indicator;
this.led_StopState.Name = "led_StopState";
this.led_StopState.OffColor = System.Drawing.Color.Gray;
this.led_StopState.OnColor = System.Drawing.Color.Red;
this.led_StopState.Style = SeeSharpTools.JY.GUI.LED.LedStyle.Circular;
this.led_StopState.Value = false;
//
// lbl_Title
//
@@ -686,7 +686,7 @@
private System.Windows.Forms.ToolStripMenuItem 显示主界面;
private System.Windows.Forms.ToolStripMenuItem 退出;
private System.Windows.Forms.Label label8;
private SeeSharpTools.JY.GUI.LED led_EMCState;
private SeeSharpTools.JY.GUI.LED led_StopState;
}
}
LargeSquareOne/FrmMain.cs
+2 -2
View File
@@ -297,7 +297,7 @@ namespace LargeSquareOne
{
this.Invoke(new Action(() =>
{
this.led_EMCState.Value = CommonMethods.EMCStatues;
this.led_StopState.Value = CommonMethods.EMCStatues;
this.lbl_DateTime.Text = CurrentTime + " " + week + " " + $"{CommonMethods.strClass}";
if (CommonMethods.plcDevice != null)
@@ -339,7 +339,7 @@ namespace LargeSquareOne
if (CommonMethods.Statues != null && CommonMethods.Statues.Count > 0)
{
this.led_RunState.Value = CommonMethods.Statues[0];
//this.led_StopState.BlinkOn = CommonMethods.Statues[1];
this.led_StopState.BlinkOn = CommonMethods.Statues[1];
this.led_AlarmState.BlinkOn = CommonMethods.Statues[2];
this.led_IldeState.BlinkOn = CommonMethods.Statues[3];
LargeSquareOne/FrmMain.resx
+1118 -1100
View File
File diff suppressed because it is too large Load Diff
LargeSquareOne/FrmMain.zh-CN.resx
+45 -6
View File
@@ -121,35 +121,63 @@
<data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>1747, 32</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 17</value>
</data>
<data name="label8.Text" xml:space="preserve">
<value>停止</value>
</data>
<data name="led_StopState.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>7, 13, 7, 13</value>
</data>
<data name="led_StopState.Size" type="System.Drawing.Size, System.Drawing">
<value>20, 20</value>
</data>
<data name="lbl_Title.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>1638, 26</value>
</data>
<data name="label5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>1638, 9</value>
</data>
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>1707, 32</value>
</data>
<data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>1678, 32</value>
</data>
<data name="label21.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="led_MESState.Location" type="System.Drawing.Point, System.Drawing">
<value>1716, 7</value>
</data>
<data name="label19.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label18.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btn_right.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btn_Left.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
<data name="led_PLCState.Location" type="System.Drawing.Point, System.Drawing">
<value>1682, 7</value>
</data>
<data name="lbl_DateTime.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@@ -172,7 +200,18 @@
<data name="lbl_LoginLevel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ucRollText1.Size" type="System.Drawing.Size, System.Drawing">
<value>491, 45</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>491, 45</value>
</data>
<data name="btn_right.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btn_Left.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="TopPanel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAABzkAAACSCAYAAADW+HcrAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
LargeSquareOne/FrmMonitor.Designer.cs
Generated
+4
View File
@@ -306,6 +306,7 @@
this.proPPM.IntValue = 0;
this.proPPM.IsShowCoreEllipseBorder = true;
this.proPPM.Location = new System.Drawing.Point(387, 23);
this.proPPM.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.proPPM.MaxValue = 50000;
this.proPPM.Name = "proPPM";
this.proPPM.ShowStyleType = JinYuan.ControlLib.ShowStyleType.Ring;
@@ -376,6 +377,7 @@
this.proOKQty.IntValue = 0;
this.proOKQty.IsShowCoreEllipseBorder = true;
this.proOKQty.Location = new System.Drawing.Point(110, 37);
this.proOKQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.proOKQty.MaxValue = 50000;
this.proOKQty.Name = "proOKQty";
this.proOKQty.ShowStyleType = JinYuan.ControlLib.ShowStyleType.Ring;
@@ -411,6 +413,7 @@
this.label2.TabIndex = 25;
this.label2.Text = "稼动率";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// titleRunTime
//
@@ -697,6 +700,7 @@
this.Chart12HourTotal.Size = new System.Drawing.Size(1866, 396);
this.Chart12HourTotal.TabIndex = 4;
this.Chart12HourTotal.Text = "chart1";
this.Chart12HourTotal.Click += new System.EventHandler(this.Chart12HourTotal_Click);
//
// FrmMonitor
//
LargeSquareOne/FrmMonitor.cs
+16 -2
View File
@@ -202,7 +202,7 @@ namespace LargeSquareOne
int TotalQty = CommonMethods.TotalQty;
int ProOKQty = CommonMethods.ProOKQty;
int PPM = CommonMethods.Ppm;
string Factory_code = CommonMethods.mesConfig.siteCode;
string line_No = CommonMethods.mesConfig.lineCode;
string Eqp_code = CommonMethods.mesConfig.equipNum;
@@ -231,10 +231,14 @@ namespace LargeSquareOne
titleLine_No.Title = line_No;
titleEqp_code.Title = Eqp_code;
proUtilizationRate.FloatValue = (float)UtilizationRate;
//proUtilizationRate.ValueFloatOrInt = JinYuan.ControlLib.ValueFloatOrInt.int;
//proUtilizationRate.FloatValue = (float)99;
proPPM.IntValue = PPM;
proOKQty.IntValue = ProOKQty;
proOKRatio.Value = YieldRate.ToString() == "NaN" ? 0 : YieldRate;
proTotalQty.TotalValue = TotalQty;
proTotalQty.TotalValue = TotalQty;
if (CommonMethods.PlcOpenAndRunTime != null && CommonMethods.PlcOpenAndRunTime.Count > 0)
{
@@ -327,5 +331,15 @@ namespace LargeSquareOne
#endregion
private void label2_Click(object sender, EventArgs e)
{
}
private void Chart12HourTotal_Click(object sender, EventArgs e)
{
}
}
}
LargeSquareOne/FrmMonitor.resx
+1 -1
View File
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABG
DQAAAk1TRnQBSQFMAgEBAwEAAZABCwGQAQsBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
DQAAAk1TRnQBSQFMAgEBAwEAAaABCwGgAQsBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGaAADHQEpAl4BZwHwATQBNQHPAf8BNAE1Ac8B/wE0
ATUBzwH/ATQBNQHPAf8BNAE1Ac8B/wNOAZZgAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
GAADYAHbASgB6gH0Af8BKAHqAfQB/wEoAeoB9AH/ASgB6gH0Af8BKAHqAfQB/wEoAeoB9AH/ASgB6gH0
LargeSquareOne/LargeSquareOne.csproj
+1
View File
@@ -363,6 +363,7 @@
</EmbeddedResource>
<EmbeddedResource Include="FrmMain.resx">
<DependentUpon>FrmMain.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FrmMsgBoxOutWithAck.resx">
<DependentUpon>FrmMsgBoxOutWithAck.cs</DependentUpon>
LargeSquareOne/LargeSquareOne.rar
BIN
View File
Binary file not shown.
dbBackup/SQLClear.sql
-1
View File
@@ -1 +0,0 @@
TRUNCATE TABLE AGearEntity;