20260810同步

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,13 +0,0 @@
-### 该问题是怎么引起的？
-
-
-
-### 重现步骤
-
-
-
-### 报错信息
-
-
-
-

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

@@ -1,12 +0,0 @@
-### 相关的Issue
-
-
-### 原因（目的、解决的问题等）
-
-
-### 描述（做了什么，变更了什么）
-
-
-### 测试用例（新增、改动、可能影响的功能）
-
-

.gitignore

@@ -362,3 +362,5 @@ MigrationBackup/
 FodyWeavers.xsd
 *.rar
 /LargeSquareOne/App.config
+/JinYuan.Helper/JinYuan.Helper.csproj.user
+/jy_hc.md

JinYuan.ControlCenter/ControlCenter.cs

@@ -14,6 +14,7 @@ using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -106,6 +107,7 @@ namespace JinYuan.ControlCenters
         {
 
             GetAlarmData();
+            GetSafeEqptData();
             InitFunc();
             IntiDevice();
             Timer_RefreshData = new System.Timers.Timer(1000);
@@ -897,9 +899,11 @@ namespace JinYuan.ControlCenters
                 {
                     UploadEquEnergy();//电表
                     //UPloadAnemograph();//风速仪
+                    ShowSafeEqptEven_Run(); //安全装置状态
                 });
                 Regular = 0;
             }
+           
             if (TotalNum > 4)
             {
                 GetEnergyData();
@@ -1500,6 +1504,22 @@ namespace JinYuan.ControlCenters
 
         }
 
