chojy
/
INT69DC_7C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DC_7C 

# Conflicts:
#	INT69DC_7C/Forms/FormInformation.cs
#	INT69DC_7C/Forms/FormMainDisplay.Designer.cs
#	INT69DC_7C/Version.txt
master
DESKTOP-999R8N3\CJY 2024-05-16 14:38:38 +09:00
parent 2ab3fd4430 8231522ea5
commit 981baa3694
4 changed files with 92 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INT69DC_7C/Forms/FormInformation.cs
View File

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

64
INT69DC_7C/Forms/FormMain.cs
View File

@ -109,6 +109,8 @@ namespace INT69DC_7C.Forms
public List<string> ListDllUserName;
// Dataviewer Filter
public DataViewerFilter CurrentDataViewerFilter;
// Judgment Result Buffer
private Collection<DataStore.JudgmentStatus> CollJudgmentStatus;
// Collection
private Collection<int> CollectionGraphData; // 판정설정 그래프 데이터
@ -325,6 +327,7 @@ namespace INT69DC_7C.Forms
this.CollectionIndividualDirection = new Collection<string>();
this.CollectionProductName = new Collection<string>();
this.CollectionFeedbackStatus = new Collection<FeedBackSystem1>();
this.CollJudgmentStatus = new Collection<DataStore.JudgmentStatus>();
this.CollectionWeightData.Clear();
this.CollectionWeightDataTest.Clear();
@ -341,6 +344,7 @@ namespace INT69DC_7C.Forms
this.CollectionIndividualDirection.Clear();
this.CollectionProductName.Clear();
this.CollectionFeedbackStatus.Clear();
this.CollJudgmentStatus.Clear();
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
@ -354,6 +358,7 @@ namespace INT69DC_7C.Forms
this.CollectionDigit.Add("");
this.CollectionFilter.Add("");
this.CollectionFeedbackStatus.Add(new FeedBackSystem1());
this.CollJudgmentStatus.Add(DataStore.JudgmentStatus.Empty);
}
for (int i = 0; i < 13; i++)
@ -812,6 +817,7 @@ namespace INT69DC_7C.Forms
this.CollectionWeightData[index].WeightString = receiveData.Substring(2, 5);
this.CollectionWeightData[index].ADCValue = receiveData.Substring(7, 5);
if (this.SystemConfig.EthernetOperationMode == 3)
this.Update30000ModbusData(index);
}
else
@ -823,6 +829,7 @@ namespace INT69DC_7C.Forms
this.CollectionWeightData[index2].WeightString = receiveData.Substring(2, 5);
this.CollectionWeightData[index2].ADCValue = receiveData.Substring(7, 5);
if (this.SystemConfig.EthernetOperationMode == 3)
this.Update30000ModbusData(index2);
}
}
@ -5048,18 +5055,69 @@ namespace INT69DC_7C.Forms
{
if (this.SystemConfig.IsWeightViewForward == true)
{
DataStore.JudgmentStatus jStatus = DataStore.JudgmentStatus.Empty;
bool result1 = false;
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
this.CollectionWeightData[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2));
jStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2));
this.CollJudgmentStatus[i] = jStatus;
if (jStatus != DataStore.JudgmentStatus.Pass)
result1 = true;
}
if (this.SystemConfig.IsIndividualNG == false)
{
// 판정데이터 검사
if (result1 == true)
{
for (int i = 0; i < this.CollJudgmentStatus.Count; i++)
{
if (this.CollJudgmentStatus[i] == DataStore.JudgmentStatus.Pass)
this.CollJudgmentStatus[i] = DataStore.JudgmentStatus.EXNg;
}
}
}
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
this.CollectionWeightData[i].JudgmentStatus = this.CollJudgmentStatus[i];
this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces);
this.CollectionWeightData[i].WeightString = receiveData.Substring(i * 12 + 2, 5);
this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5);
if (this.SystemConfig.EthernetOperationMode == 3)
this.Update30000ModbusData(i);
}
}
else
{
DataStore.JudgmentStatus jStatus = DataStore.JudgmentStatus.Empty;
bool result1 = false;
for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
{
jStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2));
this.CollJudgmentStatus[this.CollJudgmentStatus.Count - i] = jStatus;
if (jStatus != DataStore.JudgmentStatus.Pass)
result1 = true;
}
if (this.SystemConfig.IsIndividualNG == false)
{
// 판정데이터 검사
if (result1 == true)
{
for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
{
if (this.CollJudgmentStatus[i] == DataStore.JudgmentStatus.Pass)
this.CollJudgmentStatus[i] = DataStore.JudgmentStatus.EXNg;
}
}
}
for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
{
this.CollectionWeightData[this.CollectionWeightData.Count - i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2));
@ -5067,6 +5125,7 @@ namespace INT69DC_7C.Forms
this.CollectionWeightData[this.CollectionWeightData.Count - i].WeightString = receiveData.Substring((i - 1) * 12 + 2, 5);
this.CollectionWeightData[this.CollectionWeightData.Count - i].ADCValue = receiveData.Substring((i - 1) * 12 + 7, 5);
if (this.SystemConfig.EthernetOperationMode == 3)
this.Update30000ModbusData(this.CollectionWeightData.Count - i);
}
}
@ -5092,9 +5151,6 @@ namespace INT69DC_7C.Forms
}
}
}
//foreach (WeightData data in this.CollectionWeightData)
// data.IsUpdate = true;
#endregion
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)

