From 7f59f9b69ccfc36ae227a4c900969b100f4e61f3 Mon Sep 17 00:00:00 2001 From: sj84 Date: Tue, 3 Sep 2024 15:51:57 +0900 Subject: [PATCH] =?UTF-8?q?@=20Ver=2011.4.2=20by=20LSJ=20=20-=202024.08.27?= =?UTF-8?q?=20=20-=20Ver=2011.4.1=20Modify=20=20-=20Framework=20:=20SmartX?= =?UTF-8?q?=20Framework=20V3.1.1(update:=202019.03.21)=20=20-=20=EC=A0=95?= =?UTF-8?q?=EB=9F=89=EC=95=8C=EB=9E=8C=EC=B9=B4=EC=9A=B4=ED=8A=B8=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20(ATPC)=20=20=20=20?= =?UTF-8?q?=EC=8A=A4=ED=8B=B12=20=EB=AA=A8=EB=93=9C=20=EC=9D=BC=EB=95=8C?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20OFF=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=EC=A0=90=20=EC=88=98=EC=A0=95=20(=ED=95=AD?= =?UTF-8?q?=EC=83=81=20ON=20=EC=83=81=ED=83=9C=EC=9E=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Forms/FormMain.cs | 59 +++++------------------------ INT69DC_7C/Version.txt | 9 ++++- 3 files changed, 18 insertions(+), 52 deletions(-) diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index ab84783..973ccb4 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.4.1"; + this.labelDisplayVer.Text = "11.4.2"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; else diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index babd215..66b38f3 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -9971,12 +9971,15 @@ namespace INT69DC_7C.Forms public void IntegratedTransmission(Collection datas) { #region ATPC - bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData); + if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) + { + bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(datas); - if (result == true) - this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard); + if (result == true) + this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard); - this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt); + this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt); + } #endregion #region COM3 @@ -10014,7 +10017,7 @@ namespace INT69DC_7C.Forms #endregion // DataBackup - this.TrackingInspectionData(this.CollectionWeightData); + this.TrackingInspectionData(datas); } public void IntegratedTransmissionCheck(Collection datas) { @@ -11968,51 +11971,7 @@ namespace INT69DC_7C.Forms { this.timerTimeOutTransmission.Enabled = false; - #region ATPC - bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData); - - if (result == true) - this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard); - - this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt); - #endregion - - #region COM3 - switch (this.SystemConfig.Serial3Mode) - { - case 2: - this.UartCom3Write(this.Protocol_OPT2_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData)); - break; - case 3: - this.UartCom3Write(this.Protocol_OPT3_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - case 6: - this.UartCom3Write(this.Protocol_OPT5_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - default: - break; - } - #endregion - - #region Ethernet - switch (this.SystemConfig.EthernetMode) - { - case 1: - this.SendEthernetData(this.Protocol_OPT2_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData)); - break; - case 2: - this.SendEthernetData(this.Protocol_OPT3_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - case 4: - this.SendEthernetData(this.Protocol_OPT5_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - default: - break; - } - #endregion - - // DataBackup - this.TrackingInspectionData(this.CollectionWeightData); + this.IntegratedTransmission(this.CollectionWeightData); foreach (WeightData data in this.CollectionWeightData) data.IsUpdate = false; diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 923e104..332f5ed 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,9 +15,16 @@ 멀티형 8,10,12열 컨베어/스틱 계량기 */ +@ Ver 11.4.2 by LSJ + - 2024.08.27 + - Ver 11.4.1 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - 정량알람카운트 버그 수정 (ATPC) + 스틱2 모드 일때 기능 OFF 안되는 문제점 수정 (항상 ON 상태임) + @ Ver 11.4.1 by CJY - 2024.08.21 - - Ver 11.3.0 Modify + - Ver 11.4.0 Modify - Framework : SmartX Framework V3.1.1(update: 2019.03.21) - (버그수정)단순 로그인 시, 자동 로그아웃 기능 실행되는 버그 수정