+        List<AlarmForm> listSafeEqptForm = null;
+        public void GetSafeEqptData()
+        {
+            //加载PLC安全装置状态文件
+            try
+            {
+                string strFileName = System.Environment.CurrentDirectory + "\\安全装置报警寄存器对应表.csv";
+                listSafeEqptForm = CSVHelper<AlarmForm>.ReadCSV(strFileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("加载安装装置报警文件失败！");
+            }
+
+        }
+
         /// <summary>
         /// 报警信息读取
         /// </summary>
@@ -1507,56 +1527,63 @@ namespace JinYuan.ControlCenters
         /// <param name="resByte"></param>
         List<AlarmData> listOld = new List<AlarmData>();
         List<AlarmData> listNew = new List<AlarmData>();
-        List<AlarmStatus> listAlarmStatus = null;
+        //List<AlarmStatus> listAlarmStatus = null;
         string alarmStartDate = "";
         int AlarmCount = 0;
         string strAllAlarm = "";
         bool isRead = false;
+		private readonly object _alarmLock = new object();
         private void ShowAlarmEven_Run(string strGuidAlarm)
         {
             if (CommonMethods.IsRun && CommonMethods.plcDevice.IsConnected)
             {
-                //StringBuilder sb = new StringBuilder();
-                listNew.Clear();
                 string Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
                 JYResult<byte[]> resByte = CommonMethods.PlcLink.ReadValue<JYResult<byte[]>>("D10010", Data_Type.ArrByte, 500);
-                if (resByte.IsSuccess && resByte != null)
-                {
-                    if (resByte == null) { return; }
-                    //如果未配置报警地址信息返回 TODO
-                    if (listAlarmForm == null) { return; }
-                    int startPlcAddr = 10010;//TODO 读取起始地址
-                    //3.公用方法解析byte[]数据 => List<AlarmStatus>           
-                    if (resByte == null) { return; } //如果未配置报警地址信息返回
-                    //TODO 切换三菱和欧姆龙
-                    listAlarmStatus = PLCAlarmParseHelper.OmronFinsByte2Status(startPlcAddr, resByte.Content);
-                    //4.判定有不良后，关联AlarmStatus 和AlarmForm
-                    if (listAlarmStatus == null) { return; } //状态信息为空返回
-                                                             //如果有报警，获取报警信息
-                    if (listAlarmStatus.Any(p => p.Status))
-                    {
-                        //关联表单数据和报警记录，获取报警信息
-                        listNew = listAlarmStatus
-                         .Where(s => s.Status)
-                         .Join(listAlarmForm
-                         , s => s.PLCAdress
-                         , f => f.PLCAdress
-                         , (s, f) => new AlarmData()
-                         {
-                             AlarmGuid = strGuidAlarm,
-                             PLCAdress = s.PLCAdress,
-                             AlarmCode = f.AlarmCode,
-                             AlarmContent = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
-                             AlarmType = "停机报警",
-                             AlarmDesc = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
-                             AlarmState = "1",
-                             StartTime = Date,
-                             EndTime = Date,
-                             Flag = 0
-                         }).ToList();
-                    }
 
-                    string strAlarm = "";
+                if (!resByte.IsSuccess || resByte == null || listAlarmForm == null) 
+                { 
+                    return; 
+                }
+
+                int startPlcAddr = 10010;
+                var listAlarmStatus = PLCAlarmParseHelper.OmronFinsByte2Status(startPlcAddr, resByte.Content);
+
+                if (listAlarmStatus == null || !listAlarmStatus.Any(p => p.Status)) 
+                { 
+                    return; 
+                }
+
+                // 当前新的报警信息
+                var newAlarmData = new List<AlarmData>();
+                // 当前已经消除的报警信息
+                var saveAlarmData = new List<AlarmData>();
+                var listOldAlarm = new List<AlarmData>();
+
+                #region 操作共享列表listNew、listOld时加锁
+                lock (_alarmLock)
+                {
+                    listNew.Clear();
+
+                    //关联表单数据和报警记录，获取报警信息
+                    listNew = listAlarmStatus
+                     .Where(s => s.Status)
+                     .Join(listAlarmForm
+                     , s => s.PLCAdress
+                     , f => f.PLCAdress
+                     , (s, f) => new AlarmData()
+                     {
+                         AlarmGuid = strGuidAlarm,
+                         PLCAdress = s.PLCAdress,
+                         AlarmCode = f.AlarmCode,
+                         AlarmContent = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
+                         AlarmType = "停机报警",
+                         AlarmDesc = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
+                         AlarmState = "1",
+                         StartTime = Date,
+                         EndTime = Date,
+                         Flag = 0
+                     }).ToList();
+
                     //添加新的报警信息
                     if (listNew.Count > 0)
                     {
@@ -1575,6 +1602,8 @@ namespace JinYuan.ControlCenters
                             if (alarmLog == null)
                             {
                                 listOld.Add(r);
+                                newAlarmData.Add(r.Clone() as AlarmData);
+
                                 //上传报警
                                 if (CommonMethods.sysConfig.MesModeSwitching)
                                 {
@@ -1594,9 +1623,6 @@ namespace JinYuan.ControlCenters
                         CommonMethods.SlideAlarmText = strAllAlarm.Substring(0, strAllAlarm.Length - 1);
                     }
 
-                    //移除已经消除的报警信息
-                    var saveAlarmData = new List<AlarmData>();
-                    var listOldAlarm = new List<AlarmData>();
                     listOldAlarm.AddRange(listOld);
                     if (listOldAlarm.Count > 0)
                     {
@@ -1606,60 +1632,125 @@ namespace JinYuan.ControlCenters
                             if (alarmLog == null)
                             {
                                 item.EndTime = Date;
-                                saveAlarmData.Add(item);
+                                saveAlarmData.Add(item.Clone() as AlarmData);
                                 listOld.Remove(item);
                             }
                         }
                     }
+                }
+                #endregion
 
-                    if (saveAlarmData.Count > 0)
+                if (saveAlarmData.Count > 0)
+                {
+                    string strALLAlarm = "";
+                    //写csv文件
+                    var nowDate = DateTime.Now;
+                    string basePath = $@"{CommonMethods.strAlarmLogspath}\{DateTime.Now.Year}\{DateTime.Now.Month}";
+                    string fileName = $@"{nowDate.Day}.csv";
+                    string title = "GUID,报警地址,故障代码,报警内容,开始时间,结束时间,是否停机";
+                    string alarmContent = string.Empty;
+
+                    List<FaultCodeList> faultCodeLists = new List<FaultCodeList>();
+                    foreach (var m in saveAlarmData)
                     {
-                        string strALLAlarm = "";
+                        FaultCodeList item = new FaultCodeList();
-                        //写csv文件
+                        item.faultCode = m.AlarmCode;
-                        var nowDate = DateTime.Now;
+                        faultCodeLists.Add(item);
-                        string basePath = $@"{CommonMethods.strAlarmLogspath}\{DateTime.Now.Year}\{DateTime.Now.Month}";
+                        alarmContent += $"{m.AlarmGuid},{m.PLCAdress},{m.AlarmCode},{m.AlarmContent},{m.StartTime},{m.EndTime},{m.AlarmType}\n";
-                        string fileName = $@"{nowDate.Day}.csv";
+                        strALLAlarm += $"{m.AlarmContent},";
-                        string title = "GUID,报警地址,故障代码,报警内容,开始时间,结束时间,是否停机";
-                        string alarmContent = string.Empty;
 
-                        List<FaultCodeList> faultCodeLists = new List<FaultCodeList>();
+                        //上传报警
-                        foreach (var m in saveAlarmData)
-                        {
-                            FaultCodeList item = new FaultCodeList();
-                            item.faultCode = m.AlarmCode;
-                            faultCodeLists.Add(item);
-                            alarmContent += $"{m.AlarmGuid},{m.PLCAdress},{m.AlarmCode},{m.AlarmContent},{m.StartTime},{m.EndTime},{m.AlarmType}\n";
-                            strALLAlarm += $"{m.AlarmContent},";
-
-                            //上传报警
-                            if (CommonMethods.sysConfig.MesModeSwitching)
-                            {
-                                //上传报警
-                                MESDataCombin.EquAlarm(m, 0);
-                            }
-                        }
-
-                        alarmContent = alarmContent.Substring(0, alarmContent.Length - 1);
-                        CSVHelper<AlarmCSVData>.WriterCSV(basePath, fileName, title, alarmContent);
-
-                        // 上传消除的报警信息
                         if (CommonMethods.sysConfig.MesModeSwitching)
                         {
-                            //上传设备报警状态
+                            //上传报警
-                            MESDataCombin.EqpStatusParam("Alert", string.IsNullOrEmpty(alarmStartDate) ? Date : alarmStartDate, strGuidAlarm, faultCodeLists);
+                            MESDataCombin.EquAlarm(m, 0);
                         }
-                        //报警保存
-                        SaveAlarmCount(saveAlarmData);
                     }
+
+                    alarmContent = alarmContent.Substring(0, alarmContent.Length - 1);
+                    CSVHelper<AlarmCSVData>.WriterCSV(basePath, fileName, title, alarmContent);
+
+                    // 上传消除的报警信息
+                    if (CommonMethods.sysConfig.MesModeSwitching)
+                    {
+                        //上传设备报警状态
+                        MESDataCombin.EqpStatusParam("Alert", string.IsNullOrEmpty(alarmStartDate) ? Date : alarmStartDate, strGuidAlarm, faultCodeLists);
+                    }
+                    //报警保存
+                    SaveAlarmCount(saveAlarmData, newAlarmData);
                 }
             }
         }
 
 
+        List<AlarmData> safeEqptStatus = new List<AlarmData>();
+        List<AlarmStatus> listSafeEqptStatus = null;
+        private void ShowSafeEqptEven_Run()
+        {
+            if (CommonMethods.IsRun && CommonMethods.plcDevice.IsConnected)
+            {
+                string Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+                JYResult<byte[]> resByte = CommonMethods.PlcLink.ReadValue<JYResult<byte[]>>("D1000", Data_Type.ArrByte, 8);
+                if (resByte.IsSuccess && resByte != null)
+                {
+                    if (resByte == null) { return; }
+                    //如果未配置报警地址信息返回 TODO
+                    if (listSafeEqptForm == null) { return; }
+                    int startPlcAddr = 1000;
+                    
+                    listSafeEqptStatus = PLCAlarmParseHelper.OmronFinsByte2Status(startPlcAddr, resByte.Content);
+                    //4.判定有不良后，关联AlarmStatus 和AlarmForm
+                    if (listSafeEqptStatus == null) { return; } //状态信息为空返回
+                                                                //如果有报警，获取报警信息
+                    var josnTxtMsg = $"{Date}:获取PLC安全设备运行状态:\r\n";
+                    for (int i = 0; i < listSafeEqptStatus.Count; i++)
+                    {
+                        josnTxtMsg += $"plc_addr={listSafeEqptStatus[i].PLCAdress},status={listSafeEqptStatus[i].Status}\r\n";
+                    }
+                    
+                    TxtHelper.WriteTxt($@"{CommonMethods.strMesLogspath}\{DateTime.Now.ToString("yyyyMMdd")}\设备运行状态\{DateTime.Now.ToString("HH")}.txt", josnTxtMsg);
+                    //关联表单数据和报警记录，获取报警信息
+                    safeEqptStatus = listSafeEqptStatus
+                        .Join(listSafeEqptForm
+                        , s => s.PLCAdress
+                        , f => f.PLCAdress
+                        , (s, f) => new AlarmData()
+                        {
+                            PLCAdress = s.PLCAdress,
+                            AlarmCode = f.AlarmCode,
+                            AlarmContent = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
+                            AlarmDesc = f.AlarmContent == "" ? s.PLCAdress : f.AlarmContent,
+                            AlarmType = "安全装置",
+                            AlarmState = s.Status?"0":"1",  //mes 要求0是异常，1是正常
+                            StartTime = Date,
+                            EndTime = Date,
+                            Flag = 0
+                        }).ToList();
+
+                    if (safeEqptStatus.Count > 0)
+                    {
+                        List<SafeEqptCode> safeEqptCodeLists = new List<SafeEqptCode>();
+                        safeEqptStatus.ForEach(r =>
+                        {
+                            if (CommonMethods.sysConfig.MesModeSwitching)
+                            {
+                                var item = new SafeEqptCode();
+                                item.equipNum = r.AlarmCode;
+                                item.status = r.AlarmState;
+                                safeEqptCodeLists.Add(item);
+                            }
+                        });
+
+                        MESDataCombin.SafeEqptAlarm(Date, safeEqptCodeLists);
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// 报警保存
         /// </summary>
-        private void SaveAlarmCount(List<AlarmData> alarmDatas)
+        private void SaveAlarmCount(List<AlarmData> alarmDatas, List<AlarmData> newAlarmDataList)
         {
             bool ISAdd = false;
             var recordToUpdate = new AlarmCountEntry();
@@ -1700,7 +1791,7 @@ namespace JinYuan.ControlCenters
             }
             else
             {
-                foreach (var m in listNew)
+                foreach (var m in newAlarmDataList)
                 {
                     AlarmCountEntry alarm = new AlarmCountEntry();
                     alarm.PLCAdress = m.PLCAdress;

JinYuan.ControlCenter/ControlCenter_Plc.cs

@@ -373,6 +373,7 @@ namespace JinYuan.ControlCenters
                 List<short> listRes = GetList<short>(3, 0);//进站电芯反馈结果
 
                 byte[] bytes = bArrays.Content.ByteReverse();//高低位转换
+                byte[] bytes1 = bArrays.Content;
 
                 // 从D2200开始
                 #region 数据解析
@@ -586,7 +587,7 @@ namespace JinYuan.ControlCenters
                 sw2.Stop();
                 ////输出上料数据处理耗时：
                 CommonMethods.AddDataMonitorLog(0, $"外观检测进站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
-
+                LoggerHelp.WriteInfo($"外观检测进站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
             }
         }
 
@@ -1789,426 +1790,488 @@ namespace JinYuan.ControlCenters
         private void BlankingStation(JYResult<byte[]> bArrays, object plcModel)
         {
             Group pf = plcModel as Group;
-            if (bArrays == null)
+            if (bArrays == null || !bArrays.IsSuccess || bArrays.Content == null)
             {
                 CommonMethods.PlcLink.WriteInt16(pf.VarList[0].VarAddress, 0);//置位0
                 CommonMethods.AddLog(false, $"电芯出站PLC有触发信号，但无数据!");
                 LoggerHelp.WriteLog($"电芯出站PLC有触发信号，但无数据!", "SysErrorLog");
+
+                return;
             }
-            if (bArrays.IsSuccess && bArrays.Content != null)
+
+            Random random = new Random();
+            //解析数据  
+            sw2.Restart();
+            #region 数据变量定义
+            List<BGearEntity> list = new List<BGearEntity>();//实体
+                                                             //int[] MyRes = new int[2];//AB反馈结果
+            int[] MyRes = new int[3];//三个外观检测反馈结果
+            #endregion
+            //高低位转换
+            byte[] bytes = bArrays.Content.ByteReverse();
+            byte[] bytes1 = bArrays.Content;
+
+            List<string> listBarCode = GetList<string>(3, "");//电芯条码
+                                                              //List<string> listNum = GetList<string>(1, "");//进站磁悬浮动子编号
+            List<short> listRes = GetList<short>(3, 0);//出站电芯反馈结果
+                                                       //反馈结果
+            #region 电芯解析
+            //电芯解析  从3200 开始              
+            listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
+            listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
+            listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
+            #endregion
+            #region 上传MES
+            //D3200起
+            for (int i = 0; i < 3; i++)
             {
-                Random random = new Random();
+                try
-                //解析数据  
-                sw2.Restart();
-                #region 数据变量定义
-                List<BGearEntity> list = new List<BGearEntity>();//实体
-                //int[] MyRes = new int[2];//AB反馈结果
-                int[] MyRes = new int[3];//三个外观检测反馈结果
-                #endregion
-                //高低位转换
-                byte[] bytes = bArrays.Content.ByteReverse();
-                byte[] bytes1 = bArrays.Content;
-
-                List<string> listBarCode = GetList<string>(3, "");//电芯条码
-                //List<string> listNum = GetList<string>(1, "");//进站磁悬浮动子编号
-                List<short> listRes = GetList<short>(3, 0);//出站电芯反馈结果
-                //反馈结果
-                #region 电芯解析
-                //电芯解析  从3200 开始              
-                listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
-                listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
-                listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
-                #region 上传MES
-                //D3200起
-                for (int i = 0; i < 3; i++)
                 {
-                    try
+                    BGearEntity m = new BGearEntity();
+                    AGearEntity TT = new AGearEntity();
+                    //极限件标志
+                    int ChallengeFlag = 0;
+                    //芯包信息1  D3300~D3326
+                    //芯包信息2  D3330~D3356
+                    //芯包信息3  D3360~D3386
+                    for (int j = 0; j < 27; j++)
                     {
-                        BGearEntity m = new BGearEntity();
+                        m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
-                        AGearEntity TT = new AGearEntity();
+                    }
-                        //极限件标志
+                    // CCD 
-                        int ChallengeFlag = 0;
+                    m.CCD_Data[i, 19] = ShortLib.GetShortFromByteArray(bArrays.Content, 600 + i * 30 * 2 + 20, DataFormat.CDAB);
-                        //芯包信息1  D3300~D3326
+
-                        //芯包信息2  D3330~D3356
+                    //3400   3430   3460
-                        //芯包信息3  D3360~D3386
+                    m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB).ToString();
-                        for (int j = 0; j < 20; j++)
+                    //3401   3431  3461
+                    m.ThicknessResult1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
+                    //3500   3530   3560
+                    m.flatness_setpoint = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 30 * 2, DataFormat.CDAB).ToString();
+                    m.flatness_actual = FloatLib.GetFloatFromByteArray(bArrays.Content, 600 + i * 30 * 2 + 2 * 2, DataFormat.CDAB).ToString();
+                    //厚度3400
+                    //for (int j = 0; j < 3; j++)
+                    //{
+                    //    m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB);
+                    //}
+                    ////厚度plc 3500
+                    //for (int j = 0; j < 3; j++)
+                    //{
+                    //    m.Thickness_PLCData[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 500 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+                    //}
+                    //不良ng编号4300
+                    //for (int j = 0; j < 20; j++)
+                    //{
+                    //    m.CCD_NgNo[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 2200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+                    //}
+                    for (int j = 0; j < 27; j++)
+                    {
+                        m.CCD_NgNo[i, j] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, (7800 * 2 + j * 40 * 2 + i * 2 * 1000), 20 * 2, System.Text.Encoding.ASCII).
+                         Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
+                        //ShortLib.GetShortFromByteArray(bArrays.Content, 6800 *2 +  j  * 2, DataFormat.CDAB);
+                    }
+
+                    #region 视觉新增不良缺陷数据 by clm 20260724
+                    List<int> qrCodeAddressList = new List<int>();
+                    for (int k = 0; k < 4; k++)
+                    {
+                        int address = 9750 + k * 2 + i * 8;
+                        qrCodeAddressList.Add(address);
+                    }
+
+                    m.QrCodeWidth = FloatLib.GetFloatFromByteArray(bArrays.Content, qrCodeAddressList[0], DataFormat.CDAB).ToString();
+                    m.QrCodeHeight = FloatLib.GetFloatFromByteArray(bArrays.Content, qrCodeAddressList[1], DataFormat.CDAB).ToString();
+                    m.QrCodeTopMargin = FloatLib.GetFloatFromByteArray(bArrays.Content, qrCodeAddressList[2], DataFormat.CDAB).ToString();
+                    m.QrCodeLeftMargin = FloatLib.GetFloatFromByteArray(bArrays.Content, qrCodeAddressList[3], DataFormat.CDAB).ToString();
+                    #endregion
+
+                    //芯包扫码时间
+                    //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");                       
+                    m.BarCode = listBarCode[i];
+                    //m.CSBYHCODEA = "TEST";
+                    #region 极限件查询
+                    //var EX = CommonMethods.db.QuerySqlList<Challenge>(CommonMethods.dBSQL.GetChallengeCode(m.BarCode));
+                    //for (int j = 0; j < EX.Count; j++)
+                    //{
+                    //    if (string.Compare(EX[j].ChallengeBarCode, m.BarCode) == 0)
+                    //    {
+                    //        m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")";
+                    //        ChallengeFlag = 1;
+                    //    }
+                    //}
+                    #endregion
+                    //查询进站时间数据
+                    var w = CommonMethods.db.QuerySqlList<AGearEntity>(CommonMethods.dBSQL.GetInTime(m.BarCode));
+                    //获取新一行数据
+                    if (w.Count > 0)
+                        TT = w[w.Count - 1];
+                    //
+                    //if (w.Count > 0)
+                    //    TT = w[0];
+                    if (TT.TestTime != null)
+                        m.ScanTime[0] = TT.TestTime;
+                    else
+                        m.ScanTime[0] = "";
+                    //芯包出站时间
+                    m.ScanTime[1] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+                    //复投次数
+                    m.RethrowNum = 0;
+                    if (w.Count > 0)
+                    {
+                        int cccc = w.Count;
+                        m.RethrowNum = cccc - 1;
+                    }
+
+                    int Code_NG = 0;//条码有无标志 1为有，2为无
+                                    //判断有无条码
+                    if (m.BarCode != null && m.BarCode != "" && m.BarCode != "ERROR")
+                        Code_NG = 1;
+                    else
+                        Code_NG = 2;
+
+                    //m.ChannelNo = m.MyNo[i];
+                    //m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+                    //不良代码判定
+                    //List<string> NGcodeList = new List<string>();
+                    //NGcodeList = NGcode(m.list_Data1[i, 10], m.list_Data1[i, 11], m.list_Data1[i, 12], m.list_Data1[i, 15], m.list_Data1[i, 26], m.list_Data1[i, 16]
+                    //    , m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], m.list_Data1[i, 23], m.list_Data1[i, 24], m.list_Data1[i, 25], m.list_Data1[i, 27]);
+                    // var (NGcodeList, NGmessage) = NGWGJcode(m.CCD_Data, i);
+
+                    //电芯CCD判定结果
+                    #region //电芯CCD判定结果 1 0K 0NG 2缺图
+                    m.CCD1 = m.CCD_Data[i, 0];
+                    m.CCD2 = m.CCD_Data[i, 1];
+                    m.CCD3 = m.CCD_Data[i, 2];
+                    m.CCD4 = m.CCD_Data[i, 3];
+                    m.CCD5 = m.CCD_Data[i, 4];
+                    m.CCD6 = m.CCD_Data[i, 5];
+                    m.CCD7 = m.CCD_Data[i, 6];
+                    m.CCD8 = m.CCD_Data[i, 7];
+                    m.CCD9 = m.CCD_Data[i, 8];
+                    m.CCD10 = m.CCD_Data[i, 9];
+                    m.CCD11 = m.CCD_Data[i, 10];
+                    m.CCD12 = m.CCD_Data[i, 11];
+                    m.CCD13 = m.CCD_Data[i, 12];
+                    m.CCD14 = m.CCD_Data[i, 13];
+                    m.CCD15 = m.CCD_Data[i, 14];
+                    m.CCD16 = m.CCD_Data[i, 15];
+                    m.CCD17 = m.CCD_Data[i, 16];
+                    m.CCD18 = m.CCD_Data[i, 17];
+                    m.CCD19 = m.CCD_Data[i, 18];
+                    m.CCD20 = m.CCD_Data[i, 19];
+                    m.CCD21 = m.CCD_Data[i, 20];
+                    m.CCD22 = m.CCD_Data[i, 21];
+                    m.CCD23 = m.CCD_Data[i, 22];
+                    m.CCD24 = m.CCD_Data[i, 23];
+                    m.CCD25 = m.CCD_Data[i, 24];
+                    m.CCD26 = m.CCD_Data[i, 25];
+                    m.CCD27 = m.CCD_Data[i, 26];
+
+                    m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 0 ? "NG" : "缺图");
+                    m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图");
+                    m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图");
+                    m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 0 ? "NG" : "缺图");
+                    m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 0 ? "NG" : "缺图");
+                    m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 0 ? "NG" : "缺图");
+                    m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 0 ? "NG" : "缺图");
+                    m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 0 ? "NG" : "缺图");
+                    m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 0 ? "NG" : "缺图");
+                    m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 0 ? "NG" : "缺图");
+                    m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 0 ? "NG" : "缺图");
+                    m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 0 ? "NG" : "缺图");
+                    m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 0 ? "NG" : "缺图");
+                    m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图");
+                    m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图");
+                    m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图");
+                    m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 0 ? "NG" : "缺图");
+                    m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 0 ? "NG" : "缺图");
+                    m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 0 ? "NG" : "缺图");
+                    m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 0 ? "NG" : "缺图");
+                    m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 0 ? "NG" : "缺图");
+                    m.CCDResult22 = m.CCD_Data[i, 21] == 9 ? "OK" : (m.CCD_Data[i, 21] == 1 ? "NG" : "缺图"); //总结果
+                    m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 0 ? "NG" : "缺图");
+                    m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 0 ? "NG" : "缺图");
+                    m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 0 ? "NG" : "缺图");
+                    m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 0 ? "NG" : "缺图");
+                    m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 0 ? "NG" : "缺图");
+                    m.CCD1NgCode = m.CCD_NgNo[i, 0];
+                    m.CCD2NgCode = m.CCD_NgNo[i, 1];
+                    m.CCD3NgCode = m.CCD_NgNo[i, 2];
+                    m.CCD4NgCode = m.CCD_NgNo[i, 3];
+                    m.CCD5NgCode = m.CCD_NgNo[i, 4];
+                    m.CCD6NgCode = m.CCD_NgNo[i, 5];
+                    m.CCD7NgCode = m.CCD_NgNo[i, 6];
+                    m.CCD8NgCode = m.CCD_NgNo[i, 7];
+                    m.CCD9NgCode = m.CCD_NgNo[i, 8];
+                    m.CCD10NgCode = m.CCD_NgNo[i, 9];
+                    m.CCD11NgCode = m.CCD_NgNo[i, 10];
+                    m.CCD12NgCode = m.CCD_NgNo[i, 11];
+                    m.CCD13NgCode = m.CCD_NgNo[i, 12];
+                    m.CCD14NgCode = m.CCD_NgNo[i, 13];
+                    m.CCD15NgCode = m.CCD_NgNo[i, 14];
+                    m.CCD16NgCode = m.CCD_NgNo[i, 15];
+                    m.CCD17NgCode = m.CCD_NgNo[i, 16];
+                    m.CCD18NgCode = m.CCD_NgNo[i, 17];
+                    m.CCD19NgCode = m.CCD_NgNo[i, 18];
+                    m.CCD20NgCode = m.CCD_NgNo[i, 19];
+                    m.CCD21NgCode = m.CCD_NgNo[i, 20];
+                    m.CCD22NgCode = m.CCD_NgNo[i, 21];
+                    m.CCD23NgCode = m.CCD_NgNo[i, 22];
+                    m.CCD24NgCode = m.CCD_NgNo[i, 23];
+                    m.CCD25NgCode = m.CCD_NgNo[i, 24];
+                    m.CCD26NgCode = m.CCD_NgNo[i, 25];
+                    m.CCD27NgCode = m.CCD_NgNo[i, 26];
+                    #endregion
+
+                    m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    m.CSBYHPROCESSNAME = "外观检测";
+                    m.CSBYHSCHEDULE = CommonMethods.strClass;
+                    m.CSBYHINSTATIONTIME = m.ScanTime[0];
+                    m.CSBYHOUTSTATIONTIME = m.ScanTime[1];
+                    m.MaterialCode = CommonMethods.mesConfig.MaterialCode;
+                    //m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]);
+                    //m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]);
+                    //m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]);
+                    m.ChannelNo = i + 1;
+                    { //此处预留
+                        m.out_battery_grade = "";//出入站条码等级
+                        m.in_battery_grade = "";
+                        m.appearance_standard = "";
+                    }
+                    //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置，
+                    //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折
+                    if (Code_NG == 1)
+                    {
+                        for (int ii = 0; ii < 16; ii++)
                         {
-                            m.CCD_Data[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
+                            if (m.CCD_Data[i, ii] != 1)
-                        }
-                        //3400
-                        m.Thickness1 = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2, DataFormat.CDAB).ToString();
-                        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++)
-                        //{
-                        //    m.Thickness_Data[i, j] = FloatLib.GetFloatFromByteArray(bArrays.Content, 400 + i * 30 * 2 + j * 4, DataFormat.CDAB);
-                        //}
-                        ////厚度plc 3500
-                        //for (int j = 0; j < 3; j++)
-                        //{
-                        //    m.Thickness_PLCData[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 500 + i * 30 * 2 + j * 2, DataFormat.CDAB);
-                        //}
-                        //不良ng编号4300
-                        //for (int j = 0; j < 20; j++)
-                        //{
-                        //    m.CCD_NgNo[i, j] = ShortLib.GetShortFromByteArray(bArrays.Content, 2200 + i * 30 * 2 + j * 2, DataFormat.CDAB);
-                        //}
-                        for (int j = 0; j < 20; j++)
-                        {
-                            m.CCD_NgNo[i, j] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, (7800 * 2 + j * 40 * 2 + i * 2 * 1000), 20 * 2, System.Text.Encoding.ASCII).
-                             Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim();
-                            //ShortLib.GetShortFromByteArray(bArrays.Content, 6800 *2 +  j  * 2, DataFormat.CDAB);
-                        }
-
-                        //芯包扫码时间
-                        //m.ScanTime[i] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");                       
-                        m.BarCode = listBarCode[i];
-                        //m.CSBYHCODEA = "TEST";
-                        #region 极限件查询
-                        //var EX = CommonMethods.db.QuerySqlList<Challenge>(CommonMethods.dBSQL.GetChallengeCode(m.BarCode));
-                        //for (int j = 0; j < EX.Count; j++)
-                        //{
-                        //    if (string.Compare(EX[j].ChallengeBarCode, m.BarCode) == 0)
-                        //    {
-                        //        m.Remark += "(极限件," + EX[j].CodeMessage + "," + EX[j].WeldingCCD + ")";
-                        //        ChallengeFlag = 1;
-                        //    }
-                        //}
-                        #endregion
-                        //查询进站时间数据
-                        var w = CommonMethods.db.QuerySqlList<AGearEntity>(CommonMethods.dBSQL.GetInTime(m.BarCode));
-                        //获取新一行数据
-                        if (w.Count > 0)
-                            TT = w[w.Count - 1];
-                        //
-                        //if (w.Count > 0)
-                        //    TT = w[0];
-                        if (TT.TestTime != null)
-                            m.ScanTime[0] = TT.TestTime;
-                        else
-                            m.ScanTime[0] = "";
-                        //芯包出站时间
-                        m.ScanTime[1] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-
-                        //复投次数
-                        m.RethrowNum = 0;
-                        if (w.Count > 0)
-                        {
-                            int cccc = w.Count;
-                            m.RethrowNum = cccc - 1;
-                        }
-
-                        int Code_NG = 0;//条码有无标志 1为有，2为无
-                        //判断有无条码
-                        if (m.BarCode != null && m.BarCode != "" && m.BarCode != "ERROR")
-                            Code_NG = 1;
-                        else
-                            Code_NG = 2;
-
-                        //m.ChannelNo = m.MyNo[i];
-                        //m.TestTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-
-                        //不良代码判定
-                        //List<string> NGcodeList = new List<string>();
-                        //NGcodeList = NGcode(m.list_Data1[i, 10], m.list_Data1[i, 11], m.list_Data1[i, 12], m.list_Data1[i, 15], m.list_Data1[i, 26], m.list_Data1[i, 16]
-                        //    , m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], m.list_Data1[i, 23], m.list_Data1[i, 24], m.list_Data1[i, 25], m.list_Data1[i, 27]);
-                        // var (NGcodeList, NGmessage) = NGWGJcode(m.CCD_Data, i);
-
-                        //电芯CCD判定结果
-                        #region //电芯CCD判定结果 1 0K 0NG 2缺图
-                        m.CCD1 = m.CCD_Data[i, 0];
-                        m.CCD2 = m.CCD_Data[i, 1];
-                        m.CCD3 = m.CCD_Data[i, 2];
-                        m.CCD4 = m.CCD_Data[i, 3];
-                        m.CCD5 = m.CCD_Data[i, 4];
-                        m.CCD6 = m.CCD_Data[i, 5];
-                        m.CCD7 = m.CCD_Data[i, 6];
-                        m.CCD8 = m.CCD_Data[i, 7];
-                        m.CCD9 = m.CCD_Data[i, 8];
-                        m.CCD10 = m.CCD_Data[i, 9];
-                        m.CCD11 = m.CCD_Data[i, 10];
-                        m.CCD12 = m.CCD_Data[i, 11];
-                        m.CCD13 = m.CCD_Data[i, 12];
-                        m.CCD14 = m.CCD_Data[i, 13];
-                        m.CCD15 = m.CCD_Data[i, 14];
-                        m.CCD16 = m.CCD_Data[i, 15];
-                        m.CCD17 = m.CCD_Data[i, 16];
-                        m.CCD18 = m.CCD_Data[i, 17];
-                        m.CCD19 = m.CCD_Data[i, 18];
-                        m.CCD20 = m.CCD_Data[i, 19];
-                        m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 0 ? "NG" : "缺图");
-                        m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 0 ? "NG" : "缺图");
-                        m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 0 ? "NG" : "缺图");
-                        m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 0 ? "NG" : "缺图");
-                        m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 0 ? "NG" : "缺图");
-                        m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 0 ? "NG" : "缺图");
-                        m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 0 ? "NG" : "缺图");
-                        m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 0 ? "NG" : "缺图");
-                        m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 0 ? "NG" : "缺图");
-                        m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 0 ? "NG" : "缺图");
-                        m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 0 ? "NG" : "缺图");
-                        m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 0 ? "NG" : "缺图");
-                        m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 0 ? "NG" : "缺图");
-                        m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 0 ? "NG" : "缺图");
-                        m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 0 ? "NG" : "缺图");
-                        m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 0 ? "NG" : "缺图");
-                        m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 0 ? "NG" : "缺图");
-                        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" : "缺图");
-                        #endregion
-                        
-                        m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        m.CSBYHPROCESSNAME = "外观检测";
-                        m.CSBYHSCHEDULE = CommonMethods.strClass;
-                        m.CSBYHINSTATIONTIME = m.ScanTime[0];                        
-                        m.CSBYHOUTSTATIONTIME = m.ScanTime[1];
-                        m.MaterialCode = CommonMethods.mesConfig.MaterialCode;
-                        //m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]);
-                        //m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]);
-                        //m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]);
-                        m.ChannelNo = i + 1;
-                        { //此处预留
-                            m.out_battery_grade = "";//出入站条码等级
-                            m.in_battery_grade = "";
-                            m.appearance_standard = "";
-                        }
-                        //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置，
-                        //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折
-                        if (Code_NG == 1)
-                        {
-                            for (int ii = 0; ii < 16; ii++)
                             {
-                                if (m.CCD_Data[i, ii] != 1)
+                                //1OK，2扫码NG，3MES反馈NG，4其他NG
-                                {
+                                MyRes[i] = 4;
-                                    //1OK，2扫码NG，3MES反馈NG，4其他NG
+                                break;
-                                    MyRes[i] = 4;
-                                    break;
-                                }
-
                             }
+
                         }
