diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 046a4e3..0791db4 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "11.0.5"; + this.labelDisplayVer.Text = "11.2.0"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index e745aab..a9e2fac 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -109,6 +109,8 @@ namespace INT69DC_7C.Forms public List ListDllUserName; // Dataviewer Filter public DataViewerFilter CurrentDataViewerFilter; + // Judgment Result Buffer + private Collection CollJudgmentStatus; // Collection private Collection CollectionGraphData; // 판정설정 그래프 데이터 @@ -325,6 +327,7 @@ namespace INT69DC_7C.Forms this.CollectionIndividualDirection = new Collection(); this.CollectionProductName = new Collection(); this.CollectionFeedbackStatus = new Collection(); + this.CollJudgmentStatus = new Collection(); this.CollectionWeightData.Clear(); this.CollectionWeightDataTest.Clear(); @@ -341,6 +344,7 @@ namespace INT69DC_7C.Forms this.CollectionIndividualDirection.Clear(); this.CollectionProductName.Clear(); this.CollectionFeedbackStatus.Clear(); + this.CollJudgmentStatus.Clear(); for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { @@ -354,6 +358,7 @@ namespace INT69DC_7C.Forms this.CollectionDigit.Add(""); this.CollectionFilter.Add(""); this.CollectionFeedbackStatus.Add(new FeedBackSystem1()); + this.CollJudgmentStatus.Add(DataStore.JudgmentStatus.Empty); } for (int i = 0; i < 13; i++) @@ -812,7 +817,8 @@ namespace INT69DC_7C.Forms this.CollectionWeightData[index].WeightString = receiveData.Substring(2, 5); this.CollectionWeightData[index].ADCValue = receiveData.Substring(7, 5); - this.Update30000ModbusData(index); + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(index); } else { @@ -823,7 +829,8 @@ namespace INT69DC_7C.Forms this.CollectionWeightData[index2].WeightString = receiveData.Substring(2, 5); this.CollectionWeightData[index2].ADCValue = receiveData.Substring(7, 5); - this.Update30000ModbusData(index2); + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(index2); } } private void UpdateWeightDataTest(int index, string receiveData) @@ -5048,26 +5055,78 @@ namespace INT69DC_7C.Forms { if (this.SystemConfig.IsWeightViewForward == true) { + DataStore.JudgmentStatus jStatus = DataStore.JudgmentStatus.Empty; + bool result1 = false; + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - this.CollectionWeightData[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); + jStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); + this.CollJudgmentStatus[i] = jStatus; + + if (jStatus != DataStore.JudgmentStatus.Pass) + result1 = true; + } + + if (this.SystemConfig.IsIndividualNG == false) + { + // 판정데이터 검사 + if (result1 == true) + { + for (int i = 0; i < this.CollJudgmentStatus.Count; i++) + { + if (this.CollJudgmentStatus[i] == DataStore.JudgmentStatus.Pass) + this.CollJudgmentStatus[i] = DataStore.JudgmentStatus.EXNg; + } + } + } + + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + this.CollectionWeightData[i].JudgmentStatus = this.CollJudgmentStatus[i]; this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); this.CollectionWeightData[i].WeightString = receiveData.Substring(i * 12 + 2, 5); this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); - this.Update30000ModbusData(i); + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(i); } } else { + DataStore.JudgmentStatus jStatus = DataStore.JudgmentStatus.Empty; + bool result1 = false; + + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + jStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2)); + this.CollJudgmentStatus[this.CollJudgmentStatus.Count - i] = jStatus; + + if (jStatus != DataStore.JudgmentStatus.Pass) + result1 = true; + } + + if (this.SystemConfig.IsIndividualNG == false) + { + // 판정데이터 검사 + if (result1 == true) + { + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + if (this.CollJudgmentStatus[i] == DataStore.JudgmentStatus.Pass) + this.CollJudgmentStatus[i] = DataStore.JudgmentStatus.EXNg; + } + } + } + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) { this.CollectionWeightData[this.CollectionWeightData.Count - i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2)); this.CollectionWeightData[this.CollectionWeightData.Count - i].Weight = Helper.StringToWeight(receiveData.Substring((i - 1) * 12 + 2, 5), this.SystemConfig.DecimalPlaces); this.CollectionWeightData[this.CollectionWeightData.Count - i].WeightString = receiveData.Substring((i - 1) * 12 + 2, 5); this.CollectionWeightData[this.CollectionWeightData.Count - i].ADCValue = receiveData.Substring((i - 1) * 12 + 7, 5); - - this.Update30000ModbusData(this.CollectionWeightData.Count - i); + + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(this.CollectionWeightData.Count - i); } } } @@ -5092,9 +5151,6 @@ namespace INT69DC_7C.Forms } } } - - //foreach (WeightData data in this.CollectionWeightData) - // data.IsUpdate = true; #endregion if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) diff --git a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs index 4ea8e23..a7c55d8 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs @@ -430,12 +430,12 @@ this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 17F, System.Drawing.FontStyle.Bold); + this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; this.labelTotalCount.Location = new System.Drawing.Point(99, 703); this.labelTotalCount.Name = "labelTotalCount"; - this.labelTotalCount.Size = new System.Drawing.Size(148, 41); + this.labelTotalCount.Size = new System.Drawing.Size(142, 41); this.labelTotalCount.TabIndex = 444; this.labelTotalCount.Text = "999999999"; this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -450,7 +450,7 @@ this.labelProductionSpeed.BackPictureBox2 = null; this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black; this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 17F, System.Drawing.FontStyle.Bold); + this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelProductionSpeed.InitVisible = true; this.labelProductionSpeed.LineSpacing = 0F; this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704); @@ -488,12 +488,12 @@ this.labelNGCount.BackPictureBox2 = null; this.labelNGCount.BorderColor = System.Drawing.Color.Black; this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 17F, System.Drawing.FontStyle.Bold); + this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelNGCount.InitVisible = true; this.labelNGCount.LineSpacing = 0F; - this.labelNGCount.Location = new System.Drawing.Point(365, 703); + this.labelNGCount.Location = new System.Drawing.Point(344, 703); this.labelNGCount.Name = "labelNGCount"; - this.labelNGCount.Size = new System.Drawing.Size(125, 41); + this.labelNGCount.Size = new System.Drawing.Size(142, 41); this.labelNGCount.TabIndex = 442; this.labelNGCount.Text = "1234567"; this.labelNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -1672,7 +1672,7 @@ this.labelTitleTotalCount.BackPictureBox2 = null; this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleTotalCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); this.labelTitleTotalCount.InitVisible = true; this.labelTitleTotalCount.LineSpacing = 0F; this.labelTitleTotalCount.Location = new System.Drawing.Point(23, 703); @@ -1692,7 +1692,7 @@ this.labelTitleNGCount.BackPictureBox2 = null; this.labelTitleNGCount.BorderColor = System.Drawing.Color.Black; this.labelTitleNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleNGCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNGCount.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); this.labelTitleNGCount.InitVisible = true; this.labelTitleNGCount.LineSpacing = 0F; this.labelTitleNGCount.Location = new System.Drawing.Point(274, 703); diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index bffab4b..df8f21a 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,15 +15,29 @@ Ƽ 8,10,12 /ƽ 跮 */ -@ Ver 11.0.5 by CJY - - 2024.04.30 - - Ver 11.0.4 Modify +@ Ver 11.2.0 by CJY + - 2024.05.23 + - Ver 11.1.0 Modify - Framework : SmartX Framework V3.1.1(update: 2019.03.21) - , ׷ ư ѱ۷ - ȭ , ߷ Disable ư ѱ۷ - ǥȭ, ȭ ϴ "Arial" -> "Tahoma" + - IO Test ư ߰ + - Ϻ ̹ ߰(ڵ ߰ ) + - Ÿ 簳 ߰ + +@ Ver 11.1.0 by LSJ + - 2024.04.11 + - Ver 11.0.3 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ǥ׷ + 1. ǥ׷ ۾ Tahoma -> Arial + - ƽ1忡 NG(OFF) ϶ ߷ + ) 10 1 ҷ̸, 1 NG 9 + ǰ ó + : 9 + : ǰ EX NG ҷ @ Ver 11.0.4 by CJY - 2024.04.11