Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C

- 2024.07.04
 - Ver 8.2.2 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - 로드셀 고장 났을 때 장비 구동 정리
   변경 전 : 로드셀 에러 시 장비 정지
   변경 후 : 로드셀 에러 시, 환경설정-바이패스 활성화 되어 있으면, 장비 구동 할 수 있도록 수정

INT63DC_2C/Forms/FormInformation.cs

@@ -153,7 +153,7 @@ namespace INT63DC_2C.Forms
         }
         private void DefaultSetting()
         {
-            this.labelDisplayVer.Text = "8.2.2";
+            this.labelDisplayVer.Text = "8.3.0";
             this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
             this.textBoxSerialNo.Location = new Point(395, 225);
             this.textBoxSerialNo.Visible = false;

INT63DC_2C/Forms/FormMainDisplay.cs

@@ -2115,10 +2115,31 @@ namespace INT63DC_2C.Forms
             if (alarm.IsAlignError == true)
                 this.smartListBox1.AddItem("Product discharge error");
 
-            this.panelAlarmMessageBox2.BringToFront();
+            // bypass 설정 체크
-            this.panelAlarmMessageBox2.Visible = true;
+            bool isBypass = false;
+            if (alarm.IsLoadcellError == true)
+            { 
+                foreach(WeightData data in this.ParentForm.CollectionWeightData)
+                {
+                    if (data.IsBypassMode == true)
+                    {
+                        isBypass = true;
+                        continue;
+                    }
+                }
+            }
+
+            if (alarm.IsLoadcellError == true)
+            {
+                if (isBypass == true)
+                    return;
+            }
+
             if (this.ParentForm.CurrentAlarmList.IsBuzzerStatus == false)
             {
+                this.panelAlarmMessageBox2.BringToFront();
+                this.panelAlarmMessageBox2.Visible = true;
+
                 this.ParentForm.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard);
                 this.ParentForm.TransferData(CommunicationCommand.BuzzerOn, CommunicationID.MainBoard);
                 this.ParentForm.CurrentAlarmList.IsBuzzerStatus = true;
@@ -2281,6 +2302,7 @@ namespace INT63DC_2C.Forms
             if (this.ParentForm.IsServoOrigin == false)
                 this.panelAlarmMessageBox4.Visible = false;
 
+            // Bypass Display
             switch (this.ParentForm.SystemConfig.EquipmentColumns)
             {
                 case 2:

INT63DC_2C/Forms/FormMotorSetting.cs

@@ -408,7 +408,7 @@ namespace INT63DC_2C.Forms
             if (label == null)
                 return;
 
-            if (this.ParentForm.smartModbus.IsOpen == false || label.Text.Trim() == "0")
+            if (this.ParentForm.smartModbus.IsOpen == false)
             {
                 // 통신 연결상태를 확인하세요
                 DialogFormMessage myMsg = new DialogFormMessage(23, this.ParentForm.SystemConfig.Language);
@@ -443,7 +443,7 @@ namespace INT63DC_2C.Forms
 
                 if (myKeyPad.ShowDialog() == DialogResult.OK)
                 {
-                    if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 20000)
+                    if (myKeyPad.doubleValue < 1 || myKeyPad.doubleValue > 20000)
                     {
                         // 입력범위를 확인하세요
                         DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);
@@ -463,7 +463,7 @@ namespace INT63DC_2C.Forms
 
                 if (myKeyPad.ShowDialog() == DialogResult.OK)
                 {
-                    if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 20000)
+                    if (myKeyPad.doubleValue < 1 || myKeyPad.doubleValue > 20000)
                     {
                         // 입력범위를 확인하세요
                         DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);
@@ -486,7 +486,7 @@ namespace INT63DC_2C.Forms
 
                 if (myKeyPad.ShowDialog() == DialogResult.OK)
                 {
-                    if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 10000)
+                    if (myKeyPad.doubleValue < 1 || myKeyPad.doubleValue > 10000)
                     {
                         // 입력범위를 확인하세요
                         DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);
@@ -506,7 +506,7 @@ namespace INT63DC_2C.Forms
 
                 if (myKeyPad.ShowDialog() == DialogResult.OK)
                 {
-                    if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 10000)
+                    if (myKeyPad.doubleValue < 1 || myKeyPad.doubleValue > 10000)
                     {
                         // 입력범위를 확인하세요
                         DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);