-                        else
+                    }
-                            MyRes[i] = 2;//扫码NG
+                    else
-                        var judementResult = JudgmentWGJResult(1, m.CCD_Data, i);
+                        MyRes[i] = 2;//扫码NG
-                        MyRes[i] = judementResult.Item1;
+                    var judementResult = JudgmentWGJResult(1, m.CCD_Data, i);
-                        OK_NG = judementResult.Item2;
+                    MyRes[i] = judementResult.Item1;
-                        NG_Type = judementResult.Item3;
+                    OK_NG = judementResult.Item2;
-                        m.Result = MyRes[i];
+                    NG_Type = judementResult.Item3;
+                    m.Result = MyRes[i];
 
-                        m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG;
+                    m.CSBYHOUTSTATIONJUDGMENTRESULT = m.judgment_result[i] = OK_NG;
 
-                        m.Remark += NG_Type;
+                    m.Remark += NG_Type;
-                        NG_Type = "";//清除上一次不良字符串
+                    NG_Type = "";//清除上一次不良字符串
-                        OK_NG = ""; //清除上一次结果
+                    OK_NG = ""; //清除上一次结果
 
-                        list.Add(m);
+                    list.Add(m);
 
-                        string ur2 = CommonMethods.mesConfig.ResultProcessParamMesUrl;
+                    string ur2 = CommonMethods.mesConfig.ResultProcessParamMesUrl;
-                        string siteCode1 = CommonMethods.mesConfig.siteCode;
+                    string siteCode1 = CommonMethods.mesConfig.siteCode;
-                        string lineCode1 = CommonMethods.mesConfig.lineCode;
+                    string lineCode1 = CommonMethods.mesConfig.lineCode;
-                        string equipNum1 = CommonMethods.mesConfig.equipNum;
+                    string equipNum1 = CommonMethods.mesConfig.equipNum;
-                        string materialCode1 = CommonMethods.mesConfig.MaterialCode;
+                    string materialCode1 = CommonMethods.mesConfig.MaterialCode;
-                        string userName1 = CommonMethods.mesConfig.mesUserName;
+                    string userName1 = CommonMethods.mesConfig.mesUserName;
-                        MesUploadType unloadType = MesUploadType.DD;
+                    MesUploadType unloadType = MesUploadType.DD;
-                        string Mesage = "";
+                    string Mesage = "";
-                        //加判断无条码不上传mes  1为有条码
+                    //加判断无条码不上传mes  1为有条码
-                        if (Code_NG == 1)
+                    if (Code_NG == 1)
+                    {
+                        string MesMessage = "";
+                        MesResType mesResType = MesResType.C;
+                        if (CommonMethods.mesConfig.isUpMes)
                         {
-                            string MesMessage = "";
+                            string url = CommonMethods.mesConfig.OutStationMesUrl;
-                            MesResType mesResType = MesResType.C;
+                            string siteCode = CommonMethods.mesConfig.siteCode;
-                            if (CommonMethods.mesConfig.isUpMes)
+                            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 = "";
+                            var (NGcodeList, NGmessage) = NGWGJcode(m.CCD_NgNo, i);
+                            bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, m, ref MesMessage, ref mesResType, NGcodeList, NGmessage);
+                            //bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,)
+                            if (MesMessage.Contains("发生一个或多个错误"))
                             {
-                                string url = CommonMethods.mesConfig.OutStationMesUrl;
+                                MesMessage = "上传失败,";
-                                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 = "";
-                                var (NGcodeList, NGmessage) = NGWGJcode(m.CCD_NgNo, i);
-                                bool Res = CommonMethods.hbgMes.OutboundInformations(url, siteCode, lineCode, equipNum, materialCode, userName, m, ref MesMessage, ref mesResType, NGcodeList, NGmessage);
-                                //bool Res = CommonMethods.hbgMes.SingleCellOutStation(url, siteCode, lineCode, equipNum, materialCode, userName, m,)
-                                if (MesMessage.Contains("发生一个或多个错误"))
-                                {
-                                    MesMessage = "上传失败,";
-                                }
-                                else
-                                {
-                                    m.Flag = 1;
-                                }
-                                if (Res)
-                                {
-                                    //MES出站判定结果
-                                    m.Result = MyRes[i];
-                                    ////芯包重量1判定结果
-                                    //if (m.list_Data1[i, 10] == 2) { m.Remark += "芯包重量NG,"; }
-                                    ////芯包侧厚判定结果
-                                    //if (m.list_Data1[i, 11] == 2) { m.Remark += "芯包侧厚NG,"; }
-                                    ////芯包CCD极性检测结果
-                                    //if (m.list_Data1[i, 12] == 2) { m.Remark += "芯包CCD极性检测NG,"; }
-                                    m.Remark += MesMessage;
-                                }
-                                else
-                                {
-                                    switch (mesResType)
-                                    {
-                                        case MesResType.A:// 停线，设备报警停机
-                                            //m.listRes[i] = 10;
-                                           // m.Result = MyRes[i] = 2;
-                                            m.Result = MyRes[i] = 3;
-                                            m.Remark += "MES NG";
-                                            break;
-                                        case MesResType.B://不停机，MEs NG品要排出，要给PLC发NG信号
-                                            //m.listRes[i] = 9;
-                                            // m.Result = MyRes[i] = 2;
-                                            m.Result = MyRes[i] = 3;
-                                            m.Remark += "MES NG";
-                                            break;
-                                        case MesResType.C://可忽略 
-                                            //m.listRes[i] = 1;
-                                            // m.Result = MyRes[i] = 2;
-                                            m.Result = MyRes[i] = 1;
-                                            m.Remark += "MES Alerm OK";
-                                            break;
-                                        case MesResType.D://可忽略 
-                                            //m.listRes[i] = 1;
-                                            // m.Result = MyRes[i] = 2;
-                                            m.Result = MyRes[i] = 1;
-                                            m.Remark += "MES OK";
-                                            break;
-                                        default:
-                                            m.Remark += "MES NG";
-                                            m.Result = MyRes[i] = 3;
-                                            break;
-                                    }
-                                    ////芯包重量1判定结果
-                                    //if (m.list_Data1[i, 10] == 2) { m.Remark += "芯包重量NG,"; }
-                                    ////芯包侧厚判定结果
-                                    //if (m.list_Data1[i, 11] == 2) { m.Remark += "芯包侧厚NG,"; }
-                                    ////芯包CCD极性检测结果
-                                    //if (m.list_Data1[i, 12] == 2) { m.Remark += "芯包CCD极性检测NG,"; }
-                                    m.Remark += MesMessage;
-                                }
-                                //发送产品结果参数给MES
-                                bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage);
-                                list[i].PlcResult = MyRes[i];
-                                #region 排出 5 厚度NG电芯 6 外观NG电芯，
-                                if (list[i].PlcResult != 1)
-                                {
-                                    //厚度不良分档  5 测厚不良 6 外观不良
-                                    if (list[i].CCD19 != 1)
-                                    {
-                                        m.Result = MyRes[i] = 5;
-                                        list[i].Remark += $",测厚度NG";
-                                    }
-                                    else
-                                    {
-                                        //外观不良分档
-                                        m.Result = MyRes[i] = 6;
-                                        list[i].Remark += $",外观检NG不良";
-                                    }
-
-                                }
-                                
-                                #endregion
-
-                                if (m.Flag == 1)
-                                    m.UpState = "已上传";
-                                else
-                                    m.UpState = "未上传";
                             }
                             else
                             {
-                                m.Result = MyRes[i];
+                                m.Flag = 1;
-                                m.Remark += "本地存储";
-                                m.UpState = "未上传";
                             }