16
INT69DC_7C/Forms/FormMainDisplay.Designer.cs generated
View File

@ -430,12 +430,12 @@
this.labelTotalCount.BackPictureBox2 = null;
this.labelTotalCount.BorderColor = System.Drawing.Color.Black;
this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 17F, System.Drawing.FontStyle.Bold);
this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular);
this.labelTotalCount.InitVisible = true;
this.labelTotalCount.LineSpacing = 0F;
this.labelTotalCount.Location = new System.Drawing.Point(99, 703);
this.labelTotalCount.Name = "labelTotalCount";
this.labelTotalCount.Size = new System.Drawing.Size(148, 41);
this.labelTotalCount.Size = new System.Drawing.Size(142, 41);
this.labelTotalCount.TabIndex = 444;
this.labelTotalCount.Text = "999999999";
this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@ -450,7 +450,7 @@
this.labelProductionSpeed.BackPictureBox2 = null;
this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black;
this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 17F, System.Drawing.FontStyle.Bold);
this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular);
this.labelProductionSpeed.InitVisible = true;
this.labelProductionSpeed.LineSpacing = 0F;
this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704);
@ -488,12 +488,12 @@
this.labelNGCount.BackPictureBox2 = null;
this.labelNGCount.BorderColor = System.Drawing.Color.Black;
this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 17F, System.Drawing.FontStyle.Bold);
this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular);
this.labelNGCount.InitVisible = true;
this.labelNGCount.LineSpacing = 0F;
this.labelNGCount.Location = new System.Drawing.Point(365, 703);
this.labelNGCount.Location = new System.Drawing.Point(344, 703);
this.labelNGCount.Name = "labelNGCount";
this.labelNGCount.Size = new System.Drawing.Size(125, 41);
this.labelNGCount.Size = new System.Drawing.Size(142, 41);
this.labelNGCount.TabIndex = 442;
this.labelNGCount.Text = "1234567";
this.labelNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@ -1672,7 +1672,7 @@
this.labelTitleTotalCount.BackPictureBox2 = null;
this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black;
this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitleTotalCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.labelTitleTotalCount.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold);
this.labelTitleTotalCount.InitVisible = true;
this.labelTitleTotalCount.LineSpacing = 0F;
this.labelTitleTotalCount.Location = new System.Drawing.Point(23, 703);
@ -1692,7 +1692,7 @@
this.labelTitleNGCount.BackPictureBox2 = null;
this.labelTitleNGCount.BorderColor = System.Drawing.Color.Black;
this.labelTitleNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitleNGCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.labelTitleNGCount.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold);
this.labelTitleNGCount.InitVisible = true;
this.labelTitleNGCount.LineSpacing = 0F;
this.labelTitleNGCount.Location = new System.Drawing.Point(274, 703);

22
INT69DC_7C/Version.txt
View File

@ -15,15 +15,29 @@
멀티형 8,10,12열 컨베어/스틱 계량기
*/
@ Ver 11.0.5 by CJY
- 2024.04.30
- Ver 11.0.4 Modify
@ Ver 11.2.0 by CJY
- 2024.05.23
- Ver 11.1.0 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- 유저설정
영문 시, 그룹편집 버튼 한글로 나오는 버그 수정
- 메인화면
영문 시, 중량 Disable 버튼 한글로 나오는 버그 수정
표화면, 메인화면 하단 "Arial" -> "Tahoma" 변경
- IO Test 버튼 추가
- 일본어 이미지 추가(코드상 추가 안함)
- 장비 타입 양개형 추가
@ Ver 11.1.0 by LSJ
- 2024.04.11
- Ver 11.0.3 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- 표그래프
1. 표그래프 글씨 Tahoma -> Arial
- 스틱1모드에서 개별NG(OFF) 일때 중량 판정 데이터 수정
예) 10개 중 1개 불량이면, 1개 NG 9개 정상 판정
제품 모두 리젝 처리됨
변경 전 : 정상 수량은 9개 증가함
변경 후 : 정상 제품 EX NG 불량 으로 수정
@ Ver 11.0.4 by CJY
- 2024.04.11