diff --git a/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs b/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs index 429654f..92ae0fa 100644 --- a/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs +++ b/INT69DC_7C/DialogForms/DialogFormDataStatistics.cs @@ -17,6 +17,9 @@ namespace INT69DC_7C.DialogForms { #region Field private FormDataStatistics m_ParentForm; + + public List ListFiles; // 파일 리스트 - Part11 미사용 시 + public List ListInspectionFile; // 파일 리스트 - Part11 사용 시 #endregion #region Constructor @@ -57,7 +60,13 @@ namespace INT69DC_7C.DialogForms } private void DefaultSetting() { - this.DisplayTreeViewUpdate(); + this.ListFiles = new List(); + this.ListInspectionFile = new List(); + + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false) + this.DisplayTreeViewUpdate11(); + else + this.DisplayTreeViewUpdate2(); this.labelNodeIndex.Text = "-"; this.labelFileName.Text = "-"; @@ -66,94 +75,89 @@ namespace INT69DC_7C.DialogForms this.labelId.Text = "-"; } - private Collection> FileClassification(List files) + private List DirectorySort(DirectoryInfo[] directorys) { - string date = "", date1 = ""; - Collection> fileClassification = new Collection>(); - List list = new List(); + List listDirectory = new List(); + Dictionary dirNames = new Dictionary(); - for (int i = 0; i < files.Count; i++) - { - date = files[i].Substring(0, 12); - if (i == 0) - date1 = date; + foreach (DirectoryInfo dir in directorys) + dirNames.Add(dir.Name, int.Parse(dir.Name)); - if (date == date1) - { - list.Add(files[i]); - } - else - { - date1 = date; + // 순서데로 오름차순 정렬 + var vrList = dirNames.OrderBy(x => x.Value); + foreach (var v in vrList) + listDirectory.Add(v.Key); - List l = new List(); - - foreach (string s in list) - l.Add(s); - - fileClassification.Add(l); - list = new List(); - list.Add(files[i]); - } - } - - List ls = new List(); - foreach (string s in list) - ls.Add(s); - fileClassification.Add(ls); - - return fileClassification; + return listDirectory; } - private List FileSort(FileInfo[] files) + private List DayInspectionDirectorySort(FileInfo[] files) { - List listFiles = new List(); - Dictionary fileNames = new Dictionary(); - Dictionary fileNamesSort = new Dictionary(); + string[] fileName; + List listFile = new List(); + Dictionary dirNames = new Dictionary(); + #region File List 품번 순서데로 정렬 foreach (FileInfo file in files) { - if (file.Name.StartsWith("20") == true) - fileNames.Add(file.Name, int.Parse(file.Name.Substring(11, 1))); + fileName = file.Name.Split('_'); + dirNames.Add(file.Name, int.Parse(fileName[1].Substring(0, fileName[1].Length - 4))); } - var vrList = fileNames.Keys.ToList(); - vrList.Sort(); - + var vrList = dirNames.OrderBy(x => x.Value); foreach (var v in vrList) - fileNamesSort.Add(v, fileNames[v]); + listFile.Add(v.Key); + #endregion - foreach (var v in fileNamesSort) - listFiles.Add(v.Key); + #region File List 날짜 순서데로 정렬 + dirNames = new Dictionary(); + foreach (string f in listFile) + dirNames.Add(f, int.Parse(f.Substring(0, 8))); - return listFiles; + listFile.Clear(); + vrList = dirNames.OrderBy(x => x.Value); + foreach (var v in vrList) + listFile.Add(v.Key); + #endregion + + return listFile; } - private List FileSort(List lst) + private List DayInspectionDirectorySort2(FileInfo[] files) { - List listFiles = new List(); - Dictionary fileNames = new Dictionary(); - Dictionary fileNamesSort = new Dictionary(); + string[] fileName; + List listFile = new List(); + Dictionary dirNames = new Dictionary(); - foreach (string list in lst) + #region File List 품번 순서데로 정렬 + foreach (FileInfo file in files) { - if (list.Length == 22) - fileNames.Add(list, int.Parse(list.Substring(13, 1))); - else - fileNames.Add(list, int.Parse(list.Substring(13, 2))); + fileName = file.Name.Split('_'); + dirNames.Add(file.Name, int.Parse(fileName[1].Substring(0, fileName[1].Length - 4))); } - // Lane 순서데로 오름차순 정렬 - var vrList = fileNames.OrderBy(x => x.Value); - + var vrList = dirNames.OrderBy(x => x.Value); foreach (var v in vrList) - listFiles.Add(v.Key); + listFile.Add(v.Key); + #endregion - return listFiles; + #region File List 날짜 순서데로 정렬 + dirNames = new Dictionary(); + foreach (string f in listFile) + dirNames.Add(f, int.Parse(f.Substring(1, 8))); + + listFile.Clear(); + vrList = dirNames.OrderBy(x => x.Value); + foreach (var v in vrList) + listFile.Add(v.Key); + #endregion + + return listFile; } - private void DisplayTreeViewUpdate() + /// + /// Part11 미사용 + /// + private void DisplayTreeViewUpdate11() { - int fileCount = 0; - DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataBackupFolder); List fileNames = new List(); @@ -163,44 +167,108 @@ namespace INT69DC_7C.DialogForms FileInfo[] files = dir.GetFiles(); - foreach (FileInfo file in files) + if (files.Length != 0) { - if (file.Name.StartsWith("20") == true) - fileCount++; - } + // 날짜, 품번 순으로 정렬 + fileNames = this.DayInspectionDirectorySort(files); + this.ListFiles = fileNames; - if (fileCount != 0) - { - // 파일 이름 순으로 정렬 - fileNames = this.FileSort(files); - // 파일 날짜 순으로 분류 - this.ParentForm.CollectionFileClassification = this.FileClassification(fileNames); - - foreach (List list in this.ParentForm.CollectionFileClassification) + foreach (string name in fileNames) { - List myList = new List(); + this.treeView1.Nodes.Add(name); + } + } + } + /// + /// Part11 사용 + /// + private void DisplayTreeViewUpdate2() + { + int fileCount = 0; + //TreeNode node; + List years = new List(); + List months = new List(); + List days = new List(); - // Lane 순서데로 오름 차순 정렬 - if (list.Count > 1 && list[0].Length > 18) - myList = this.FileSort(list); - else - myList = list; + this.treeView1.Nodes.Clear(); + this.ListInspectionFile.Clear(); - TreeNode node = new TreeNode(myList[0].Substring(0, 12)); + DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataInspectionFolder); + List fileNames = new List(); - for (int i = 0; i < myList.Count; i++) + // 폴더 체크 + if (dir.Exists == false) + dir.Create(); + + // year 폴더 가져오기 + DirectoryInfo[] yearDirectorys = dir.GetDirectories(); + // year 폴더 정렬 + years = this.DirectorySort(yearDirectorys); + + // Inspection File 리스트 생성 + if (years.Count != 0) + { + // Year + foreach (string year in years) + { + DataBackupYear y = new DataBackupYear(year); + DirectoryInfo monthDir = new DirectoryInfo(string.Format("{0}{1}", this.ParentForm.ParentForm.PathDataInspectionFolder, year)); + DirectoryInfo[] monthDirectorys = monthDir.GetDirectories(); + + months = this.DirectorySort(monthDirectorys); + + if (months.Count != 0) { - node.Nodes.Add(myList[i]); - } + // Month + foreach (string month in months) + { + DirectoryInfo dayDir = new DirectoryInfo(string.Format("{0}{1}\\{2}", this.ParentForm.ParentForm.PathDataInspectionFolder, year, month)); + FileInfo[] dayFiles = dayDir.GetFiles(); + days = this.DayInspectionDirectorySort2(dayFiles); + + DataBackupMonth m = new DataBackupMonth(month); + m.Days = days; + + y.Months.Add(m); + } + + this.ListInspectionFile.Add(y); + } + else + { + this.ListInspectionFile.Add(y); + } + } + + // node 생성 + for (int i = 0; i < this.ListInspectionFile.Count; i++) + { + TreeNode node = new TreeNode(this.ListInspectionFile[i].Year); + for (int j = 0; j < this.ListInspectionFile[i].Months.Count; j++) + { + TreeNode nodeMonth = new TreeNode(this.ListInspectionFile[i].Months[j].Month); + + for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++) + { + nodeMonth.Nodes.Add(this.ListInspectionFile[i].Months[j].Days[k]); + fileCount++; + } + node.Nodes.Add(nodeMonth); + } this.treeView1.Nodes.Add(node); } } + + //this.labelInspectionFileCount.Text = fileCount.ToString(); } public void DisplayRefresh() { - this.DisplayTreeViewUpdate(); + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false) + this.DisplayTreeViewUpdate11(); + else + this.DisplayTreeViewUpdate2(); } #endregion @@ -209,30 +277,23 @@ namespace INT69DC_7C.DialogForms { int ret = 0; - if (this.ParentForm.SelectNodeIndex == -1) + if (this.ParentForm.SelectFilePath == "") return; this.treeView1.Enabled = false; this.buttonRead.Enabled = false; this.buttonClose.Enabled = false; - if (this.treeView1.Nodes.Count != 0) + this.ParentForm.ClearData(); + ret = this.ParentForm.DataRead(); + + if (ret == 0) { - this.ParentForm.ClearData(); - - if (this.ParentForm.ParentForm.SystemConfig.EquipmentMode == 2) - ret = this.ParentForm.DataRead2(); - else - ret = this.ParentForm.DataRead1(); - - if (ret == 0) - { - this.DialogResult = DialogResult.OK; - this.Close(); - } - else - this.DialogResult = DialogResult.Cancel; + this.DialogResult = DialogResult.OK; + this.Close(); } + else + this.DialogResult = DialogResult.Cancel; this.treeView1.Enabled = true; this.buttonRead.Enabled = true; @@ -246,25 +307,34 @@ namespace INT69DC_7C.DialogForms private void treeView1_AfterSelect(object sender, TreeViewEventArgs e) { - string fileName = ""; + string fileName = "", pathFileName = ""; + string[] name; - if (e.Node.Parent == null) + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false) { fileName = e.Node.Text; - this.ParentForm.SelectNodeIndex = e.Node.Index; - //this.labelNodeIndex.Text = string.Format("{0}", this.ParentForm.SelectNodeIndex + 1); + + this.ParentForm.SelectFilePath = string.Format("{0}{1}", this.ParentForm.ParentForm.PathDataBackupFolder, fileName); + name = fileName.Split('_'); + this.labelFileName.Text = fileName; + this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(0, 4), name[0].Substring(4, 2), name[0].Substring(6, 2)); + this.labelProductNo.Text = name[1].Substring(0, name[1].Length - 4); } else { - fileName = e.Node.Parent.Text; - this.ParentForm.SelectNodeIndex = e.Node.Parent.Index; - //this.labelNodeIndex.Text = string.Format("{0}", this.ParentForm.SelectNodeIndex + 1); - } + if (e.Node.Text.Length > 10) + { + fileName = e.Node.Text; + pathFileName = string.Format("{0}{1}\\{2}\\{3}", + this.ParentForm.ParentForm.PathDataInspectionFolder, fileName.Substring(1, 4), int.Parse(fileName.Substring(5, 2)), fileName); + this.ParentForm.SelectFilePath = pathFileName; - this.labelFileName.Text = fileName; - this.labelDate.Text = string.Format("{0}.{1}.{2}", fileName.Substring(0, 4), fileName.Substring(4, 2), fileName.Substring(6, 2)); - this.labelProductNo.Text = fileName.Substring(9, 1); - this.labelId.Text = fileName.Substring(11, 1); + name = fileName.Split('_'); + this.labelFileName.Text = fileName; + this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(1, 4), name[0].Substring(5, 2), name[0].Substring(7, 2)); + this.labelProductNo.Text = name[1].Substring(0, name[1].Length - 4); + } + } } #endregion } diff --git a/INT69DC_7C/Forms/FormDataStatistics.cs b/INT69DC_7C/Forms/FormDataStatistics.cs index 287c396..2ea04e0 100644 --- a/INT69DC_7C/Forms/FormDataStatistics.cs +++ b/INT69DC_7C/Forms/FormDataStatistics.cs @@ -21,16 +21,14 @@ namespace INT69DC_7C.Forms public partial class FormDataStatistics : Form { #region Field - private int m_SelectNodeIndex; private int FileIndex; + public string SelectFilePath; private FormMain m_ParentForm; public DataCommonList CurrentDataCommonList; - private Collection CollectionWeightData; //스틱1 파일에서 읽은 데이터 + private Collection CollectionWeightData; //파일에서 읽은 데이터 private Collection CollectionLaneData; //파일에서 읽은 데이터를 통계 계산 처리된 데이터 - public Collection> CollectionFileClassification; // 스틱2 파일 리스트 - private Collection> CollectionWeightDataStick2; // 스틱2 파일에서 읽은 데이터 private Collection CollectionCommonLabel; private Collection CollectionLane; @@ -66,12 +64,6 @@ namespace INT69DC_7C.Forms #endregion #region Property - public int SelectNodeIndex - { - get { return this.m_SelectNodeIndex; } - set { this.m_SelectNodeIndex = value; } - } - public FormMain ParentForm { get { return this.m_ParentForm; } @@ -256,11 +248,9 @@ namespace INT69DC_7C.Forms private void DefaultSetting() { this.FileIndex = 0; - this.SelectNodeIndex = -1; + this.SelectFilePath = ""; this.CurrentDataCommonList = new DataCommonList(); - this.CollectionFileClassification = new Collection>(); - this.CollectionWeightDataStick2 = new Collection>(); this.CollectionWeightData = new Collection(); this.CollectionLaneData = new Collection(); @@ -324,10 +314,7 @@ namespace INT69DC_7C.Forms } for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) - { - this.CollectionWeightDataStick2.Add(new List()); this.CollectionLaneData.Add(new DataCollector()); - } this.InitializeLabels(); } @@ -418,77 +405,6 @@ namespace INT69DC_7C.Forms this.CurrentDataCommonList.TotalPassAverageWeight = passAverageWeight; this.CurrentDataCommonList.TotalPassVariance = passVariance; } - private void SetCommonData(Collection> datas, Collection laneDatas) - { - double dValue1 = 0.0, dValue2 = 0.0, passSumWeight = 0.0, overSumWeight = 0.0, underSumWeight = 0.0, passAverageWeight = 0.0, passVariance = 0.0; - string sValue = ""; - int underCount = 0, passCount = 0, overCount = 0, exNGCount = 0, index = -1; - - for (int i = 0; i < datas.Count; i++) - { - if (datas[i].Count != 0) - { - index = i; - break; - } - } - - this.CurrentDataCommonList.ProductName = datas[index][datas[index].Count - 1][3]; - this.CurrentDataCommonList.Lot = datas[index][datas[index].Count - 1][4]; - this.CurrentDataCommonList.StartTime = string.Format("{0} {1}", datas[index][0][0], datas[index][0][1]); - this.CurrentDataCommonList.EndTime = string.Format("{0} {1}", datas[index][datas[index].Count - 1][0], datas[index][datas[index].Count - 1][1]); - - dValue1 = double.Parse(datas[index][datas[index].Count - 1][5]); - sValue = Helper.DoubleToString(dValue1, 1); - this.CurrentDataCommonList.UnderRange = sValue; - - dValue1 = double.Parse(datas[index][datas[index].Count - 1][6]); - sValue = Helper.DoubleToString(dValue1, 1); - this.CurrentDataCommonList.PassRange = sValue; - - dValue1 = double.Parse(datas[index][datas[index].Count - 1][7]); - sValue = Helper.DoubleToString(dValue1, 1); - this.CurrentDataCommonList.OverRange = sValue; - - dValue1 = double.Parse(datas[index][datas[index].Count - 1][8]); - sValue = Helper.DoubleToString(dValue1, 1); - this.CurrentDataCommonList.TareRange = sValue; - - for (int i = 0; i < laneDatas.Count; i++) - { - underCount += laneDatas[i].UnderTotalCount; - passCount += laneDatas[i].PassTotalCount; - overCount += laneDatas[i].OverTotalCount; - exNGCount += laneDatas[i].ExNgTotalCount; - - passSumWeight += laneDatas[i].PassSumWeight; - overSumWeight += laneDatas[i].OverSumWeight; - underSumWeight += laneDatas[i].UnderSumWeight; - } - - // 전체 정량 평균 - passAverageWeight = passSumWeight / passCount; - // 전체 정량 분산 - for (int i = 0; i < laneDatas.Count; i++) - { - for (int j = 0; j < laneDatas[i].PassWeightData.Count; j++) - { - dValue1 = passAverageWeight - laneDatas[i].PassWeightData[j]; - dValue2 += dValue1 * dValue1; - } - } - passVariance = dValue2 / passCount; - - this.CurrentDataCommonList.TotalUnderCount = underCount; - this.CurrentDataCommonList.TotalPassCount = passCount; - this.CurrentDataCommonList.TotalOverCount = overCount; - this.CurrentDataCommonList.TotalExNgCount = exNGCount; - this.CurrentDataCommonList.TotalPassSumWeight = passSumWeight; - this.CurrentDataCommonList.TotalOverSumWeight = overSumWeight; - this.CurrentDataCommonList.TotalUnderSumWeight = underSumWeight; - this.CurrentDataCommonList.TotalPassAverageWeight = passAverageWeight; - this.CurrentDataCommonList.TotalPassVariance = passVariance; - } private void SetData(DataCollector data, string weight, DataStore.JudgmentStatus grade) { if (grade == DataStore.JudgmentStatus.Pass) @@ -580,105 +496,86 @@ namespace INT69DC_7C.Forms } private void DataAnalysis() { - if (this.ParentForm.SystemConfig.EquipmentMode == 2) + #region Set Data + if (this.ParentForm.SystemConfig.EquipmentColumns == 7) { - #region Stick 2 - for (int i = 0; i < this.CollectionWeightDataStick2.Count; i++) + for (int i = 0; i < this.CollectionWeightData.Count; i++) { - for (int j = 0; j < this.CollectionWeightDataStick2[i].Count; j++) - { - this.SetData(this.CollectionLaneData[i], this.CollectionWeightDataStick2[i][j][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightDataStick2[i][j][10])); - } + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); + this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); + this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 8) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); + this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); + this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); + this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 10) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); + this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); + this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); + this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24])); + this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26])); + this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28])); } - #endregion } else { - #region Stick 1,3 - if (this.ParentForm.SystemConfig.EquipmentColumns == 7) + for (int i = 0; i < this.CollectionWeightData.Count; i++) { - for (int i = 0; i < this.CollectionWeightData.Count; i++) - { - this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); - this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); - this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); - this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); - this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); - this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); - this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); - } + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); + this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); + this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); + this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24])); + this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26])); + this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28])); + this.SetData(this.CollectionLaneData[10], this.CollectionWeightData[i][29], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][30])); + this.SetData(this.CollectionLaneData[11], this.CollectionWeightData[i][31], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][32])); } - else if (this.ParentForm.SystemConfig.EquipmentColumns == 8) - { - for (int i = 0; i < this.CollectionWeightData.Count; i++) - { - this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); - this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); - this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); - this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); - this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); - this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); - this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); - this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24])); - } - } - else if (this.ParentForm.SystemConfig.EquipmentColumns == 10) - { - for (int i = 0; i < this.CollectionWeightData.Count; i++) - { - this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); - this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); - this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); - this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); - this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); - this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); - this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); - this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24])); - this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26])); - this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28])); - } - } - else - { - for (int i = 0; i < this.CollectionWeightData.Count; i++) - { - this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); - this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); - this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); - this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); - this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); - this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); - this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22])); - this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24])); - this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26])); - this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28])); - this.SetData(this.CollectionLaneData[10], this.CollectionWeightData[i][29], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][30])); - this.SetData(this.CollectionLaneData[11], this.CollectionWeightData[i][31], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][32])); - } - } - #endregion - } + } + #endregion for (int i = 0; i < this.CollectionLaneData.Count; i++) this.CollectionLaneData[i].StatisticalAnalysis(); - if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.SetCommonData(this.CollectionWeightDataStick2, this.CollectionLaneData); - else - this.SetCommonData(this.CollectionWeightData, this.CollectionLaneData); - + this.SetCommonData(this.CollectionWeightData, this.CollectionLaneData); this.UpdateDisplay(this.CurrentDataCommonList, this.CollectionLaneData); } - public int DataRead1() + public int DataRead() { - string path = ""; int ret = 0, flag = 0; long count = 0; - SmartX.SmartSplash splash; + if (this.SelectFilePath == "") + return ret = -1; - splash = new SmartX.SmartSplash(); + SmartSplash splash = new SmartSplash(); splash.CenterPosition = true; splash.AnimationInterval = 100; splash.LoadingImagePathname = "SmartLoading4"; @@ -686,9 +583,7 @@ namespace INT69DC_7C.Forms this.CollectionWeightData.Clear(); - path = string.Format("{0}{1}", this.ParentForm.PathDataBackupFolder, this.CollectionFileClassification[this.SelectNodeIndex][0]); - - this.ParentForm.smartFileIO.FilePathName = path; + this.ParentForm.smartFileIO.FilePathName = this.SelectFilePath; this.ParentForm.smartFileIO.Open(2000000); this.ParentForm.smartFileIO.ReadStringAllBuffer(); @@ -725,57 +620,6 @@ namespace INT69DC_7C.Forms return ret; } - public int DataRead2() - { - string path = "", lane = ""; - int ret = 0, index = 0; - List lt; - - SmartX.SmartSplash splash; - - splash = new SmartX.SmartSplash(); - splash.CenterPosition = true; - splash.AnimationInterval = 100; - splash.LoadingImagePathname = "SmartLoading4"; - splash.Start(); - - lt = new List(); - - // 열별로 삭제 - for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) - this.CollectionWeightDataStick2[i].Clear(); - - try - { - for (int i = 0; i < this.CollectionFileClassification[this.SelectNodeIndex].Count; i++) - { - lt.Clear(); - if (this.CollectionFileClassification[this.SelectNodeIndex][i].Length == 22) - lane = this.CollectionFileClassification[this.SelectNodeIndex][i].Substring(13, 1); - else - lane = this.CollectionFileClassification[this.SelectNodeIndex][i].Substring(13, 2); - index = int.Parse(lane); - - path = string.Format("{0}{1}", this.ParentForm.PathDataBackupFolder, this.CollectionFileClassification[this.SelectNodeIndex][i]); - this.LoadDataBackupFile(ref this.CollectionWeightDataStick2, path, index - 1); - } - - this.DataAnalysis(); - splash.Finish(); - ret = 0; - } - catch - { - ret = -1; - splash.Finish(); - DialogFormMessage msg = new DialogFormMessage(13, this.ParentForm.SystemConfig.Language); - msg.ShowDialog(); - - this.ParentForm.smartFileIO.Close(); - } - - return ret; - } public void ClearData() { this.InitializeLabels(); @@ -1050,7 +894,7 @@ namespace INT69DC_7C.Forms } private void buttonFileSelect_Click(object sender, EventArgs e) { - this.SelectNodeIndex = -1; + this.SelectFilePath = ""; DialogFormDataStatistics form = new DialogFormDataStatistics(this); if (form.ShowDialog() == DialogResult.OK) diff --git a/INT69DC_7C/Forms/FormMain.Designer.cs b/INT69DC_7C/Forms/FormMain.Designer.cs index bddedd6..4588e47 100644 --- a/INT69DC_7C/Forms/FormMain.Designer.cs +++ b/INT69DC_7C/Forms/FormMain.Designer.cs @@ -47,10 +47,11 @@ this.timerTimeoutOPT4_OnlineCheck = new System.Windows.Forms.Timer(); this.smartSerialPortCom3 = new SmartX.SmartSerialPort(); this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer(); - this.timerTimeOutOPT = new System.Windows.Forms.Timer(); - this.timerTimeOutOPT_Ethernet = new System.Windows.Forms.Timer(); - this.timerTimeOutOPT2 = new System.Windows.Forms.Timer(); + this.timerTimeOutCOM3 = new System.Windows.Forms.Timer(); + this.timerTimeOutEthernet = new System.Windows.Forms.Timer(); + this.timerTimeOutATPC = new System.Windows.Forms.Timer(); this.timerUserList = new System.Windows.Forms.Timer(); + this.timerTimeOutDB = new System.Windows.Forms.Timer(); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -190,26 +191,31 @@ this.smartTCPMultiServer.ReceiveTimeout = 3000; this.smartTCPMultiServer.OnReceiveHandler += new SmartX.SmartTCPMultiServer.ReceiveHandler(this.smartTCPMultiServer_OnReceiveHandler); // - // timerTimeOutOPT + // timerTimeOutCOM3 // - this.timerTimeOutOPT.Interval = 300; - this.timerTimeOutOPT.Tick += new System.EventHandler(this.timerTimeOutOPT_Tick); + this.timerTimeOutCOM3.Interval = 300; + this.timerTimeOutCOM3.Tick += new System.EventHandler(this.timerTimeOutCOM3_Tick); // - // timerTimeOutOPT_Ethernet + // timerTimeOutEthernet // - this.timerTimeOutOPT_Ethernet.Interval = 300; - this.timerTimeOutOPT_Ethernet.Tick += new System.EventHandler(this.timerTimeOutOPT_Ethernet_Tick); + this.timerTimeOutEthernet.Interval = 300; + this.timerTimeOutEthernet.Tick += new System.EventHandler(this.timerTimeOutEthernet_Tick); // - // timerTimeOutOPT2 + // timerTimeOutATPC // - this.timerTimeOutOPT2.Interval = 300; - this.timerTimeOutOPT2.Tick += new System.EventHandler(this.timerTimeOutOPT2_Tick); + this.timerTimeOutATPC.Interval = 300; + this.timerTimeOutATPC.Tick += new System.EventHandler(this.timerTimeOutATPC_Tick); // // timerUserList // this.timerUserList.Interval = 1000; this.timerUserList.Tick += new System.EventHandler(this.timerUserList_Tick); // + // timerTimeOutDB + // + this.timerTimeOutDB.Interval = 300; + this.timerTimeOutDB.Tick += new System.EventHandler(this.timerTimeOutDB_Tick); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -244,9 +250,10 @@ private System.Windows.Forms.Timer timerTimeoutOPT4_OnlineCheck; public SmartX.SmartSerialPort smartSerialPortCom3; public SmartX.SmartTCPMultiServer smartTCPMultiServer; - public System.Windows.Forms.Timer timerTimeOutOPT; - public System.Windows.Forms.Timer timerTimeOutOPT_Ethernet; - public System.Windows.Forms.Timer timerTimeOutOPT2; + public System.Windows.Forms.Timer timerTimeOutCOM3; + public System.Windows.Forms.Timer timerTimeOutEthernet; + public System.Windows.Forms.Timer timerTimeOutATPC; private System.Windows.Forms.Timer timerUserList; + public System.Windows.Forms.Timer timerTimeOutDB; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index c3e0dfe..71cddb7 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -372,17 +372,24 @@ namespace INT69DC_7C.Forms } private void DefaultSetting1() { + // AB Food this.timerOPT1.Interval = 1000; this.timerOPT1.Enabled = false; + // AB Food + this.timerTimeoutOPT1.Interval = 800; + this.timerTimeoutOPT1.Enabled = false; this.timerAdcLog.Interval = 300000; this.timerAdcLog.Enabled = false; - this.timerTimeoutOPT1.Interval = 800; - this.timerTimeoutOPT1.Enabled = false; + this.timerTimeOutCOM3.Interval = 800; + this.timerTimeOutCOM3.Enabled = false; - this.timerTimeOutOPT.Interval = 300; - this.timerTimeOutOPT.Enabled = false; + this.timerTimeOutEthernet.Interval = 800; + this.timerTimeOutEthernet.Enabled = false; + + this.timerTimeOutATPC.Interval = 800; + this.timerTimeOutATPC.Enabled = false; this.ColorLogOff = Color.Red; this.ColorLogOn = Color.Green; @@ -674,7 +681,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT.Enabled = false; + this.timerTimeOutCOM3.Enabled = false; this.SerialCH3OPT2IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -1726,6 +1733,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[0].IsUpdate_COM3 = true; + this.CollectionWeightData[0].IsUpdate_ATPC = true; + this.CollectionWeightData[0].IsUpdate_Ethernet = true; + this.CollectionWeightData[0].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay10(this.EquipmentStatus, this.CollectionFeedbackStatus[9]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay12(this.EquipmentStatus, this.CollectionWeightData[11]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay12(this.EquipmentStatus, this.CollectionFeedbackStatus[11]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -1753,61 +1812,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[0], 1); - this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[6], 7); - this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[7], 8); - this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[9], 10); - this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay10(this.EquipmentStatus, this.CollectionFeedbackStatus[9]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[11], 12); - this.ChildFormMainDisplay.UpdateStartWeightDisplay12(this.EquipmentStatus, this.CollectionWeightData[11]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay12(this.EquipmentStatus, this.CollectionFeedbackStatus[11]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[0].IsUpdate_COM3 = true; - this.CollectionWeightData[0].IsUpdate_ATPC = true; - this.CollectionWeightData[0].IsUpdate_Ethernet = true; - this.CollectionWeightData[0].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -1843,8 +1847,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT_Ethernet.Enabled == false) - this.timerTimeOutOPT_Ethernet.Enabled = true; + if (this.timerTimeOutEthernet.Enabled == false) + this.timerTimeOutEthernet.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.EthernetOPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -1869,8 +1873,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT_Ethernet.Enabled == false) - this.timerTimeOutOPT_Ethernet.Enabled = true; + if (this.timerTimeOutEthernet.Enabled == false) + this.timerTimeOutEthernet.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.EthernetOPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -1903,8 +1907,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT_Ethernet.Enabled == false) - this.timerTimeOutOPT_Ethernet.Enabled = true; + if (this.timerTimeOutEthernet.Enabled == false) + this.timerTimeOutEthernet.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.EthernetOPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -1964,8 +1968,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -1988,8 +1992,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2036,8 +2040,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2059,8 +2063,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -2105,6 +2109,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[1].IsUpdate_COM3 = true; + this.CollectionWeightData[1].IsUpdate_ATPC = true; + this.CollectionWeightData[1].IsUpdate_Ethernet = true; + this.CollectionWeightData[1].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay9(this.EquipmentStatus, this.CollectionFeedbackStatus[8]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay11(this.EquipmentStatus, this.CollectionWeightData[10]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay11(this.EquipmentStatus, this.CollectionFeedbackStatus[10]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -2132,61 +2188,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[1], 2); - this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[5], 6); - this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[6], 7); - this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[8], 9); - this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay9(this.EquipmentStatus, this.CollectionFeedbackStatus[8]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[10], 11); - this.ChildFormMainDisplay.UpdateStartWeightDisplay11(this.EquipmentStatus, this.CollectionWeightData[10]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay11(this.EquipmentStatus, this.CollectionFeedbackStatus[10]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[1].IsUpdate_COM3 = true; - this.CollectionWeightData[1].IsUpdate_ATPC = true; - this.CollectionWeightData[1].IsUpdate_Ethernet = true; - this.CollectionWeightData[1].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -2286,8 +2287,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2310,8 +2311,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2358,8 +2359,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2381,8 +2382,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -2427,6 +2428,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[2].IsUpdate_COM3 = true; + this.CollectionWeightData[2].IsUpdate_ATPC = true; + this.CollectionWeightData[2].IsUpdate_Ethernet = true; + this.CollectionWeightData[2].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay10(this.EquipmentStatus, this.CollectionFeedbackStatus[9]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -2454,61 +2507,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[2], 3); - this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[4], 5); - this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[5], 6); - this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[7], 8); - this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[9], 10); - this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay10(this.EquipmentStatus, this.CollectionFeedbackStatus[9]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[2].IsUpdate_COM3 = true; - this.CollectionWeightData[2].IsUpdate_ATPC = true; - this.CollectionWeightData[2].IsUpdate_Ethernet = true; - this.CollectionWeightData[2].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -2608,8 +2606,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2632,8 +2630,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2680,8 +2678,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2703,8 +2701,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -2749,6 +2747,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[3].IsUpdate_COM3 = true; + this.CollectionWeightData[3].IsUpdate_ATPC = true; + this.CollectionWeightData[3].IsUpdate_Ethernet = true; + this.CollectionWeightData[3].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay9(this.EquipmentStatus, this.CollectionFeedbackStatus[8]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -2776,61 +2826,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[3], 4); - this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[3], 4); - this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[4], 5); - this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[6], 7); - this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[8], 9); - this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay9(this.EquipmentStatus, this.CollectionFeedbackStatus[8]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[3].IsUpdate_COM3 = true; - this.CollectionWeightData[3].IsUpdate_ATPC = true; - this.CollectionWeightData[3].IsUpdate_Ethernet = true; - this.CollectionWeightData[3].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -2930,8 +2925,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -2954,8 +2949,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3002,8 +2997,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3025,8 +3020,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -3071,6 +3066,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[4].IsUpdate_COM3 = true; + this.CollectionWeightData[4].IsUpdate_ATPC = true; + this.CollectionWeightData[4].IsUpdate_Ethernet = true; + this.CollectionWeightData[4].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -3098,61 +3145,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[4], 5); - this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[2], 3); - this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[3], 4); - this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[5], 6); - this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[7], 8); - this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[4].IsUpdate_COM3 = true; - this.CollectionWeightData[4].IsUpdate_ATPC = true; - this.CollectionWeightData[4].IsUpdate_Ethernet = true; - this.CollectionWeightData[4].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -3252,8 +3244,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3276,8 +3268,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3324,8 +3316,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3347,8 +3339,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -3393,6 +3385,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[5].IsUpdate_COM3 = true; + this.CollectionWeightData[5].IsUpdate_ATPC = true; + this.CollectionWeightData[5].IsUpdate_Ethernet = true; + this.CollectionWeightData[5].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -3420,61 +3464,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[5], 6); - this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[1], 2); - this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[2], 3); - this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[4], 5); - this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[6], 7); - this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[5].IsUpdate_COM3 = true; - this.CollectionWeightData[5].IsUpdate_ATPC = true; - this.CollectionWeightData[5].IsUpdate_Ethernet = true; - this.CollectionWeightData[5].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -3574,8 +3563,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3598,8 +3587,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3646,8 +3635,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3669,8 +3658,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -3715,6 +3704,58 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[6].IsUpdate_COM3 = true; + this.CollectionWeightData[6].IsUpdate_ATPC = true; + this.CollectionWeightData[6].IsUpdate_Ethernet = true; + this.CollectionWeightData[6].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -3742,61 +3783,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[6], 7); - this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay7(this.EquipmentStatus, this.CollectionFeedbackStatus[6]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - this.TrackingInspectionData(this.CollectionWeightData[0], 1); - this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[1], 2); - this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[3], 4); - this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[5], 6); - this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay6(this.EquipmentStatus, this.CollectionFeedbackStatus[5]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[6].IsUpdate_COM3 = true; - this.CollectionWeightData[6].IsUpdate_ATPC = true; - this.CollectionWeightData[6].IsUpdate_Ethernet = true; - this.CollectionWeightData[6].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -3896,8 +3882,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3920,8 +3906,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3968,8 +3954,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -3991,8 +3977,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -4037,6 +4023,56 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[7].IsUpdate_COM3 = true; + this.CollectionWeightData[7].IsUpdate_ATPC = true; + this.CollectionWeightData[7].IsUpdate_Ethernet = true; + this.CollectionWeightData[7].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -4064,58 +4100,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[7], 8); - this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay8(this.EquipmentStatus, this.CollectionFeedbackStatus[7]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - break; - case 8: - this.TrackingInspectionData(this.CollectionWeightData[0], 1); - this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[2], 3); - this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[4], 5); - this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay5(this.EquipmentStatus, this.CollectionFeedbackStatus[4]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[7].IsUpdate_COM3 = true; - this.CollectionWeightData[7].IsUpdate_ATPC = true; - this.CollectionWeightData[7].IsUpdate_Ethernet = true; - this.CollectionWeightData[7].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -4215,8 +4199,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4239,8 +4223,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4287,8 +4271,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4310,8 +4294,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -4355,6 +4339,54 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[8].IsUpdate_COM3 = true; + this.CollectionWeightData[8].IsUpdate_ATPC = true; + this.CollectionWeightData[8].IsUpdate_Ethernet = true; + this.CollectionWeightData[8].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay9(this.EquipmentStatus, this.CollectionFeedbackStatus[8]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + break; + case 8: + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -4382,55 +4414,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[8], 9); - this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay9(this.EquipmentStatus, this.CollectionFeedbackStatus[8]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - break; - case 8: - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[1], 2); - this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[3], 4); - this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay4(this.EquipmentStatus, this.CollectionFeedbackStatus[3]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[8].IsUpdate_COM3 = true; - this.CollectionWeightData[8].IsUpdate_ATPC = true; - this.CollectionWeightData[8].IsUpdate_Ethernet = true; - this.CollectionWeightData[8].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -4530,8 +4513,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4554,8 +4537,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4602,8 +4585,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4625,8 +4608,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -4669,6 +4652,54 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[9].IsUpdate_COM3 = true; + this.CollectionWeightData[9].IsUpdate_ATPC = true; + this.CollectionWeightData[9].IsUpdate_Ethernet = true; + this.CollectionWeightData[9].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay10(this.EquipmentStatus, this.CollectionFeedbackStatus[9]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + break; + case 8: + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -4696,55 +4727,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[9], 10); - this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay10(this.EquipmentStatus, this.CollectionFeedbackStatus[9]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - break; - case 8: - break; - case 10: - this.TrackingInspectionData(this.CollectionWeightData[0], 1); - this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[2], 3); - this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay3(this.EquipmentStatus, this.CollectionFeedbackStatus[2]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[9].IsUpdate_COM3 = true; - this.CollectionWeightData[9].IsUpdate_ATPC = true; - this.CollectionWeightData[9].IsUpdate_Ethernet = true; - this.CollectionWeightData[9].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -4844,8 +4826,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4868,8 +4850,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4916,8 +4898,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -4939,8 +4921,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -4983,6 +4965,52 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[10].IsUpdate_COM3 = true; + this.CollectionWeightData[10].IsUpdate_ATPC = true; + this.CollectionWeightData[10].IsUpdate_Ethernet = true; + this.CollectionWeightData[10].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay11(this.EquipmentStatus, this.CollectionWeightData[10]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay11(this.EquipmentStatus, this.CollectionFeedbackStatus[10]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + break; + case 8: + break; + case 10: + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -5010,52 +5038,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[10], 11); - this.ChildFormMainDisplay.UpdateStartWeightDisplay11(this.EquipmentStatus, this.CollectionWeightData[10]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay11(this.EquipmentStatus, this.CollectionFeedbackStatus[10]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - break; - case 8: - break; - case 10: - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[1], 2); - this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay2(this.EquipmentStatus, this.CollectionFeedbackStatus[1]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[10].IsUpdate_COM3 = true; - this.CollectionWeightData[10].IsUpdate_ATPC = true; - this.CollectionWeightData[10].IsUpdate_Ethernet = true; - this.CollectionWeightData[10].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 11].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -5155,8 +5137,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -5179,8 +5161,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -5227,8 +5209,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -5250,8 +5232,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -5293,6 +5275,52 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay + #region 통합 전송하기 위한 데이터 체크 + // 중량 갱신이 되었는지 체크 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[11].IsUpdate_COM3 = true; + this.CollectionWeightData[11].IsUpdate_ATPC = true; + this.CollectionWeightData[11].IsUpdate_Ethernet = true; + this.CollectionWeightData[11].IsUpdate_DataBackup = true; + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_COM3 = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_ATPC = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_Ethernet = true; + this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_DataBackup = true; + } + #endregion + + #region 화면 갱신, 데이터 백업 + if (this.SystemConfig.IsWeightViewForward == true) + { + this.ChildFormMainDisplay.UpdateStartWeightDisplay12(this.EquipmentStatus, this.CollectionWeightData[11]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay12(this.EquipmentStatus, this.CollectionFeedbackStatus[11]); + } + else + { + switch (this.SystemConfig.EquipmentColumns) + { + case 7: + break; + case 8: + break; + case 10: + break; + case 12: + this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); + this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); + break; + default: + break; + } + } + + this.TrackingInspectionDataIntegratedCheck(this.CollectionWeightData); + #endregion + #region 이중진입 if (this.CurrentOptionParameterItem.DoubleEnter == "1") { @@ -5320,52 +5348,6 @@ namespace INT69DC_7C.Forms } #endregion - #region 화면 갱신, 데이터 백업 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.TrackingInspectionData(this.CollectionWeightData[11], 12); - this.ChildFormMainDisplay.UpdateStartWeightDisplay12(this.EquipmentStatus, this.CollectionWeightData[11]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay12(this.EquipmentStatus, this.CollectionFeedbackStatus[11]); - } - else - { - switch (this.SystemConfig.EquipmentColumns) - { - case 7: - break; - case 8: - break; - case 10: - break; - case 12: - this.TrackingInspectionData(this.CollectionWeightData[0], 1); - this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); - this.ChildFormMainDisplay.UpdateFeedbackDataDisplay1(this.EquipmentStatus, this.CollectionFeedbackStatus[0]); - break; - default: - break; - } - } - #endregion - - #region 통합 전송하기 위한 데이터 체크 - // 중량 갱신이 되었는지 체크 - if (this.SystemConfig.IsWeightViewForward == true) - { - this.CollectionWeightData[11].IsUpdate_COM3 = true; - this.CollectionWeightData[11].IsUpdate_ATPC = true; - this.CollectionWeightData[11].IsUpdate_Ethernet = true; - this.CollectionWeightData[11].IsUpdate_DataBackup = true; - } - else - { - this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_COM3 = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_ATPC = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_Ethernet = true; - this.CollectionWeightData[this.CollectionWeightData.Count - 12].IsUpdate_DataBackup = true; - } - #endregion - #region 입력센서 연속 입력 시 정지 if (this.SystemConfig.IsEmergencyStopEntrySensorError == true) { @@ -5465,8 +5447,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT2IntegratedTransmissionCheck(this.CollectionWeightData); @@ -5489,8 +5471,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT3IntegratedTransmissionCheck(this.CollectionWeightData); @@ -5537,8 +5519,8 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 - if (this.timerTimeOutOPT.Enabled == false) - this.timerTimeOutOPT.Enabled = true; + if (this.timerTimeOutCOM3.Enabled == false) + this.timerTimeOutCOM3.Enabled = true; // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) this.SerialCH3OPT5IntegratedTransmissionCheck(this.CollectionWeightData); @@ -5560,8 +5542,8 @@ namespace INT69DC_7C.Forms #region ATPC(Alarm Total Pass Count) if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) { - if (this.timerTimeOutOPT2.Enabled == false) - this.timerTimeOutOPT2.Enabled = true; + if (this.timerTimeOutATPC.Enabled == false) + this.timerTimeOutATPC.Enabled = true; } #endregion #endregion @@ -10819,7 +10801,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT.Enabled = false; + this.timerTimeOutCOM3.Enabled = false; this.SerialCH3OPT2IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -10853,7 +10835,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT.Enabled = false; + this.timerTimeOutCOM3.Enabled = false; this.SerialCH3OPT3IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -11240,7 +11222,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT.Enabled = false; + this.timerTimeOutCOM3.Enabled = false; this.SerialCH3OPT5IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -11284,7 +11266,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT_Ethernet.Enabled = false; + this.timerTimeOutEthernet.Enabled = false; this.EthernetOPT2IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -11310,7 +11292,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT_Ethernet.Enabled = false; + this.timerTimeOutEthernet.Enabled = false; this.EthernetOPT3IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -11336,7 +11318,7 @@ namespace INT69DC_7C.Forms if (value == this.SystemConfig.EquipmentColumns) { - this.timerTimeOutOPT_Ethernet.Enabled = false; + this.timerTimeOutEthernet.Enabled = false; this.EthernetOPT5IntegratedTransmission(datas); foreach (WeightData data in this.CollectionWeightData) @@ -11614,29 +11596,12 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.IsPart11 == false) { folder = this.PathDataBackupFolder; - fileName = string.Format("{0:yyyyMMdd}-{1}", time, this.SystemConfig.ProductNumber); + fileName = string.Format("{0:yyyyMMdd}_{1}.csv", time, this.SystemConfig.ProductNumber); } else { folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month); - fileName = string.Format("I{0:yyyyMMdd}-{1}.csv", time, this.SystemConfig.ProductNumber); - } - } - private void GetTrackingInspectionFolderPath(ref string folder, ref string fileName, int lane) - { - string ret = ""; - DateTime time = DateTime.Now; - - if (this.SystemConfig.IsPart11 == false) - { - ret = string.Format("{0}{1:yyyyMMdd}-{2}_{3}Lane.csv", this.PathDataBackupFolder, DateTime.Now, this.SystemConfig.ProductNumber, lane); - folder = this.PathDataBackupFolder; - fileName = string.Format("{0:yyyyMMdd}-{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane); - } - else - { - folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month); - fileName = string.Format("I{0:yyyyMMdd}-{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane); + fileName = string.Format("I{0:yyyyMMdd}_{1}.csv", time, this.SystemConfig.ProductNumber); } } private void TrackingInspectionData(Collection items) @@ -11714,94 +11679,46 @@ namespace INT69DC_7C.Forms for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - sw.Write(","); - sw.Write(Helper.DoubleToString(items[i].Weight, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(items[i].JudgmentStatus); + if (items[i].IsUpdate_DataBackup == true) + { + sw.Write(","); + sw.Write(Helper.DoubleToString(items[i].Weight, this.SystemConfig.DecimalPlaces)); + sw.Write(","); + sw.Write(items[i].JudgmentStatus); + } + else + { + sw.Write(","); + sw.Write(Helper.DoubleToString(0.0, this.SystemConfig.DecimalPlaces)); + sw.Write(","); + sw.Write(DataStore.JudgmentStatus.Empty); + } } sw.WriteLine(); sw.Close(); } } - private void TrackingInspectionData(WeightData item, int lane) + private void TrackingInspectionDataIntegratedCheck(Collection datas) { - bool fileCheck = false, directoryCheck = false; - string fullFilePath = "", folderPath = "", fileName = ""; - StreamWriter sw; + int value = 0; - if (this.SystemConfig.IsDataBackup == true) + if (this.timerTimeOutDB.Enabled == false) + this.timerTimeOutDB.Enabled = true; + + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - this.GetTrackingInspectionFolderPath(ref folderPath, ref fileName, lane); - fullFilePath = string.Format("{0}{1}", folderPath, fileName); - - DirectoryInfo di = new DirectoryInfo(folderPath); - directoryCheck = di.Exists; - // 폴더 체크 - if (directoryCheck == false) - di.Create(); - - FileInfo fileInfo = new FileInfo(fullFilePath); - fileCheck = fileInfo.Exists; - - sw = new StreamWriter(fullFilePath, true, Encoding.UTF8); - - if (fileCheck == false) - { - this.RemoveInspectionDataFile(); - - sw.Write("Date"); - sw.Write(","); - sw.Write("Time"); - sw.Write(","); - sw.Write("P_No"); - sw.Write(","); - sw.Write("Name"); - sw.Write(","); - sw.Write("Lot"); - sw.Write(","); - sw.Write("UnderRange"); - sw.Write(","); - sw.Write("PassRange"); - sw.Write(","); - sw.Write("OverRange"); - sw.Write(","); - sw.Write("TareRange"); - sw.Write(","); - sw.Write("Weight"); - sw.Write(","); - sw.Write("Grade"); - - sw.WriteLine(); - } - - sw.Write(string.Format("{0:yyyy-MM-dd}", DateTime.Now)); - sw.Write(","); - sw.Write(string.Format("{0:HH:mm:ss}", DateTime.Now)); - sw.Write(","); - sw.Write(this.CurrentProductItem.Number); - sw.Write(","); - sw.Write(this.CurrentProductItem.Name); - sw.Write(","); - sw.Write(this.CurrentProductItem.LotNo); - sw.Write(","); - sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.UnderRange, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.OverRange, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.TareRange, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(Helper.DoubleToString(item.Weight, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(item.JudgmentStatus); - sw.WriteLine(); - - sw.Close(); + if (datas[i].IsUpdate_DataBackup == true || datas[i].IsBypassMode == true) + value++; + } + + if (value == this.SystemConfig.EquipmentColumns) + { + this.timerTimeOutDB.Enabled = false; + this.TrackingInspectionData(datas); + + foreach (WeightData data in datas) + data.IsUpdate_DataBackup = false; } - } - private void TrackingInspectionDataIntegratedCheck() - { } private void RemoveInspectionDataFile() { @@ -12351,9 +12268,9 @@ namespace INT69DC_7C.Forms this.timerUserList.Enabled = true; } - private void timerTimeOutOPT_Tick(object sender, EventArgs e) + private void timerTimeOutCOM3_Tick(object sender, EventArgs e) { - this.timerTimeOutOPT.Enabled = false; + this.timerTimeOutCOM3.Enabled = false; switch (this.SystemConfig.Serial3Mode) { @@ -12373,9 +12290,9 @@ namespace INT69DC_7C.Forms foreach (WeightData data in this.CollectionWeightData) data.IsUpdate_COM3 = false; } - private void timerTimeOutOPT_Ethernet_Tick(object sender, EventArgs e) + private void timerTimeOutEthernet_Tick(object sender, EventArgs e) { - this.timerTimeOutOPT_Ethernet.Enabled = false; + this.timerTimeOutEthernet.Enabled = false; switch (this.SystemConfig.EthernetMode) { @@ -12391,10 +12308,13 @@ namespace INT69DC_7C.Forms default: break; } + + foreach (WeightData data in this.CollectionWeightData) + data.IsUpdate_Ethernet = false; } - private void timerTimeOutOPT2_Tick(object sender, EventArgs e) + private void timerTimeOutATPC_Tick(object sender, EventArgs e) { - this.timerTimeOutOPT2.Enabled = false; + this.timerTimeOutATPC.Enabled = false; bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData); @@ -12406,6 +12326,15 @@ namespace INT69DC_7C.Forms foreach (WeightData data in this.CollectionWeightData) data.IsUpdate_ATPC = false; } + private void timerTimeOutDB_Tick(object sender, EventArgs e) + { + this.timerTimeOutDB.Enabled = false; + + this.TrackingInspectionData(this.CollectionWeightData); + + foreach (WeightData data in this.CollectionWeightData) + data.IsUpdate_DataBackup = false; + } private void timerUserList_Tick(object sender, EventArgs e) { this.timerUserList.Enabled = false; diff --git a/INT69DC_7C/Forms/FormMain.resx b/INT69DC_7C/Forms/FormMain.resx index 4c0175e..f2fdec0 100644 --- a/INT69DC_7C/Forms/FormMain.resx +++ b/INT69DC_7C/Forms/FormMain.resx @@ -168,18 +168,21 @@ 1063, 54 - + 141, 93 - + 293, 93 - + 1231, 54 17, 93 + + 469, 93 + WEBPAD @@ -187,6 +190,6 @@ False - 92 + 145 \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index dabe4c6..2fbc0dc 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -1275,8 +1275,10 @@ namespace INT69DC_7C.Forms this.timerTimeout.Enabled = false; this.labelTimeroutCount.Visible = false; - this.ParentForm.timerTimeOutOPT.Enabled = false; - this.ParentForm.timerTimeOutOPT.Interval = jItem.JudgmentDelayTime - 100; + this.ParentForm.timerTimeOutCOM3.Enabled = false; + this.ParentForm.timerTimeOutCOM3.Interval = jItem.JudgmentDelayTime - 100; + this.ParentForm.timerTimeOutEthernet.Enabled = false; + this.ParentForm.timerTimeOutEthernet.Interval = jItem.JudgmentDelayTime - 100; value = pItem.Number.ToString(); if (this.buttonProductNo.Text != value)