-                            if (CommonMethods.sysConfig.OKSwitching)
+                            if (Res)
                             {
-                                //调试发OK
+                                //MES出站判定结果
-                                m.Result = MyRes[i] = 1;
+                                m.Result = MyRes[i];
-                                //m.Result = "OK";
+                                ////芯包重量1判定结果
+                                //if (m.list_Data1[i, 10] == 2) { m.Remark += "芯包重量NG,"; }
+                                ////芯包侧厚判定结果
+                                //if (m.list_Data1[i, 11] == 2) { m.Remark += "芯包侧厚NG,"; }
+                                ////芯包CCD极性检测结果
+                                //if (m.list_Data1[i, 12] == 2) { m.Remark += "芯包CCD极性检测NG,"; }
+                                m.Remark += MesMessage;
                             }
+                            else
+                            {
+                                switch (mesResType)
+                                {
+                                    case MesResType.A:// 停线，设备报警停机
+                                                      //m.listRes[i] = 10;
+                                                      // m.Result = MyRes[i] = 2;
+                                        m.Result = MyRes[i] = 3;
+                                        m.Remark += "MES NG";
+                                        break;
+                                    case MesResType.B://不停机，MEs NG品要排出，要给PLC发NG信号
+                                                      //m.listRes[i] = 9;
+                                                      // m.Result = MyRes[i] = 2;
+                                        m.Result = MyRes[i] = 3;
+                                        m.Remark += "MES NG";
+                                        break;
+                                    case MesResType.C://可忽略 
+                                                      //m.listRes[i] = 1;
+                                                      // m.Result = MyRes[i] = 2;
+                                        m.Result = MyRes[i] = 1;
+                                        m.Remark += "MES Alerm OK";
+                                        break;
+                                    case MesResType.D://可忽略 
+                                                      //m.listRes[i] = 1;
+                                                      // m.Result = MyRes[i] = 2;
+                                        m.Result = MyRes[i] = 1;
+                                        m.Remark += "MES OK";
+                                        break;
+                                    default:
+                                        m.Remark += "MES NG";
+                                        m.Result = MyRes[i] = 3;
+                                        break;
+                                }
+                                ////芯包重量1判定结果
+                                //if (m.list_Data1[i, 10] == 2) { m.Remark += "芯包重量NG,"; }
+                                ////芯包侧厚判定结果
+                                //if (m.list_Data1[i, 11] == 2) { m.Remark += "芯包侧厚NG,"; }
+                                ////芯包CCD极性检测结果
+                                //if (m.list_Data1[i, 12] == 2) { m.Remark += "芯包CCD极性检测NG,"; }
+                                m.Remark += MesMessage;
+                            }
+                            //发送产品结果参数给MES
+                            bool Res1 = CommonMethods.hbgMes.ProducResultParam(ur2, siteCode1, lineCode1, equipNum1, materialCode1, userName1, m, unloadType, ref Mesage);
+                            list[i].PlcResult = MyRes[i];
+                            #region 排出 5 厚度NG电芯 6 外观NG电芯，
+                            if (list[i].PlcResult != 1)
+                            {
+                                //厚度不良分档  5 测厚不良 6 外观不良
+                                if (list[i].CCD19 != 1)
+                                {
+                                    m.Result = MyRes[i] = 5;
+                                    list[i].Remark += $",测厚度NG";
+                                }
+                                else
+                                {
+                                    //外观不良分档
+                                    m.Result = MyRes[i] = 6;
+                                    list[i].Remark += $",外观检NG不良";
+                                }
+
+                            }
+
+                            #endregion
+
+                            if (m.Flag == 1)
+                                m.UpState = "已上传";
+                            else
+                                m.UpState = "未上传";
                         }
                         else
                         {
-                            m.Result = MyRes[i] = 2;
+                            m.Result = MyRes[i];
                             m.Remark += "本地存储";
-                            ////芯包重量1判定结果
-                            //if (m.list_Data1[i, 10] == 2) { m.Remark += ",芯包重量NG"; }
-                            ////芯包侧厚判定结果
-                            //if (m.list_Data1[i, 11] == 2) { m.Remark += ",芯包侧厚NG"; }
-                            ////芯包CCD极性检测结果
-                            //if (m.list_Data1[i, 12] == 2) { m.Remark += ",芯包CCD极性检测NG"; }
                             m.UpState = "未上传";
                         }
-                        #region//极限件发3给PLC
+                        if (CommonMethods.sysConfig.OKSwitching)
-                        //if (ChallengeFlag == 1)
+                        {
-                        //{
+                            //调试发OK
-                        //    if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊前ccd") == 0)
+                            m.Result = MyRes[i] = 1;
-                        //    {
+                            //m.Result = "OK";
-                        //        MyRes[i] = 3;
+                        }
-                        //    }
-                        //    if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊后ccd") == 0)
-                        //    {
-                        //        MyRes[i] = 4;
-                        //    }
-                        //}
-                        #endregion
                     }
-                    catch (Exception ex)
+                    else
                     {
-                        LoggerHelp.WriteLog($"外观检测出站线程数据解析：{ex}", "SysErrorLog");
+                        m.Result = MyRes[i] = 2;
+                        m.Remark += "本地存储";
+                        ////芯包重量1判定结果
+                        //if (m.list_Data1[i, 10] == 2) { m.Remark += ",芯包重量NG"; }
+                        ////芯包侧厚判定结果
+                        //if (m.list_Data1[i, 11] == 2) { m.Remark += ",芯包侧厚NG"; }
+                        ////芯包CCD极性检测结果
+                        //if (m.list_Data1[i, 12] == 2) { m.Remark += ",芯包CCD极性检测NG"; }
+                        m.UpState = "未上传";
                     }
-                }
+                    #region//极限件发3给PLC
-
+                    //if (ChallengeFlag == 1)
-                #endregion
-                JYResult result1 = null;
-                JYResult result2 = null;
-                JYResult result3 = null;
-                if (pf.IsFeedbackPlc)
-                {
-                    //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
-                   // if (CommonMethods.sysConfig.OKSwitching)
-                    {
-                        //调试发OK
-                        //MyRes[0] = 1;
-                        //MyRes[1] = 1;
-                        Thread.Sleep(500);
-                        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
-                        result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[4].VarAddress, MyRes[2], Data_Type.Short);//判断结果写入PLC
-                    }
-                    //else
                     //{
-                    //    //将mes反馈的结果发给PLC
+                    //    if (string.Compare(EX[0].WeldingCCD, "焊前CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊前ccd") == 0)
-                    //    Thread.Sleep(500);
+                    //    {
-                    //    result1 = CommonMethods.PlcLink.WriteValue(pf.VarList[2].VarAddress, MyRes[0], Data_Type.Short);//判断结果写入PLC
+                    //        MyRes[i] = 3;
-                    //    result2 = CommonMethods.PlcLink.WriteValue(pf.VarList[3].VarAddress, MyRes[1], Data_Type.Short);//判断结果写入PLC
+                    //    }
+                    //    if (string.Compare(EX[0].WeldingCCD, "焊后CCD") == 0 || string.Compare(EX[0].WeldingCCD, "焊后ccd") == 0)
+                    //    {
+                    //        MyRes[i] = 4;
+                    //    }
                     //}
+                    #endregion
                 }
-                JYResult result4 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0
+                catch (Exception ex)
-                CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}");
-                LoggerHelp.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}");
-
-                Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); });
-                //数据存储 - 异步处理
-                Task.Run(() =>
                 {
-                    SaveBlankingData(list);
+                    LoggerHelp.WriteLog($"外观检测出站线程数据解析：{ex}", "SysErrorLog");
-                });
+                }
-
-                sw2.Stop();
-                ////输出下料数据处理耗时：
-                CommonMethods.AddDataMonitorLog(0, $"外观检测出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
             }
+
+            #endregion
+            JYResult result1 = null;
+            JYResult result2 = null;
+            JYResult result3 = null;
+            if (pf.IsFeedbackPlc)
+            {
+                //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
+                // if (CommonMethods.sysConfig.OKSwitching)
+                {
+                    //调试发OK
+                    //MyRes[0] = 1;
+                    //MyRes[1] = 1;
+                    Thread.Sleep(500);
+                    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
+                    result3 = CommonMethods.PlcLink.WriteValue(pf.VarList[4].VarAddress, MyRes[2], Data_Type.Short);//判断结果写入PLC
+                }
+                //else
+                //{
+                //    //将mes反馈的结果发给PLC
+                //    Thread.Sleep(500);
+                //    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 result4 = CommonMethods.PlcLink.WriteValue(pf.VarList[0].VarAddress, 0);//置位0
+            CommonMethods.AddDataMonitorLog(0, $"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}");
+            LoggerHelp.WriteLog($"发送信息给PLC:{result1.IsSuccess},{MyRes[0]},{MyRes[1]},{MyRes[2]}");
+
+            Task.Run(() => { SendDateMQTT.Instance.EnterandExitSendMessge(1); });
+            //数据存储 - 异步处理
+            Task.Run(() =>
+            {
+                SaveBlankingData(list);
+            });
+
+            sw2.Stop();
+            ////输出下料数据处理耗时：
+            CommonMethods.AddDataMonitorLog(0, $"外观检测出站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
+            LoggerHelp.WriteInfo($"外观检测进站共耗时：{sw2.Elapsed.TotalMilliseconds}ms");
         }
         /// <summary>
         /// 电池结果判断
@@ -2278,8 +2341,6 @@ namespace JinYuan.ControlCenters
         }
         #endregion
 
-        #endregion
-
         #region 创建空的数组List
         public List<T> GetList<T>(int num, T data)
         {

JinYuan.ControlCenter/MES/MESDataCombin.cs

@@ -108,6 +108,52 @@ namespace JinYuan.ControlCenters
 
         #endregion
 
+        #region 11、安全装置状态
+        /// <summary>
+        /// 安全装置状态
+        /// </summary>
+        /// <param name="strStatus"></param>
+        /// <returns></returns>
+        public static string SafeEqptAlarm(string StartDate, List<SafeEqptCode> safeEqptCodeLists = null)
+        {
+            var nowTime = DateTime.Now;
+            string resJson = "";
+            string josnTxtMsg = string.Empty;
+            string Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
+            try
+            {
+                //SafeEqptStatusParam statusParam = new SafeEqptStatusParam();
+                //statusParam.siteCode = CommonMethods.mesConfig.siteCode;
+                //statusParam.lineCode = CommonMethods.mesConfig.lineCode;
+                //statusParam.equipNum = CommonMethods.mesConfig.equipNum;
+                //statusParam.userName = CommonMethods.mesConfig.mesUserName;
+                //statusParam.seatId = "";
+                //statusParam.recordDate = StartDate;
+                //statusParam.uploadTime = Date;
+                //statusParam.safeEqptCodeList = safeEqptCodeLists;
+                //string SendJosn = JsonConvert.SerializeObject(statusParam);
 
+                var sw = new Stopwatch();
+                
+                for (int i = 0; i < safeEqptCodeLists.Count; i++)
+                {
+                    string SendJosn = JsonConvert.SerializeObject(safeEqptCodeLists[i]);
+                    sw.Start();
+                    resJson = MESApiHelper.HttpPostJsonAPI(CommonMethods.mesConfig.SafeEqptStatusMesUrl, SendJosn);
+                    sw.Stop();
+                    josnTxtMsg = $"{nowTime.ToString("yyyy-MM-dd HH:mm:ss.fff")}:调用MES安全设备运行状态接口:{CommonMethods.mesConfig.SafeEqptStatusMesUrl},请求数据为:{SendJosn},\n{nowTime.AddMilliseconds(sw.ElapsedMilliseconds).ToString("yyyy-MM-dd HH:mm:ss.fff")}:接口耗时:{sw.ElapsedMilliseconds}ms,返回结果:{resJson}";
+                    TxtHelper.WriteTxt($@"{CommonMethods.strMesLogspath}\{nowTime.ToString("yyyyMMdd")}\设备运行状态\{nowTime.ToString("HH")}.txt", josnTxtMsg);
+                }
+                
+                
+            }
+            catch (Exception ex)
+            {
+                LoggerHelp.WriteEX("调用MES安全设备运行状态接口", ex);
+            }
+            return resJson;
+        }
+
+        #endregion
     }
 }

