SJ84
/
INT99DC_7C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

@ Ver 4.2.0 by LSJ 

- 2025.08.05
 - Ver 4.1.1 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - 영테크팩 요청(고려은단) 15열 튜브
   포장기 공급기1, 공급기2 에서 충진되는 중량 구분하여 표시 요청
   장비설정 - 15열 설정시 Cross Mark 기능 활성화 됨
main V4.2.0
DESKTOP-S459P9R\LSJ 2025-09-02 13:16:33 +09:00
parent 039fd131c4
commit fa03592b7f
9 changed files with 902 additions and 611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
INT99DC_7C/Controls/ControlMainDisplayTable15.cs
View File

@ -194,7 +194,19 @@ namespace INT99DC_7C.Controls
else if (weightDatas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
grd = "●";//grd = "O";
else
grd = "";
{
if (this.ParentForm.ParentForm.SystemConfig.IsCrossMark == true)
{
if (this.ParentForm.ParentForm.FlagCrossMarkFirst == true)
grd = "★";
else
grd = "";
}
else
{
grd = "";
}
}
}
weight = Helper.DoubleToString(weightDatas[i].Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces);

9
INT99DC_7C/DataStore.cs
View File

@ -692,6 +692,7 @@ namespace INT99DC_7C
private bool m_IsOptDataStatistics;
private bool m_IsCutView;
private bool m_IsPart11;
private bool m_IsCrossMark;
private int m_DecimalPlaces;
private int m_EquipmentColumns;
@ -831,6 +832,11 @@ namespace INT99DC_7C
return false;
}
}
public bool IsCrossMark
{
get { return this.m_IsCrossMark; }
set { this.m_IsCrossMark = value; }
}
public int DecimalPlaces
{
@ -1033,6 +1039,7 @@ namespace INT99DC_7C
this.IsOptDataStatistics = false;
this.IsCutView = false;
this.IsPart11 = false;
this.IsCrossMark = false;
this.DecimalPlaces = 1;
this.EquipmentColumns = 10;
@ -1158,7 +1165,7 @@ namespace INT99DC_7C
public bool DummyBool15;
public bool DummyBool16;
public bool DummyBool17;
public bool DummyBool18;
public bool IsCrossMark;
public bool IsAlarmContinuousNGEnable;
public bool IsAlarmTotalPassCntEnable;

58
INT99DC_7C/Forms/FormEquipmentSetting.Designer.cs generated
View File

@ -81,6 +81,8 @@
this.labelStaticLine = new SmartX.SmartLabel();
this.labelStaticEquipmentID = new SmartX.SmartLabel();
this.labelTitle = new SmartX.SmartLabel();
this.buttonCrossMark = new SmartX.SmartButton();
this.labelStaticCrossMark = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.groupBoxSpecialMenu.SuspendLayout();
this.panel9.SuspendLayout();
@ -110,6 +112,8 @@
//
this.groupBoxSpecialMenu.BackPictureBox = this.smartForm1;
this.groupBoxSpecialMenu.BackPictureBox1 = null;
this.groupBoxSpecialMenu.Controls.Add(this.buttonCrossMark);
this.groupBoxSpecialMenu.Controls.Add(this.labelStaticCrossMark);
this.groupBoxSpecialMenu.Controls.Add(this.smartLabel6);
this.groupBoxSpecialMenu.Controls.Add(this.labelDataStoragePeriod);
this.groupBoxSpecialMenu.Controls.Add(this.labelStaticDataStoragePeriod);
@ -759,7 +763,7 @@
this.comboBoxEquipmentColumn.Name = "comboBoxEquipmentColumn";
this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(140, 29);
this.comboBoxEquipmentColumn.TabIndex = 127;
this.comboBoxEquipmentColumn.SelectedIndexChanged += new System.EventHandler(this.control_Click);
this.comboBoxEquipmentColumn.SelectedIndexChanged += new System.EventHandler(this.comboBoxEquipmentColumn_SelectedIndexChanged);
//
// buttonFeedingConveyor
//
@ -1008,6 +1012,56 @@
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Wordwrap = false;
//
// buttonCrossMark
//
this.buttonCrossMark.BackPictureBox = null;
this.buttonCrossMark.BackPictureBox1 = null;
this.buttonCrossMark.BackPictureBox2 = null;
this.buttonCrossMark.ButtonColor = System.Drawing.Color.Gray;
this.buttonCrossMark.ButtonImageAutoSize = true;
this.buttonCrossMark.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonCrossMark.DisableImage = null;
this.buttonCrossMark.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCrossMark.DownImage")));
this.buttonCrossMark.GroupID = 0;
this.buttonCrossMark.InitVisible = true;
this.buttonCrossMark.Location = new System.Drawing.Point(418, 542);
this.buttonCrossMark.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonCrossMark.Name = "buttonCrossMark";
this.buttonCrossMark.NestedClickEventPrevent = false;
this.buttonCrossMark.OutlinePixel = 1;
this.buttonCrossMark.RepeatInterval = 200;
this.buttonCrossMark.RepeatIntervalAccelerate = null;
this.buttonCrossMark.SafeInterval = 200;
this.buttonCrossMark.Size = new System.Drawing.Size(84, 25);
this.buttonCrossMark.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonCrossMark.TabIndex = 232;
this.buttonCrossMark.TextColor = System.Drawing.Color.Black;
this.buttonCrossMark.TextDownColor = System.Drawing.Color.White;
this.buttonCrossMark.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonCrossMark.TextLocation = new System.Drawing.Point(0, 0);
this.buttonCrossMark.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonCrossMark.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonCrossMark.UpImage")));
this.buttonCrossMark.Click += new System.EventHandler(this.buttonCrossMark_Click);
//
// labelStaticCrossMark
//
this.labelStaticCrossMark.BackPictureBox = this.smartForm1;
this.labelStaticCrossMark.BackPictureBox1 = null;
this.labelStaticCrossMark.BackPictureBox2 = null;
this.labelStaticCrossMark.BorderColor = System.Drawing.Color.Black;
this.labelStaticCrossMark.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStaticCrossMark.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.labelStaticCrossMark.InitVisible = true;
this.labelStaticCrossMark.LineSpacing = 0F;
this.labelStaticCrossMark.Location = new System.Drawing.Point(95, 542);
this.labelStaticCrossMark.Name = "labelStaticCrossMark";
this.labelStaticCrossMark.Size = new System.Drawing.Size(305, 25);
this.labelStaticCrossMark.TabIndex = 231;
this.labelStaticCrossMark.Text = "Cross Mark";
this.labelStaticCrossMark.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
this.labelStaticCrossMark.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStaticCrossMark.Wordwrap = false;
//
// FormEquipmentSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -1085,5 +1139,7 @@
private SmartX.SmartLabel smartLabel6;
public SmartX.SmartLabel labelDataStoragePeriod;
private SmartX.SmartLabel labelStaticDataStoragePeriod;
private SmartX.SmartButton buttonCrossMark;
private SmartX.SmartLabel labelStaticCrossMark;
}
}

