CCD结果为20项
This commit is contained in:
liming 蔡
@@ -264,27 +264,6 @@ namespace JinYuan.ControlCenters
|
||||
/// </summary>
|
||||
private (short, string, string) JudgmentWGJResult(int A, int[,] B, int C)
|
||||
{
|
||||
var ngType = new string[20] {"正面(2D/3D)结果",
|
||||
"反面(2D/3D)结果",
|
||||
"左侧面(2D/3D)结果",
|
||||
"右侧面(2D/3D)结果",
|
||||
"顶面(2D/3D)结果",
|
||||
"底面(2D/3D)结果",
|
||||
"底DE1结果",
|
||||
"底DE2结果",
|
||||
"底DE3结果",
|
||||
"底DE4结果",
|
||||
"中ME1结果",
|
||||
"中ME2结果",
|
||||
"中ME3结果",
|
||||
"中ME4结果",
|
||||
"右极柱(POS/NEG)结果",
|
||||
"左极柱(POS/NEG)结果",
|
||||
"防爆阀(PRO)结果",
|
||||
"二维码结果",
|
||||
"厚度结果",
|
||||
"平面度结果"
|
||||
};
|
||||
short Result = 1;
|
||||
var OK_NG = "OK";
|
||||
var NG_Type = "";
|
||||
@@ -295,7 +274,7 @@ namespace JinYuan.ControlCenters
|
||||
//1OK，2扫码NG，3MES反馈NG，4其他NG
|
||||
Result = 4;
|
||||
OK_NG = "NG";
|
||||
NG_Type += $"{ngType[i]}(NG),";
|
||||
NG_Type += $"{ConstValue.CCDNameArr[i]}(NG),";
|
||||
}
|
||||
}
|
||||
if (A == 2)
|
||||
@@ -1383,16 +1362,18 @@ namespace JinYuan.ControlCenters
|
||||
//芯包信息1 D3300~D3326
|
||||
//芯包信息2 D3330~D3356
|
||||
//芯包信息3 D3360~D3386
|
||||
for (int j = 0; j < 27; j++)
|
||||
for (int j = 0; j < ConstValue.COUNT_CCD; j++)
|
||||
{
|
||||
m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
|
||||
}
|
||||
|
||||
#region 注释掉的采集数据 by clm 20260812
|
||||
//3400
|
||||
m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB);
|
||||
m.ThicknessResult1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
|
||||
//3500
|
||||
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();
|
||||
//m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB);
|
||||
//m.ThicknessResult1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
|
||||
////3500
|
||||
//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
|
||||
//for (int j = 0; j < 3; j++)
|
||||
//{
|
||||
@@ -1414,6 +1395,7 @@ namespace JinYuan.ControlCenters
|
||||
// Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
|
||||
// //ShortLib.GetShortFromByteArray(bArrays.Content, 6800 *2 + j * 2, DataFormat.CDAB);
|
||||
//}
|
||||
#endregion
|
||||
|
||||
//芯包扫码时间
|
||||
//m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
@@ -1491,13 +1473,6 @@ 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" : "缺图");
|
||||
@@ -1519,13 +1494,17 @@ 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] == 1 ? "OK" : (m.CCD_Data[i, 21] == 0 ? "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" : "缺图");
|
||||
|
||||
#region 注释代码
|
||||
//m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图");
|
||||
//m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 0 ? "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" : "缺图");
|
||||
#endregion
|
||||
|
||||
m.CCD1NgCode = m.CCD_NgNo[i, 0];
|
||||
m.CCD2NgCode = m.CCD_NgNo[i, 1];
|
||||
m.CCD3NgCode = m.CCD_NgNo[i, 2];
|
||||
@@ -1574,7 +1553,7 @@ namespace JinYuan.ControlCenters
|
||||
//芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折
|
||||
if (Code_NG == 1)
|
||||
{
|
||||
for (int ii = 0; ii < 16; ii++)
|
||||
for (int ii = 0; ii < ConstValue.COUNT_CCD; ii++)
|
||||
{
|
||||
if (m.CCD_Data[i, ii] != 1)
|
||||
{
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace JinYuan.Models
|
||||
|
||||
public short[,] list_pan = new short[3, 1];//物流线托盘码
|
||||
//
|
||||
public int[,] CCD_Data = new int[3, 27];//芯包CCD信息1,2,3
|
||||
public int[,] CCD_Data = new int[3, ConstValue.COUNT_CCD];//芯包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 缺图
|
||||
@@ -71,13 +71,17 @@ 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; }
|
||||
|
||||
#region 未使用CCD值 by clm 20260812
|
||||
//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; }
|
||||
#endregion
|
||||
|
||||
public string CCD1NgCode { get; set; }
|
||||
public string CCD2NgCode { get; set; }
|
||||
public string CCD3NgCode { get; set; }
|
||||
@@ -112,7 +116,7 @@ namespace JinYuan.Models
|
||||
/// <summary>
|
||||
/// 电芯1_厚度数据1
|
||||
/// </summary>
|
||||
public float Thickness1 { get; set; }
|
||||
//public float Thickness1 { get; set; }
|
||||
// public float Thickness2 { get; set; }
|
||||
// public float Thickness3 { get; set; }
|
||||
/// <summary>
|
||||
@@ -124,17 +128,17 @@ namespace JinYuan.Models
|
||||
/// <summary>
|
||||
/// 电芯1_厚度OKNG 显示OK NG
|
||||
/// </summary>
|
||||
public string ThicknessResult1 { get; set; }
|
||||
//public string ThicknessResult1 { get; set; }
|
||||
// public string ThicknessResult2 { get; set; }
|
||||
// public string ThicknessResult3 { get; set; }
|
||||
/// <summary>
|
||||
/// 平面度设定值
|
||||
/// </summary>
|
||||
public string flatness_setpoint { get; set; }
|
||||
//public string flatness_setpoint { get; set; }
|
||||
/// <summary>
|
||||
/// 平面度实际值
|
||||
/// </summary>
|
||||
public string flatness_actual { get; set; }
|
||||
//public string flatness_actual { get; set; }
|
||||
/// <summary>
|
||||
/// 电芯_CCD1结果 1 OK，0 NG，2 缺图
|
||||
/// </summary>
|
||||
@@ -158,13 +162,16 @@ 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; }
|
||||
|
||||
#region 未使用CCD结果 by clm 20260812
|
||||
//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; }
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 芯包条码
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace JinYuan.Models
|
||||
{
|
||||
public class ConstValue
|
||||
{
|
||||
/// <summary>
|
||||
/// CCD采集项数
|
||||
/// </summary>
|
||||
public const int COUNT_CCD = 20;
|
||||
|
||||
/// <summary>
|
||||
/// CCD采集项名称列表
|
||||
/// </summary>
|
||||
public static string[] CCDNameArr = new string[20] {
|
||||
"正面(2D/3D)",
|
||||
"反面(2D/3D)",
|
||||
"左侧面(2D/3D)",
|
||||
"右侧面(2D/3D)",
|
||||
"顶面(2D/3D)",
|
||||
"底面(2D/3D)",
|
||||
"底DE1",
|
||||
"底DE2",
|
||||
"底DE3",
|
||||
"底DE4",
|
||||
"中ME1",
|
||||
"中ME2",
|
||||
"中ME3",
|
||||
"中ME4",
|
||||
"正极柱(POS)",
|
||||
"负极柱(NEG)",
|
||||
"防爆阀(PRO)",
|
||||
"二维码检测结果",
|
||||
"厚度结果",
|
||||
"平面度结果"
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -80,6 +80,7 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ConstValue.cs" />
|
||||
<Compile Include="NgCodeEntity.cs" />
|
||||
<Compile Include="AlarmCountEntry.cs" />
|
||||
<Compile Include="AlarmForm.cs" />
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using System;
|
||||
using JinYuan.Models;
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace JinYuan.VirtualDataLibrary
|
||||
{
|
||||
@@ -120,43 +122,28 @@ namespace JinYuan.VirtualDataLibrary
|
||||
|
||||
else if (type == 1)
|
||||
{
|
||||
strSql = @"SELECT CONVERT(varchar,[CSBYHASCANNINGTIME], 120) 时间
|
||||
string preSql = @"SELECT CONVERT(varchar,[CSBYHASCANNINGTIME], 120) 时间
|
||||
,[CSBYHPROCESSNAME] 工序名
|
||||
,[CSBYHSCHEDULE] 班次
|
||||
,[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结果
|
||||
,[CCDResult21] 电芯CCD21结果
|
||||
,[CCDResult22] 电芯CCD22结果
|
||||
,[CCDResult23] 电芯CCD23结果
|
||||
,[CCDResult24] 电芯CCD24结果
|
||||
,[CCDResult25] 电芯CCD25结果
|
||||
,[CCDResult26] 电芯CCD26结果
|
||||
,[CCDResult27] 电芯CCD27结果
|
||||
,[Result] 结果
|
||||
,[RethrowNum] 复投次数";
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (int i = 0; i < ConstValue.CCDNameArr.Length; i++)
|
||||
{
|
||||
sb.Append($",[CCDResult{i + 1}] '{ConstValue.CCDNameArr[i]}'");
|
||||
}
|
||||
|
||||
string formatSql = sb.ToString();
|
||||
|
||||
string nextSql = @",[Result] 结果
|
||||
,case when [Flag]=1 then '已上传' else '未上传' end 上传状态
|
||||
FROM [dbo].[BGearEntity] where CSBYHASCANNINGTIME >= '" + strDate1 + "' and CSBYHASCANNINGTIME <= '" + strDate2 + "' ";
|
||||
|
||||
strSql = string.Concat(preSql, formatSql, nextSql);
|
||||
|
||||
if (strBarCode != "")
|
||||
{
|
||||
strSql += " and BarCode like '%" + strBarCode + "' ";
|
||||
|
||||
-341
@@ -63,38 +63,6 @@
|
||||
this.rtb_Info = new System.Windows.Forms.RichTextBox();
|
||||
this.groupBoxEX5 = new JinYuan.ControlLib.GroupBoxEX();
|
||||
this.dgvBlankingData = new System.Windows.Forms.DataGridView();
|
||||
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column33 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column138 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column96 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column97 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column98 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column99 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column100 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column101 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column103 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column104 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column105 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column106 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column107 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column108 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column109 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column110 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column111 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.Column114 = 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();
|
||||
@@ -496,39 +464,6 @@
|
||||
this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
this.dgvBlankingData.ColumnHeadersHeight = 34;
|
||||
this.dgvBlankingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
|
||||
this.dgvBlankingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.dataGridViewTextBoxColumn1,
|
||||
this.dataGridViewTextBoxColumn2,
|
||||
this.Column7,
|
||||
this.dataGridViewTextBoxColumn5,
|
||||
this.Column33,
|
||||
this.Column29,
|
||||
this.Column3,
|
||||
this.Column138,
|
||||
this.Column25,
|
||||
this.Column96,
|
||||
this.Column97,
|
||||
this.Column98,
|
||||
this.Column99,
|
||||
this.Column100,
|
||||
this.Column101,
|
||||
this.Column103,
|
||||
this.Column104,
|
||||
this.Column105,
|
||||
this.Column106,
|
||||
this.Column107,
|
||||
this.Column108,
|
||||
this.Column109,
|
||||
this.Column110,
|
||||
this.Column111,
|
||||
this.Column112,
|
||||
this.Column113,
|
||||
this.Column114,
|
||||
this.Column147,
|
||||
this.Column34,
|
||||
this.Column35,
|
||||
this.Column102,
|
||||
this.Column22});
|
||||
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
|
||||
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F);
|
||||
@@ -562,250 +497,6 @@
|
||||
this.dgvBlankingData.TabIndex = 10;
|
||||
this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick);
|
||||
//
|
||||
// dataGridViewTextBoxColumn1
|
||||
//
|
||||
this.dataGridViewTextBoxColumn1.HeaderText = "序号";
|
||||
this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
|
||||
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
|
||||
this.dataGridViewTextBoxColumn1.ReadOnly = true;
|
||||
this.dataGridViewTextBoxColumn1.Width = 52;
|
||||
//
|
||||
// dataGridViewTextBoxColumn2
|
||||
//
|
||||
this.dataGridViewTextBoxColumn2.DataPropertyName = "CSBYHASCANNINGTIME";
|
||||
this.dataGridViewTextBoxColumn2.HeaderText = "时间";
|
||||
this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
|
||||
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
|
||||
this.dataGridViewTextBoxColumn2.ReadOnly = true;
|
||||
this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
this.dataGridViewTextBoxColumn2.Width = 160;
|
||||
//
|
||||
// Column7
|
||||
//
|
||||
this.Column7.DataPropertyName = "ChannelNo";
|
||||
this.Column7.HeaderText = "通道";
|
||||
this.Column7.Name = "Column7";
|
||||
this.Column7.ReadOnly = true;
|
||||
//
|
||||
// dataGridViewTextBoxColumn5
|
||||
//
|
||||
this.dataGridViewTextBoxColumn5.DataPropertyName = "BarCode";
|
||||
this.dataGridViewTextBoxColumn5.HeaderText = "电芯码";
|
||||
this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
|
||||
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
|
||||
this.dataGridViewTextBoxColumn5.ReadOnly = true;
|
||||
this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
this.dataGridViewTextBoxColumn5.Width = 210;
|
||||
//
|
||||
// Column33
|
||||
//
|
||||
this.Column33.DataPropertyName = "CSBYHSCHEDULE";
|
||||
this.Column33.HeaderText = "班次";
|
||||
this.Column33.MinimumWidth = 8;
|
||||
this.Column33.Name = "Column33";
|
||||
this.Column33.ReadOnly = true;
|
||||
this.Column33.Width = 150;
|
||||
//
|
||||
// Column29
|
||||
//
|
||||
this.Column29.DataPropertyName = "CSBYHOUTSTATIONJUDGMENTRESULT";
|
||||
this.Column29.HeaderText = "出站判定";
|
||||
this.Column29.MinimumWidth = 8;
|
||||
this.Column29.Name = "Column29";
|
||||
this.Column29.ReadOnly = true;
|
||||
this.Column29.Width = 150;
|
||||
//
|
||||
// Column3
|
||||
//
|
||||
this.Column3.DataPropertyName = "Remark";
|
||||
this.Column3.HeaderText = "备注";
|
||||
this.Column3.Name = "Column3";
|
||||
this.Column3.ReadOnly = true;
|
||||
this.Column3.Width = 400;
|
||||
//
|
||||
// Column138
|
||||
//
|
||||
this.Column138.DataPropertyName = "UpState";
|
||||
this.Column138.HeaderText = "上传状态";
|
||||
this.Column138.Name = "Column138";
|
||||
this.Column138.ReadOnly = true;
|
||||
//
|
||||
// Column25
|
||||
//
|
||||
this.Column25.DataPropertyName = "CCDResult1";
|
||||
this.Column25.HeaderText = "正面(2D/3D)";
|
||||
this.Column25.Name = "Column25";
|
||||
this.Column25.ReadOnly = true;
|
||||
//
|
||||
// Column96
|
||||
//
|
||||
this.Column96.DataPropertyName = "CCDResult2";
|
||||
this.Column96.HeaderText = "反面(2D/3D)";
|
||||
this.Column96.Name = "Column96";
|
||||
this.Column96.ReadOnly = true;
|
||||
//
|
||||
// Column97
|
||||
//
|
||||
this.Column97.DataPropertyName = "CCDResult3";
|
||||
this.Column97.HeaderText = "左侧面(2D/3D)";
|
||||
this.Column97.Name = "Column97";
|
||||
this.Column97.ReadOnly = true;
|
||||
//
|
||||
// Column98
|
||||
//
|
||||
this.Column98.DataPropertyName = "CCDResult4";
|
||||
this.Column98.HeaderText = "右侧面(2D/3D)";
|
||||
this.Column98.Name = "Column98";
|
||||
this.Column98.ReadOnly = true;
|
||||
//
|
||||
// Column99
|
||||
//
|
||||
this.Column99.DataPropertyName = "CCDResult5";
|
||||
this.Column99.HeaderText = "顶面(2D/3D)";
|
||||
this.Column99.Name = "Column99";
|
||||
this.Column99.ReadOnly = true;
|
||||
//
|
||||
// Column100
|
||||
//
|
||||
this.Column100.DataPropertyName = "CCDResult6";
|
||||
this.Column100.HeaderText = "底面(2D/3D)";
|
||||
this.Column100.Name = "Column100";
|
||||
this.Column100.ReadOnly = true;
|
||||
//
|
||||
// Column101
|
||||
//
|
||||
this.Column101.DataPropertyName = "CCDResult7";
|
||||
this.Column101.HeaderText = "底DE1";
|
||||
this.Column101.Name = "Column101";
|
||||
this.Column101.ReadOnly = true;
|
||||
//
|
||||
// Column103
|
||||
//
|
||||
this.Column103.DataPropertyName = "CCDResult8";
|
||||
this.Column103.HeaderText = "底DE2";
|
||||
this.Column103.Name = "Column103";
|
||||
this.Column103.ReadOnly = true;
|
||||
//
|
||||
// Column104
|
||||
//
|
||||
this.Column104.DataPropertyName = "CCDResult9";
|
||||
this.Column104.HeaderText = "底DE3";
|
||||
this.Column104.Name = "Column104";
|
||||
this.Column104.ReadOnly = true;
|
||||
//
|
||||
// Column105
|
||||
//
|
||||
this.Column105.DataPropertyName = "CCDResult10";
|
||||
this.Column105.HeaderText = "底DE4";
|
||||
this.Column105.Name = "Column105";
|
||||
this.Column105.ReadOnly = true;
|
||||
//
|
||||
// Column106
|
||||
//
|
||||
this.Column106.DataPropertyName = "CCDResult11";
|
||||
this.Column106.HeaderText = "中ME1";
|
||||
this.Column106.Name = "Column106";
|
||||
this.Column106.ReadOnly = true;
|
||||
//
|
||||
// Column107
|
||||
//
|
||||
this.Column107.DataPropertyName = "CCDResult12";
|
||||
this.Column107.HeaderText = "中ME2";
|
||||
this.Column107.Name = "Column107";
|
||||
this.Column107.ReadOnly = true;
|
||||
//
|
||||
// Column108
|
||||
//
|
||||
this.Column108.DataPropertyName = "CCDResult13";
|
||||
this.Column108.HeaderText = "中ME3";
|
||||
this.Column108.Name = "Column108";
|
||||
this.Column108.ReadOnly = true;
|
||||
//
|
||||
// Column109
|
||||
//
|
||||
this.Column109.DataPropertyName = "CCDResult14";
|
||||
this.Column109.HeaderText = "中ME4";
|
||||
this.Column109.Name = "Column109";
|
||||
this.Column109.ReadOnly = true;
|
||||
//
|
||||
// Column110
|
||||
//
|
||||
this.Column110.DataPropertyName = "CCDResult15";
|
||||
this.Column110.HeaderText = "极柱(POS/NEG)";
|
||||
this.Column110.Name = "Column110";
|
||||
this.Column110.ReadOnly = true;
|
||||
//
|
||||
// Column111
|
||||
//
|
||||
this.Column111.DataPropertyName = "CCDResult16";
|
||||
this.Column111.HeaderText = "防爆阀(PRO)";
|
||||
this.Column111.Name = "Column111";
|
||||
this.Column111.ReadOnly = true;
|
||||
//
|
||||
// Column112
|
||||
//
|
||||
this.Column112.DataPropertyName = "CCDResult17";
|
||||
this.Column112.HeaderText = "厚度1";
|
||||
this.Column112.Name = "Column112";
|
||||
this.Column112.ReadOnly = true;
|
||||
//
|
||||
// Column113
|
||||
//
|
||||
this.Column113.DataPropertyName = "CCDResult18";
|
||||
this.Column113.HeaderText = "厚度2";
|
||||
this.Column113.Name = "Column113";
|
||||
this.Column113.ReadOnly = true;
|
||||
//
|
||||
// Column114
|
||||
//
|
||||
this.Column114.DataPropertyName = "CCDResult19";
|
||||
this.Column114.HeaderText = "厚度3";
|
||||
this.Column114.Name = "Column114";
|
||||
this.Column114.ReadOnly = true;
|
||||
//
|
||||
// Column147
|
||||
//
|
||||
this.Column147.DataPropertyName = "RethrowNum";
|
||||
this.Column147.HeaderText = "复投次数";
|
||||
this.Column147.Name = "Column147";
|
||||
this.Column147.ReadOnly = true;
|
||||
//
|
||||
// Column34
|
||||
//
|
||||
this.Column34.DataPropertyName = "CSBYHINSTATIONTIME";
|
||||
this.Column34.HeaderText = "电芯进站时间";
|
||||
this.Column34.MinimumWidth = 8;
|
||||
this.Column34.Name = "Column34";
|
||||
this.Column34.ReadOnly = true;
|
||||
this.Column34.Width = 150;
|
||||
//
|
||||
// Column35
|
||||
//
|
||||
this.Column35.DataPropertyName = "CSBYHOUTSTATIONTIME";
|
||||
this.Column35.HeaderText = "电芯出站时间";
|
||||
this.Column35.MinimumWidth = 8;
|
||||
this.Column35.Name = "Column35";
|
||||
this.Column35.ReadOnly = true;
|
||||
this.Column35.Width = 150;
|
||||
//
|
||||
// Column102
|
||||
//
|
||||
this.Column102.DataPropertyName = "Flag";
|
||||
this.Column102.HeaderText = "标志";
|
||||
this.Column102.MinimumWidth = 8;
|
||||
this.Column102.Name = "Column102";
|
||||
this.Column102.ReadOnly = true;
|
||||
this.Column102.Width = 150;
|
||||
//
|
||||
// Column22
|
||||
//
|
||||
this.Column22.DataPropertyName = "Result";
|
||||
this.Column22.HeaderText = "反馈结果";
|
||||
this.Column22.MinimumWidth = 8;
|
||||
this.Column22.Name = "Column22";
|
||||
this.Column22.ReadOnly = true;
|
||||
this.Column22.Width = 150;
|
||||
//
|
||||
// imageList1
|
||||
//
|
||||
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
|
||||
@@ -871,37 +562,5 @@
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn InResult;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column139;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column33;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column29;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column138;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column25;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column96;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column97;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column98;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column99;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column100;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column101;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column103;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column104;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column105;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column106;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column107;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column108;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column109;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column110;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column111;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column112;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column113;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column114;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column147;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column34;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column35;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column102;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn Column22;
|
||||
}
|
||||
}
|
||||
@@ -46,6 +46,7 @@ namespace LargeSquareOne
|
||||
this.dgvFeedingData.DataError += delegate (object sender, DataGridViewDataErrorEventArgs e) { };
|
||||
this.dgvFeedingData.DoubleBufferedDataGirdView(true);
|
||||
|
||||
InitDgvColumns();
|
||||
this.dgvBlankingData.AutoGenerateColumns = false;
|
||||
this.dgvBlankingData.DataSource = listTB;
|
||||
this.dgvBlankingData.DataError += delegate (object sender, DataGridViewDataErrorEventArgs e) { };
|
||||
@@ -68,7 +69,140 @@ namespace LargeSquareOne
|
||||
};
|
||||
}
|
||||
|
||||
private void InitDgvColumns()
|
||||
{
|
||||
#region dgvBlankingData列定义
|
||||
List<DataGridViewColumn> colDefList = new List<DataGridViewColumn>();
|
||||
|
||||
DataGridViewTextBoxColumn dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn1.HeaderText = "序号";
|
||||
dataGridViewTextBoxColumn1.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
|
||||
dataGridViewTextBoxColumn1.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn1.Width = 52;
|
||||
colDefList.Add(dataGridViewTextBoxColumn1);
|
||||
|
||||
DataGridViewTextBoxColumn dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn2.DataPropertyName = "CSBYHASCANNINGTIME";
|
||||
dataGridViewTextBoxColumn2.HeaderText = "时间";
|
||||
dataGridViewTextBoxColumn2.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
|
||||
dataGridViewTextBoxColumn2.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
dataGridViewTextBoxColumn2.Width = 160;
|
||||
colDefList.Add(dataGridViewTextBoxColumn2);
|
||||
|
||||
DataGridViewTextBoxColumn Column7 = new DataGridViewTextBoxColumn();
|
||||
Column7.DataPropertyName = "ChannelNo";
|
||||
Column7.HeaderText = "通道";
|
||||
Column7.Name = "Column7";
|
||||
Column7.ReadOnly = true;
|
||||
colDefList.Add(Column7);
|
||||
|
||||
DataGridViewTextBoxColumn dataGridViewTextBoxColumn5 = new DataGridViewTextBoxColumn();
|
||||
dataGridViewTextBoxColumn5.DataPropertyName = "BarCode";
|
||||
dataGridViewTextBoxColumn5.HeaderText = "电芯码";
|
||||
dataGridViewTextBoxColumn5.MinimumWidth = 8;
|
||||
dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
|
||||
dataGridViewTextBoxColumn5.ReadOnly = true;
|
||||
dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
dataGridViewTextBoxColumn5.Width = 210;
|
||||
colDefList.Add(dataGridViewTextBoxColumn5);
|
||||
|
||||
DataGridViewColumn Column33 = new DataGridViewTextBoxColumn();
|
||||
Column33.DataPropertyName = "CSBYHSCHEDULE";
|
||||
Column33.HeaderText = "班次";
|
||||
Column33.MinimumWidth = 8;
|
||||
Column33.Name = "Column33";
|
||||
Column33.ReadOnly = true;
|
||||
Column33.Width = 150;
|
||||
colDefList.Add(Column33);
|
||||
|
||||
DataGridViewColumn Column29 = new DataGridViewTextBoxColumn();
|
||||
Column29.DataPropertyName = "CSBYHOUTSTATIONJUDGMENTRESULT";
|
||||
Column29.HeaderText = "出站判定";
|
||||
Column29.MinimumWidth = 8;
|
||||
Column29.Name = "Column29";
|
||||
Column29.ReadOnly = true;
|
||||
Column29.Width = 150;
|
||||
colDefList.Add(Column29);
|
||||
|
||||
DataGridViewColumn Column3 = new DataGridViewTextBoxColumn();
|
||||
Column3.DataPropertyName = "Remark";
|
||||
Column3.HeaderText = "备注";
|
||||
Column3.Name = "Column3";
|
||||
Column3.ReadOnly = true;
|
||||
Column3.Width = 400;
|
||||
colDefList.Add(Column3);
|
||||
|
||||
DataGridViewColumn Column138 = new DataGridViewTextBoxColumn();
|
||||
Column138.DataPropertyName = "UpState";
|
||||
Column138.HeaderText = "上传状态";
|
||||
Column138.Name = "Column138";
|
||||
Column138.ReadOnly = true;
|
||||
colDefList.Add(Column138);
|
||||
|
||||
#region CCD列
|
||||
for (int i = 0; i < ConstValue.CCDNameArr.Length; i++)
|
||||
{
|
||||
DataGridViewColumn col = new DataGridViewTextBoxColumn();
|
||||
|
||||
col.DataPropertyName = $"CCDResult{i + 1}";
|
||||
col.HeaderText = ConstValue.CCDNameArr[i];
|
||||
col.Name = $"Col_ccd_{i + 1}";
|
||||
col.ReadOnly = true;
|
||||
|
||||
colDefList.Add(col);
|
||||
}
|
||||
#endregion
|
||||
|
||||
DataGridViewColumn Column147 = new DataGridViewTextBoxColumn();
|
||||
Column147.DataPropertyName = "RethrowNum";
|
||||
Column147.HeaderText = "复投次数";
|
||||
Column147.Name = "Column147";
|
||||
Column147.ReadOnly = true;
|
||||
colDefList.Add(Column147);
|
||||
|
||||
DataGridViewColumn Column34 = new DataGridViewTextBoxColumn();
|
||||
Column34.DataPropertyName = "CSBYHINSTATIONTIME";
|
||||
Column34.HeaderText = "电芯进站时间";
|
||||
Column34.MinimumWidth = 8;
|
||||
Column34.Name = "Column34";
|
||||
Column34.ReadOnly = true;
|
||||
Column34.Width = 150;
|
||||
colDefList.Add(Column34);
|
||||
|
||||
DataGridViewColumn Column35 = new DataGridViewTextBoxColumn();
|
||||
Column35.DataPropertyName = "CSBYHOUTSTATIONTIME";
|
||||
Column35.HeaderText = "电芯出站时间";
|
||||
Column35.MinimumWidth = 8;
|
||||
Column35.Name = "Column35";
|
||||
Column35.ReadOnly = true;
|
||||
Column35.Width = 150;
|
||||
colDefList.Add(Column35);
|
||||
|
||||
DataGridViewColumn Column102 = new DataGridViewTextBoxColumn();
|
||||
Column102.DataPropertyName = "Flag";
|
||||
Column102.HeaderText = "标志";
|
||||
Column102.MinimumWidth = 8;
|
||||
Column102.Name = "Column102";
|
||||
Column102.ReadOnly = true;
|
||||
Column102.Width = 150;
|
||||
colDefList.Add(Column102);
|
||||
|
||||
DataGridViewColumn Column22 = new DataGridViewTextBoxColumn();
|
||||
Column22.DataPropertyName = "Result";
|
||||
Column22.HeaderText = "反馈结果";
|
||||
Column22.MinimumWidth = 8;
|
||||
Column22.Name = "Column22";
|
||||
Column22.ReadOnly = true;
|
||||
Column22.Width = 150;
|
||||
colDefList.Add(Column22);
|
||||
|
||||
|
||||
this.dgvBlankingData.Columns.AddRange(colDefList.ToArray());
|
||||
#endregion
|
||||
}
|
||||
|
||||
private void FrmDataMonitor_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
@@ -73,7 +73,7 @@ namespace LargeSquareOne
|
||||
CommonMethods.IsLoginOk = true;
|
||||
}
|
||||
//ngcode
|
||||
CommonMethods.listNgCodeEntity = CommonMethods.db.QueryAll<NgCodeEntity>();
|
||||
//CommonMethods.listNgCodeEntity = CommonMethods.db.QueryAll<NgCodeEntity>();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user