JinYuan.DAL/SQLSugarService.cs

@@ -1399,8 +1399,6 @@ namespace JinYuan.DAL
 
         #endregion
 
-
-
         #region 私有方法
 
         /// <summary>

JinYuan.Helper/JinYuan.Helper.csproj.user

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-  </PropertyGroup>
-</Project>

JinYuan.MES/MesDataProcess.cs

@@ -1233,7 +1233,8 @@ namespace JinYuan.MES
                     datavolist.Add(new TagDataVOListItem()
                     {
                         tagCode = keys[0],
-                        tagValue = temp == null ? "0" : temp.ToString(),//m
+                        //tagValue = temp == null ? "0" : temp.ToString(),//m
+                        tagValue = temp == null ? "0" : (temp.ToString()=="OK"?"1":"0"),//m
                         tagTime = DateTime.Now.ToString(),
                         tagCalculateResult = "Y",
                         tagRemark = keys[2]
@@ -1306,7 +1307,7 @@ namespace JinYuan.MES
                 // 生产型号
                 datavolist.Add(new TagDataVOListItem()
                 {
-                    tagCode = "product_model",
+                    tagCode = "PRODUCTION_MODEL_WGJC",
                     tagValue = payload1.materialCode,
                     tagTime = DateTime.Now.ToString(),
                     tagCalculateResult = "",
@@ -1686,7 +1687,12 @@ namespace JinYuan.MES
                 {
                     if (res1.category == null)
                     {
-                        mesResType = MesResType.B;
+                        if (res1.code== "EVEDL_PM_0406")
+                        {
+                            mesResType = MesResType.C;
+                        }
+                        else
+                            mesResType = MesResType.B;
                         MesMessage = res1.message;
                     }
                     else

JinYuan.MES/Models/EqpStatusParam.cs

@@ -60,4 +60,63 @@ namespace JinYuan.MES.Models
         /// </summary>
         public string faultCode { get; set; }
     }
+
+
+    public class SafeEqptStatusParam
+    {
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        public string siteCode { get; set; }
+        /// <summary>
+        ///  产线编号
+        /// </summary>
+        public string lineCode { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string equipNum { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string materialCode { get; set; }
+        /// <summary>
+        /// 员工账号
+        /// </summary>
+        public string userName { get; set; }
+        /// <summary>
+        /// 库位ID
+        /// </summary>
+        public string seatId { get; set; }
+        /// <summary>
+        /// 采集时间
+        /// </summary>
+        public string recordDate { get; set; }
+        /// <summary>
+        ///  设备状态 。Run：（正常运行）、Alert：（故障调试）、Idle：（闲置待机）、Maintain（停止运行）
+        /// </summary>
+        public string statusCode { get; set; }
+        /// <summary>
+        /// 状态变更时间
+        /// </summary>
+        public string uploadTime { get; set; }
+        /// <summary>
+        /// 唯一标识符号
+        /// </summary>
+        public string guid { get; set; }
+        public List<SafeEqptCode> safeEqptCodeList { get; set; }
+    }
+
+    public class SafeEqptCode
+    {
+        /// <summary>
+        /// 安全装置编码
+        /// </summary>
+        public string equipNum { get; set; }
+        /// <summary>
+        /// 设备状态
+        /// </summary>
+        public string status { get; set; }
+
+    }
 }

JinYuan.Models/Alarm/AlarmData.cs

@@ -1,11 +1,12 @@
 using CsvHelper.Configuration.Attributes;
+using System;
 
 namespace JinYuan.Models
 {
     /// <summary>
     /// 工位报警数据
     /// </summary>
-    public class AlarmData
+    public class AlarmData : ICloneable
     {
         /// <summary>
         /// 报警唯一标识符
@@ -56,6 +57,21 @@ namespace JinYuan.Models
         /// 更新状态
         /// </summary>
         public int Flag { get; set; }
+        public object Clone()
+        {
+            return new AlarmData() {
+                AlarmGuid = this.AlarmGuid,
+                PLCAdress = this.PLCAdress,
+                AlarmContent = this.AlarmContent,
+                AlarmCode = this.AlarmCode,
+                AlarmType = this.AlarmType,
+                StartTime = this.StartTime,
+                EndTime = this.EndTime,
+                AlarmDesc = this.AlarmDesc,
+                AlarmState = this.AlarmState,
+                Flag = this.Flag
+            };
+        }
     }
 
     public class AlarmCSVData

JinYuan.Models/BGearEntity.cs

@@ -20,8 +20,8 @@ namespace JinYuan.Models
 
         public short[,] list_pan = new short[3, 1];//物流线托盘码
         //
-        public int[,] CCD_Data = new int[3, 20];//芯包CCD信息1,2,3
+        public int[,] CCD_Data = new int[3, 27];//芯包CCD信息1,2,3
-        public string[,] CCD_NgNo = new string[3, 20];//芯包不良编码信息1,2,3
+        public string[,] CCD_NgNo = new string[3, 27];//芯包不良编码信息1,2,3
        // public float[,] Thickness_Data = new float[3, 3];//电芯3_厚度数据信息1,2,3
        // public int[,] Thickness_PLCData = new int[3, 3];//电芯3_厚度数据OKNG1,2,3 与ccd一样 1 OK，0 NG，2 缺图
         /// <summary>
@@ -71,7 +71,44 @@ namespace JinYuan.Models
         public int CCD18 { get; set; }
         public int CCD19 { get; set; }
         public int CCD20 { get; set; }
-      
+        public int CCD21 { get; set; }
+        public int CCD22 { get; set; }
+        public int CCD23 { get; set; }
+        public int CCD24 { get; set; }
+        public int CCD25 { get; set; }
+        public int CCD26 { get; set; }
+        public int CCD27 { get; set; }
+        public string CCD1NgCode { get; set; }
+        public string CCD2NgCode { get; set; }
+        public string CCD3NgCode { get; set; }
+        public string CCD4NgCode { get; set; }
+        public string CCD5NgCode { get; set; }
+        public string CCD6NgCode { get; set; }
+        public string CCD7NgCode { get; set; }
+        public string CCD8NgCode { get; set; }
+        public string CCD9NgCode { get; set; }
+        public string CCD10NgCode { get; set; }
+        public string CCD11NgCode { get; set; }
+        public string CCD12NgCode { get; set; }
+        public string CCD13NgCode { get; set; }
+        public string CCD14NgCode { get; set; }
+        public string CCD15NgCode { get; set; }
+        public string CCD16NgCode { get; set; }
+        public string CCD17NgCode { get; set; }
+        /// <summary>
+        /// 二维码ng 不良编号
+        /// </summary>
+        public string CCD18NgCode { get; set; }
+        public string CCD19NgCode { get; set; }
+        public string CCD20NgCode { get; set; }
+        public string CCD21NgCode { get; set; }
+        public string CCD22NgCode { get; set; }
+        public string CCD23NgCode { get; set; }
+        public string CCD24NgCode { get; set; }
+        public string CCD25NgCode { get; set; }
+        public string CCD26NgCode { get; set; }
+        public string CCD27NgCode { get; set; }
+        /// <summary>
         /// <summary>
         /// 电芯1_厚度数据1
         /// </summary>
@@ -121,7 +158,33 @@ namespace JinYuan.Models
         public string CCDResult18 { get; set; }
         public string CCDResult19 { get; set; }
         public string CCDResult20 { get; set; }
+        public string CCDResult21 { get; set; }
+        public string CCDResult22 { get; set; }
+        public string CCDResult23 { get; set; }
+        public string CCDResult24 { get; set; }
+        public string CCDResult25 { get; set; }
+        public string CCDResult26 { get; set; }
+        public string CCDResult27 { get; set; }
 
+        /// <summary>
+        /// 二维码宽度
+        /// </summary>
+        public string QrCodeWidth { get; set; }
+
+        /// <summary>
+        /// 二维码高度
+        /// </summary>
+        public string QrCodeHeight { get; set; }
+
+        /// <summary>
+        /// 二维码上端间距
+        /// </summary>
+        public string QrCodeTopMargin { get; set; }
+
+        /// <summary>
+        /// 二维码左端间距
+        /// </summary>
+        public string QrCodeLeftMargin { get; set; }
 
         /// <summary>
         /// 芯包条码
@@ -191,6 +254,8 @@ namespace JinYuan.Models
         public string SM_cutting_frequency { get; set; }
         public string SM_cutting_speed { get; set; }
         public string SM_dust_removal_wind_speed { get; set; }
+        public string barcode_match_result { get; set; }
+        public string ng_code_summary { get; set; }
        
     }
 }

JinYuan.VirtualDataLibrary/DBSQL.cs

@@ -118,32 +118,36 @@ namespace JinYuan.VirtualDataLibrary
                     strSql = @"SELECT CONVERT(varchar,[CSBYHASCANNINGTIME], 120) 时间 
                         ,[CSBYHPROCESSNAME] 工序名
                         ,[CSBYHSCHEDULE] 班次
-                        ,[CSBYHCODEA] 电芯码
+                        ,[BarCode] 电芯码
                         ,[CSBYHOUTSTATIONJUDGMENTRESULT] 出站判定结果
                         ,[Remark] 备注
                         ,[RethrowNum] 复投次数
-                        ,[CCDResult1] 电芯CCD1结果 
+                        ,[CCDResult1] 正面
-                        ,[CCDResult2] 电芯CCD2结果 
+                        ,[CCDResult2] 反面
-                        ,[CCDResult3] 电芯CCD3结果 
+                        ,[CCDResult3] 左侧面
-                        ,[CCDResult4] 电芯CCD4结果
+                        ,[CCDResult4] 右侧面
-                        ,[CCDResult5] 电芯CCD5结果 
+                        ,[CCDResult5] 顶面
-                        ,[CCDResult6] 电芯CCD6结果
+                        ,[CCDResult6] 底面
-                        ,[CCDResult7] 电芯CCD7结果
+                        ,[CCDResult7] 底DE1
-                        ,[CCDResult8] 电芯CCD8结果
+                        ,[CCDResult8] 底DE2
-                        ,[CCDResult9] 电芯CCD9结果
+                        ,[CCDResult9] 底DE3
-                        ,[CCDResult10] 电芯CCD10结果
+                        ,[CCDResult10] 底DE4
-                        ,[CCDResult11] 电芯CCD11结果
+                        ,[CCDResult11] 中ME1
-                        ,[CCDResult12] 电芯CCD12结果
+                        ,[CCDResult12] 中ME2
-                        ,[CCDResult13] 电芯CCD13结果
+                        ,[CCDResult13] 中ME3
-                        ,[CCDResult14] 电芯CCD14结果
+                        ,[CCDResult14] 中ME4
-                        ,[CCDResult15] 电芯CCD15结果
+                        ,[CCDResult15] 正极柱
-                        ,[CCDResult16] 电芯CCD16结果
+                        ,[CCDResult16] 负极柱
-                        ,[CCDResult17] 电芯CCD17结果
+                        ,[CCDResult17] 防爆阀
-                        ,[CCDResult18] 电芯CCD18结果 
+                        ,[CCDResult18] 二维码
-                        ,[CCDResult19] 电芯CCD19结果 
+                        ,[CCDResult19] 厚度
-                        ,[CCDResult20] 电芯CCD20结果
+                        ,[CCDResult20] 平面度
+                        ,[QrCodeWidth] 二维码宽度
+                        ,[QrCodeHeight] 二维码高度
+                        ,[QrCodeTopMargin] 二维码上端间距
+                        ,[QrCodeLeftMargin] 二维码左端间距
                         ,[CCDResult21] 电芯CCD21结果 
-                        ,[CCDResult22] 电芯CCD22结果
+                        ,[CCDResult22] 外观检测总结果
                         ,[CCDResult23] 电芯CCD23结果
                         ,[CCDResult24] 电芯CCD24结果
                         ,[CCDResult25] 电芯CCD25结果
@@ -219,12 +223,12 @@ namespace JinYuan.VirtualDataLibrary
         public string GetStaticByDay(string startDateTime, string endDateTime)
         {
             string strSql = $@" SELECT CONVERT(varchar(13),TestTime,120) 时间, ProdIn 总数, ProdOut OK总数,Ppm PPM均值,
-                                cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
+                                cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
                                 cast(case when ProdIn>0 then (ROUND(cast(isnull(ProdOut,0) as float)/cast(isnull(ProdIn,0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
                                 FROM Hourprod WHERE TestTime BETWEEN  '{startDateTime}' AND '{endDateTime}' GROUP BY TestTime,ProdOut,ProdIn,Ppm,JiaDL
                                 UNION ALL
                                 SELECT '合计' as '时间', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT FDate,sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(PPM) Ppm,
-                                 cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL, 
+                                 cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL, 
                                 cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率  FROM Hourprod
                                 WHERE TestTime BETWEEN   '{startDateTime}' AND '{endDateTime}' GROUP BY FDate) as t ";
 
@@ -240,12 +244,12 @@ namespace JinYuan.VirtualDataLibrary
         public string GetStaticByWeek(string startDateTime, string endDateTime)
         {
             string strSql = $@" SELECT convert(char(10), TestTime, 120) 月份, sum(ProdIn) 总数, sum(ProdOut) OK总数,AVG(Ppm) PPM均值,
-                                cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
+                                cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
                                 cast(case when sum(ProdIn)>0 then (ROUND(cast(isnull(SUM(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
                                 FROM Hourprod WHERE TestTime BETWEEN  '{startDateTime}' AND '{endDateTime}' GROUP BY convert(char(10), TestTime, 120),JiaDL
                                 UNION ALL
                                 SELECT '合计' as '月份', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(Ppm) Ppm,
-                                cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL, 
+                                cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL, 
                                 cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10))+'%' 优率  FROM Hourprod
                                 WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}') as t ";
             return strSql;
@@ -261,12 +265,12 @@ namespace JinYuan.VirtualDataLibrary
         public string GetStaticByMonth(string startDateTime, string endDateTime)
         {
             string strSql = $@" SELECT convert(char(7), TestTime, 120) 月份, sum(ProdIn) 总数, sum(ProdOut) OK总数,AVG(Ppm) PPM均值,
-                                cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
+                                cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
                                 cast(case when sum(ProdIn)>0 then (ROUND(cast(isnull(SUM(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
                                 FROM Hourprod WHERE TestTime BETWEEN  '{startDateTime}' AND '{endDateTime}' GROUP BY convert(char(7), TestTime, 120),JiaDL
                                 UNION ALL
                                 SELECT '合计' as '月份', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(Ppm) Ppm,
-                                cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL, 
+                                cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL, 
                                 cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10))+'%' 优率  FROM Hourprod
                                 WHERE TestTime BETWEEN '{startDateTime}' AND '{endDateTime}') as t ";
             return strSql;
@@ -298,12 +302,12 @@ namespace JinYuan.VirtualDataLibrary
             }
 
             string strsql = $@" SELECT CONVERT(varchar(13),TestTime,120) 时间, ProdIn 总数, ProdOut OK总数,Ppm PPM均值,
-                                cast(ROUND(JiaDL*100,1)as nvarchar(10))+'%' 稼动率均值,
+                                cast(ROUND(JiaDL*100,1)as nvarchar(20))+'%' 稼动率均值,
                                 cast(case when ProdIn>0 then (ROUND(cast(isnull(ProdOut,0) as float)/cast(isnull(ProdIn,0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率
                                 FROM Hourprod WHERE TestTime BETWEEN  '{sDateTime1}' AND '{sDateTime2}' GROUP BY TestTime,ProdOut,ProdIn,Ppm,JiaDL
                                 UNION ALL
                                 SELECT '合计' as '时间', ProdIn '总数', ProdOut 'OK总数',Ppm 'PPM均值' ,JiaDL '稼动率均值',优率 as '优率' FROM (SELECT FDate,sum(ProdIn) ProdIn, SUM(ProdOut) ProdOut,AVG(Ppm) Ppm,
-                                cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(10))+'%' JiaDL, 
+                                cast(ROUND(AVG(JiaDL)*100,1) as nvarchar(20))+'%' JiaDL, 
                                 cast(case when (sum(ProdIn))>0 then (ROUND(cast(isnull(sum(ProdOut),0) as float)/cast(isnull(sum(ProdIn),0) as float)*100,2)) else 0 end as nvarchar(10) )+'%' 优率  FROM Hourprod
                                 WHERE TestTime BETWEEN  '{sDateTime1}' AND '{sDateTime2}' GROUP BY FDate) as t ";
             return strsql;

JinYuan.VirtualDataLibrary/MesConfig.cs

@@ -189,5 +189,10 @@ namespace JinYuan.VirtualDataLibrary
         /// </summary>
         public string OkNgParamMesUrl = "http://10.17.128.206/core/api/public/eve/pm/eqm/new/grading";
 
+        /// <summary>
+        /// 安全设备运行状态
+        /// </summary>
+        public string SafeEqptStatusMesUrl = "http://10.22.161.62:804/device-status";
+
     }
 }

LargeSquareOne/Config/Configure.ini

@@ -23,22 +23,23 @@ MES/
 白夜班交替时间=20:30:00
 MES日志保存路径=D:\APILog
 存储服务器IP地址=192.168.2.108
-员工权限校验=http://10.22.160.141/core/api/public/equipment/base/user/login/verify
+员工权限校验=http://10.22.160.1/core/api/public/equipment/base/user/login/verify
-设备参数设定值请求=http://10.22.160.141/core/api/public/param/setting/request
+设备参数设定值请求=http://10.22.160.1/core/api/public/param/setting/request
-设备参数设定值变更=http://10.22.160.141/core/api/public/param/setting/change
+设备参数设定值变更=http://10.22.160.1/core/api/public/param/setting/change
-产品进站=http://10.22.160.141/core/api/public/formation/section/arrival/bz
+产品进站=http://10.22.160.2/core/api/public/formation/section/arrival/bz
-产品过程加工参数=http://10.22.160.141/core/api/public/product/process/param/new/process
+产品过程加工参数=http://10.22.160.1/core/api/public/product/process/param/new/process
-产品结果加工参数=http://10.22.160.141/core/api/public/product/process/param/new/result
+产品结果加工参数=http://10.22.160.3/core/api/public/product/process/param/new/result
-产品出站=http://10.22.160.141/core/api/public/eve/pm/formation-section
+产品出站=http://10.22.160.1/core/api/public/eve/pm/formation-section/bz
-设备报警=http://10.22.160.141/core/api/public/equipment/alarm/currency
+设备报警=http://10.22.160.1/core/api/public/equipment/alarm/currency
-设备状态=http://10.22.160.141/core/api/public/eve/pm/eqm/run/status/operation
+设备状态=http://10.22.160.1/core/api/public/eve/pm/eqm/run/status/operation
-能耗=http://10.22.160.141/core/api/public/eve/pm/energy/consumption/collection/submit
+能耗=http://10.22.160.1/core/api/public/eve/pm/energy/consumption/collection/submit
 风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
 风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
-分档参数=http://10.22.160.141/core/api/public/eve/pm/eqm/new/grading
+分档参数=http://10.22.160.1/core/api/public/eve/pm/eqm/new/grading
-guid=a270c7d2-9cbd-4739-9a0b-0709b5813332
+安全设备状态=http://10.22.161.62:804/device-status
-DeviceState=1
+guid=4d38bbab-8d31-4946-8584-524ee6cb1045
-run_AlarmMark=0
+DeviceState=3
+run_AlarmMark=1
 run_IdleMark=0
 
 [统计计数]

LargeSquareOne/Config/Device.ini

@@ -1,4 +1,4 @@
 [设备参数]
-IP地址=127.0.0.1
+IP地址=192.168.1.50
 端口号=9600
 PLC类型=OmronFinsTcp_HSL

LargeSquareOne/FrmAlarmLog.cs

@@ -32,7 +32,6 @@ namespace LargeSquareOne
             }
             else
             {
-
                 int rowCount = this.dgv_Log.Rows.Add();
                 this.dgv_Log.Rows[rowCount].Cells[0].Value = CurrentTime;
                 this.dgv_Log.Rows[rowCount].Cells[1].Value = isError ? "错误" : "信息";

LargeSquareOne/FrmDataMonitor.Designer.cs

@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDataMonitor));
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.groupBoxEX3 = new JinYuan.ControlLib.GroupBoxEX();
@@ -91,6 +91,11 @@
             this.Column112 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column113 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column114 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.平面度 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Col_QrCodeWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Col_QrCodeHeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Col_QrCodeTopMargin = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Col_QrCodeLeftMargin = 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();
@@ -112,7 +117,7 @@
             this.tableLayoutPanel1.ColumnCount = 3;
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.94608F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 75.05392F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 528F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 660F));
             this.tableLayoutPanel1.Controls.Add(this.groupBoxEX3, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.groupBoxEX2, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.groupBoxEX4, 1, 0);
@@ -125,9 +130,9 @@
             this.tableLayoutPanel1.RowCount = 3;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 45.62334F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.37666F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 477F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 596F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 16F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1370, 749);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1942, 1102);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // groupBoxEX3
@@ -146,7 +151,7 @@
             this.groupBoxEX3.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxEX3.Name = "groupBoxEX3";
             this.groupBoxEX3.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxEX3.Size = new System.Drawing.Size(206, 120);
+            this.groupBoxEX3.Size = new System.Drawing.Size(315, 226);
             this.groupBoxEX3.TabIndex = 14;
             this.groupBoxEX3.TabStop = false;
             this.groupBoxEX3.Text = "操作设置";
@@ -155,11 +160,11 @@
             // 
             this.btSatrt.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
             this.btSatrt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btSatrt.Location = new System.Drawing.Point(42, 32);
+            this.btSatrt.Location = new System.Drawing.Point(52, 131);
             this.btSatrt.Margin = new System.Windows.Forms.Padding(2);
             this.btSatrt.Name = "btSatrt";
             this.btSatrt.Padding = new System.Windows.Forms.Padding(2);
-            this.btSatrt.Size = new System.Drawing.Size(67, 28);
+            this.btSatrt.Size = new System.Drawing.Size(84, 35);
             this.btSatrt.TabIndex = 12;
             this.btSatrt.Text = "开始监控";
             this.btSatrt.Click += new System.EventHandler(this.btSatrt_Click);
@@ -169,11 +174,11 @@
             this.txtMaterialCode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
             this.txtMaterialCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtMaterialCode.ForeColor = System.Drawing.Color.White;
-            this.txtMaterialCode.Location = new System.Drawing.Point(110, 56);
+            this.txtMaterialCode.Location = new System.Drawing.Point(138, 70);
             this.txtMaterialCode.Margin = new System.Windows.Forms.Padding(2);
             this.txtMaterialCode.Name = "txtMaterialCode";
             this.txtMaterialCode.ReadOnly = true;
-            this.txtMaterialCode.Size = new System.Drawing.Size(180, 26);
+            this.txtMaterialCode.Size = new System.Drawing.Size(224, 31);
             this.txtMaterialCode.TabIndex = 0;
             // 
             // cmbModelType
@@ -183,10 +188,10 @@
             this.cmbModelType.ContentItemsStyle.ItemBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
             this.cmbModelType.DropDownButton.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
             this.cmbModelType.DropDownButton.DropDownFullArea = true;
-            this.cmbModelType.Location = new System.Drawing.Point(110, 19);
+            this.cmbModelType.Location = new System.Drawing.Point(138, 24);
             this.cmbModelType.Margin = new System.Windows.Forms.Padding(2);
             this.cmbModelType.Name = "cmbModelType";
-            this.cmbModelType.Size = new System.Drawing.Size(180, 30);
+            this.cmbModelType.Size = new System.Drawing.Size(225, 38);
             this.cmbModelType.TabIndex = 1;
             this.cmbModelType.SelectedItemsChanged += new System.EventHandler(this.cmbModelType_SelectedItemsChanged);
             // 
@@ -194,10 +199,10 @@
             // 
             this.angleLabel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
             this.angleLabel2.ForeColor = System.Drawing.Color.White;
-            this.angleLabel2.Location = new System.Drawing.Point(22, 56);
+            this.angleLabel2.Location = new System.Drawing.Point(28, 70);
             this.angleLabel2.Margin = new System.Windows.Forms.Padding(2);
             this.angleLabel2.Name = "angleLabel2";
-            this.angleLabel2.Size = new System.Drawing.Size(88, 24);
+            this.angleLabel2.Size = new System.Drawing.Size(110, 28);
             this.angleLabel2.TabIndex = 11;
             this.angleLabel2.Text = "物料编码：";
             // 
@@ -205,10 +210,10 @@
             // 
             this.angleLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
             this.angleLabel1.ForeColor = System.Drawing.Color.White;
-            this.angleLabel1.Location = new System.Drawing.Point(22, 24);
+            this.angleLabel1.Location = new System.Drawing.Point(28, 30);
             this.angleLabel1.Margin = new System.Windows.Forms.Padding(2);
             this.angleLabel1.Name = "angleLabel1";
-            this.angleLabel1.Size = new System.Drawing.Size(88, 24);
+            this.angleLabel1.Size = new System.Drawing.Size(110, 28);
             this.angleLabel1.TabIndex = 10;
             this.angleLabel1.Text = "生产型号：";
             // 
@@ -216,11 +221,11 @@
             // 
             this.btStop.BackNormalColor = System.Drawing.Color.Red;
             this.btStop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
-            this.btStop.Location = new System.Drawing.Point(171, 105);
+            this.btStop.Location = new System.Drawing.Point(214, 131);
             this.btStop.Margin = new System.Windows.Forms.Padding(2);
             this.btStop.Name = "btStop";
             this.btStop.Padding = new System.Windows.Forms.Padding(2);
-            this.btStop.Size = new System.Drawing.Size(67, 28);
+            this.btStop.Size = new System.Drawing.Size(84, 35);
             this.btStop.TabIndex = 13;
             this.btStop.Text = "停止监控";
             this.btStop.Click += new System.EventHandler(this.btStop_Click);
@@ -232,11 +237,11 @@
             this.groupBoxEX2.Controls.Add(this.lVConfigRange);
             this.groupBoxEX2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxEX2.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX2.Location = new System.Drawing.Point(2, 126);
+            this.groupBoxEX2.Location = new System.Drawing.Point(2, 232);
             this.groupBoxEX2.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxEX2.Name = "groupBoxEX2";
             this.groupBoxEX2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxEX2.Size = new System.Drawing.Size(206, 143);
+            this.groupBoxEX2.Size = new System.Drawing.Size(315, 271);
             this.groupBoxEX2.TabIndex = 13;
             this.groupBoxEX2.TabStop = false;
             this.groupBoxEX2.Text = "参数";
@@ -254,11 +259,11 @@
             this.lVConfigRange.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lVConfigRange.ForeColor = System.Drawing.Color.White;
             this.lVConfigRange.HideSelection = false;
-            this.lVConfigRange.Location = new System.Drawing.Point(2, 21);
+            this.lVConfigRange.Location = new System.Drawing.Point(2, 26);
             this.lVConfigRange.Margin = new System.Windows.Forms.Padding(2);
             this.lVConfigRange.Name = "lVConfigRange";
             this.lVConfigRange.OwnerDraw = true;
-            this.lVConfigRange.Size = new System.Drawing.Size(202, 120);
+            this.lVConfigRange.Size = new System.Drawing.Size(311, 243);
             this.lVConfigRange.TabIndex = 2;
             this.lVConfigRange.UseCompatibleStateImageBehavior = false;
             this.lVConfigRange.View = System.Windows.Forms.View.Details;
@@ -297,12 +302,12 @@
             this.groupBoxEX4.Controls.Add(this.dgvFeedingData);
             this.groupBoxEX4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxEX4.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX4.Location = new System.Drawing.Point(212, 2);
+            this.groupBoxEX4.Location = new System.Drawing.Point(321, 2);
             this.groupBoxEX4.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxEX4.Name = "groupBoxEX4";
             this.groupBoxEX4.Padding = new System.Windows.Forms.Padding(2);
             this.tableLayoutPanel1.SetRowSpan(this.groupBoxEX4, 2);
-            this.groupBoxEX4.Size = new System.Drawing.Size(1156, 267);
+            this.groupBoxEX4.Size = new System.Drawing.Size(1619, 501);
             this.groupBoxEX4.TabIndex = 15;
             this.groupBoxEX4.TabStop = false;
             this.groupBoxEX4.Text = "进站";
@@ -316,14 +321,14 @@
             this.dgvFeedingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
             this.dgvFeedingData.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.dgvFeedingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
+            this.dgvFeedingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvFeedingData.ColumnHeadersHeight = 34;
             this.dgvFeedingData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvFeedingData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -334,36 +339,36 @@
             this.InResult,
             this.Column5,
             this.Column139});
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle14;
+            this.dgvFeedingData.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgvFeedingData.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvFeedingData.EnableHeadersVisualStyles = false;
             this.dgvFeedingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
-            this.dgvFeedingData.Location = new System.Drawing.Point(2, 21);
+            this.dgvFeedingData.Location = new System.Drawing.Point(2, 26);
             this.dgvFeedingData.Margin = new System.Windows.Forms.Padding(2);
             this.dgvFeedingData.MultiSelect = false;
             this.dgvFeedingData.Name = "dgvFeedingData";
             this.dgvFeedingData.ReadOnly = true;
             this.dgvFeedingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
+            this.dgvFeedingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvFeedingData.RowHeadersVisible = false;
             this.dgvFeedingData.RowHeadersWidth = 60;
             this.dgvFeedingData.RowTemplate.Height = 23;
             this.dgvFeedingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvFeedingData.Size = new System.Drawing.Size(1152, 244);
+            this.dgvFeedingData.Size = new System.Drawing.Size(1615, 473);
             this.dgvFeedingData.TabIndex = 10;
             this.dgvFeedingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvFeedingData_CellContentClick);
             this.dgvFeedingData.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvFeedingData_RowPrePaint);
@@ -391,8 +396,10 @@
             // 
             this.Column6.DataPropertyName = "CNum";
             this.Column6.HeaderText = "通道";
+            this.Column6.MinimumWidth = 6;
             this.Column6.Name = "Column6";
             this.Column6.ReadOnly = true;
+            this.Column6.Width = 125;
             // 
             // Column1
             // 
@@ -427,8 +434,10 @@
             // 
             this.Column139.DataPropertyName = "UpState";
             this.Column139.HeaderText = "上传状态";
+            this.Column139.MinimumWidth = 6;
             this.Column139.Name = "Column139";
             this.Column139.ReadOnly = true;
+            this.Column139.Width = 125;
             // 
             // groupBoxEX1
             // 
@@ -437,11 +446,11 @@
             this.groupBoxEX1.Controls.Add(this.rtb_Info);
             this.groupBoxEX1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxEX1.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX1.Location = new System.Drawing.Point(2, 273);
+            this.groupBoxEX1.Location = new System.Drawing.Point(2, 507);
             this.groupBoxEX1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxEX1.Name = "groupBoxEX1";
             this.groupBoxEX1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxEX1.Size = new System.Drawing.Size(206, 474);
+            this.groupBoxEX1.Size = new System.Drawing.Size(315, 593);
             this.groupBoxEX1.TabIndex = 12;
             this.groupBoxEX1.TabStop = false;
             this.groupBoxEX1.Text = "日志记录";
@@ -452,11 +461,11 @@
             this.rtb_Info.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.rtb_Info.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rtb_Info.ForeColor = System.Drawing.Color.White;
-            this.rtb_Info.Location = new System.Drawing.Point(2, 21);
+            this.rtb_Info.Location = new System.Drawing.Point(2, 26);
             this.rtb_Info.Margin = new System.Windows.Forms.Padding(2);
             this.rtb_Info.Name = "rtb_Info";
             this.rtb_Info.ReadOnly = true;
-            this.rtb_Info.Size = new System.Drawing.Size(202, 451);
+            this.rtb_Info.Size = new System.Drawing.Size(311, 565);
             this.rtb_Info.TabIndex = 1;
             this.rtb_Info.Text = "";
             // 
@@ -468,11 +477,11 @@
             this.groupBoxEX5.Controls.Add(this.dgvBlankingData);
             this.groupBoxEX5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBoxEX5.ForeColor = System.Drawing.Color.White;
-            this.groupBoxEX5.Location = new System.Drawing.Point(212, 273);
+            this.groupBoxEX5.Location = new System.Drawing.Point(321, 507);
             this.groupBoxEX5.Margin = new System.Windows.Forms.Padding(2);
             this.groupBoxEX5.Name = "groupBoxEX5";
             this.groupBoxEX5.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxEX5.Size = new System.Drawing.Size(1156, 474);
+            this.groupBoxEX5.Size = new System.Drawing.Size(1619, 593);
             this.groupBoxEX5.TabIndex = 16;
             this.groupBoxEX5.TabStop = false;
             this.groupBoxEX5.Text = "出站";
@@ -486,14 +495,14 @@
             this.dgvBlankingData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
             this.dgvBlankingData.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.dgvBlankingData.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvBlankingData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
+            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[] {
@@ -524,41 +533,46 @@
             this.Column112,
             this.Column113,
             this.Column114,
+            this.平面度,
+            this.Col_QrCodeWidth,
+            this.Col_QrCodeHeight,
+            this.Col_QrCodeTopMargin,
+            this.Col_QrCodeLeftMargin,
             this.Column147,
             this.Column34,
             this.Column35,
             this.Column102,
             this.Column22});
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle17;
+            this.dgvBlankingData.DefaultCellStyle = dataGridViewCellStyle5;
             this.dgvBlankingData.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvBlankingData.EnableHeadersVisualStyles = false;
             this.dgvBlankingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
-            this.dgvBlankingData.Location = new System.Drawing.Point(2, 21);
+            this.dgvBlankingData.Location = new System.Drawing.Point(2, 26);
             this.dgvBlankingData.Margin = new System.Windows.Forms.Padding(2);
             this.dgvBlankingData.MultiSelect = false;
             this.dgvBlankingData.Name = "dgvBlankingData";
             this.dgvBlankingData.ReadOnly = true;
             this.dgvBlankingData.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle18;
+            this.dgvBlankingData.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvBlankingData.RowHeadersVisible = false;
             this.dgvBlankingData.RowHeadersWidth = 60;
             this.dgvBlankingData.RowTemplate.Height = 23;
             this.dgvBlankingData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvBlankingData.Size = new System.Drawing.Size(1152, 451);
+            this.dgvBlankingData.Size = new System.Drawing.Size(1615, 565);
             this.dgvBlankingData.TabIndex = 10;
             this.dgvBlankingData.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBlankingData_CellContentClick);
             // 
@@ -592,13 +606,15 @@
             // 
             this.Column7.DataPropertyName = "ChannelNo";
             this.Column7.HeaderText = "通道";
+            this.Column7.MinimumWidth = 6;
             this.Column7.Name = "Column7";
             this.Column7.ReadOnly = true;
+            this.Column7.Width = 125;
             // 
             // dataGridViewTextBoxColumn5
             // 
             this.dataGridViewTextBoxColumn5.DataPropertyName = "BarCode";
-            this.dataGridViewTextBoxColumn5.HeaderText = "芯包条码";
+            this.dataGridViewTextBoxColumn5.HeaderText = "电芯码";
             this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
             this.dataGridViewTextBoxColumn5.ReadOnly = true;
@@ -627,6 +643,7 @@
             // 
             this.Column3.DataPropertyName = "Remark";
             this.Column3.HeaderText = "备注";
+            this.Column3.MinimumWidth = 6;
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
             this.Column3.Width = 400;
@@ -635,148 +652,235 @@
             // 
             this.Column138.DataPropertyName = "UpState";
             this.Column138.HeaderText = "上传状态";
+            this.Column138.MinimumWidth = 6;
             this.Column138.Name = "Column138";
             this.Column138.ReadOnly = true;
+            this.Column138.Width = 125;
             // 
             // Column25
             // 
             this.Column25.DataPropertyName = "CCDResult1";
             this.Column25.HeaderText = "正面(2D/3D)";
+            this.Column25.MinimumWidth = 6;
             this.Column25.Name = "Column25";
             this.Column25.ReadOnly = true;
+            this.Column25.Width = 125;
             // 
             // Column96
             // 
             this.Column96.DataPropertyName = "CCDResult2";
             this.Column96.HeaderText = "反面(2D/3D)";
+            this.Column96.MinimumWidth = 6;
             this.Column96.Name = "Column96";
             this.Column96.ReadOnly = true;
+            this.Column96.Width = 125;
             // 
             // Column97
             // 
             this.Column97.DataPropertyName = "CCDResult3";
             this.Column97.HeaderText = "左侧面(2D/3D)";
+            this.Column97.MinimumWidth = 6;
             this.Column97.Name = "Column97";
             this.Column97.ReadOnly = true;
+            this.Column97.Width = 125;
             // 
             // Column98
             // 
             this.Column98.DataPropertyName = "CCDResult4";
             this.Column98.HeaderText = "右侧面(2D/3D)";
+            this.Column98.MinimumWidth = 6;
             this.Column98.Name = "Column98";
             this.Column98.ReadOnly = true;
+            this.Column98.Width = 125;
             // 
             // Column99
             // 
             this.Column99.DataPropertyName = "CCDResult5";
             this.Column99.HeaderText = "顶面(2D/3D)";
+            this.Column99.MinimumWidth = 6;
             this.Column99.Name = "Column99";
             this.Column99.ReadOnly = true;
+            this.Column99.Width = 125;
             // 
             // Column100
             // 
             this.Column100.DataPropertyName = "CCDResult6";
             this.Column100.HeaderText = "底面(2D/3D)";
+            this.Column100.MinimumWidth = 6;
             this.Column100.Name = "Column100";
             this.Column100.ReadOnly = true;
+            this.Column100.Width = 125;
             // 
             // Column101
             // 
             this.Column101.DataPropertyName = "CCDResult7";
             this.Column101.HeaderText = "底DE1";
+            this.Column101.MinimumWidth = 6;
             this.Column101.Name = "Column101";
             this.Column101.ReadOnly = true;
+            this.Column101.Width = 125;
             // 
             // Column103
             // 
             this.Column103.DataPropertyName = "CCDResult8";
             this.Column103.HeaderText = "底DE2";
+            this.Column103.MinimumWidth = 6;
             this.Column103.Name = "Column103";
             this.Column103.ReadOnly = true;
+            this.Column103.Width = 125;
             // 
             // Column104
             // 
             this.Column104.DataPropertyName = "CCDResult9";
             this.Column104.HeaderText = "底DE3";
+            this.Column104.MinimumWidth = 6;
             this.Column104.Name = "Column104";
             this.Column104.ReadOnly = true;
+            this.Column104.Width = 125;
             // 
             // Column105
             // 
             this.Column105.DataPropertyName = "CCDResult10";
             this.Column105.HeaderText = "底DE4";
+            this.Column105.MinimumWidth = 6;
             this.Column105.Name = "Column105";
             this.Column105.ReadOnly = true;
+            this.Column105.Width = 125;
             // 
             // Column106
             // 
             this.Column106.DataPropertyName = "CCDResult11";
             this.Column106.HeaderText = "中ME1";
+            this.Column106.MinimumWidth = 6;
             this.Column106.Name = "Column106";
             this.Column106.ReadOnly = true;
+            this.Column106.Width = 125;
             // 
             // Column107
             // 
             this.Column107.DataPropertyName = "CCDResult12";
             this.Column107.HeaderText = "中ME2";
+            this.Column107.MinimumWidth = 6;
             this.Column107.Name = "Column107";
             this.Column107.ReadOnly = true;
+            this.Column107.Width = 125;
             // 
             // Column108
             // 
             this.Column108.DataPropertyName = "CCDResult13";
             this.Column108.HeaderText = "中ME3";
+            this.Column108.MinimumWidth = 6;
             this.Column108.Name = "Column108";
             this.Column108.ReadOnly = true;
+            this.Column108.Width = 125;
             // 
             // Column109
             // 
             this.Column109.DataPropertyName = "CCDResult14";
             this.Column109.HeaderText = "中ME4";
+            this.Column109.MinimumWidth = 6;
             this.Column109.Name = "Column109";
             this.Column109.ReadOnly = true;
+            this.Column109.Width = 125;
             // 
             // Column110
             // 
             this.Column110.DataPropertyName = "CCDResult15";
-            this.Column110.HeaderText = "极柱(POS/NEG)";
+            this.Column110.HeaderText = "正极柱(POS/NEG)";
+            this.Column110.MinimumWidth = 6;
             this.Column110.Name = "Column110";
             this.Column110.ReadOnly = true;
+            this.Column110.Width = 125;
             // 
             // Column111
             // 
             this.Column111.DataPropertyName = "CCDResult16";
-            this.Column111.HeaderText = "防爆阀(PRO)";
+            this.Column111.HeaderText = "负极柱(POS/NEG)";
+            this.Column111.MinimumWidth = 6;
             this.Column111.Name = "Column111";
             this.Column111.ReadOnly = true;
+            this.Column111.Width = 125;
             // 
             // Column112
             // 
             this.Column112.DataPropertyName = "CCDResult17";
-            this.Column112.HeaderText = "厚度1";
+            this.Column112.HeaderText = "防爆阀(PRO)";
+            this.Column112.MinimumWidth = 6;
             this.Column112.Name = "Column112";
             this.Column112.ReadOnly = true;
+            this.Column112.Width = 125;
             // 
             // Column113
             // 
             this.Column113.DataPropertyName = "CCDResult18";
-            this.Column113.HeaderText = "厚度2";
+            this.Column113.HeaderText = "二维码";
+            this.Column113.MinimumWidth = 6;
             this.Column113.Name = "Column113";
             this.Column113.ReadOnly = true;
+            this.Column113.Width = 125;
             // 
             // Column114
             // 
             this.Column114.DataPropertyName = "CCDResult19";
-            this.Column114.HeaderText = "厚度3";
+            this.Column114.HeaderText = "厚度";
+            this.Column114.MinimumWidth = 6;
             this.Column114.Name = "Column114";
             this.Column114.ReadOnly = true;
+            this.Column114.Width = 125;
+            // 
+            // 平面度
+            // 
+            this.平面度.DataPropertyName = "CCDResult20";
+            this.平面度.HeaderText = "平面度";
+            this.平面度.MinimumWidth = 6;
+            this.平面度.Name = "平面度";
+            this.平面度.ReadOnly = true;
+            this.平面度.Width = 125;
+            // 
+            // Col_QrCodeWidth
+            // 
+            this.Col_QrCodeWidth.DataPropertyName = "QrCodeWidth";
+            this.Col_QrCodeWidth.HeaderText = "二维码宽度";
+            this.Col_QrCodeWidth.MinimumWidth = 6;
+            this.Col_QrCodeWidth.Name = "Col_QrCodeWidth";
+            this.Col_QrCodeWidth.ReadOnly = true;
+            this.Col_QrCodeWidth.Width = 125;
+            // 
+            // Col_QrCodeHeight
+            // 
+            this.Col_QrCodeHeight.DataPropertyName = "QrCodeHeight";
+            this.Col_QrCodeHeight.HeaderText = "二维码高度";
+            this.Col_QrCodeHeight.MinimumWidth = 6;
+            this.Col_QrCodeHeight.Name = "Col_QrCodeHeight";
+            this.Col_QrCodeHeight.ReadOnly = true;
+            this.Col_QrCodeHeight.Width = 125;
+            // 
+            // Col_QrCodeTopMargin
+            // 
+            this.Col_QrCodeTopMargin.DataPropertyName = "QrCodeTopMargin";
+            this.Col_QrCodeTopMargin.HeaderText = "二维码上端间距";
+            this.Col_QrCodeTopMargin.MinimumWidth = 6;
+            this.Col_QrCodeTopMargin.Name = "Col_QrCodeTopMargin";
+            this.Col_QrCodeTopMargin.ReadOnly = true;
+            this.Col_QrCodeTopMargin.Width = 125;
+            // 
+            // Col_QrCodeLeftMargin
+            // 
+            this.Col_QrCodeLeftMargin.DataPropertyName = "QrCodeLeftMargin";
+            this.Col_QrCodeLeftMargin.HeaderText = "二维码左端间距";
+            this.Col_QrCodeLeftMargin.MinimumWidth = 6;
+            this.Col_QrCodeLeftMargin.Name = "Col_QrCodeLeftMargin";
+            this.Col_QrCodeLeftMargin.ReadOnly = true;
+            this.Col_QrCodeLeftMargin.Width = 125;
             // 
             // Column147
             // 
             this.Column147.DataPropertyName = "RethrowNum";
             this.Column147.HeaderText = "复投次数";
+            this.Column147.MinimumWidth = 6;
             this.Column147.Name = "Column147";
             this.Column147.ReadOnly = true;
+            this.Column147.Width = 125;
             // 
             // Column34
             // 
@@ -816,15 +920,16 @@
             // 
             // FrmDataMonitor
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.ClientSize = new System.Drawing.Size(1370, 749);
+            this.ClientSize = new System.Drawing.Size(1942, 1102);
             this.Controls.Add(this.tableLayoutPanel1);
             this.DoubleBuffered = true;
             this.Font = new System.Drawing.Font("微软雅黑", 10.5F);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "FrmDataMonitor";
             this.Text = "数据监控";
             this.Load += new System.EventHandler(this.FrmDataMonitor_Load);
@@ -898,6 +1003,11 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column112;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column113;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column114;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 平面度;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Col_QrCodeWidth;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Col_QrCodeHeight;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Col_QrCodeTopMargin;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Col_QrCodeLeftMargin;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column147;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column34;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column35;

LargeSquareOne/FrmDataMonitor.resx

@@ -120,9 +120,6 @@
   <metadata name="lVConfigRange.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="lVConfigRange.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -177,6 +174,21 @@
   <metadata name="Column97.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="平面度.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Col_QrCodeWidth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Col_QrCodeHeight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Col_QrCodeTopMargin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Col_QrCodeLeftMargin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column147.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -200,7 +212,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
-        DQAAAk1TRnQBSQFMAgEBAwEAAZABAgGQAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        DQAAAk1TRnQBSQFMAgEBAwEAAagBAgGoAQIBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABEAMAAQEBAAEgBgABEC4AAxUBHQMkATQDBQEGKAADHQEpAl4BZwHwATUBNgHPAf8BNQE2Ac8B/wE1
         ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wNOAZagAAMTARkDZQHlA+YB/wPmAf8D5gH/A+YB/wPmAf8DRwGA
         HAACUwFUAaoBNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2Ac8B/wE1ATYBzwH/ATUBNgHPAf8BNQE2

LargeSquareOne/FrmHistory.Designer.cs

@@ -28,9 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -46,6 +43,9 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panelEnhanced1 = new JinYuan.ControlLib.PanelEnhanced();
             this.tabControlPlus1 = new HML.TabControlPlus();
             this.tabPagePlus1 = new HML.TabPagePlus();
@@ -60,7 +60,6 @@
             this.label3 = new System.Windows.Forms.Label();
             this.dtp_End = new System.Windows.Forms.DateTimePicker();
             this.label1 = new System.Windows.Forms.Label();
-            this.dgv_Main = new System.Windows.Forms.DataGridView();
             this.tabPagePlus2 = new HML.TabPagePlus();
             this.tabControlPlus2 = new HML.TabControlPlus();
             this.tabPagePlus4 = new HML.TabPagePlus();
@@ -108,6 +107,7 @@
             this.dtp_AlarmTimeEnd = new System.Windows.Forms.DateTimePicker();
             this.label12 = new System.Windows.Forms.Label();
             this.dgv_AlarmData = new System.Windows.Forms.DataGridView();
+            this.dgv_Main = new System.Windows.Forms.DataGridView();
             this.panelEnhanced1.SuspendLayout();
             this.tabControlPlus1.SuspendLayout();
             this.tabPagePlus1.SuspendLayout();
@@ -115,7 +115,6 @@
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).BeginInit();
             this.tabPagePlus2.SuspendLayout();
             this.tabControlPlus2.SuspendLayout();
             this.tabPagePlus4.SuspendLayout();
@@ -140,6 +139,7 @@
             this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv_AlarmData)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).BeginInit();
             this.SuspendLayout();
             // 
             // panelEnhanced1
@@ -338,58 +338,6 @@
             this.label1.TabIndex = 12;
             this.label1.Text = "开始时间";
             // 
-            // dgv_Main
-            // 
-            this.dgv_Main.AllowUserToAddRows = false;
-            this.dgv_Main.AllowUserToDeleteRows = false;
-            this.dgv_Main.AllowUserToResizeColumns = false;
-            this.dgv_Main.AllowUserToResizeRows = false;
-            this.dgv_Main.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
-            this.dgv_Main.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
-            this.dgv_Main.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.dgv_Main.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgv_Main.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgv_Main.ColumnHeadersHeight = 45;
-            this.dgv_Main.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgv_Main.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dgv_Main.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgv_Main.EnableHeadersVisualStyles = false;
-            this.dgv_Main.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
-            this.dgv_Main.Location = new System.Drawing.Point(0, 0);
-            this.dgv_Main.MultiSelect = false;
-            this.dgv_Main.Name = "dgv_Main";
-            this.dgv_Main.ReadOnly = true;
-            this.dgv_Main.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgv_Main.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
-            this.dgv_Main.RowHeadersWidth = 45;
-            this.dgv_Main.RowTemplate.Height = 23;
-            this.dgv_Main.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgv_Main.Size = new System.Drawing.Size(1603, 628);
-            this.dgv_Main.TabIndex = 5;
-            this.dgv_Main.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_Main_RowPostPaint);
-            this.dgv_Main.Paint += new System.Windows.Forms.PaintEventHandler(this.dgv_Main_Paint);
-            // 
             // tabPagePlus2
             // 
             this.tabPagePlus2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
@@ -1225,6 +1173,58 @@
             this.dgv_AlarmData.TabIndex = 5;
             this.dgv_AlarmData.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_AlarmData_RowPostPaint);
             // 
+            // dgv_Main
+            // 
+            this.dgv_Main.AllowUserToAddRows = false;
+            this.dgv_Main.AllowUserToDeleteRows = false;
+            this.dgv_Main.AllowUserToResizeColumns = false;
+            this.dgv_Main.AllowUserToResizeRows = false;
+            this.dgv_Main.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
+            this.dgv_Main.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38)))));
+            this.dgv_Main.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dgv_Main.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(30)))), ((int)(((byte)(78)))));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgv_Main.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgv_Main.ColumnHeadersHeight = 45;
+            this.dgv_Main.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgv_Main.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgv_Main.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgv_Main.EnableHeadersVisualStyles = false;
+            this.dgv_Main.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147)))));
+            this.dgv_Main.Location = new System.Drawing.Point(0, 0);
+            this.dgv_Main.MultiSelect = false;
+            this.dgv_Main.Name = "dgv_Main";
+            this.dgv_Main.ReadOnly = true;
+            this.dgv_Main.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86)))));
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80)))));
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgv_Main.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            this.dgv_Main.RowHeadersWidth = 45;
+            this.dgv_Main.RowTemplate.Height = 23;
+            this.dgv_Main.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgv_Main.Size = new System.Drawing.Size(1603, 628);
+            this.dgv_Main.TabIndex = 5;
+            this.dgv_Main.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgv_Main_RowPostPaint);
+            this.dgv_Main.Paint += new System.Windows.Forms.PaintEventHandler(this.dgv_Main_Paint);
+            // 
             // FrmHistory
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -1244,7 +1244,6 @@
             this.splitContainer1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).EndInit();
             this.tabPagePlus2.ResumeLayout(false);
             this.tabControlPlus2.ResumeLayout(false);
             this.tabPagePlus4.ResumeLayout(false);