35
INT99DC_7C/Forms/FormEquipmentSetting.cs
View File

@ -221,6 +221,10 @@ namespace INT99DC_7C.Forms
this.comboBoxEquipmentColumn.Items.Add(12);
this.comboBoxEquipmentColumn.Items.Add(15);
this.comboBoxEquipmentColumn.SelectedItem = this.ParentForm.SystemConfig.EquipmentColumns;
if (this.ParentForm.SystemConfig.EquipmentColumns == 15)
this.CrossMarkVisible(true);
else
this.CrossMarkVisible(false);
// 중량표시
if (this.ParentForm.SystemConfig.IsWeightViewForward == true)
@ -320,9 +324,21 @@ namespace INT99DC_7C.Forms
else
this.buttonLogin.Enabled = true;
// Cross Mark(15열 리스트 교차 표시)
if (this.ParentForm.SystemConfig.IsCrossMark == true)
this.buttonCrossMark.ButtonDown();
else
this.buttonCrossMark.ButtonUp();
this.buttonSave.Visible = false;
}
public void CrossMarkVisible(bool b)
{
this.labelStaticCrossMark.Visible = b;
this.buttonCrossMark.Visible = b;
}
public void DisplayRefresh()
{
this.InitializeControl();
@ -496,6 +512,25 @@ namespace INT99DC_7C.Forms
this.buttonSave.Enabled = false;
this.buttonBack.Visible = false;
}
private void buttonCrossMark_Click(object sender, EventArgs e)
{
if (this.buttonCrossMark.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
this.ParentForm.SystemConfig.IsCrossMark = true;
else
this.ParentForm.SystemConfig.IsCrossMark = false;
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
}
private void comboBoxEquipmentColumn_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.comboBoxEquipmentColumn.SelectedIndex == 4)
this.CrossMarkVisible(true);
else
this.CrossMarkVisible(false);
if (this.buttonSave.Visible != true)
this.buttonSave.Visible = true;
}
private void buttonBack_Click(object sender, EventArgs e)
{

1363
INT99DC_7C/Forms/FormEquipmentSetting.resx
View File

File diff suppressed because it is too large Load Diff

2
INT99DC_7C/Forms/FormFactoryInitialize.cs
View File

@ -178,7 +178,7 @@ namespace INT99DC_7C.Forms
structItem2.DummyBool15 = false;
structItem2.DummyBool16 = false;
structItem2.DummyBool17 = false;
structItem2.DummyBool18 = false;
structItem2.IsCrossMark = false;
structItem2.IsAlarmContinuousNGEnable = this.ParentForm.SystemConfig.IsAlarmContinuousNGEnable;
structItem2.IsAlarmTotalPassCntEnable = this.ParentForm.SystemConfig.IsAlarmTotalPassCntEnable;

2
INT99DC_7C/Forms/FormInformation.cs
View File

@ -140,7 +140,7 @@ namespace INT99DC_7C.Forms
}
private void DefaultSetting()
{
this.labelDisplayVer.Text = "4.1.1";
this.labelDisplayVer.Text = "4.2.0";
this.labelUserMgerVer.Text = "";
this.labelAes128Ver.Text = "";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;

22
INT99DC_7C/Forms/FormMain.cs
View File

@ -31,10 +31,11 @@ namespace INT99DC_7C.Forms
public bool IsBootingComplete;
public bool IsAdcLogOpen;
private bool FlagADCValueWrite;
public int BufferSmartUart; // Buffer size 정의
public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11
public int BufferSmartUart; // Buffer size 정의
public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11
public int FlagAutomaticLogoutWarningTime;
private bool IsModbusCommonDataSend; // Modbus 공통 데이터 Start 시 한번 전송용
private bool IsModbusCommonDataSend; // Modbus 공통 데이터 Start 시 한번 전송용
public bool FlagCrossMarkFirst; // 15열 영테크팩(고려은단) 중량 표시
// 파일 위치
private string m_PathLaunchFolder;
@ -403,6 +404,7 @@ namespace INT99DC_7C.Forms
this.EquipmentStatus = DataStore.EquipmentStatus.Stop;
this.BufferSmartUart = 1000000; // 1MB
this.FlagThreadMessage1 = false;
this.FlagCrossMarkFirst = true;
this.SystemConfig = new SystemConfigurationItem();
this.CurrentProductItem = new ProductItem();
@ -873,6 +875,9 @@ namespace INT99DC_7C.Forms
this.UartCom3TransferDataABFood(DataStore.ABFoodDataCommand.Normal, (int)DataStore.ABFoodDataStatus.Normal);
}
// CrossMarkFirst
this.FlagCrossMarkFirst = true;
// Part 11
if (this.SystemConfig.IsPart11 == true)
this.SetTrackingHistoryData(DataStore.TrackingOperation.EquipmentStart, "");
@ -1678,6 +1683,12 @@ namespace INT99DC_7C.Forms
{
this.ChildFormEquipmentTest.UpdateStartWeightDisplay(this.EquipmentStatus, this.CollectionWeightDataTest);
}
// CrossMark
if (this.FlagCrossMarkFirst == true)
this.FlagCrossMarkFirst = false;
else
this.FlagCrossMarkFirst = true;
}
break;
default:
@ -2063,7 +2074,7 @@ namespace INT99DC_7C.Forms
structItem2.DummyBool15 = false;
structItem2.DummyBool16 = false;
structItem2.DummyBool17 = false;
structItem2.DummyBool18 = false;
structItem2.IsCrossMark = this.SystemConfig.IsCrossMark;
structItem2.IsAlarmTotalPassCntEnable = this.SystemConfig.IsAlarmTotalPassCntEnable;
structItem2.IsAlarmContinuousNGEnable = this.SystemConfig.IsAlarmContinuousNGEnable;
@ -2185,7 +2196,7 @@ namespace INT99DC_7C.Forms
structItem2.DummyBool15 = false;
structItem2.DummyBool16 = false;
structItem2.DummyBool17 = false;
structItem2.DummyBool18 = false;
structItem2.IsCrossMark = item.IsCrossMark;
structItem2.IsAlarmContinuousNGEnable = item.IsAlarmContinuousNGEnable;
structItem2.IsAlarmTotalPassCntEnable = item.IsAlarmTotalPassCntEnable;
@ -2325,6 +2336,7 @@ namespace INT99DC_7C.Forms
this.SystemConfig.ModbusTcpStartAddress = structItem2.ModbusTcpStartAddress;
this.SystemConfig.ModbusTcpAddress1 = structItem2.ModbusTcpAddress1;
this.SystemConfig.ModbusTcpAddress2 = structItem2.ModbusTcpAddress2;
this.SystemConfig.IsCrossMark = structItem2.IsCrossMark;
if (structItem2.AlarmTotalPassCnt < 20)
{

8
INT99DC_7C/Version.txt
View File

@ -14,6 +14,14 @@
멀티형 8,10,12열 튜브스틱 계량기
*/
@ Ver 4.2.0 by LSJ
- 2025.08.05
- Ver 4.1.1 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 영테크팩 요청(고려은단) 15열 튜브
포장기 공급기1, 공급기2 에서 충진되는 중량 구분하여 표시 요청
장비설정 - 15열 설정시 Cross Mark 기능 활성화 됨
@ Ver 4.1.1 by LSJ
- 2025.08.04
- Ver 4.1.0 Modify