SoftwareGroup/604WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改出站数据字段

Browse Source
This commit is contained in:
Administrator
2026-08-21 18:15:39 +08:00
parent a7a9037b9b
commit 84305a1318
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.ControlCenter/ControlCenter_Plc.cs
+15 -15
View File
@@ -1696,22 +1696,22 @@ namespace JinYuan.ControlCenters
list[i].PlcResult = MyRes[i]; list[i].PlcResult = MyRes[i];
#region 排出 5 厚度NG电芯 6 外观NG电芯， #region 排出 5 厚度NG电芯 6 外观NG电芯，
if (list[i].PlcResult != 1) //if (list[i].PlcResult != 1)
{ //{
//厚度不良分档 5 测厚不良 6 外观不良 // //厚度不良分档 5 测厚不良 6 外观不良
if (list[i].CCD19 != 1) // if (list[i].CCD19 != 1)
{ // {
m.Result = MyRes[i] = 5; // m.Result = MyRes[i] = 5;
list[i].Remark += $",测厚度NG"; // list[i].Remark += $",测厚度NG";
} // }
else // else
{ // {
//外观不良分档 // //外观不良分档
m.Result = MyRes[i] = 6; // m.Result = MyRes[i] = 6;
list[i].Remark += $",外观检NG不良"; // list[i].Remark += $",外观检NG不良";
} // }
} //}
#endregion #endregion
JinYuan.MES/MesDataProcess.cs
+1 -1
View File
@@ -1218,7 +1218,7 @@ namespace JinYuan.MES
string strFileName = System.Environment.CurrentDirectory + "\\采集项目表.csv"; string strFileName = System.Environment.CurrentDirectory + "\\采集项目表.csv";
FileStream fileStream = new FileStream(strFileName, FileMode.Open, FileAccess.Read, FileShare.Read); FileStream fileStream = new FileStream(strFileName, FileMode.Open, FileAccess.Read, FileShare.Read);
StreamReader streamReader = new StreamReader(fileStream); StreamReader streamReader = new StreamReader(fileStream, Encoding.UTF8);
_ = streamReader.ReadLine(); _ = streamReader.ReadLine();
while (!streamReader.EndOfStream) while (!streamReader.EndOfStream)
{ {
JinYuan.Models/BGearEntity.cs
+7 -7
View File
@@ -129,20 +129,20 @@ namespace JinYuan.Models
/// 电芯1_厚度数据1 /// 电芯1_厚度数据1
/// </summary> /// </summary>
//public float Thickness1 { get; set; } //public float Thickness1 { get; set; }
// public float Thickness2 { get; set; } // public float Thickness2 { get; set; }
// public float Thickness3 { get; set; } // public float Thickness3 { get; set; }
/// <summary> /// <summary>
/// 电芯1_厚度 PLC判定 OKNG 1 OK，0 NG /// 电芯1_厚度 PLC判定 OKNG 1 OK，0 NG
/// </summary> /// </summary>
// public int ThicknessPLCResult1 { get; set; } // public int ThicknessPLCResult1 { get; set; }
// public int ThicknessPLCResult2 { get; set; } // public int ThicknessPLCResult2 { get; set; }
// public int ThicknessPLCResult3 { get; set; } // public int ThicknessPLCResult3 { get; set; }
/// <summary> /// <summary>
/// 电芯1_厚度OKNG 显示OK NG /// 电芯1_厚度OKNG 显示OK NG
/// </summary> /// </summary>
//public string ThicknessResult1 { get; set; } //public string ThicknessResult1 { get; set; }
// public string ThicknessResult2 { get; set; } // public string ThicknessResult2 { get; set; }
// public string ThicknessResult3 { get; set; } // public string ThicknessResult3 { get; set; }
/// <summary> /// <summary>
/// 平面度设定值 /// 平面度设定值
/// </summary> /// </summary>