@@ -1274,6 +1273,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
             this.splitContainer2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgv_AlarmData)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv_Main)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1289,7 +1289,6 @@
         private System.Windows.Forms.Label label1;
         private JinYuan.ControlLib.PanelEnhanced panelEnhanced1;
         private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.DataGridView dgv_Main;
         private HML.TabControlPlus tabControlPlus1;
         private HML.TabPagePlus tabPagePlus1;
         private HML.TabPagePlus tabPagePlus2;
@@ -1341,5 +1340,6 @@
         private System.Windows.Forms.DataGridView dgv_AlarmData;
         private System.Windows.Forms.TextBox txtBarCode;
         private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.DataGridView dgv_Main;
     }
 }

LargeSquareOne/FrmHistory.cs

@@ -455,9 +455,9 @@ namespace LargeSquareOne
 
             TimeSpan timeSpan = endDateTime - startDateTime;
 
-            if (timeSpan.TotalDays > 1.0)
+            if (timeSpan.TotalDays > 31.0)
             {
-                return OperateResult.CreateFailResult<DataTable>("查询范围不能超过1天");
+                return OperateResult.CreateFailResult<DataTable>("查询范围不能超过31天");
             }
 
             DataTable dataTable = CommonMethods.db.QueryDataTable(CommonMethods.dBSQL.SelectHostAlarmData(start, end, alarmType));

