Compare commits

...

5 Commits

Author SHA1 Message Date
Seonjae 378c8fe77c Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C 2025-04-01 16:52:11 +09:00
Seonjae 83fe1e0d95 no message 2025-04-01 16:49:37 +09:00
DESKTOP-999R8N3\CJY 47d3526039 Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C 2025-02-07 09:11:32 +09:00
Seonjae 3be257a866 @ Ver 8.3.0 by LSJ
- 2024.07.04
 - Ver 8.2.2 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - 로드셀 고장 났을 때 장비 구동 정리
   변경 전 : 로드셀 에러 시 장비 정지
   변경 후 : 로드셀 에러 시, 환경설정-바이패스 활성화 되어 있으면, 장비 구동 할 수 있도록 수정
2024-07-12 15:07:23 +09:00
DESKTOP-999R8N3\CJY f94de7d50e Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C 2024-07-08 09:48:07 +09:00
6 changed files with 27 additions and 5 deletions

Binary file not shown.

View File

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

View File

@ -2115,10 +2115,31 @@ namespace INT63DC_2C.Forms
if (alarm.IsAlignError == true)
this.smartListBox1.AddItem("Product discharge error");
this.panelAlarmMessageBox2.BringToFront();
this.panelAlarmMessageBox2.Visible = true;
// bypass 설정 체크
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:

Binary file not shown.