Amkor/ATV_STDLabelAttach
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

프로젝트 구조 개선 및 README.md 추가

Browse Source 
- UIControl 프로젝트 구조 변경 (CapCleaningControl → Sub/UIControl)
- arAjinextek 라이브러리 통합 및 구조 개선
- 새로운 arAjinextek_Union 프로젝트 추가
- 솔루션 파일에 README.md 추가
- QR 모드에서 WMS RCV 태그 인식 기능 강화
- 데이터베이스 스키마 업데이트 및 관련 클래스 수정
- 프린터 및 바코드 장치 연동 로직 개선

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
ChiKyun Kim
2025-08-07 08:35:56 +09:00
parent c17296101a
commit 9a7d1d27c7
140 changed files with 4203 additions and 6791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Handler/Project/Dialog/DIOMonitor.Designer.cs generated
View File

@@ -29,10 +29,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
arDev.AjinEXTEK.ColorListItem colorListItem1 = new arDev.AjinEXTEK.ColorListItem();
arDev.AjinEXTEK.ColorListItem colorListItem2 = new arDev.AjinEXTEK.ColorListItem();
arDev.AjinEXTEK.ColorListItem colorListItem3 = new arDev.AjinEXTEK.ColorListItem();
arDev.AjinEXTEK.ColorListItem colorListItem4 = new arDev.AjinEXTEK.ColorListItem();
arDev.AjinEXTEK.UI.ColorListItem colorListItem1 = new arDev.AjinEXTEK.UI.ColorListItem();
arDev.AjinEXTEK.UI.ColorListItem colorListItem2 = new arDev.AjinEXTEK.UI.ColorListItem();
arDev.AjinEXTEK.UI.ColorListItem colorListItem3 = new arDev.AjinEXTEK.UI.ColorListItem();
arDev.AjinEXTEK.UI.ColorListItem colorListItem4 = new arDev.AjinEXTEK.UI.ColorListItem();
arCtl.GridView.ColorListItem colorListItem5 = new arCtl.GridView.ColorListItem();
arCtl.GridView.ColorListItem colorListItem6 = new arCtl.GridView.ColorListItem();
arCtl.GridView.ColorListItem colorListItem7 = new arCtl.GridView.ColorListItem();
@@ -74,12 +74,12 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel2 = new System.Windows.Forms.Panel();
this.tblDI = new arDev.AjinEXTEK.IOPanel();
this.tblDI = new arDev.AjinEXTEK.UI.IOPanel();
this.lbTitle1 = new arCtl.arLabel();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.panel6 = new System.Windows.Forms.Panel();
this.tblDO = new arDev.AjinEXTEK.IOPanel();
this.tblDO = new arDev.AjinEXTEK.UI.IOPanel();
this.arLabel2 = new arCtl.arLabel();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
@@ -240,7 +240,7 @@
colorListItem2.BackColor1 = System.Drawing.Color.Lime;
colorListItem2.BackColor2 = System.Drawing.Color.Green;
colorListItem2.Remark = "ON";
this.tblDI.ColorList = new arDev.AjinEXTEK.ColorListItem[] {
this.tblDI.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
colorListItem1,
colorListItem2};
this.tblDI.ContextMenuStrip = this.contextMenuStrip1;
@@ -355,7 +355,7 @@
colorListItem4.BackColor1 = System.Drawing.Color.Lime;
colorListItem4.BackColor2 = System.Drawing.Color.Green;
colorListItem4.Remark = "ON";
this.tblDO.ColorList = new arDev.AjinEXTEK.ColorListItem[] {
this.tblDO.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
colorListItem3,
colorListItem4};
this.tblDO.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1726,8 +1726,8 @@
private System.Windows.Forms.Panel panel22;
private arCtl.GridView.GridView gbi14;
private System.Windows.Forms.Label lbi14;
private arDev.AjinEXTEK.IOPanel tblDI;
private arDev.AjinEXTEK.IOPanel tblDO;
private arDev.AjinEXTEK.UI.IOPanel tblDI;
private arDev.AjinEXTEK.UI.IOPanel tblDO;
private System.Windows.Forms.Panel panel1;
private arCtl.GridView.GridView gbi05;
private System.Windows.Forms.Label lbi05;

16
Handler/Project/Dialog/DIOMonitor.cs
View File

@@ -55,13 +55,13 @@ namespace Project.Dialog
tblDO.setItemTextAlign(ContentAlignment.MiddleLeft);
// tblFG.setItemTextAlign(ContentAlignment.BottomLeft);
tblDI.ColorList = new arDev.AjinEXTEK.ColorListItem[] {
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.Lime, BackColor2 = Color.Green, Remark="True" },
tblDI.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.Lime, BackColor2 = Color.Green, Remark="True" },
};
tblDO.ColorList = new arDev.AjinEXTEK.ColorListItem[] {
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.Tomato, BackColor2 = Color.Red, Remark="True" },
tblDO.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.Tomato, BackColor2 = Color.Red, Remark="True" },
};
//인터락이름
@@ -275,7 +275,7 @@ namespace Project.Dialog
// PUB.flag.set((int)e.idx, !curValue, "IOMONITOR");
//}
void tblDO_ItemClick(object sender, arDev.AjinEXTEK.IOPanel.ItemClickEventArgs e)
void tblDO_ItemClick(object sender, arDev.AjinEXTEK.UI.IOPanel.ItemClickEventArgs e)
{
var newValue = !PUB.dio.GetDOValue(e.idx);
if (PUB.dio.IsInit == false)
@@ -295,7 +295,7 @@ namespace Project.Dialog
}
}
void tblDI_ItemClick(object sender, arDev.AjinEXTEK.IOPanel.ItemClickEventArgs e)
void tblDI_ItemClick(object sender, arDev.AjinEXTEK.UI.IOPanel.ItemClickEventArgs e)
{
var newValue = !PUB.dio.GetDIValue(e.idx);
if (PUB.dio.IsInit == false || PUB.flag.get(eVarBool.FG_DEBUG) == true)

12
Handler/Project/Dialog/Model_Motion.cs
View File

@@ -279,7 +279,7 @@ namespace Project
var pos = (double)nud.Value;
//모션이 초기화가 안되있다면 오류로 처리한다
if (PUB.mot.IsHomeSet(nud.MotionIndex) == false)
if (PUB.mot.IsHomeSet((short)nud.MotionIndex) == false)
{
UTIL.MsgE("해당 축은 홈 검색이 완료되지 않았습니다.\n먼저 홈 검색을 완료 하세요");
return;
@@ -295,11 +295,11 @@ namespace Project
"축 : {0}\n" +
"변경전 : {1}\n" +
"변경후 : {2}\n" +
"변경 후 '저장'을 눌러야 영구 기록 됩니다", axis, PUB.mot.GetActPos(nud.MotionIndex), pos, nud.Value);
"변경 후 '저장'을 눌러야 영구 기록 됩니다", axis, PUB.mot.GetActPos((short)nud.MotionIndex), pos, nud.Value);
if (UTIL.MsgQ(msg1) != System.Windows.Forms.DialogResult.Yes) return;
ChangeCurrentPosition(nud.MotionIndex, nud);
ChangeCurrentPosition((short)nud.MotionIndex, nud);
break;
case arFrame.Control.MotCommandButton.eCommand.AbsoluteMove:
case arFrame.Control.MotCommandButton.eCommand.RelativeMove:
@@ -318,7 +318,7 @@ namespace Project
"축 : {0}\n" +
"현재위치 : {1}\n" +
"대상위치 : {2}\n" +
"이동 시 충돌 가능성이 있는지 반드시 확인 하세요", axis, PUB.mot.GetActPos(nud.MotionIndex), pos);
"이동 시 충돌 가능성이 있는지 반드시 확인 하세요", axis, PUB.mot.GetActPos((short)nud.MotionIndex), pos);
if (UTIL.MsgQ(msg) != System.Windows.Forms.DialogResult.Yes) return;
@@ -408,7 +408,7 @@ namespace Project
for (int r = 0; r < dvMot.RowCount; r++) // 오류수정 2111221
{
var row = this.dvMot.Rows[r];
var axis = int.Parse(row.Cells[0].Value.ToString());
var axis = short.Parse(row.Cells[0].Value.ToString());
row.Cells[0].Style.BackColor = PUB.mot.IsServOn(axis) ? Color.Lime : Color.Tomato;
row.Cells[2].Value = $"{PUB.mot.GetCmdPos(axis)}";
row.Cells[3].Value = $"{PUB.mot.GetActPos(axis)}";
@@ -558,7 +558,7 @@ namespace Project
#endregion
void ChangeCurrentPosition(int Axis, NumericUpDown valueCtl)
void ChangeCurrentPosition(short Axis, NumericUpDown valueCtl)
{
valueCtl.Value = (decimal)PUB.mot.GetActPos(Axis);
}

6
Handler/Project/Dialog/Model_Motion_Desc.cs
View File

@@ -157,7 +157,7 @@ namespace Project.Dialog
for (int r = 0; r < dvMot.RowCount; r++) // 오류수정 2111221
{
var row = this.dvMot.Rows[r];
var axis = int.Parse(row.Cells[0].Value.ToString());
var axis = short.Parse(row.Cells[0].Value.ToString());
row.Cells[0].Style.BackColor = PUB.mot.IsServOn(axis) ? Color.Lime : Color.Tomato;
row.Cells[2].Value = $"{PUB.mot.GetCmdPos(axis)}";
row.Cells[3].Value = $"{PUB.mot.GetActPos(axis)}";
@@ -179,10 +179,6 @@ namespace Project.Dialog
}
void ChangeCurrentPosition(int Axis, NumericUpDown valueCtl)
{
valueCtl.Value = (decimal)PUB.mot.GetActPos(Axis);
}
/// <summary>
/// 상단목록에서 모션을 선택한 경우
/// </summary>

86
Handler/Project/Dialog/Model_Operation.Designer.cs generated
View File

@@ -31,18 +31,16 @@
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.dv = new arCtl.arDatagridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ds1 = new Project.DataSet1();
this.tmDisplay = new System.Windows.Forms.Timer(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.checkBox31 = new System.Windows.Forms.CheckBox();
this.chkOwnZPL = new System.Windows.Forms.CheckBox();
this.panel5 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.Panel();
@@ -50,6 +48,7 @@
this.chkSIDCHK = new System.Windows.Forms.CheckBox();
this.checkBox32 = new System.Windows.Forms.CheckBox();
this.chkEnbCamera = new System.Windows.Forms.CheckBox();
this.button1 = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.chkApplySidInfo = new System.Windows.Forms.CheckBox();
@@ -136,9 +135,10 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.arLabel2 = new arCtl.arLabel();
this.arLabel18 = new arCtl.arLabel();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ds1 = new Project.DataSet1();
((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
this.panel5.SuspendLayout();
this.panel4.SuspendLayout();
this.panel1.SuspendLayout();
@@ -154,6 +154,8 @@
this.tableLayoutPanel1.SuspendLayout();
this.panel3.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
this.SuspendLayout();
//
// dv
@@ -204,15 +206,6 @@
this.Column1.Name = "Column1";
this.Column1.Width = 50;
//
// dvc_title
//
this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dvc_title.DataPropertyName = "Title";
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dvc_title.DefaultCellStyle = dataGridViewCellStyle2;
this.dvc_title.HeaderText = "설명";
this.dvc_title.Name = "dvc_title";
//
// Code
//
this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -222,17 +215,6 @@
this.Code.HeaderText = "Customer Code";
this.Code.Name = "Code";
//
// bs
//
this.bs.DataMember = "OPModel";
this.bs.DataSource = this.ds1;
this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged_1);
//
// ds1
//
this.ds1.DataSetName = "DataSet1";
this.ds1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// tmDisplay
//
this.tmDisplay.Interval = 500;
@@ -251,6 +233,19 @@
this.toolTip1.SetToolTip(this.checkBox31, "바코드룰에 없는 데이터를 제외 합니다..");
this.checkBox31.UseVisualStyleBackColor = true;
//
// chkOwnZPL
//
this.chkOwnZPL.AutoSize = true;
this.chkOwnZPL.DataBindings.Add(new System.Windows.Forms.Binding("CheckState", this.bs, "bOwnZPL", true));
this.chkOwnZPL.Dock = System.Windows.Forms.DockStyle.Right;
this.chkOwnZPL.Location = new System.Drawing.Point(519, 0);
this.chkOwnZPL.Name = "chkOwnZPL";
this.chkOwnZPL.Size = new System.Drawing.Size(133, 34);
this.chkOwnZPL.TabIndex = 17;
this.chkOwnZPL.Text = "개별프린트코드";
this.toolTip1.SetToolTip(this.chkOwnZPL, "바코드룰에 없는 데이터를 제외 합니다..");
this.chkOwnZPL.UseVisualStyleBackColor = true;
//
// panel5
//
this.panel5.Controls.Add(this.panel4);
@@ -293,9 +288,11 @@
//
this.panel7.BackColor = System.Drawing.Color.Gainsboro;
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel7.Controls.Add(this.chkOwnZPL);
this.panel7.Controls.Add(this.chkSIDCHK);
this.panel7.Controls.Add(this.checkBox32);
this.panel7.Controls.Add(this.chkEnbCamera);
this.panel7.Controls.Add(this.button1);
this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
this.panel7.Location = new System.Drawing.Point(10, 82);
this.panel7.Name = "panel7";
@@ -349,6 +346,17 @@
this.chkEnbCamera.Text = "비전 사용 안함";
this.chkEnbCamera.UseVisualStyleBackColor = true;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(652, 0);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(55, 34);
this.button1.TabIndex = 18;
this.button1.Text = "편집";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
@@ -1483,6 +1491,26 @@
this.arLabel18.TextShadow = true;
this.arLabel18.TextVisible = true;
//
// dvc_title
//
this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dvc_title.DataPropertyName = "Title";
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dvc_title.DefaultCellStyle = dataGridViewCellStyle2;
this.dvc_title.HeaderText = "설명";
this.dvc_title.Name = "dvc_title";
//
// bs
//
this.bs.DataMember = "OPModel";
this.bs.DataSource = this.ds1;
this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged_1);
//
// ds1
//
this.ds1.DataSetName = "DataSet1";
this.ds1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// Model_Operation
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1497,8 +1525,6 @@
this.Text = "모델 선택";
this.Load += new System.EventHandler(this.@__Load);
((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit();
this.panel5.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.panel4.PerformLayout();
@@ -1523,6 +1549,8 @@
this.panel3.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit();
this.ResumeLayout(false);
}
@@ -1631,5 +1659,7 @@
private System.Windows.Forms.CheckBox checkBox34;
private System.Windows.Forms.CheckBox checkBox35;
private System.Windows.Forms.CheckBox chkSave2;
private System.Windows.Forms.CheckBox chkOwnZPL;
private System.Windows.Forms.Button button1;
}
}

34
Handler/Project/Dialog/Model_Operation.cs
View File

@@ -1,4 +1,5 @@
using AR;
using Project.Dialog;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -621,6 +622,12 @@ namespace Project
if (drv == null) return;
var dr = drv.Row as DataSet1.OPModelRow;
if (dr.IsbOwnZPLNull())
{
dr.bOwnZPL = false;
dr.EndEdit();
}
//this.tabControl1.Visible = !dr.Title.StartsWith("101");
//this.panel6.Visible = !dr.Title.StartsWith("101");
// this.panel7.Visible = !dr.Title.StartsWith("101");
@@ -752,6 +759,33 @@ namespace Project
{
}
private void button1_Click(object sender, EventArgs e)
{
var drv = bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as DataSet1.OPModelRow;
if (chkOwnZPL.Checked == false)
{
UTIL.MsgE("개별프린트코드가 해제되어있으므로 실제 적용되지 않습니다");
}
var idx = dr.idx;
var fn = UTIL.MakePath("Model", idx.ToString(), "zpl.txt");
var fnBase = UTIL.MakePath("zpl.txt");
if (System.IO.File.Exists(fnBase) && System.IO.File.Exists(fn) == false)
{
UTIL.MsgI("전용 출력파일(ZPL.TXT)이 존재하지 않아 기본에서 복사합니다");
var fi = new System.IO.FileInfo(fn);
if (fi.Directory.Exists == false) fi.Directory.Create();
System.IO.File.Copy(fnBase, fn, true);
}
using (var f = new fZPLEditor(fn))
{
f.ShowDialog();
}
}
}
}

40
Handler/Project/Dialog/Motion_MoveToGroup.cs
View File

@@ -320,7 +320,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] 원점(0)으로 이동 : " + ax.ToString());
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{
Axis = (int)ax,
Axis = (short)ax,
Position = 0,
Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc,
@@ -336,7 +336,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)");
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{
Axis = (int)ax,
Axis = (short)ax,
Position = dr.Position,
Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc,
@@ -353,7 +353,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)");
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{
Axis = (int)ax,
Axis = (short)ax,
Position = dr.Position,
Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc,
@@ -370,7 +370,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)");
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{
Axis = (int)ax,
Axis = (short)ax,
Position = Math.Max(dr.Position - 50, 0),
Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc,
@@ -469,7 +469,7 @@ namespace Project.Dialog
{
var ax = nlist[i];
var dr = nplist[i];
var curpos = PUB.mot.GetCmdPos((int)ax);
var curpos = PUB.mot.GetCmdPos((short)ax);
sb.AppendLine($"[{dr.idx}] 축:{ax} - {dr.PosTitle}\n\t변경위치 {dr.Position} -> {curpos}");
var param = new Tuple<DataSet1.MCModelRow, eAxis, string, double, double>(dr, ax, dr.PosTitle, dr.Position, curpos);
poslist.Enqueue(param);
@@ -508,27 +508,27 @@ namespace Project.Dialog
var vel = (float)nudJogVel.Value;
if (tag == "X+")
{
if (axisX >= 0) PUB.mot.JOG(axisX, arDev.MOT.MOTION_DIRECTION.Positive, vel, 500, false, false);
if (axisX >= 0) PUB.mot.JOG((short)axisX, arDev.MOT.MOTION_DIRECTION.Positive, vel, 500, false, false);
}
else if (tag == "X-")
{
if (axisX >= 0) PUB.mot.JOG(axisX, arDev.MOT.MOTION_DIRECTION.Negative, vel, 500, false, false);
if (axisX >= 0) PUB.mot.JOG((short)axisX, arDev.MOT.MOTION_DIRECTION.Negative, vel, 500, false, false);
}
else if (tag == "Y+")
{
if (axisY >= 0) PUB.mot.JOG(axisY, arDev.MOT.MOTION_DIRECTION.Positive, vel, 500, false, false);
if (axisY >= 0) PUB.mot.JOG((short)axisY, arDev.MOT.MOTION_DIRECTION.Positive, vel, 500, false, false);
}
else if (tag == "Y-")
{
if (axisY >= 0) PUB.mot.JOG(axisY, arDev.MOT.MOTION_DIRECTION.Negative, vel, 500, false, false);
if (axisY >= 0) PUB.mot.JOG((short)axisY, arDev.MOT.MOTION_DIRECTION.Negative, vel, 500, false, false);
}
else if (tag == "Z+")
{
if (axisZ >= 0) PUB.mot.JOG(axisZ, arDev.MOT.MOTION_DIRECTION.Positive, vel, 500, false, false);
if (axisZ >= 0) PUB.mot.JOG((short)axisZ, arDev.MOT.MOTION_DIRECTION.Positive, vel, 500, false, false);
}
else if (tag == "Z-")
{
if (axisZ >= 0) PUB.mot.JOG(axisZ, arDev.MOT.MOTION_DIRECTION.Negative, vel, 500, false, false);
if (axisZ >= 0) PUB.mot.JOG((short)axisZ, arDev.MOT.MOTION_DIRECTION.Negative, vel, 500, false, false);
}
}
@@ -539,27 +539,27 @@ namespace Project.Dialog
var vel = (float)nudJogVel.Value;
if (tag == "X+")
{
if (axisX >= 0) PUB.mot.MoveStop("MOVETOGRP", axisX, true);
if (axisX >= 0) PUB.mot.MoveStop("MOVETOGRP", (short)axisX, true);
}
else if (tag == "X-")
{
if (axisX >= 0) PUB.mot.MoveStop("MOVETOGRP", axisX, true);
if (axisX >= 0) PUB.mot.MoveStop("MOVETOGRP", (short)axisX, true);
}
else if (tag == "Y+")
{
if (axisY >= 0) PUB.mot.MoveStop("MOVETOGRP", axisY, true);
if (axisY >= 0) PUB.mot.MoveStop("MOVETOGRP", (short)axisY, true);
}
else if (tag == "Y-")
{
if (axisY >= 0) PUB.mot.MoveStop("MOVETOGRP", axisY, true);
if (axisY >= 0) PUB.mot.MoveStop("MOVETOGRP", (short)axisY, true);
}
else if (tag == "Z+")
{
if (axisZ >= 0) PUB.mot.MoveStop("MOVETOGRP", axisZ, true);
if (axisZ >= 0) PUB.mot.MoveStop("MOVETOGRP", (short)axisZ, true);
}
else if (tag == "Z-")
{
if (axisZ >= 0) PUB.mot.MoveStop("MOVETOGRP", axisZ, true);
if (axisZ >= 0) PUB.mot.MoveStop("MOVETOGRP", (short)axisZ, true);
}
}
@@ -569,7 +569,7 @@ namespace Project.Dialog
var motpos = string.Empty;
if (axisX >= 0)
{
motpos += $"X:{PUB.mot.GetActPos(axisX):N3}/{PUB.mot.GetCmdPos(axisX):N3}";
motpos += $"X:{PUB.mot.GetActPos((short)axisX):N3}/{PUB.mot.GetCmdPos((short)axisX):N3}";
button6.BackColor = PUB.iLock[axisX].IsEmpty() ? Color.FromArgb(224, 224, 224) : Color.Orange;
}
else
@@ -579,7 +579,7 @@ namespace Project.Dialog
}
if (axisY >= 0)
{
motpos += $" / Y:{PUB.mot.GetActPos(axisY):N3}/{PUB.mot.GetCmdPos(axisY):N3}";
motpos += $" / Y:{PUB.mot.GetActPos((short)axisY):N3}/{PUB.mot.GetCmdPos((short)axisY):N3}";
button5.BackColor = PUB.iLock[axisY].IsEmpty() ? Color.FromArgb(224, 224, 224) : Color.Orange;
}
else
@@ -589,7 +589,7 @@ namespace Project.Dialog
}
if (axisZ >= 0)
{
motpos += $" / Z:{PUB.mot.GetActPos(axisZ):N3},{PUB.mot.GetCmdPos(axisZ):N3}";
motpos += $" / Z:{PUB.mot.GetActPos((short)axisZ):N3},{PUB.mot.GetCmdPos((short)axisZ):N3}";
button4.BackColor = PUB.iLock[axisZ].IsEmpty() ? Color.FromArgb(224, 224, 224) : Color.Orange;
}
else

2
Handler/Project/Dialog/Quick_Control.cs.cs
View File

@@ -117,7 +117,7 @@ namespace Project.Dialog
//전체 이동경로상 오류가 있으면 처리 하지 않는다.
var ermsg = new System.Text.StringBuilder();
if (PUB.mot.IsHomeSet((int)axis) == false)
if (PUB.mot.IsHomeSet((short)axis) == false)
{
ermsg.AppendLine("해당 축은 홈 검색이 완료되지 않았습니다");
}

22
Handler/Project/Dialog/RegExPrintRule.Designer.cs generated
View File

@@ -33,7 +33,7 @@
this.dataSet1 = new Project.DataSet1();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.tam = new Project.DataSet1TableAdapters.TableAdapterManager();
this.ta = new Project.DataSet1TableAdapters.Component_Reel_PrintRegExRuleTableAdapter();
this.ta = new Project.DataSet1TableAdapters.K4EE_Component_Reel_PrintRegExRuleTableAdapter();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
@@ -80,21 +80,21 @@
//
// bs
//
this.bs.DataMember = "Component_Reel_PrintRegExRule";
this.bs.DataMember = "K4EE_Component_Reel_PrintRegExRule";
this.bs.DataSource = this.dataSet1;
this.bs.Sort = "CustCode,Seq";
//
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.Component_Reel_CustInfoTableAdapter = null;
this.tam.Component_Reel_PreSetTableAdapter = null;
this.tam.Component_Reel_Print_InformationTableAdapter = null;
this.tam.Component_Reel_PrintRegExRuleTableAdapter = this.ta;
this.tam.Component_Reel_RegExRuleTableAdapter = null;
this.tam.Component_Reel_ResultTableAdapter = null;
this.tam.Component_Reel_SID_ConvertTableAdapter = null;
this.tam.Component_Reel_SID_InformationTableAdapter = null;
this.tam.K4EE_Component_Reel_CustInfoTableAdapter = null;
this.tam.K4EE_Component_Reel_PreSetTableAdapter = null;
this.tam.K4EE_Component_Reel_Print_InformationTableAdapter = null;
this.tam.K4EE_Component_Reel_PrintRegExRuleTableAdapter = this.ta;
this.tam.K4EE_Component_Reel_RegExRuleTableAdapter = null;
this.tam.K4EE_Component_Reel_ResultTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_ConvertTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_InformationTableAdapter = null;
this.tam.UpdateOrder = Project.DataSet1TableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// ta
@@ -435,7 +435,7 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox2;
private DataSet1TableAdapters.Component_Reel_PrintRegExRuleTableAdapter ta;
private DataSet1TableAdapters.K4EE_Component_Reel_PrintRegExRuleTableAdapter ta;
private System.Windows.Forms.DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn seqDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn custCodeDataGridViewTextBoxColumn;

2
Handler/Project/Dialog/RegExPrintRule.cs
View File

@@ -38,7 +38,7 @@ namespace Project.Dialog
{
try
{
this.ta.Fill(this.dataSet1.Component_Reel_PrintRegExRule);
this.ta.Fill(this.dataSet1.K4EE_Component_Reel_PrintRegExRule);
component_Reel_RegExRuleDataGridView.AutoResizeColumns();
}
catch (System.Exception ex)

22
Handler/Project/Dialog/RegExRule.Designer.cs generated
View File

@@ -65,7 +65,7 @@
this.label2 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.ta = new Project.DataSet1TableAdapters.Component_Reel_RegExRuleTableAdapter();
this.ta = new Project.DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter();
this.tam = new Project.DataSet1TableAdapters.TableAdapterManager();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -119,7 +119,7 @@
//
// bs
//
this.bs.DataMember = "Component_Reel_RegExRule";
this.bs.DataMember = "K4EE_Component_Reel_RegExRule";
this.bs.DataSource = this.dataSet1;
this.bs.Sort = "CustCode,Seq";
this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
@@ -385,14 +385,14 @@
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.Component_Reel_CustInfoTableAdapter = null;
this.tam.Component_Reel_PreSetTableAdapter = null;
this.tam.Component_Reel_Print_InformationTableAdapter = null;
this.tam.Component_Reel_PrintRegExRuleTableAdapter = null;
this.tam.Component_Reel_RegExRuleTableAdapter = this.ta;
this.tam.Component_Reel_ResultTableAdapter = null;
this.tam.Component_Reel_SID_ConvertTableAdapter = null;
this.tam.Component_Reel_SID_InformationTableAdapter = null;
this.tam.K4EE_Component_Reel_CustInfoTableAdapter = null;
this.tam.K4EE_Component_Reel_PreSetTableAdapter = null;
this.tam.K4EE_Component_Reel_Print_InformationTableAdapter = null;
this.tam.K4EE_Component_Reel_PrintRegExRuleTableAdapter = null;
this.tam.K4EE_Component_Reel_RegExRuleTableAdapter = this.ta;
this.tam.K4EE_Component_Reel_ResultTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_ConvertTableAdapter = null;
this.tam.K4EE_Component_Reel_SID_InformationTableAdapter = null;
this.tam.UpdateOrder = Project.DataSet1TableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// toolStripButton2
@@ -433,7 +433,7 @@
private DataSet1 dataSet1;
private System.Windows.Forms.BindingSource bs;
private DataSet1TableAdapters.Component_Reel_RegExRuleTableAdapter ta;
private DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter ta;
private DataSet1TableAdapters.TableAdapterManager tam;
private System.Windows.Forms.BindingNavigator bn;
private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;

14
Handler/Project/Dialog/RegExRule.cs
View File

@@ -17,7 +17,7 @@ namespace Project.Dialog
public RegExRule()
{
InitializeComponent();
this.dataSet1.Component_Reel_RegExRule.TableNewRow += (s1, e1) => {
this.dataSet1.K4EE_Component_Reel_RegExRule.TableNewRow += (s1, e1) => {
if(PUB.Result.isSetvModel)
e1.Row["CustCode"] = PUB.Result.vModel.Title;
};
@@ -44,12 +44,12 @@ namespace Project.Dialog
{
try
{
this.ta.FillByWithSample(this.dataSet1.Component_Reel_RegExRule, cust);
this.ta.FillByWithSample(this.dataSet1.K4EE_Component_Reel_RegExRule, cust);
foreach(DataGridViewRow drow in this.dv1.Rows)
{
var drv = drow.DataBoundItem as DataRowView;
if (drv == null) continue;
var dr = drv.Row as DataSet1.Component_Reel_RegExRuleRow;
var dr = drv.Row as DataSet1.K4EE_Component_Reel_RegExRuleRow;
if (dr.IsCustCodeNull() || dr.CustCode.isEmpty())
drow.DefaultCellStyle.BackColor = Color.DimGray;
else
@@ -73,7 +73,7 @@ namespace Project.Dialog
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as DataSet1.Component_Reel_RegExRuleRow;
var dr = drv.Row as DataSet1.K4EE_Component_Reel_RegExRuleRow;
}
private void toolStripButton2_Click(object sender, EventArgs e)
@@ -81,13 +81,13 @@ namespace Project.Dialog
try
{
DataSet1 ds1 = new DataSet1();
this.ta.FillAll(ds1.Component_Reel_RegExRule);
this.ta.FillAll(ds1.K4EE_Component_Reel_RegExRule);
var path = UTIL.MakePath("Export", "BarcodeRule.xml");
var fi = new System.IO.FileInfo(path);
if (fi.Directory.Exists == false) fi.Directory.Create();
ds1.Component_Reel_RegExRule.WriteXml(path);
UTIL.MsgI($"Export list File = {path},count={ds1.Component_Reel_RegExRule.Count}");
ds1.K4EE_Component_Reel_RegExRule.WriteXml(path);
UTIL.MsgI($"Export list File = {path},count={ds1.K4EE_Component_Reel_RegExRule.Count}");
}
catch (System.Exception ex)
{

4
Handler/Project/Dialog/fFinishJob.cs
View File

@@ -67,7 +67,7 @@ namespace Project.Dialog
label2.Text = string.Format("현 작업 정보({0}~{1})", sd.ToString("HH:mm:ss"), ed.ToString("HH:mm:ss"));
//현작업
var ta = new DataSet1TableAdapters.Component_Reel_ResultTableAdapter();
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
var list = ta.GetByValidGuid(sd, ed, AR.SETTING.Data.McName, PUB.Result.guid);
//var list = db.Component_Reel_Result.Where(t => t.STIME >= sd && t.STIME <= ed && t.PRNVALID == true && t.PRNATTACH == true && t.MC == AR.SETTING.Data.McName);
UpdateList(list, dataGridView1, dataGridView2);
@@ -80,7 +80,7 @@ namespace Project.Dialog
UpdateList(listday, dataGridView3, dataGridView4);
}
void UpdateList(DataSet1.Component_Reel_ResultDataTable list, DataGridView dvS, DataGridView dvB)
void UpdateList(DataSet1.K4EE_Component_Reel_ResultDataTable list, DataGridView dvS, DataGridView dvB)
{
dvS.Rows.Clear();
dvB.Rows.Clear();

6
Handler/Project/Dialog/fHistory.Designer.cs generated
View File

@@ -75,7 +75,7 @@
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dataSet1 = new Project.DataSet1();
this.ta = new Project.DataSet1TableAdapters.Component_Reel_ResultTableAdapter();
this.ta = new Project.DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
this.panel2 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
@@ -446,7 +446,7 @@
//
// bs
//
this.bs.DataMember = "Component_Reel_Result";
this.bs.DataMember = "K4EE_Component_Reel_Result";
this.bs.DataSource = this.dataSet1;
this.bs.Sort = "wdate desc";
//
@@ -528,7 +528,7 @@
private System.Windows.Forms.ToolStripMenuItem sendDataToolStripMenuItem;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripMenuItem viewXMLToolStripMenuItem;
private DataSet1TableAdapters.Component_Reel_ResultTableAdapter ta;
private DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter ta;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button3;

8
Handler/Project/Dialog/fHistory.cs
View File

@@ -117,7 +117,7 @@ namespace Project.Dialog
return;
}
//저장소초기화
this.dataSet1.Component_Reel_Result.Clear();
this.dataSet1.K4EE_Component_Reel_Result.Clear();
System.Diagnostics.Stopwatch wat = new System.Diagnostics.Stopwatch();
wat.Restart();
@@ -127,7 +127,7 @@ namespace Project.Dialog
if (search.isEmpty()) search = "%";
else search = "%" + search + "%";
ta.FillBySearch(this.dataSet1.Component_Reel_Result, SETTING.Data.McName, dtSD.Value.ToShortDateString(), dtED.Value.ToShortDateString(), search);
ta.FillBySearch(this.dataSet1.K4EE_Component_Reel_Result, SETTING.Data.McName, dtSD.Value.ToShortDateString(), dtED.Value.ToShortDateString(), search);
wat.Stop();
@@ -207,7 +207,7 @@ namespace Project.Dialog
}
else
{
var dType = this.dataSet1.Component_Reel_Result.Columns[propertyName].DataType;
var dType = this.dataSet1.K4EE_Component_Reel_Result.Columns[propertyName].DataType;
if (dType == typeof(float)) Sheet.writeNum(row, i, (float)dr.Cells[i].Value);
else if (dType == typeof(double)) Sheet.writeNum(row, i, (double)dr.Cells[i].Value);
else if (dType == typeof(int)) Sheet.writeNum(row, i, (int)dr.Cells[i].Value);
@@ -268,7 +268,7 @@ namespace Project.Dialog
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as DataSet1.Component_Reel_ResultRow;
var dr = drv.Row as DataSet1.K4EE_Component_Reel_ResultRow;
using(var f = new Dialog.fManualPrint(dr.SID,dr.VLOT, dr.QTY.ToString(),dr.MFGDATE,dr.RID, dr.VNAME, dr.PARTNO))
{

38
Handler/Project/Dialog/fLoaderInfo.cs
View File

@@ -177,7 +177,7 @@ namespace Project.Dialog
if (this.PrintPos.isEmpty() && item.VisionData.SID.isEmpty() == false)
{
//프린트위치가없다면 서버를 조회하여 데이터를 찾아준다. - 231005
var taresult = new DataSet1TableAdapters.Component_Reel_ResultTableAdapter();
var taresult = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
this.PrintPos = taresult.GetPrintPosition(AR.SETTING.Data.McName, item.VisionData.SID);
}
DisplayPrintPos(this.PrintPos);
@@ -459,7 +459,7 @@ namespace Project.Dialog
{
try
{
using (var ta = new DataSet1TableAdapters.Component_Reel_Print_InformationTableAdapter())
using (var ta = new DataSet1TableAdapters.K4EE_Component_Reel_Print_InformationTableAdapter())
{
var dr = ta.GetBySID(PUB.MCCode, lvValue).FirstOrDefault();
if (dr != null) //자료가잇는 경우에만 적용
@@ -603,8 +603,8 @@ namespace Project.Dialog
}
//sid 가 변경되었으나 해당 sid 인쇄위치 및 customer / part no 값을 확인 합니다.
var taSID = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter();
var taPRN = new DataSet1TableAdapters.Component_Reel_Print_InformationTableAdapter();
var taSID = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter();
var taPRN = new DataSet1TableAdapters.K4EE_Component_Reel_Print_InformationTableAdapter();
try
{
@@ -692,9 +692,9 @@ namespace Project.Dialog
new SqlParameter("sd", sd),
};
DataSet1.Component_Reel_ResultRow preData = null;
DataSet1.K4EE_Component_Reel_ResultRow preData = null;
var preDatas = DBHelper.Get(sql, ps);
if (preDatas.Rows.Count > 0) preData = preDatas.Rows[0] as DataSet1.Component_Reel_ResultRow;
if (preDatas.Rows.Count > 0) preData = preDatas.Rows[0] as DataSet1.K4EE_Component_Reel_ResultRow;
//var preData = db2.Component_Reel_Result.AsNoTracking().Where(t =>
//t.JTYPE == PUB.Result.JobType2 &&
@@ -1083,7 +1083,7 @@ namespace Project.Dialog
return;
}
var sid = tbSID.Text.Trim();
using (var db = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter())
using (var db = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter())
{
var dr = db.GetBySID(PUB.MCCode, sid).FirstOrDefault();
if (dr == null)
@@ -1114,20 +1114,8 @@ namespace Project.Dialog
private void btCustAutoInput_Click(object sender, EventArgs e)
{
using (var db = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter())
using (var db = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter())
{
////서플라이코드가 있다면 그 코드값으로 가져온다
//var custCode = TbCustCode.Text.Trim();
//if (custCode.isEmpty() == false)
//{
// var drCustCode = db.Component_Reel_SIDConv.Where(t => t.cust == custCode).FirstOrDefault();
// if (drCustCode != null && drCustCode.manu.isEmpty() == false)
// {
// Pub.log.Add(string.Format("서플라이네임을 가져옴 값={0},코드={1}", drCustCode.manu, custCode));
// tbVName.Text = drCustCode.manu;
// return;
// }
//}
var sid = tbSID.Text.Trim();
if (sid.isEmpty())
@@ -1153,7 +1141,7 @@ namespace Project.Dialog
var vlot = this.tbVLOT.Text.Trim();
if (vlot.isEmpty() == false)
{
using (var taResult = new DataSet1TableAdapters.Component_Reel_ResultTableAdapter())
using (var taResult = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter())
{
var dr2 = taResult.GetByLastVLotOne(AR.SETTING.Data.McName, vlot).FirstOrDefault();
if (dr2 != null)
@@ -1188,7 +1176,7 @@ namespace Project.Dialog
}
//각 상황에 따라 다르다.
using (var db = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter())
using (var db = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter())
{
var amksid = string.Empty;
var dtSIDInfo = db.GetData(PUB.MCCode);
@@ -2070,7 +2058,7 @@ namespace Project.Dialog
var dlg = UTIL.MsgQ("SID 에서 인쇄 위치를 검색 할까요?");
if (dlg != DialogResult.Yes) return;
using (var db = new DataSet1TableAdapters.Component_Reel_Print_InformationTableAdapter())
using (var db = new DataSet1TableAdapters.K4EE_Component_Reel_Print_InformationTableAdapter())
{
var dr = db.GetBySID(PUB.MCCode, sid).FirstOrDefault();
if (dr == null || dr.PrintPosition.isEmpty())
@@ -2087,7 +2075,7 @@ namespace Project.Dialog
private void button1_Click_1(object sender, EventArgs e)
{
//데이터베이스 결과에서 자료를 추가한다.
var result = new DataSet1.Component_Reel_ResultDataTable();// new List<Component_Reel_Result>();
var result = new DataSet1.K4EE_Component_Reel_ResultDataTable();// new List<Component_Reel_Result>();
var tabName = "K4EE_Component_Reel_Result with (no lock)";
@@ -2199,7 +2187,7 @@ namespace Project.Dialog
{
var sid = this.tbSID.Text.Trim();
if (sid.isEmpty()) return;
using (var db = new DataSet1TableAdapters.Component_Reel_Print_InformationTableAdapter())
using (var db = new DataSet1TableAdapters.K4EE_Component_Reel_Print_InformationTableAdapter())
{
var dr = db.GetBySID(PUB.MCCode, sid).FirstOrDefault();
if (dr == null || dr.PrintPosition.isEmpty())

2
Handler/Project/Dialog/fPickerMove.cs
View File

@@ -287,7 +287,7 @@ namespace Project.Dialog
var itemdata = vidx == eWorkPort.Left ? PUB.Result.ItemDataL : PUB.Result.ItemDataR;
var sql = "select top 1 * from K4EE_Component_Reel_Result where JGUID = @jguid";
var dr = DBHelper.Get<DataSet1.Component_Reel_ResultDataTable>(sql, new SqlParameter("jguid", itemdata.guid)).FirstOrDefault();
var dr = DBHelper.Get<DataSet1.K4EE_Component_Reel_ResultDataTable>(sql, new SqlParameter("jguid", itemdata.guid)).FirstOrDefault();
if (dr == null)
{
var ermsg = string.Format("다음 guid 를 찾을수 없어 검증취소 를 변경하지 못함 vidx={2},guid={0},sid={1}", itemdata.guid, itemdata.VisionData.SID, vidx);

4
Handler/Project/Dialog/fSelectCustInfo.cs
View File

@@ -24,10 +24,10 @@ namespace Project.Dialog
this.Show();
Application.DoEvents();
var ta = new DataSet1TableAdapters.Component_Reel_CustInfoTableAdapter();
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_CustInfoTableAdapter();
var dt = ta.GetData();
this.listView1.Items.Clear();
foreach(DataSet1.Component_Reel_CustInfoRow item in dt)
foreach(DataSet1.K4EE_Component_Reel_CustInfoRow item in dt)
{
if (item.code.isEmpty()) continue;
var lv = this.listView1.Items.Add(item.code);

45
Handler/Project/Dialog/fSelectJob.Designer.cs generated
View File

@@ -52,7 +52,6 @@
this.tabPage2 = new System.Windows.Forms.TabPage();
this.GrpSidConvData = new System.Windows.Forms.GroupBox();
this.chkCVSave = new System.Windows.Forms.CheckBox();
this.chkCVApplyQtyMax = new System.Windows.Forms.CheckBox();
this.chkCVApplyBatch = new System.Windows.Forms.CheckBox();
this.chkCVWhereLot = new System.Windows.Forms.CheckBox();
this.chkCVApplyPrint = new System.Windows.Forms.CheckBox();
@@ -78,9 +77,7 @@
this.chkDayApplyCust = new System.Windows.Forms.CheckBox();
this.chkDayApplyPart = new System.Windows.Forms.CheckBox();
this.grpApplySidinfo = new System.Windows.Forms.GroupBox();
this.chkInfoWhereMC = new System.Windows.Forms.CheckBox();
this.chkInfoWhereLot = new System.Windows.Forms.CheckBox();
this.chkInfoApplyQty = new System.Windows.Forms.CheckBox();
this.chkInfoApplyBatch = new System.Windows.Forms.CheckBox();
this.chkInfoSave = new System.Windows.Forms.CheckBox();
this.chkInfoApplyPrint = new System.Windows.Forms.CheckBox();
@@ -443,7 +440,6 @@
// GrpSidConvData
//
this.GrpSidConvData.Controls.Add(this.chkCVSave);
this.GrpSidConvData.Controls.Add(this.chkCVApplyQtyMax);
this.GrpSidConvData.Controls.Add(this.chkCVApplyBatch);
this.GrpSidConvData.Controls.Add(this.chkCVWhereLot);
this.GrpSidConvData.Controls.Add(this.chkCVApplyPrint);
@@ -479,18 +475,6 @@
this.chkCVSave.Text = "변경 정보를 서버에 기록 합니다";
this.chkCVSave.UseVisualStyleBackColor = true;
//
// chkCVApplyQtyMax
//
this.chkCVApplyQtyMax.AutoSize = true;
this.chkCVApplyQtyMax.ForeColor = System.Drawing.Color.Green;
this.chkCVApplyQtyMax.Location = new System.Drawing.Point(617, 21);
this.chkCVApplyQtyMax.Name = "chkCVApplyQtyMax";
this.chkCVApplyQtyMax.Size = new System.Drawing.Size(86, 23);
this.chkCVApplyQtyMax.TabIndex = 50;
this.chkCVApplyQtyMax.Tag = "10";
this.chkCVApplyQtyMax.Text = "Qty(Max)";
this.chkCVApplyQtyMax.UseVisualStyleBackColor = true;
//
// chkCVApplyBatch
//
this.chkCVApplyBatch.AutoSize = true;
@@ -778,9 +762,7 @@
//
// grpApplySidinfo
//
this.grpApplySidinfo.Controls.Add(this.chkInfoWhereMC);
this.grpApplySidinfo.Controls.Add(this.chkInfoWhereLot);
this.grpApplySidinfo.Controls.Add(this.chkInfoApplyQty);
this.grpApplySidinfo.Controls.Add(this.chkInfoApplyBatch);
this.grpApplySidinfo.Controls.Add(this.chkInfoSave);
this.grpApplySidinfo.Controls.Add(this.chkInfoApplyPrint);
@@ -803,18 +785,6 @@
this.grpApplySidinfo.TabStop = false;
this.grpApplySidinfo.Text = "입력정보 적용";
//
// chkInfoWhereMC
//
this.chkInfoWhereMC.AutoSize = true;
this.chkInfoWhereMC.ForeColor = System.Drawing.Color.Blue;
this.chkInfoWhereMC.Location = new System.Drawing.Point(379, 50);
this.chkInfoWhereMC.Name = "chkInfoWhereMC";
this.chkInfoWhereMC.Size = new System.Drawing.Size(50, 23);
this.chkInfoWhereMC.TabIndex = 36;
this.chkInfoWhereMC.Tag = "12";
this.chkInfoWhereMC.Text = "MC";
this.chkInfoWhereMC.UseVisualStyleBackColor = true;
//
// chkInfoWhereLot
//
this.chkInfoWhereLot.AutoSize = true;
@@ -827,18 +797,6 @@
this.chkInfoWhereLot.Text = "VLOT";
this.chkInfoWhereLot.UseVisualStyleBackColor = true;
//
// chkInfoApplyQty
//
this.chkInfoApplyQty.AutoSize = true;
this.chkInfoApplyQty.ForeColor = System.Drawing.Color.Green;
this.chkInfoApplyQty.Location = new System.Drawing.Point(614, 24);
this.chkInfoApplyQty.Name = "chkInfoApplyQty";
this.chkInfoApplyQty.Size = new System.Drawing.Size(86, 23);
this.chkInfoApplyQty.TabIndex = 34;
this.chkInfoApplyQty.Tag = "10";
this.chkInfoApplyQty.Text = "Qty(Max)";
this.chkInfoApplyQty.UseVisualStyleBackColor = true;
//
// chkInfoApplyBatch
//
this.chkInfoApplyBatch.AutoSize = true;
@@ -1193,7 +1151,6 @@
private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.ComboBox cmbCustCode;
private System.Windows.Forms.CheckBox chkInfoApplyBatch;
private System.Windows.Forms.CheckBox chkInfoApplyQty;
private System.Windows.Forms.CheckBox chkDayWhereLot;
private System.Windows.Forms.CheckBox chkInfoWhereLot;
private System.Windows.Forms.Label label1;
@@ -1202,9 +1159,7 @@
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.CheckBox chkInfoWhereMC;
private System.Windows.Forms.CheckBox chkCVSave;
private System.Windows.Forms.CheckBox chkCVApplyQtyMax;
private System.Windows.Forms.CheckBox chkCVApplyBatch;
private System.Windows.Forms.CheckBox chkCVWhereLot;
private System.Windows.Forms.CheckBox chkCVApplyPrint;

25
Handler/Project/Dialog/fSelectJob.cs
View File

@@ -78,13 +78,13 @@ namespace Project.Dialog
//자료를 조회하고 대표 코드가 잇으면 처리한다. 221013
var taSID = new DataSet1TableAdapters.SidinfoCustGroupTableAdapter();
var dtcustgrp = taSID.GetData(PUB.MCCode);
var dtcustgrp = taSID.GetData();
if (dtcustgrp != null && dtcustgrp.Count == 1)
cmbCustCode.Text = dtcustgrp.First().CustCode;
//프리셋가져온다
var ta = new DataSet1TableAdapters.Component_Reel_PreSetTableAdapter();
ta.Fill(this.dataSet11.Component_Reel_PreSet, "R1");
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_PreSetTableAdapter();
ta.Fill(this.dataSet11.K4EE_Component_Reel_PreSet, "R1");
//작업형태를 다시 시작해준다. - 210329
if (PUB.Result.JobType2.isEmpty()) PUB.Result.JobType2 = "모델정보";
@@ -191,7 +191,7 @@ namespace Project.Dialog
}
if (chkCustom.Checked) PUB.MCCode = AR.SETTING.Data.McName;
else PUB.MCCode = "IB";// AR.SETTING.Data.MCID;
else PUB.MCCode = "R0";
var curcust = this.cmbCustCode.Text.Trim();
if (curcust.isEmpty() == false)
@@ -206,14 +206,13 @@ namespace Project.Dialog
}
}
//230509
if (chkSIDConv.Checked)
{
try
{
//sid정보테이블을 다시 불러온다
var taConv = new DataSet1TableAdapters.Component_Reel_SID_ConvertTableAdapter();
var taConv = new DataSet1TableAdapters.K4EE_Component_Reel_SID_ConvertTableAdapter();
PUB.Result.DTSidConvert.Clear();
taConv.Fill(PUB.Result.DTSidConvert);
PUB.Result.DTSidConvert.AcceptChanges();
@@ -228,8 +227,6 @@ namespace Project.Dialog
}
}
//작업형태 지정
PUB.Result.JobType2 = this.ModeData;
@@ -266,12 +263,12 @@ namespace Project.Dialog
///22092[
VAR.BOOL[eVarBool.Opt_SID_Apply_batch] = chkInfoApplyBatch.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_qty] = chkInfoApplyQty.Checked;
VAR.BOOL[eVarBool.Opt_SID_Apply_qty] = false;// chkInfoApplyQty.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_PartNo] = chkInfoWherePart.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_CustCode] = chkInfoWhereCust.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_SID] = chkInfoWhereSID.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_VLOT] = chkInfoWhereLot.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_MC] = chkInfoWhereMC.Checked;
VAR.BOOL[eVarBool.Opt_SID_Where_MC] = false;// chkInfoWhereMC.Checked;
VAR.BOOL[eVarBool.Opt_SID_WriteServer] = chkInfoSave.Checked;
@@ -292,7 +289,7 @@ namespace Project.Dialog
VAR.BOOL[eVarBool.Opt_Conv_Apply_VenderName] = chkCVApplyVender.Checked;
VAR.BOOL[eVarBool.Opt_Conv_Apply_PrintPos] = chkCVApplyPrint.Checked;
VAR.BOOL[eVarBool.Opt_Conv_Apply_Batch] = chkCVApplyBatch.Checked;
VAR.BOOL[eVarBool.Opt_Conv_Apply_QtyMax] = chkCVApplyQtyMax.Checked;
VAR.BOOL[eVarBool.Opt_Conv_Apply_QtyMax] = false;// chkCVApplyQtyMax.Checked;
VAR.BOOL[eVarBool.Opt_Conv_Where_PartNo] = chkCVWherePart.Checked;
VAR.BOOL[eVarBool.Opt_Conv_Where_CustCode] = chkCVWhereCust.Checked;
@@ -460,7 +457,7 @@ namespace Project.Dialog
var dlg = UTIL.MsgQ($"{txt} 항목 옵션을 현재 값으로 변경 할까요??");
if (dlg != DialogResult.Yes) return;
var dr = this.dataSet11.Component_Reel_PreSet.Where(t => t.Title == txt).FirstOrDefault();
var dr = this.dataSet11.K4EE_Component_Reel_PreSet.Where(t => t.Title == txt).FirstOrDefault();
if (dr == null)
{
UTIL.MsgE("프리셋 정보를 찾을 수 없어 신규로 생성합니다");
@@ -500,8 +497,8 @@ namespace Project.Dialog
}
dr.EndEdit();
var ta = new DataSet1TableAdapters.Component_Reel_PreSetTableAdapter();
var rlt = ta.Update(this.dataSet11.Component_Reel_PreSet) == 1;
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_PreSetTableAdapter();
var rlt = ta.Update(this.dataSet11.K4EE_Component_Reel_PreSet) == 1;
if (rlt == false) UTIL.MsgE("변경 실패");
}

8
Handler/Project/Dialog/fSelectResult.cs
View File

@@ -13,12 +13,12 @@ namespace Project.Dialog
{
public partial class fSelectResult : Form
{
public DataSet1.Component_Reel_ResultRow SelectedValue = null;
public fSelectResult(DataSet1.Component_Reel_ResultDataTable list)
public DataSet1.K4EE_Component_Reel_ResultRow SelectedValue = null;
public fSelectResult(DataSet1.K4EE_Component_Reel_ResultDataTable list)
{
InitializeComponent();
this.lv1.Items.Clear();
foreach (DataSet1.Component_Reel_ResultRow item in list)
foreach (DataSet1.K4EE_Component_Reel_ResultRow item in list)
{
var dt = (DateTime)item.wdate;
var lv = this.lv1.Items.Add(dt.ToString("dd HH:mm:ss"));
@@ -53,7 +53,7 @@ namespace Project.Dialog
UTIL.MsgE("아이템을 선택하세요\n\n취소하려면 ESC키 혹은 닫기 버튼을 누르세요");
return;
}
this.SelectedValue = this.lv1.FocusedItem.Tag as DataSet1.Component_Reel_ResultRow;
this.SelectedValue = this.lv1.FocusedItem.Tag as DataSet1.K4EE_Component_Reel_ResultRow;
this.DialogResult = DialogResult.OK;
}

2
Handler/Project/Dialog/fSelectSID.cs
View File

@@ -69,7 +69,7 @@ namespace Project.Dialog
if (sidNew.isEmpty()) lv.SubItems.Add("--");
else
{
using (var db = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter())
using (var db = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter())
{
var list = db.GetbySIDNoCustCode(PUB.MCCode, sidNew).ToList();
if (list.Any() == true)

30
Handler/Project/Dialog/fZPLEditor.Designer.cs generated
View File

@@ -36,7 +36,10 @@ namespace Project.Dialog
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.logTextBox1 = new arCtl.LogTextBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStrip1.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
// richTextBox1
@@ -44,7 +47,7 @@ namespace Project.Dialog
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox1.Location = new System.Drawing.Point(0, 39);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(664, 462);
this.richTextBox1.Size = new System.Drawing.Size(664, 440);
this.richTextBox1.TabIndex = 0;
this.richTextBox1.Text = "";
//
@@ -111,7 +114,7 @@ namespace Project.Dialog
this.logTextBox1.EnableGubunColor = true;
this.logTextBox1.Font = new System.Drawing.Font("Consolas", 9F);
this.logTextBox1.ListFormat = "[{0}] {1}";
this.logTextBox1.Location = new System.Drawing.Point(0, 501);
this.logTextBox1.Location = new System.Drawing.Point(0, 479);
this.logTextBox1.MaxListCount = ((ushort)(200));
this.logTextBox1.MaxTextLength = ((uint)(4000u));
this.logTextBox1.MessageInterval = 50;
@@ -120,6 +123,22 @@ namespace Project.Dialog
this.logTextBox1.TabIndex = 2;
this.logTextBox1.Text = "";
//
// statusStrip1
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1});
this.statusStrip1.Location = new System.Drawing.Point(0, 579);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(664, 22);
this.statusStrip1.TabIndex = 3;
this.statusStrip1.Text = "statusStrip1";
//
// toolStripStatusLabel1
//
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
this.toolStripStatusLabel1.Size = new System.Drawing.Size(121, 17);
this.toolStripStatusLabel1.Text = "toolStripStatusLabel1";
//
// fZPLEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -128,12 +147,15 @@ namespace Project.Dialog
this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.logTextBox1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.statusStrip1);
this.Name = "fZPLEditor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ZPL Printer Code Editor";
this.Load += new System.EventHandler(this.fZPLEditor_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -148,5 +170,7 @@ namespace Project.Dialog
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private arCtl.LogTextBox logTextBox1;
}
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
}
}

113
Handler/Project/Dialog/fZPLEditor.cs
View File

@@ -11,61 +11,74 @@ using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fZPLEditor : Form
{
string fn = string.Empty;
public fZPLEditor(string fn_)
{
InitializeComponent();
this.fn = fn_;
this.FormClosed += FZPLEditor_FormClosed;
}
public partial class fZPLEditor : Form
{
string fn = string.Empty;
public fZPLEditor(string fn_)
{
InitializeComponent();
this.fn = fn_;
this.FormClosed += FZPLEditor_FormClosed;
this.logTextBox1.ColorList = new arCtl.sLogMessageColor[] {
new arCtl.sLogMessageColor("NORM",Color.White),
new arCtl.sLogMessageColor("ERR", Color.Red),
new arCtl.sLogMessageColor("WARN",Color.Tomato),
new arCtl.sLogMessageColor("INFO",Color.SkyBlue),
new arCtl.sLogMessageColor("BCD", Color.Yellow)
};
this.logTextBox1.EnableDisplayTimer = false;
this.logTextBox1.DateFormat = "HH:mm:ss";
this.logTextBox1.ForeColor = Color.White;
toolStripStatusLabel1.Text = fn_;
}
private void FZPLEditor_FormClosed(object sender, FormClosedEventArgs e)
{
PUB.log.RaiseMsg -= Log_RaiseMsg;
}
private void FZPLEditor_FormClosed(object sender, FormClosedEventArgs e)
{
PUB.log.RaiseMsg -= Log_RaiseMsg;
}
private void fZPLEditor_Load(object sender, EventArgs e)
{
this.richTextBox1.Text = System.IO.File.ReadAllText(this.fn, System.Text.Encoding.Default);
PUB.log.RaiseMsg += Log_RaiseMsg;
}
private void fZPLEditor_Load(object sender, EventArgs e)
{
if (System.IO.File.Exists(this.fn))
this.richTextBox1.Text = System.IO.File.ReadAllText(this.fn, System.Text.Encoding.Default);
private void Log_RaiseMsg(DateTime LogTime, string TypeStr, string Message)
{
this.logTextBox1.AddMsg(LogTime, TypeStr, Message);
}
PUB.log.RaiseMsg += Log_RaiseMsg;
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
//load
if(UTIL.MsgQ("다시 불러 올까요?") == DialogResult.Yes)
this.richTextBox1.Text = System.IO.File.ReadAllText(this.fn, System.Text.Encoding.Default);
}
private void Log_RaiseMsg(DateTime LogTime, string TypeStr, string Message)
{
this.logTextBox1.AddMsg(LogTime, TypeStr, Message);
}
private void toolStripButton2_Click(object sender, EventArgs e)
{
//save
if(UTIL.MsgQ("저장 할까요?")== DialogResult.Yes)
System.IO.File.WriteAllText(this.fn, this.richTextBox1.Text.Trim(), System.Text.Encoding.Default);
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
//load
if (UTIL.MsgQ("다시 불러 올까요?") == DialogResult.Yes)
this.richTextBox1.Text = System.IO.File.ReadAllText(this.fn, System.Text.Encoding.Default);
}
private void toolStripButton4_Click(object sender, EventArgs e)
{
//right
if (PUB.PrinterR.IsOpen)
PUB.PrinterR.Print(this.richTextBox1.Text);
else PUB.log.AddAT("프린터R연결 안됨");
}
private void toolStripButton2_Click(object sender, EventArgs e)
{
//save
if (UTIL.MsgQ("저장 할까요?") == DialogResult.Yes)
System.IO.File.WriteAllText(this.fn, this.richTextBox1.Text.Trim(), System.Text.Encoding.Default);
}
private void toolStripButton3_Click(object sender, EventArgs e)
{
//left
if (PUB.PrinterL.IsOpen)
PUB.PrinterL.Print(this.richTextBox1.Text);
else
PUB.log.AddAT("프린터L 연결 안됨");
}
}
private void toolStripButton4_Click(object sender, EventArgs e)
{
//right
if (PUB.PrinterR.IsOpen)
PUB.PrinterR.Print(this.richTextBox1.Text);
else PUB.log.AddAT("프린터R연결 안됨");
}
private void toolStripButton3_Click(object sender, EventArgs e)
{
//left
if (PUB.PrinterL.IsOpen)
PUB.PrinterL.Print(this.richTextBox1.Text);
else
PUB.log.AddAT("프린터L 연결 안됨");
}
}
}

3
Handler/Project/Dialog/fZPLEditor.resx
View File

@@ -120,4 +120,7 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>124, 17</value>
</metadata>
</root>

4
Handler/Project/Dialog/fswPLC.Designer.cs generated
View File

@@ -33,7 +33,7 @@
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel();
this.ioPanel1 = new arDev.AjinEXTEK.IOPanel();
this.ioPanel1 = new arDev.AjinEXTEK.UI.IOPanel();
this.logTextBox1 = new arCtl.LogTextBox();
this.gridView1 = new arCtl.GridView.GridView();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -328,7 +328,7 @@
private arCtl.LogTextBox logTextBox1;
private System.Windows.Forms.Timer timer1;
private arDev.AjinEXTEK.IOPanel ioPanel1;
private arDev.AjinEXTEK.UI.IOPanel ioPanel1;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
private arCtl.GridView.GridView gridView1;

8
Handler/Project/Dialog/fswPLC.cs
View File

@@ -77,9 +77,9 @@ namespace Project.Dialog
for (int i = 0; i < titles.Count; i++)
values.Add(false);
ioPanel1.ColorList = new arDev.AjinEXTEK.ColorListItem[] {
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.Lime, BackColor2 = Color.Green, Remark="True" },
ioPanel1.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.Lime, BackColor2 = Color.Green, Remark="True" },
};
this.ioPanel1.setTitle(titles.ToArray());
@@ -184,7 +184,7 @@ namespace Project.Dialog
}
}
}
private void IoPanel1_ItemClick(object sender, arDev.AjinEXTEK.IOPanel.ItemClickEventArgs e)
private void IoPanel1_ItemClick(object sender, arDev.AjinEXTEK.UI.IOPanel.ItemClickEventArgs e)
{
var name = this.ioPanel1.Names[e.idx];
if (name.StartsWith("Y"))