LargeSquareOne/FrmMain.Designer.cs

@@ -125,6 +125,7 @@
             this.lbl_Title.ForeColor = System.Drawing.Color.White;
             this.lbl_Title.Image = global::LargeSquareOne.Properties.Resources.Current;
             this.lbl_Title.Name = "lbl_Title";
+            this.lbl_Title.Click += new System.EventHandler(this.lbl_Title_Click);
             // 
             // label7
             // 

LargeSquareOne/FrmMain.cs

@@ -204,7 +204,7 @@ namespace LargeSquareOne
             CommonMethods.mesConfig.StatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "设备状态", "0");
             CommonMethods.mesConfig.WattrMeterUrl = IniConfigHelper.ReadIniData("MES配置", "能耗", "0");
             CommonMethods.mesConfig.CollectData = IniConfigHelper.ReadIniData("MES配置", "风速仪", "0");
-
+            CommonMethods.mesConfig.SafeEqptStatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "安全设备状态", "0");
             //CommonMethods.ProdDRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDRFIDNgQty", "0"));
             //CommonMethods.ProdDXNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDXNgQty", "0"));
             //CommonMethods.ProdGRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdGRFIDNgQty", "0"));
@@ -1043,6 +1043,11 @@ namespace LargeSquareOne
                 CommonMethods.IsLoginOk = false;
             }
         }
+
+        private void lbl_Title_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 
     #region 消息筛选器

LargeSquareOne/FrmMain.zh-CN.resx

@@ -5051,13 +5051,13 @@
 </value>
   </data>
   <data name="MainPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1874, 910</value>
+    <value>1874, 891</value>
   </data>
   <data name="CorePanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1920, 936</value>
+    <value>1920, 917</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1920, 1080</value>
+    <value>1920, 1061</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

LargeSquareOne/LargeSquareOne.csproj

@@ -417,6 +417,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Config\Device.ini" />
+    <None Include="Config\Device.xlsx" />
+    <None Include="Config\FdConfig.xlsx" />
     <None Include="Config\Group.xlsx" />
     <None Include="Config\Variable.xlsx" />
     <Content Include="NLog.config">

LargeSquareOne/LargeSquareOne.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />