From cabbcf0fe4e5d4050defdd8a1a39ce1310a4df32 Mon Sep 17 00:00:00 2001 From: CJY Date: Wed, 5 Nov 2025 16:31:06 +0900 Subject: [PATCH] =?UTF-8?q?-=20(=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95)Modbu?= =?UTF-8?q?s=20=EC=93=B0=EA=B8=B0=EB=B6=80=EB=B6=84=20=EC=83=81=ED=95=9C/?= =?UTF-8?q?=EA=B8=B0=EC=A4=80/=ED=95=98=ED=95=9C=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EB=B2=94=EC=9C=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Forms/FormMain.cs | 43 ++++++++++-------------- INT69DC_7C/Forms/FormMainDisplay.cs | 51 +++++++++++++++++++++++++++++ INT69DC_7C/Version.txt | 6 ++++ 3 files changed, 74 insertions(+), 26 deletions(-) diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index 1d0bedd..69bdf4b 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -8375,18 +8375,15 @@ namespace INT69DC_7C.Forms this.Current40000ModbusData._40018_UnderRange = int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); - if (this.Current40000ModbusData._40018_UnderRange >= 0 && this.Current40000ModbusData._40018_UnderRange <= 99999) + if (this.Current40000ModbusData._40018_UnderRange >= 0 && this.Current40000ModbusData._40018_UnderRange <= int.Parse(this.CurrentProductItem.PassRange)) { try { - this.CurrentProductItem.UnderRange = this.Current40000ModbusData._40018_UnderRange.ToString(); - - this.SaveProductFile(this.CurrentProductItem, this.SystemConfig.ProductNumber - 1); - this.TransferProductParameter(this.SystemConfig.ProductNumber); + string weight = Helper.StringToDecimalPlaces(this.Current40000ModbusData._40018_UnderRange.ToString(), this.SystemConfig.DecimalPlaces); + this.ChildFormMainDisplay.UpdateUnderRangeChange(weight); this.Update30000ModbusData(); this.ModbusCommonDataSend(); - this.ChildFormMainDisplay.UpdateCurrentProductDisplay(this.EquipmentStatus, this.CurrentProductItem, this.CurrentJudgmentSetItem, this.CollectionWeightData); // 초기값으로 설정해놓기 this.Current40000ModbusData._40018_UnderRange = 0; @@ -8403,6 +8400,7 @@ namespace INT69DC_7C.Forms else { // 실패 + this.Current40000ModbusData._40018_UnderRange = 0; this.Current40000ModbusData._40020_UnderRangeResult = 2; } #endregion @@ -8422,21 +8420,16 @@ namespace INT69DC_7C.Forms this.Current40000ModbusData._40021_PassRange = int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); - if (this.Current40000ModbusData._40021_PassRange >= 0 && this.Current40000ModbusData._40021_PassRange <= 99999) + if (this.Current40000ModbusData._40021_PassRange >= int.Parse(this.CurrentProductItem.UnderRange) + && this.Current40000ModbusData._40021_PassRange <= int.Parse(this.CurrentProductItem.OverRange)) { try { - string value = ""; - int digit = 0, temp = 0; - - this.CurrentProductItem.PassRange = this.Current40000ModbusData._40021_PassRange.ToString(); - - this.SaveProductFile(this.CurrentProductItem, this.SystemConfig.ProductNumber - 1); - this.TransferProductParameter(this.SystemConfig.ProductNumber); + string weight = Helper.StringToDecimalPlaces(this.Current40000ModbusData._40021_PassRange.ToString(), this.SystemConfig.DecimalPlaces); + this.ChildFormMainDisplay.UpdatePassRangeChange(weight); this.Update30000ModbusData(); this.ModbusCommonDataSend(); - this.ChildFormMainDisplay.UpdateCurrentProductDisplay(this.EquipmentStatus, this.CurrentProductItem, this.CurrentJudgmentSetItem, this.CollectionWeightData); // 초기값으로 설정해놓기 this.Current40000ModbusData._40021_PassRange = 0; @@ -8453,6 +8446,7 @@ namespace INT69DC_7C.Forms else { // 실패 + this.Current40000ModbusData._40021_PassRange = 0; this.Current40000ModbusData._40023_PassRangeResult = 2; } #endregion @@ -8472,18 +8466,16 @@ namespace INT69DC_7C.Forms this.Current40000ModbusData._40024_OverRange = int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); - if (this.Current40000ModbusData._40024_OverRange >= 0 && this.Current40000ModbusData._40024_OverRange <= 99999) + if (this.Current40000ModbusData._40024_OverRange >= int.Parse(this.CurrentProductItem.PassRange) + && this.Current40000ModbusData._40024_OverRange <= 99999) { try { - this.CurrentProductItem.OverRange = this.Current40000ModbusData._40024_OverRange.ToString(); - - this.SaveProductFile(this.CurrentProductItem, this.SystemConfig.ProductNumber - 1); - this.TransferProductParameter(this.SystemConfig.ProductNumber); + string weight = Helper.StringToDecimalPlaces(this.Current40000ModbusData._40024_OverRange.ToString(), this.SystemConfig.DecimalPlaces); + this.ChildFormMainDisplay.UpdateOverRangeChange(weight); this.Update30000ModbusData(); this.ModbusCommonDataSend(); - this.ChildFormMainDisplay.UpdateCurrentProductDisplay(this.EquipmentStatus, this.CurrentProductItem, this.CurrentJudgmentSetItem, this.CollectionWeightData); // 초기값으로 설정해놓기 this.Current40000ModbusData._40024_OverRange = 0; @@ -8500,6 +8492,7 @@ namespace INT69DC_7C.Forms else { // 실패 + this.Current40000ModbusData._40024_OverRange = 0; this.Current40000ModbusData._40026_OverRangeResult = 2; } #endregion @@ -8523,14 +8516,11 @@ namespace INT69DC_7C.Forms { try { - this.CurrentProductItem.TareRange = this.Current40000ModbusData._40027_TareWeight.ToString(); - - this.SaveProductFile(this.CurrentProductItem, this.SystemConfig.ProductNumber - 1); - this.TransferProductParameter(this.SystemConfig.ProductNumber); + string weight = Helper.StringToDecimalPlaces(this.Current40000ModbusData._40027_TareWeight.ToString(), this.SystemConfig.DecimalPlaces); + this.ChildFormMainDisplay.UpdateTareRangeChange(weight); this.Update30000ModbusData(); this.ModbusCommonDataSend(); - this.ChildFormMainDisplay.UpdateCurrentProductDisplay(this.EquipmentStatus, this.CurrentProductItem, this.CurrentJudgmentSetItem, this.CollectionWeightData); // 초기값으로 설정해놓기 this.Current40000ModbusData._40027_TareWeight = 0; @@ -8547,6 +8537,7 @@ namespace INT69DC_7C.Forms else { // 실패 + this.Current40000ModbusData._40027_TareWeight = 0; this.Current40000ModbusData._40029_TareWeightResult = 2; } #endregion diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 89548cd..881c4c9 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -2485,6 +2485,57 @@ namespace INT69DC_7C.Forms // Alarm Total Pass Count this.ClearAlarmTotalPassCount(); } + public void UpdateUnderRangeChange(string weight) + { + string value = ""; + + this.buttonUnder.Text = weight; + this.ParentForm.CurrentProductItem.UnderRange = weight.Replace(".", ""); + this.ParentForm.SaveProductFile(this.ParentForm.CurrentProductItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.UnderRange); + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2002_UnderRange, value); + + this.RescaleControl(); + } + public void UpdatePassRangeChange(string weight) + { + string value = ""; + + this.buttonPass.Text = weight; + this.ParentForm.CurrentProductItem.PassRange = weight.Replace(".", ""); + this.ParentForm.SaveProductFile(this.ParentForm.CurrentProductItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.PassRange); + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2003_PassRange, value); + + this.RescaleControl(); + } + public void UpdateOverRangeChange(string weight) + { + string value = ""; + + this.buttonOver.Text = weight; + this.ParentForm.CurrentProductItem.OverRange = weight.Replace(".", ""); + this.ParentForm.SaveProductFile(this.ParentForm.CurrentProductItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.OverRange); + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2004_OverRange, value); + + this.RescaleControl(); + } + public void UpdateTareRangeChange(string weight) + { + string value = ""; + + this.buttonTare.Text = weight; + this.ParentForm.CurrentProductItem.TareRange = weight.Replace(".", ""); + this.ParentForm.SaveProductFile(this.ParentForm.CurrentProductItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.TareRange); + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2005_TareRange, value); + } + public void RescaleControl() { switch (this.ParentForm.SystemConfig.EquipmentColumns) diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 7368edb..1c6d91c 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -24,6 +24,12 @@ ¸ÖƼÇü 8,10,12¿­ ÄÁº£¾î/½ºÆ½ °è·®±â */ +@ Ver 12.4.1 by CJY + - 2025.11.05 + - Ver 12.4.0 Modify + - Framework : SmartX Framework V3.2.4(update: 2021.01.20) + - (¹ö±×¼öÁ¤)Modbus ¾²±âºÎºÐ »óÇÑ/±âÁØ/ÇÏÇÑ°ª º¯°æ¹üÀ§ ¼öÁ¤ + @ Ver 12.4.0 by LSJ - 2025.09.05 - Ver 12.3.1 Modify