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

- 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

View File

@@ -0,0 +1,8 @@
{
"permissions": {
"allow": [
"Bash(git add:*)"
],
"deny": []
}
}

View File

@@ -31,7 +31,7 @@ namespace Project
public List<UIControl.CItem> OUTHistory; //출고포트 처리내역 public List<UIControl.CItem> OUTHistory; //출고포트 처리내역
public DataSet1.SIDHistoryDataTable SIDHistory; //sID별 rid 전체 목록 차수별로만 저장된다 public DataSet1.SIDHistoryDataTable SIDHistory; //sID별 rid 전체 목록 차수별로만 저장된다
public DataSet1.Component_Reel_SID_ConvertDataTable DTSidConvert; public DataSet1.K4EE_Component_Reel_SID_ConvertDataTable DTSidConvert;
public List<string> DTSidConvertEmptyList; public List<string> DTSidConvertEmptyList;
public List<string> DTSidConvertMultiList; public List<string> DTSidConvertMultiList;
@@ -218,7 +218,7 @@ namespace Project
//230509 //230509
if(DTSidConvert != null) DTSidConvert.Dispose(); if(DTSidConvert != null) DTSidConvert.Dispose();
DTSidConvert = new DataSet1.Component_Reel_SID_ConvertDataTable(); DTSidConvert = new DataSet1.K4EE_Component_Reel_SID_ConvertDataTable();
DTSidConvertEmptyList = new List<string>(); DTSidConvertEmptyList = new List<string>();
DTSidConvertMultiList = new List<string>(); DTSidConvertMultiList = new List<string>();
} }

View File

@@ -45,7 +45,7 @@ namespace Project.Class
public byte LabelPosition { get; set; } public byte LabelPosition { get; set; }
/// <summary> /// <summary>
/// regex check ok /// 정규식 분석이 완료되었다면 True를 반환합니다
/// </summary> /// </summary>
public Boolean RegExConfirm { get; set; } public Boolean RegExConfirm { get; set; }
public Boolean RefExApply { get; set; } public Boolean RefExApply { get; set; }

View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Drawing; using System.Drawing;
using System.ComponentModel; using System.ComponentModel;
using System.Windows.Forms;
namespace Project namespace Project
{ {
@@ -39,17 +40,19 @@ namespace Project
public bool DisableCamera { get; set; } public bool DisableCamera { get; set; }
public bool DisablePrinter { get; set; } public bool DisablePrinter { get; set; }
public bool CheckSIDExsit { get; set; } public bool CheckSIDExsit { get; set; }
//public string ByPassSID { get; set; } public bool bOwnZPL { get; set; }
public ModelInfoV() public ModelInfoV()
{ {
vOption = vSIDInfo = vJobInfo = vSIDConv1 = 0; vOption = vSIDInfo = vJobInfo = vSIDConv1 = 0;
bOwnZPL = false;
} }
public void ReadValue(DataSet1.OPModelRow dr) public void ReadValue(DataSet1.OPModelRow dr)
{ {
this.bOwnZPL = dr.bOwnZPL;
this.Title = dr.Title; this.Title = dr.Title;
this.Code = dr.Code; this.Code = dr.Code;
this.idx = dr.idx; this.idx = dr.idx;
@@ -94,6 +97,7 @@ namespace Project
dr.DisableCamera = this.DisableCamera; dr.DisableCamera = this.DisableCamera;
dr.DisablePrinter = this.DisablePrinter; dr.DisablePrinter = this.DisablePrinter;
dr.CheckSIDExsit = this.CheckSIDExsit; dr.CheckSIDExsit = this.CheckSIDExsit;
dr.bOwnZPL = this.bOwnZPL;
dr.EndEdit(); dr.EndEdit();
PUB.mdm.SaveModelV(); PUB.mdm.SaveModelV();

View File

@@ -460,8 +460,16 @@ namespace Project.Class
public byte[] QRPositionData { get; private set; } public byte[] QRPositionData { get; private set; }
public byte[] LabelPositionData { get; private set; } public byte[] LabelPositionData { get; private set; }
/// <summary>
/// keyence barcodeparse 같은데에서 분석한 자료를 이곳에 추가합니다.
/// 이 데이터는 SPS에서 처리완료됩니다.
/// </summary>
public ConcurrentDictionary<String, Class.KeyenceBarcodeData> barcodelist; public ConcurrentDictionary<String, Class.KeyenceBarcodeData> barcodelist;
public Boolean BarcodeTouched = false;
/// <summary>
/// keyence 로 부터 신규 바코드가 업데이트되었다
/// </summary>
public Boolean BarcodeDirty = false;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@@ -562,7 +570,9 @@ namespace Project.Class
public string QROutRaw { get; set; } //부착된 QR코드의 값 public string QROutRaw { get; set; } //부착된 QR코드의 값
public string ZPL { get; set; } //출력시 사용한 ZPL public string ZPL { get; set; } //출력시 사용한 ZPL
public string PrintQRData { get; set; } //출력시 사용한 ZPL에 포함된 QR데이터 public string PrintQRData { get; set; } //출력시 사용한 ZPL에 포함된 QR데이터
public string LastQueryString = string.Empty; public string LastQueryStringSID = string.Empty;
public string LastQueryStringWMS = string.Empty;
public string LastQueryStringCNV = string.Empty;
public VisionData(string reason) public VisionData(string reason)
{ {
@@ -574,7 +584,9 @@ namespace Project.Class
} }
public void Clear(string reason, Boolean timeBackup) public void Clear(string reason, Boolean timeBackup)
{ {
LastQueryString = string.Empty; LastQueryStringSID = string.Empty;
LastQueryStringWMS = string.Empty;
LastQueryStringCNV = string.Empty;
RetryLoader = 0; RetryLoader = 0;
ApplyOffset = false; ApplyOffset = false;
var baktime = new DateTime(1982, 11, 23); var baktime = new DateTime(1982, 11, 23);
@@ -668,7 +680,7 @@ namespace Project.Class
VLOT_Trust = false; VLOT_Trust = false;
VNAME_Trust = false; VNAME_Trust = false;
BarcodeTouched = false; BarcodeDirty = false;
MCN = string.Empty; MCN = string.Empty;
Target = string.Empty; Target = string.Empty;
@@ -735,7 +747,7 @@ namespace Project.Class
//obj.PrintForce = this.PrintForce; //obj.PrintForce = this.PrintForce;
obj.ReelSize = this.ReelSize; obj.ReelSize = this.ReelSize;
obj.PrintPositionCheck = this.PrintPositionCheck; obj.PrintPositionCheck = this.PrintPositionCheck;
obj.BarcodeTouched = this.BarcodeTouched; obj.BarcodeDirty = this.BarcodeDirty;
//라벨위치값 복사 //라벨위치값 복사
for (int i = 0; i < obj.LabelPositionData.Length; i++) for (int i = 0; i < obj.LabelPositionData.Length; i++)
@@ -866,7 +878,7 @@ namespace Project.Class
//obj.PrintForce = this.PrintForce; //obj.PrintForce = this.PrintForce;
obj.ReelSize = this.ReelSize; obj.ReelSize = this.ReelSize;
obj.PrintPositionCheck = this.PrintPositionCheck; obj.PrintPositionCheck = this.PrintPositionCheck;
obj.BarcodeTouched = this.BarcodeTouched; obj.BarcodeDirty = this.BarcodeDirty;
//라벨위치값 복사 //라벨위치값 복사
for (int i = 0; i < obj.LabelPositionData.Length; i++) for (int i = 0; i < obj.LabelPositionData.Length; i++)

View File

@@ -6,7 +6,7 @@ namespace Project
public class sPositionData public class sPositionData
{ {
public float inpositionrange { get; set; } public float inpositionrange { get; set; }
public int Axis; public short Axis;
public double Position { get; set; } public double Position { get; set; }
public double Acc; public double Acc;
public double _dcc; public double _dcc;

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="CS" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="CS (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.Project.Properties.Settings.GlobalReference.Default.CS" Provider="System.Data.SqlClient" /> <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="CS" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="CS (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.Project.Properties.Settings.GlobalReference.Default.CS" Provider="System.Data.SqlClient" />
</Connections> </Connections>
<Tables> <Tables>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Component_Reel_CustRuleTableAdapter" GeneratorDataComponentClassName="Component_Reel_CustRuleTableAdapter" Name="Component_Reel_CustRule" UserDataComponentName="Component_Reel_CustRuleTableAdapter"> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="K4EE_Component_Reel_CustRuleTableAdapter" GeneratorDataComponentClassName="K4EE_Component_Reel_CustRuleTableAdapter" Name="K4EE_Component_Reel_CustRule" UserDataComponentName="K4EE_Component_Reel_CustRuleTableAdapter">
<MainSource> <MainSource>
<DbSource ConnectionRef="CS (Settings)" DbObjectName="WMS.dbo.K4EE_Component_Reel_CustRule" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill"> <DbSource ConnectionRef="CS (Settings)" DbObjectName="WMS.dbo.K4EE_Component_Reel_CustRule" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand> <DeleteCommand>
@@ -86,275 +86,71 @@ SELECT code, pre, pos, len, exp FROM Component_Reel_CustRule WHERE (code = @code
</Mappings> </Mappings>
<Sources /> <Sources />
</TableAdapter> </TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Component_Reel_SIDInfoTableAdapter" GeneratorDataComponentClassName="Component_Reel_SIDInfoTableAdapter" Name="Component_Reel_SIDInfo" UserDataComponentName="Component_Reel_SIDInfoTableAdapter">
<MainSource>
<DbSource ConnectionRef="CS (Settings)" DbObjectName="WMS.dbo.K4EE_Component_Reel_SIDInfo" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [Component_Reel_SIDInfo] WHERE (([SID] = @Original_SID) AND ([CustCode] = @Original_CustCode) AND ((@IsNull_CustName = 1 AND [CustName] IS NULL) OR ([CustName] = @Original_CustName)) AND ((@IsNull_VenderName = 1 AND [VenderName] IS NULL) OR ([VenderName] = @Original_VenderName)) AND ([PartNo] = @Original_PartNo) AND ((@IsNull_PrintPosition = 1 AND [PrintPosition] IS NULL) OR ([PrintPosition] = @Original_PrintPosition)) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CustCode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustCode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CustName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CustName" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CustName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustName" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_VenderName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="VenderName" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_VenderName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VenderName" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PartNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PartNo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PrintPosition" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PrintPosition" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PrintPosition" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PrintPosition" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [Component_Reel_SIDInfo] ([SID], [CustCode], [CustName], [VenderName], [PartNo], [PrintPosition], [Remark]) VALUES (@SID, @CustCode, @CustName, @VenderName, @PartNo, @PrintPosition, @Remark);
SELECT SID, CustCode, CustName, VenderName, PartNo, PrintPosition, Remark FROM Component_Reel_SIDInfo WHERE (CustCode = @CustCode) AND (PartNo = @PartNo) AND (SID = @SID)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CustCode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustCode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CustName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VenderName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VenderName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PartNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PartNo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PrintPosition" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PrintPosition" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT SID, CustCode, CustName, VenderName, PartNo, PrintPosition, Remark
FROM K4EE_Component_Reel_SIDInfo
WHERE (SID = @sid) AND (CustCode = @custcode) AND (PartNo = @partno)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="sid" ColumnName="SID" DataSourceName="WMS.dbo.K4EE_Component_Reel_SIDInfo" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@sid" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="custcode" ColumnName="CustCode" DataSourceName="WMS.dbo.K4EE_Component_Reel_SIDInfo" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@custcode" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="CustCode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="partno" ColumnName="PartNo" DataSourceName="WMS.dbo.K4EE_Component_Reel_SIDInfo" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@partno" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="PartNo" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [Component_Reel_SIDInfo] SET [SID] = @SID, [CustCode] = @CustCode, [CustName] = @CustName, [VenderName] = @VenderName, [PartNo] = @PartNo, [PrintPosition] = @PrintPosition, [Remark] = @Remark WHERE (([SID] = @Original_SID) AND ([CustCode] = @Original_CustCode) AND ((@IsNull_CustName = 1 AND [CustName] IS NULL) OR ([CustName] = @Original_CustName)) AND ((@IsNull_VenderName = 1 AND [VenderName] IS NULL) OR ([VenderName] = @Original_VenderName)) AND ([PartNo] = @Original_PartNo) AND ((@IsNull_PrintPosition = 1 AND [PrintPosition] IS NULL) OR ([PrintPosition] = @Original_PrintPosition)) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)));
SELECT SID, CustCode, CustName, VenderName, PartNo, PrintPosition, Remark FROM Component_Reel_SIDInfo WHERE (CustCode = @CustCode) AND (PartNo = @PartNo) AND (SID = @SID)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CustCode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustCode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CustName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VenderName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VenderName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PartNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PartNo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PrintPosition" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PrintPosition" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SID" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CustCode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustCode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CustName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CustName" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CustName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CustName" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_VenderName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="VenderName" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_VenderName" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VenderName" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PartNo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PartNo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PrintPosition" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PrintPosition" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PrintPosition" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PrintPosition" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="SID" DataSetColumn="SID" />
<Mapping SourceColumn="CustCode" DataSetColumn="CustCode" />
<Mapping SourceColumn="CustName" DataSetColumn="CustName" />
<Mapping SourceColumn="VenderName" DataSetColumn="VenderName" />
<Mapping SourceColumn="PartNo" DataSetColumn="PartNo" />
<Mapping SourceColumn="PrintPosition" DataSetColumn="PrintPosition" />
<Mapping SourceColumn="Remark" DataSetColumn="Remark" />
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Component_Reel_SIDConvTableAdapter" GeneratorDataComponentClassName="Component_Reel_SIDConvTableAdapter" Name="Component_Reel_SIDConv" UserDataComponentName="Component_Reel_SIDConvTableAdapter">
<MainSource>
<DbSource ConnectionRef="CS (Settings)" DbObjectName="WMS.dbo.K4EE_Component_Reel_SIDConv" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [Component_Reel_SIDConv] WHERE (([idx] = @Original_idx) AND ((@IsNull_M101 = 1 AND [M101] IS NULL) OR ([M101] = @Original_M101)) AND ((@IsNull_M103 = 1 AND [M103] IS NULL) OR ([M103] = @Original_M103)) AND ((@IsNull_M106 = 1 AND [M106] IS NULL) OR ([M106] = @Original_M106)) AND ((@IsNull_M108 = 1 AND [M108] IS NULL) OR ([M108] = @Original_M108)) AND ((@IsNull_M103_2 = 1 AND [M103_2] IS NULL) OR ([M103_2] = @Original_M103_2)) AND ((@IsNull_M101_2 = 1 AND [M101_2] IS NULL) OR ([M101_2] = @Original_M101_2)) AND ((@IsNull_Chk = 1 AND [Chk] IS NULL) OR ([Chk] = @Original_Chk)) AND ((@IsNull_SIDFrom = 1 AND [SIDFrom] IS NULL) OR ([SIDFrom] = @Original_SIDFrom)) AND ((@IsNull_SIDTo = 1 AND [SIDTo] IS NULL) OR ([SIDTo] = @Original_SIDTo)) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M101" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M101" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M101" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M103" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M103" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M103" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M106" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M106" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M106" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M106" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M108" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M108" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M108" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M108" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M103_2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M103_2" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M103_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103_2" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M101_2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M101_2" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M101_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101_2" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Chk" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Chk" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_Chk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Chk" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SIDFrom" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SIDFrom" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SIDFrom" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDFrom" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SIDTo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SIDTo" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SIDTo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDTo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [Component_Reel_SIDConv] ([M101], [M103], [M106], [M108], [M103_2], [M101_2], [Chk], [SIDFrom], [SIDTo], [Remark]) VALUES (@M101, @M103, @M106, @M108, @M103_2, @M101_2, @Chk, @SIDFrom, @SIDTo, @Remark);
SELECT idx, M101, M103, M106, M108, M103_2, M101_2, Chk, SIDFrom, SIDTo, Remark FROM Component_Reel_SIDConv WHERE (idx = SCOPE_IDENTITY())</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M101" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M103" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M106" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M106" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M108" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M108" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M103_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103_2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M101_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101_2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Chk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Chk" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SIDFrom" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDFrom" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SIDTo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDTo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, M101, M103, M106, M108, M103_2, M101_2, Chk, SIDFrom, SIDTo, Remark
FROM K4EE_Component_Reel_SIDConv
WHERE (SIDFrom = @sidfrom) AND (SIDTo = @sidto)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="sidfrom" ColumnName="SIDFrom" DataSourceName="WMS.dbo.K4EE_Component_Reel_SIDConv" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@sidfrom" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SIDFrom" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sidto" ColumnName="SIDTo" DataSourceName="WMS.dbo.K4EE_Component_Reel_SIDConv" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@sidto" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SIDTo" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [Component_Reel_SIDConv] SET [M101] = @M101, [M103] = @M103, [M106] = @M106, [M108] = @M108, [M103_2] = @M103_2, [M101_2] = @M101_2, [Chk] = @Chk, [SIDFrom] = @SIDFrom, [SIDTo] = @SIDTo, [Remark] = @Remark WHERE (([idx] = @Original_idx) AND ((@IsNull_M101 = 1 AND [M101] IS NULL) OR ([M101] = @Original_M101)) AND ((@IsNull_M103 = 1 AND [M103] IS NULL) OR ([M103] = @Original_M103)) AND ((@IsNull_M106 = 1 AND [M106] IS NULL) OR ([M106] = @Original_M106)) AND ((@IsNull_M108 = 1 AND [M108] IS NULL) OR ([M108] = @Original_M108)) AND ((@IsNull_M103_2 = 1 AND [M103_2] IS NULL) OR ([M103_2] = @Original_M103_2)) AND ((@IsNull_M101_2 = 1 AND [M101_2] IS NULL) OR ([M101_2] = @Original_M101_2)) AND ((@IsNull_Chk = 1 AND [Chk] IS NULL) OR ([Chk] = @Original_Chk)) AND ((@IsNull_SIDFrom = 1 AND [SIDFrom] IS NULL) OR ([SIDFrom] = @Original_SIDFrom)) AND ((@IsNull_SIDTo = 1 AND [SIDTo] IS NULL) OR ([SIDTo] = @Original_SIDTo)) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark)));
SELECT idx, M101, M103, M106, M108, M103_2, M101_2, Chk, SIDFrom, SIDTo, Remark FROM Component_Reel_SIDConv WHERE (idx = @idx)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M101" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M103" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M106" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M106" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M108" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M108" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M103_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103_2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@M101_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101_2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Chk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Chk" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SIDFrom" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDFrom" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SIDTo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDTo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M101" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M101" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M101" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M103" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M103" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M103" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M106" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M106" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M106" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M106" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M108" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M108" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M108" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M108" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M103_2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M103_2" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M103_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M103_2" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_M101_2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="M101_2" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_M101_2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="M101_2" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Chk" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Chk" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_Chk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Chk" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SIDFrom" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SIDFrom" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SIDFrom" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDFrom" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SIDTo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SIDTo" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SIDTo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SIDTo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="M101" DataSetColumn="M101" />
<Mapping SourceColumn="M103" DataSetColumn="M103" />
<Mapping SourceColumn="M106" DataSetColumn="M106" />
<Mapping SourceColumn="M108" DataSetColumn="M108" />
<Mapping SourceColumn="M103_2" DataSetColumn="M103_2" />
<Mapping SourceColumn="M101_2" DataSetColumn="M101_2" />
<Mapping SourceColumn="Chk" DataSetColumn="Chk" />
<Mapping SourceColumn="SIDFrom" DataSetColumn="SIDFrom" />
<Mapping SourceColumn="SIDTo" DataSetColumn="SIDTo" />
<Mapping SourceColumn="Remark" DataSetColumn="Remark" />
</Mappings>
<Sources />
</TableAdapter>
</Tables> </Tables>
<Sources /> <Sources />
</DataSource> </DataSource>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
<xs:element name="DSList" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="DSList" msprop:Generator_DataSetName="DSList"> <xs:element name="DSList" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="DSList" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSList">
<xs:complexType> <xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Supply" msprop:Generator_RowEvHandlerName="SupplyRowChangeEventHandler" msprop:Generator_RowDeletedName="SupplyRowDeleted" msprop:Generator_RowDeletingName="SupplyRowDeleting" msprop:Generator_RowEvArgName="SupplyRowChangeEvent" msprop:Generator_TablePropName="Supply" msprop:Generator_RowChangedName="SupplyRowChanged" msprop:Generator_RowChangingName="SupplyRowChanging" msprop:Generator_TableClassName="SupplyDataTable" msprop:Generator_RowClassName="SupplyRow" msprop:Generator_TableVarName="tableSupply" msprop:Generator_UserTableName="Supply"> <xs:element name="Supply" msprop:Generator_RowEvHandlerName="SupplyRowChangeEventHandler" msprop:Generator_RowDeletedName="SupplyRowDeleted" msprop:Generator_RowDeletingName="SupplyRowDeleting" msprop:Generator_RowEvArgName="SupplyRowChangeEvent" msprop:Generator_TablePropName="Supply" msprop:Generator_RowChangedName="SupplyRowChanged" msprop:Generator_UserTableName="Supply" msprop:Generator_RowChangingName="SupplyRowChanging" msprop:Generator_RowClassName="SupplyRow" msprop:Generator_TableClassName="SupplyDataTable" msprop:Generator_TableVarName="tableSupply">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="TITLE" msprop:Generator_ColumnPropNameInRow="TITLE" msprop:Generator_ColumnPropNameInTable="TITLEColumn" msprop:Generator_ColumnVarNameInTable="columnTITLE" msprop:Generator_UserColumnName="TITLE" type="xs:string" /> <xs:element name="TITLE" msprop:Generator_ColumnPropNameInTable="TITLEColumn" msprop:Generator_ColumnPropNameInRow="TITLE" msprop:Generator_UserColumnName="TITLE" msprop:Generator_ColumnVarNameInTable="columnTITLE" type="xs:string" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="SIDConvert" msprop:Generator_RowEvHandlerName="SIDConvertRowChangeEventHandler" msprop:Generator_RowDeletedName="SIDConvertRowDeleted" msprop:Generator_RowDeletingName="SIDConvertRowDeleting" msprop:Generator_RowEvArgName="SIDConvertRowChangeEvent" msprop:Generator_TablePropName="SIDConvert" msprop:Generator_RowChangedName="SIDConvertRowChanged" msprop:Generator_RowChangingName="SIDConvertRowChanging" msprop:Generator_TableClassName="SIDConvertDataTable" msprop:Generator_RowClassName="SIDConvertRow" msprop:Generator_TableVarName="tableSIDConvert" msprop:Generator_UserTableName="SIDConvert"> <xs:element name="SIDConvert" msprop:Generator_RowEvHandlerName="SIDConvertRowChangeEventHandler" msprop:Generator_RowDeletedName="SIDConvertRowDeleted" msprop:Generator_RowDeletingName="SIDConvertRowDeleting" msprop:Generator_RowEvArgName="SIDConvertRowChangeEvent" msprop:Generator_TablePropName="SIDConvert" msprop:Generator_RowChangedName="SIDConvertRowChanged" msprop:Generator_UserTableName="SIDConvert" msprop:Generator_RowChangingName="SIDConvertRowChanging" msprop:Generator_RowClassName="SIDConvertRow" msprop:Generator_TableClassName="SIDConvertDataTable" msprop:Generator_TableVarName="tableSIDConvert">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="SID101" msprop:Generator_ColumnPropNameInRow="SID101" msprop:Generator_ColumnPropNameInTable="SID101Column" msprop:Generator_ColumnVarNameInTable="columnSID101" msprop:Generator_UserColumnName="SID101" type="xs:string" /> <xs:element name="SID101" msprop:Generator_ColumnPropNameInTable="SID101Column" msprop:Generator_ColumnPropNameInRow="SID101" msprop:Generator_UserColumnName="SID101" msprop:Generator_ColumnVarNameInTable="columnSID101" type="xs:string" />
<xs:element name="SID103" msprop:Generator_ColumnPropNameInRow="SID103" msprop:Generator_ColumnPropNameInTable="SID103Column" msprop:Generator_ColumnVarNameInTable="columnSID103" msprop:Generator_UserColumnName="SID103" type="xs:string" /> <xs:element name="SID103" msprop:Generator_ColumnPropNameInTable="SID103Column" msprop:Generator_ColumnPropNameInRow="SID103" msprop:Generator_UserColumnName="SID103" msprop:Generator_ColumnVarNameInTable="columnSID103" type="xs:string" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Component_Reel_CustRule" msprop:Generator_RowClassName="Component_Reel_CustRuleRow" msprop:Generator_RowEvHandlerName="Component_Reel_CustRuleRowChangeEventHandler" msprop:Generator_RowDeletedName="Component_Reel_CustRuleRowDeleted" msprop:Generator_RowDeletingName="Component_Reel_CustRuleRowDeleting" msprop:Generator_RowEvArgName="Component_Reel_CustRuleRowChangeEvent" msprop:Generator_TablePropName="Component_Reel_CustRule" msprop:Generator_RowChangedName="Component_Reel_CustRuleRowChanged" msprop:Generator_RowChangingName="Component_Reel_CustRuleRowChanging" msprop:Generator_TableClassName="Component_Reel_CustRuleDataTable" msprop:Generator_UserTableName="Component_Reel_CustRule" msprop:Generator_TableVarName="tableComponent_Reel_CustRule"> <xs:element name="K4EE_Component_Reel_CustRule" msprop:Generator_RowEvHandlerName="K4EE_Component_Reel_CustRuleRowChangeEventHandler" msprop:Generator_RowDeletedName="K4EE_Component_Reel_CustRuleRowDeleted" msprop:Generator_RowDeletingName="K4EE_Component_Reel_CustRuleRowDeleting" msprop:Generator_RowEvArgName="K4EE_Component_Reel_CustRuleRowChangeEvent" msprop:Generator_TablePropName="K4EE_Component_Reel_CustRule" msprop:Generator_RowChangedName="K4EE_Component_Reel_CustRuleRowChanged" msprop:Generator_UserTableName="K4EE_Component_Reel_CustRule" msprop:Generator_RowChangingName="K4EE_Component_Reel_CustRuleRowChanging" msprop:Generator_RowClassName="K4EE_Component_Reel_CustRuleRow" msprop:Generator_TableClassName="K4EE_Component_Reel_CustRuleDataTable" msprop:Generator_TableVarName="tableK4EE_Component_Reel_CustRule">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="code" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_ColumnVarNameInTable="columncode" msprop:Generator_UserColumnName="code"> <xs:element name="code" msprop:Generator_ColumnPropNameInTable="codeColumn" msprop:Generator_ColumnPropNameInRow="code" msprop:Generator_UserColumnName="code" msprop:Generator_ColumnVarNameInTable="columncode">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="10" /> <xs:maxLength value="10" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" /> <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="MatchEx" msprop:Generator_ColumnPropNameInRow="MatchEx" msprop:Generator_ColumnPropNameInTable="MatchExColumn" msprop:Generator_ColumnVarNameInTable="columnMatchEx" msprop:Generator_UserColumnName="MatchEx" minOccurs="0"> <xs:element name="MatchEx" msprop:Generator_ColumnPropNameInTable="MatchExColumn" msprop:Generator_ColumnPropNameInRow="MatchEx" msprop:Generator_UserColumnName="MatchEx" msprop:Generator_ColumnVarNameInTable="columnMatchEx" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="200" /> <xs:maxLength value="200" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="MatchIndex" msprop:Generator_ColumnPropNameInRow="MatchIndex" msprop:Generator_ColumnPropNameInTable="MatchIndexColumn" msprop:Generator_ColumnVarNameInTable="columnMatchIndex" msprop:Generator_UserColumnName="MatchIndex" type="xs:int" minOccurs="0" /> <xs:element name="MatchIndex" msprop:Generator_ColumnPropNameInTable="MatchIndexColumn" msprop:Generator_ColumnPropNameInRow="MatchIndex" msprop:Generator_UserColumnName="MatchIndex" msprop:Generator_ColumnVarNameInTable="columnMatchIndex" type="xs:int" minOccurs="0" />
<xs:element name="GroupIndex" msprop:Generator_ColumnPropNameInRow="GroupIndex" msprop:Generator_ColumnPropNameInTable="GroupIndexColumn" msprop:Generator_ColumnVarNameInTable="columnGroupIndex" msprop:Generator_UserColumnName="GroupIndex" type="xs:int" minOccurs="0" /> <xs:element name="GroupIndex" msprop:Generator_ColumnPropNameInTable="GroupIndexColumn" msprop:Generator_ColumnPropNameInRow="GroupIndex" msprop:Generator_UserColumnName="GroupIndex" msprop:Generator_ColumnVarNameInTable="columnGroupIndex" type="xs:int" minOccurs="0" />
<xs:element name="ReplaceEx" msprop:Generator_ColumnPropNameInRow="ReplaceEx" msprop:Generator_ColumnPropNameInTable="ReplaceExColumn" msprop:Generator_ColumnVarNameInTable="columnReplaceEx" msprop:Generator_UserColumnName="ReplaceEx" minOccurs="0"> <xs:element name="ReplaceEx" msprop:Generator_ColumnPropNameInTable="ReplaceExColumn" msprop:Generator_ColumnPropNameInRow="ReplaceEx" msprop:Generator_UserColumnName="ReplaceEx" msprop:Generator_ColumnVarNameInTable="columnReplaceEx" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="200" /> <xs:maxLength value="200" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="ReplaceStr" msprop:Generator_ColumnPropNameInRow="ReplaceStr" msprop:Generator_ColumnPropNameInTable="ReplaceStrColumn" msprop:Generator_ColumnVarNameInTable="columnReplaceStr" msprop:Generator_UserColumnName="ReplaceStr" minOccurs="0"> <xs:element name="ReplaceStr" msprop:Generator_ColumnPropNameInTable="ReplaceStrColumn" msprop:Generator_ColumnPropNameInRow="ReplaceStr" msprop:Generator_UserColumnName="ReplaceStr" msprop:Generator_ColumnVarNameInTable="columnReplaceStr" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="200" /> <xs:maxLength value="200" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="varName" msprop:Generator_ColumnPropNameInRow="varName" msprop:Generator_ColumnPropNameInTable="varNameColumn" msprop:Generator_ColumnVarNameInTable="columnvarName" msprop:Generator_UserColumnName="varName" minOccurs="0"> <xs:element name="varName" msprop:Generator_ColumnPropNameInTable="varNameColumn" msprop:Generator_ColumnPropNameInRow="varName" msprop:Generator_UserColumnName="varName" msprop:Generator_ColumnVarNameInTable="columnvarName" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="50" /> <xs:maxLength value="50" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="Remark" msprop:Generator_ColumnPropNameInRow="Remark" msprop:Generator_ColumnPropNameInTable="RemarkColumn" msprop:Generator_ColumnVarNameInTable="columnRemark" msprop:Generator_UserColumnName="Remark" minOccurs="0"> <xs:element name="Remark" msprop:Generator_ColumnPropNameInTable="RemarkColumn" msprop:Generator_ColumnPropNameInRow="Remark" msprop:Generator_UserColumnName="Remark" msprop:Generator_ColumnVarNameInTable="columnRemark" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="255" /> <xs:maxLength value="255" />
@@ -364,132 +160,6 @@ SELECT idx, M101, M103, M106, M108, M103_2, M101_2, Chk, SIDFrom, SIDTo, Remark
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Component_Reel_SIDInfo" msprop:Generator_RowEvHandlerName="Component_Reel_SIDInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="Component_Reel_SIDInfoRowDeleted" msprop:Generator_RowDeletingName="Component_Reel_SIDInfoRowDeleting" msprop:Generator_RowEvArgName="Component_Reel_SIDInfoRowChangeEvent" msprop:Generator_TablePropName="Component_Reel_SIDInfo" msprop:Generator_RowChangedName="Component_Reel_SIDInfoRowChanged" msprop:Generator_RowChangingName="Component_Reel_SIDInfoRowChanging" msprop:Generator_TableClassName="Component_Reel_SIDInfoDataTable" msprop:Generator_RowClassName="Component_Reel_SIDInfoRow" msprop:Generator_TableVarName="tableComponent_Reel_SIDInfo" msprop:Generator_UserTableName="Component_Reel_SIDInfo">
<xs:complexType>
<xs:sequence>
<xs:element name="SID" msprop:Generator_ColumnPropNameInRow="SID" msprop:Generator_ColumnPropNameInTable="SIDColumn" msprop:Generator_ColumnVarNameInTable="columnSID" msprop:Generator_UserColumnName="SID">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CustCode" msprop:Generator_ColumnPropNameInRow="CustCode" msprop:Generator_ColumnPropNameInTable="CustCodeColumn" msprop:Generator_ColumnVarNameInTable="columnCustCode" msprop:Generator_UserColumnName="CustCode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="CustName" msprop:Generator_ColumnPropNameInTable="CustNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CustName" msprop:Generator_UserColumnName="CustName" msprop:Generator_ColumnVarNameInTable="columnCustName" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="VenderName" msprop:Generator_ColumnPropNameInTable="VenderNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="VenderName" msprop:Generator_UserColumnName="VenderName" msprop:Generator_ColumnVarNameInTable="columnVenderName" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="PartNo" msprop:Generator_ColumnPropNameInTable="PartNoColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PartNo" msprop:Generator_UserColumnName="PartNo" msprop:Generator_ColumnVarNameInTable="columnPartNo">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="PrintPosition" msprop:Generator_ColumnPropNameInTable="PrintPositionColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrintPosition" msprop:Generator_UserColumnName="PrintPosition" msprop:Generator_ColumnVarNameInTable="columnPrintPosition" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Remark" msprop:Generator_ColumnPropNameInTable="RemarkColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Remark" msprop:Generator_UserColumnName="Remark" msprop:Generator_ColumnVarNameInTable="columnRemark">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Component_Reel_SIDConv" msprop:Generator_RowClassName="Component_Reel_SIDConvRow" msprop:Generator_RowEvHandlerName="Component_Reel_SIDConvRowChangeEventHandler" msprop:Generator_RowDeletedName="Component_Reel_SIDConvRowDeleted" msprop:Generator_RowDeletingName="Component_Reel_SIDConvRowDeleting" msprop:Generator_RowEvArgName="Component_Reel_SIDConvRowChangeEvent" msprop:Generator_TablePropName="Component_Reel_SIDConv" msprop:Generator_RowChangedName="Component_Reel_SIDConvRowChanged" msprop:Generator_RowChangingName="Component_Reel_SIDConvRowChanging" msprop:Generator_TableClassName="Component_Reel_SIDConvDataTable" msprop:Generator_UserTableName="Component_Reel_SIDConv" msprop:Generator_TableVarName="tableComponent_Reel_SIDConv">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="M101" msprop:Generator_ColumnPropNameInTable="M101Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="M101" msprop:Generator_UserColumnName="M101" msprop:Generator_ColumnVarNameInTable="columnM101" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="M103" msprop:Generator_ColumnPropNameInTable="M103Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="M103" msprop:Generator_UserColumnName="M103" msprop:Generator_ColumnVarNameInTable="columnM103" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="M106" msprop:Generator_ColumnPropNameInTable="M106Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="M106" msprop:Generator_UserColumnName="M106" msprop:Generator_ColumnVarNameInTable="columnM106" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="M108" msprop:Generator_ColumnPropNameInTable="M108Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="M108" msprop:Generator_UserColumnName="M108" msprop:Generator_ColumnVarNameInTable="columnM108" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="M103_2" msprop:Generator_ColumnPropNameInTable="M103_2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="M103_2" msprop:Generator_UserColumnName="M103_2" msprop:Generator_ColumnVarNameInTable="columnM103_2" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="M101_2" msprop:Generator_ColumnPropNameInTable="M101_2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="M101_2" msprop:Generator_UserColumnName="M101_2" msprop:Generator_ColumnVarNameInTable="columnM101_2" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Chk" msprop:Generator_ColumnPropNameInRow="Chk" msprop:Generator_ColumnPropNameInTable="ChkColumn" msprop:Generator_ColumnVarNameInTable="columnChk" msprop:Generator_UserColumnName="Chk" type="xs:boolean" minOccurs="0" />
<xs:element name="SIDFrom" msprop:Generator_ColumnPropNameInTable="SIDFromColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SIDFrom" msprop:Generator_UserColumnName="SIDFrom" msprop:Generator_ColumnVarNameInTable="columnSIDFrom" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="SIDTo" msprop:Generator_ColumnPropNameInTable="SIDToColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SIDTo" msprop:Generator_UserColumnName="SIDTo" msprop:Generator_ColumnVarNameInTable="columnSIDTo" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Remark" msprop:Generator_ColumnPropNameInTable="RemarkColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Remark" msprop:Generator_UserColumnName="Remark" msprop:Generator_ColumnVarNameInTable="columnRemark" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true"> <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -501,22 +171,12 @@ SELECT idx, M101, M103, M106, M108, M103_2, M101_2, Chk, SIDFrom, SIDTo, Remark
<xs:field xpath="mstns:SID101" /> <xs:field xpath="mstns:SID101" />
<xs:field xpath="mstns:SID103" /> <xs:field xpath="mstns:SID103" />
</xs:unique> </xs:unique>
<xs:unique name="Component_Reel_CustRule_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true"> <xs:unique name="K4EE_Component_Reel_CustRule_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Component_Reel_CustRule" /> <xs:selector xpath=".//mstns:K4EE_Component_Reel_CustRule" />
<xs:field xpath="mstns:code" /> <xs:field xpath="mstns:code" />
</xs:unique> </xs:unique>
<xs:unique name="Constraint2"> <xs:unique name="Constraint2">
<xs:selector xpath=".//mstns:Component_Reel_CustRule" /> <xs:selector xpath=".//mstns:K4EE_Component_Reel_CustRule" />
<xs:field xpath="mstns:idx" />
</xs:unique>
<xs:unique name="Component_Reel_SIDInfo_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Component_Reel_SIDInfo" />
<xs:field xpath="mstns:SID" />
<xs:field xpath="mstns:CustCode" />
<xs:field xpath="mstns:PartNo" />
</xs:unique>
<xs:unique name="Component_Reel_SIDConv_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Component_Reel_SIDConv" />
<xs:field xpath="mstns:idx" /> <xs:field xpath="mstns:idx" />
</xs:unique> </xs:unique>
</xs:element> </xs:element>

View File

@@ -4,13 +4,11 @@
Changes to this file may cause incorrect behavior and will be lost if Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated. the code is regenerated.
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="28" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:Component_Reel_CustRule" ZOrder="3" X="511" Y="141" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" /> <Shape ID="DesignTable:K4EE_Component_Reel_CustRule" ZOrder="1" X="511" Y="141" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:Component_Reel_SIDInfo" ZOrder="1" X="651" Y="371" Height="210" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" /> <Shape ID="DesignTable:Supply" ZOrder="3" X="120" Y="87" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignTable:Component_Reel_SIDConv" ZOrder="2" X="281" Y="385" Height="286" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" /> <Shape ID="DesignTable:SIDConvert" ZOrder="2" X="316" Y="82" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
<Shape ID="DesignTable:Supply" ZOrder="5" X="120" Y="87" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignTable:SIDConvert" ZOrder="4" X="316" Y="82" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
</Shapes> </Shapes>
<Connectors /> <Connectors />
</DiagramLayout> </DiagramLayout>

View File

@@ -1233,6 +1233,26 @@ ORDER BY CustCode</CommandText>
</Mappings> </Mappings>
<Sources /> <Sources />
</TableAdapter> </TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="SidinfoCustGroupTableAdapter" GeneratorDataComponentClassName="SidinfoCustGroupTableAdapter" Name="SidinfoCustGroup" UserDataComponentName="SidinfoCustGroupTableAdapter">
<MainSource>
<DbSource ConnectionRef="CS (Settings)" DbObjectName="WMS.dbo.VW_GET_MAX_QTY_VENDOR_LOT" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT CUST_CODE AS CustCode
FROM VW_GET_MAX_QTY_VENDOR_LOT WITH (NOLOCK)
WHERE (ISNULL(CUST_CODE, '') &lt;&gt; '')
GROUP BY CUST_CODE
ORDER BY CustCode</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="CustCode" DataSetColumn="CustCode" />
</Mappings>
<Sources />
</TableAdapter>
</Tables> </Tables>
<Sources> <Sources>
<DbSource ConnectionRef="CS (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="GetCustName" MethodsParameterType="CLR" Modifier="Public" Name="GetCustName" QueryType="Scalar" ScalarCallRetval="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GetCustName"> <DbSource ConnectionRef="CS (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="GetCustName" MethodsParameterType="CLR" Modifier="Public" Name="GetCustName" QueryType="Scalar" ScalarCallRetval="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GetCustName">
@@ -1300,11 +1320,10 @@ ORDER BY wdate DESC</CommandText>
<SelectCommand> <SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true"> <DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT COUNT(*) AS Expr1 <CommandText>SELECT COUNT(*) AS Expr1
FROM K4EE_Component_Reel_SID_Information WITH (no lock) FROM VW_GET_MAX_QTY_VENDOR_LOT WITH (nolock)
WHERE (MC = @mcname) AND (SID = @sid)</CommandText> WHERE (SID = @sid)</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="mcname" ColumnName="MC" DataSourceName="WMS.dbo.K4EE_Component_Reel_SID_Information" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@mcname" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="MC" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="sid" ColumnName="SID" DataSourceName="WMS.dbo.VW_GET_MAX_QTY_VENDOR_LOT" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sid" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="sid" ColumnName="SID" DataSourceName="WMS.dbo.K4EE_Component_Reel_SID_Information" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sid" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="SID" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</SelectCommand> </SelectCommand>
@@ -1394,6 +1413,7 @@ WHERE (iNBOUND = 'OK') AND (STIME &gt;= @stime) AND (SID = @sid) AND (BATCH = @
<xs:element name="DisableCamera" msprop:Generator_ColumnPropNameInTable="DisableCameraColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DisableCamera" msprop:Generator_UserColumnName="DisableCamera" msprop:Generator_ColumnVarNameInTable="columnDisableCamera" type="xs:boolean" minOccurs="0" /> <xs:element name="DisableCamera" msprop:Generator_ColumnPropNameInTable="DisableCameraColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DisableCamera" msprop:Generator_UserColumnName="DisableCamera" msprop:Generator_ColumnVarNameInTable="columnDisableCamera" type="xs:boolean" minOccurs="0" />
<xs:element name="DisablePrinter" msprop:Generator_ColumnPropNameInTable="DisablePrinterColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DisablePrinter" msprop:Generator_UserColumnName="DisablePrinter" msprop:Generator_ColumnVarNameInTable="columnDisablePrinter" type="xs:boolean" minOccurs="0" /> <xs:element name="DisablePrinter" msprop:Generator_ColumnPropNameInTable="DisablePrinterColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DisablePrinter" msprop:Generator_UserColumnName="DisablePrinter" msprop:Generator_ColumnVarNameInTable="columnDisablePrinter" type="xs:boolean" minOccurs="0" />
<xs:element name="CheckSIDExsit" msprop:Generator_ColumnPropNameInTable="CheckSIDExsitColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CheckSIDExsit" msprop:Generator_UserColumnName="CheckSIDExsit" msprop:Generator_ColumnVarNameInTable="columnCheckSIDExsit" type="xs:boolean" minOccurs="0" /> <xs:element name="CheckSIDExsit" msprop:Generator_ColumnPropNameInTable="CheckSIDExsitColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CheckSIDExsit" msprop:Generator_UserColumnName="CheckSIDExsit" msprop:Generator_ColumnVarNameInTable="columnCheckSIDExsit" type="xs:boolean" minOccurs="0" />
<xs:element name="bOwnZPL" msprop:Generator_ColumnPropNameInTable="bOwnZPLColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bOwnZPL" msprop:Generator_UserColumnName="bOwnZPL" msprop:Generator_ColumnVarNameInTable="columnbOwnZPL" type="xs:boolean" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
@@ -2020,6 +2040,19 @@ WHERE (iNBOUND = 'OK') AND (STIME &gt;= @stime) AND (SID = @sid) AND (BATCH = @
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="SidinfoCustGroup" msprop:Generator_RowEvHandlerName="SidinfoCustGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="SidinfoCustGroupRowDeleted" msprop:Generator_RowDeletingName="SidinfoCustGroupRowDeleting" msprop:Generator_RowEvArgName="SidinfoCustGroupRowChangeEvent" msprop:Generator_TablePropName="SidinfoCustGroup" msprop:Generator_RowChangedName="SidinfoCustGroupRowChanged" msprop:Generator_UserTableName="SidinfoCustGroup" msprop:Generator_RowChangingName="SidinfoCustGroupRowChanging" msprop:Generator_RowClassName="SidinfoCustGroupRow" msprop:Generator_TableClassName="SidinfoCustGroupDataTable" msprop:Generator_TableVarName="tableSidinfoCustGroup">
<xs:complexType>
<xs:sequence>
<xs:element name="CustCode" msprop:Generator_ColumnPropNameInTable="CustCodeColumn" msprop:Generator_ColumnPropNameInRow="CustCode" msprop:Generator_UserColumnName="CustCode" msprop:Generator_ColumnVarNameInTable="columnCustCode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true"> <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -2116,5 +2149,9 @@ WHERE (iNBOUND = 'OK') AND (STIME &gt;= @stime) AND (SID = @sid) AND (BATCH = @
<xs:selector xpath=".//mstns:CustCodeList" /> <xs:selector xpath=".//mstns:CustCodeList" />
<xs:field xpath="mstns:CustCode" /> <xs:field xpath="mstns:CustCode" />
</xs:unique> </xs:unique>
<xs:unique name="SidinfoCustGroup_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:SidinfoCustGroup" />
<xs:field xpath="mstns:CustCode" />
</xs:unique>
</xs:element> </xs:element>
</xs:schema> </xs:schema>

View File

@@ -4,32 +4,33 @@
Changes to this file may cause incorrect behavior and will be lost if Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated. the code is regenerated.
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-139" ViewPortY="18" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-43" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:K4EE_Component_Reel_Result" ZOrder="20" X="-129" Y="198" Height="533" Width="313" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" /> <Shape ID="DesignTable:K4EE_Component_Reel_Result" ZOrder="21" X="-129" Y="198" Height="533" Width="313" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:K4EE_Component_Reel_RegExRule" ZOrder="11" X="-3" Y="234" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="252" /> <Shape ID="DesignTable:K4EE_Component_Reel_RegExRule" ZOrder="13" X="-3" Y="234" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="252" />
<Shape ID="DesignTable:K4EE_Component_Reel_SID_Convert" ZOrder="5" X="-67" Y="154" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:K4EE_Component_Reel_SID_Convert" ZOrder="7" X="-67" Y="154" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:K4EE_Component_Reel_SID_Information" ZOrder="16" X="5" Y="229" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="197" SplitterPosition="254" /> <Shape ID="DesignTable:K4EE_Component_Reel_SID_Information" ZOrder="17" X="5" Y="229" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="197" SplitterPosition="254" />
<Shape ID="DesignTable:K4EE_Component_Reel_PreSet" ZOrder="4" X="68" Y="68" Height="305" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:K4EE_Component_Reel_PreSet" ZOrder="6" X="68" Y="68" Height="305" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:K4EE_Component_Reel_CustInfo" ZOrder="21" X="123" Y="97" Height="115" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" /> <Shape ID="DesignTable:K4EE_Component_Reel_CustInfo" ZOrder="22" X="123" Y="97" Height="115" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ResultSummary" ZOrder="12" X="-124" Y="28" Height="153" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" /> <Shape ID="DesignTable:ResultSummary" ZOrder="14" X="-124" Y="28" Height="153" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:K4EE_Component_Reel_Print_Information" ZOrder="3" X="108" Y="81" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:K4EE_Component_Reel_Print_Information" ZOrder="5" X="108" Y="81" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:K4EE_Component_Reel_PrintRegExRule" ZOrder="6" X="48" Y="39" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" /> <Shape ID="DesignTable:K4EE_Component_Reel_PrintRegExRule" ZOrder="8" X="48" Y="39" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:CustCodeList" ZOrder="14" X="587" Y="115" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" /> <Shape ID="DesignTable:CustCodeList" ZOrder="15" X="587" Y="115" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:Users" ZOrder="17" X="645" Y="602" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" /> <Shape ID="DesignTable:SidinfoCustGroup" ZOrder="2" X="368" Y="547" Height="96" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:MCModel" ZOrder="10" X="653" Y="596" Height="410" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" /> <Shape ID="DesignTable:Users" ZOrder="18" X="645" Y="602" Height="87" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:language" ZOrder="23" X="685" Y="603" Height="239" Width="134" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" /> <Shape ID="DesignTable:MCModel" ZOrder="12" X="653" Y="596" Height="410" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
<Shape ID="DesignTable:OPModel" ZOrder="13" X="675" Y="601" Height="371" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="367" /> <Shape ID="DesignTable:language" ZOrder="24" X="685" Y="603" Height="239" Width="134" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:BCDData" ZOrder="9" X="657" Y="586" Height="163" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" /> <Shape ID="DesignTable:OPModel" ZOrder="3" X="815" Y="308" Height="371" Width="152" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="367" />
<Shape ID="DesignTable:UserSID" ZOrder="25" X="671" Y="606" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" /> <Shape ID="DesignTable:BCDData" ZOrder="11" X="657" Y="586" Height="163" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:MailFormat" ZOrder="18" X="673" Y="596" Height="49" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" /> <Shape ID="DesignTable:UserSID" ZOrder="26" X="671" Y="606" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:MailRecipient" ZOrder="24" X="664" Y="596" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" /> <Shape ID="DesignTable:MailFormat" ZOrder="19" X="673" Y="596" Height="49" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
<Shape ID="DesignTable:SIDHistory" ZOrder="7" X="666" Y="598" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" /> <Shape ID="DesignTable:MailRecipient" ZOrder="25" X="664" Y="596" Height="68" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:InputDescription" ZOrder="8" X="662" Y="595" Height="143" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" /> <Shape ID="DesignTable:SIDHistory" ZOrder="9" X="666" Y="598" Height="182" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:OutputDescription" ZOrder="19" X="658" Y="594" Height="182" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" /> <Shape ID="DesignTable:InputDescription" ZOrder="10" X="662" Y="595" Height="143" Width="164" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:UserTable" ZOrder="2" X="662" Y="597" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" /> <Shape ID="DesignTable:OutputDescription" ZOrder="20" X="658" Y="594" Height="182" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:ErrorDescription" ZOrder="15" X="654" Y="604" Height="105" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" /> <Shape ID="DesignTable:UserTable" ZOrder="4" X="662" Y="597" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
<Shape ID="DesignTable:ModelList" ZOrder="22" X="683" Y="598" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" /> <Shape ID="DesignTable:ErrorDescription" ZOrder="16" X="654" Y="604" Height="105" Width="161" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:ModelList" ZOrder="23" X="683" Y="598" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="532" Y="260" Height="315" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" /> <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="532" Y="260" Height="315" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="311" />
</Shapes> </Shapes>
<Connectors /> <Connectors />

File diff suppressed because it is too large Load Diff

View File

@@ -10,16 +10,26 @@ namespace Project.Device
{ {
public string LastPrintZPL = string.Empty; public string LastPrintZPL = string.Empty;
public string qrData = string.Empty; public string qrData = string.Empty;
public string ZPLFileName { get; set; } = "zpl.txt";
public string baseZPL public string baseZPL
{ {
get get
{ {
var fi = new System.IO.FileInfo(AR.SETTING.Data.baseZPLFile); var fi = new System.IO.FileInfo(ZPLFileName);
if (fi.Exists) if (fi.Exists == false || fi.Length == 0)
{ {
return System.IO.File.ReadAllText(fi.FullName, System.Text.Encoding.Default); PUB.log.AddE($"{ZPLFileName} 이 존재하지않거나 데이터가 없습니다 zpl.txt 기본으로 변경합니다");
fi = new System.IO.FileInfo("zpl.txt");
if (fi.Exists == false) PUB.log.AddE("인쇄기본파일(zpl.txt)가 존재하지 않습니다");
} }
else return Properties.Settings.Default.ZPL7; if (fi.Exists && fi.Length > 1)
return System.IO.File.ReadAllText(fi.FullName, System.Text.Encoding.Default);
else
{
PUB.log.AddAT("ZPL파일이 없어 설정의 ZPL코드를 사용합니다");
return Properties.Settings.Default.ZPL7;
}
} }
} }

View File

@@ -1,4 +1,5 @@
using arCtl; using AR;
using arCtl;
using SATOPrinterAPI; using SATOPrinterAPI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -17,16 +18,27 @@ namespace Project.Device
public string qrData = string.Empty; public string qrData = string.Empty;
public string PortName { get; set; } public string PortName { get; set; }
public int BaudRate { get; set; } public int BaudRate { get; set; }
public string ZPLFileName { get; set; } = "zpl.txt";
public string baseZPL public string baseZPL
{ {
get get
{ {
var fi = new System.IO.FileInfo(AR.SETTING.Data.baseZPLFile); var fi = new System.IO.FileInfo(ZPLFileName);
if (fi.Exists) if (fi.Exists == false || fi.Length == 0)
{ {
return System.IO.File.ReadAllText(fi.FullName, System.Text.Encoding.Default); PUB.log.AddE($"{ZPLFileName} 이 존재하지않거나 데이터가 없습니다 zpl.txt 기본으로 변경합니다");
fi = new System.IO.FileInfo("zpl.txt");
if (fi.Exists == false) PUB.log.AddE("인쇄기본파일(zpl.txt)가 존재하지 않습니다");
} }
else return Properties.Settings.Default.ZPL7; if (fi.Exists && fi.Length > 1)
return System.IO.File.ReadAllText(fi.FullName, System.Text.Encoding.Default);
else
{
PUB.log.AddAT("ZPL파일이 없어 설정의 ZPL코드를 사용합니다");
return Properties.Settings.Default.ZPL7;
}
} }
} }

View File

@@ -26,7 +26,7 @@ namespace Project
DateTime swPLCConTime = DateTime.Now; DateTime swPLCConTime = DateTime.Now;
Boolean bRunConnection = true; Boolean bRunConnection = true;
DateTime SendStatusTime = DateTime.Now;
void bwDeviceConnection() void bwDeviceConnection()
{ {
while (bRunConnection && this.Disposing == false && this.Disposing == false) while (bRunConnection && this.Disposing == false && this.Disposing == false)
@@ -285,29 +285,6 @@ namespace Project
} }
ConnectSeq = 0; ConnectSeq = 0;
} }
var tsst = DateTime.Now - SendStatusTime;
if (tsst.TotalSeconds > 3)
{
//내정보를 전송한다.
var modelVision = "";
if (PUB.Result.isSetvModel) modelVision = PUB.Result.vModel.Title;
var dt = new
{
mc = SETTING.Data.McName,
status = PUB.sm.Step.ToString(),
model = modelVision,
bypass = (VAR.BOOL[eVarBool.Opt_DisablePrinter] ? true : false),
};
string jsonStr = Newtonsoft.Json.JsonConvert.SerializeObject(dt);
var url = $@"http://10.131.32.29:8080/api/updatelastatus";
var rlt = PostFromUrl(url, jsonStr, out bool iserr, _timeout: 1000);
if (iserr) PUB.log.AddE($"ECS 상태정보실패 메세지:{rlt}");
SendStatusTime = DateTime.Now;
}
System.Threading.Thread.Sleep(2000); System.Threading.Thread.Sleep(2000);
} }

View File

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

View File

@@ -55,13 +55,13 @@ namespace Project.Dialog
tblDO.setItemTextAlign(ContentAlignment.MiddleLeft); tblDO.setItemTextAlign(ContentAlignment.MiddleLeft);
// tblFG.setItemTextAlign(ContentAlignment.BottomLeft); // tblFG.setItemTextAlign(ContentAlignment.BottomLeft);
tblDI.ColorList = new arDev.AjinEXTEK.ColorListItem[] { tblDI.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" }, new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.Lime, BackColor2 = Color.Green, Remark="True" }, new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.Lime, BackColor2 = Color.Green, Remark="True" },
}; };
tblDO.ColorList = new arDev.AjinEXTEK.ColorListItem[] { tblDO.ColorList = new arDev.AjinEXTEK.UI.ColorListItem[] {
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" }, new arDev.AjinEXTEK.UI.ColorListItem{ BackColor1 = Color.DimGray, BackColor2 = Color.FromArgb(30,30,30), Remark="False" },
new arDev.AjinEXTEK.ColorListItem{ BackColor1 = Color.Tomato, BackColor2 = Color.Red, Remark="True" }, 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"); // 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); var newValue = !PUB.dio.GetDOValue(e.idx);
if (PUB.dio.IsInit == false) 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); var newValue = !PUB.dio.GetDIValue(e.idx);
if (PUB.dio.IsInit == false || PUB.flag.get(eVarBool.FG_DEBUG) == true) if (PUB.dio.IsInit == false || PUB.flag.get(eVarBool.FG_DEBUG) == true)

View File

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

View File

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

View File

@@ -31,18 +31,16 @@
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation)); 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.dv = new arCtl.arDatagridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Code = 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.tmDisplay = new System.Windows.Forms.Timer(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.checkBox31 = new System.Windows.Forms.CheckBox(); this.checkBox31 = new System.Windows.Forms.CheckBox();
this.chkOwnZPL = new System.Windows.Forms.CheckBox();
this.panel5 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
@@ -50,6 +48,7 @@
this.chkSIDCHK = new System.Windows.Forms.CheckBox(); this.chkSIDCHK = new System.Windows.Forms.CheckBox();
this.checkBox32 = new System.Windows.Forms.CheckBox(); this.checkBox32 = new System.Windows.Forms.CheckBox();
this.chkEnbCamera = 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.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.chkApplySidInfo = new System.Windows.Forms.CheckBox(); this.chkApplySidInfo = new System.Windows.Forms.CheckBox();
@@ -136,9 +135,10 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.arLabel2 = new arCtl.arLabel(); this.arLabel2 = new arCtl.arLabel();
this.arLabel18 = 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.dv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
this.panel5.SuspendLayout(); this.panel5.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
@@ -154,6 +154,8 @@
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// dv // dv
@@ -204,15 +206,6 @@
this.Column1.Name = "Column1"; this.Column1.Name = "Column1";
this.Column1.Width = 50; 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 // Code
// //
this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -222,17 +215,6 @@
this.Code.HeaderText = "Customer Code"; this.Code.HeaderText = "Customer Code";
this.Code.Name = "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 // tmDisplay
// //
this.tmDisplay.Interval = 500; this.tmDisplay.Interval = 500;
@@ -251,6 +233,19 @@
this.toolTip1.SetToolTip(this.checkBox31, "바코드룰에 없는 데이터를 제외 합니다.."); this.toolTip1.SetToolTip(this.checkBox31, "바코드룰에 없는 데이터를 제외 합니다..");
this.checkBox31.UseVisualStyleBackColor = true; 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 // panel5
// //
this.panel5.Controls.Add(this.panel4); this.panel5.Controls.Add(this.panel4);
@@ -293,9 +288,11 @@
// //
this.panel7.BackColor = System.Drawing.Color.Gainsboro; this.panel7.BackColor = System.Drawing.Color.Gainsboro;
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; 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.chkSIDCHK);
this.panel7.Controls.Add(this.checkBox32); this.panel7.Controls.Add(this.checkBox32);
this.panel7.Controls.Add(this.chkEnbCamera); this.panel7.Controls.Add(this.chkEnbCamera);
this.panel7.Controls.Add(this.button1);
this.panel7.Dock = System.Windows.Forms.DockStyle.Top; this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
this.panel7.Location = new System.Drawing.Point(10, 82); this.panel7.Location = new System.Drawing.Point(10, 82);
this.panel7.Name = "panel7"; this.panel7.Name = "panel7";
@@ -349,6 +346,17 @@
this.chkEnbCamera.Text = "비전 사용 안함"; this.chkEnbCamera.Text = "비전 사용 안함";
this.chkEnbCamera.UseVisualStyleBackColor = true; 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 // tabControl1
// //
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
@@ -1483,6 +1491,26 @@
this.arLabel18.TextShadow = true; this.arLabel18.TextShadow = true;
this.arLabel18.TextVisible = 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 // Model_Operation
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1497,8 +1525,6 @@
this.Text = "모델 선택"; this.Text = "모델 선택";
this.Load += new System.EventHandler(this.@__Load); this.Load += new System.EventHandler(this.@__Load);
((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit();
this.panel5.ResumeLayout(false); this.panel5.ResumeLayout(false);
this.panel4.ResumeLayout(false); this.panel4.ResumeLayout(false);
this.panel4.PerformLayout(); this.panel4.PerformLayout();
@@ -1523,6 +1549,8 @@
this.panel3.ResumeLayout(false); this.panel3.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout(); this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@@ -1631,5 +1659,7 @@
private System.Windows.Forms.CheckBox checkBox34; private System.Windows.Forms.CheckBox checkBox34;
private System.Windows.Forms.CheckBox checkBox35; private System.Windows.Forms.CheckBox checkBox35;
private System.Windows.Forms.CheckBox chkSave2; private System.Windows.Forms.CheckBox chkSave2;
private System.Windows.Forms.CheckBox chkOwnZPL;
private System.Windows.Forms.Button button1;
} }
} }

View File

@@ -1,4 +1,5 @@
using AR; using AR;
using Project.Dialog;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -621,6 +622,12 @@ namespace Project
if (drv == null) return; if (drv == null) return;
var dr = drv.Row as DataSet1.OPModelRow; var dr = drv.Row as DataSet1.OPModelRow;
if (dr.IsbOwnZPLNull())
{
dr.bOwnZPL = false;
dr.EndEdit();
}
//this.tabControl1.Visible = !dr.Title.StartsWith("101"); //this.tabControl1.Visible = !dr.Title.StartsWith("101");
//this.panel6.Visible = !dr.Title.StartsWith("101"); //this.panel6.Visible = !dr.Title.StartsWith("101");
// this.panel7.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();
}
}
} }
} }

View File

@@ -320,7 +320,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] 원점(0)으로 이동 : " + ax.ToString()); sb.AppendLine($"[{++idx:000}] 원점(0)으로 이동 : " + ax.ToString());
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{ {
Axis = (int)ax, Axis = (short)ax,
Position = 0, Position = 0,
Speed = Math.Max(100, dr.Speed), Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc, Acc = dr.SpeedAcc,
@@ -336,7 +336,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)"); sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)");
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{ {
Axis = (int)ax, Axis = (short)ax,
Position = dr.Position, Position = dr.Position,
Speed = Math.Max(100, dr.Speed), Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc, Acc = dr.SpeedAcc,
@@ -353,7 +353,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)"); sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)");
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{ {
Axis = (int)ax, Axis = (short)ax,
Position = dr.Position, Position = dr.Position,
Speed = Math.Max(100, dr.Speed), Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc, Acc = dr.SpeedAcc,
@@ -370,7 +370,7 @@ namespace Project.Dialog
sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)"); sb.AppendLine($"[{++idx:000}] {ax} 위치 이동 : {dr.Position}mm({dr.Speed}ms)");
var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData var p = new Tuple<eAxis, sPositionData, bool>(ax, new sPositionData
{ {
Axis = (int)ax, Axis = (short)ax,
Position = Math.Max(dr.Position - 50, 0), Position = Math.Max(dr.Position - 50, 0),
Speed = Math.Max(100, dr.Speed), Speed = Math.Max(100, dr.Speed),
Acc = dr.SpeedAcc, Acc = dr.SpeedAcc,
@@ -469,7 +469,7 @@ namespace Project.Dialog
{ {
var ax = nlist[i]; var ax = nlist[i];
var dr = nplist[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}"); 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); var param = new Tuple<DataSet1.MCModelRow, eAxis, string, double, double>(dr, ax, dr.PosTitle, dr.Position, curpos);
poslist.Enqueue(param); poslist.Enqueue(param);
@@ -508,27 +508,27 @@ namespace Project.Dialog
var vel = (float)nudJogVel.Value; var vel = (float)nudJogVel.Value;
if (tag == "X+") 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-") 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+") 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-") 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+") 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-") 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; var vel = (float)nudJogVel.Value;
if (tag == "X+") 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-") 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+") 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-") 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+") 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-") 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; var motpos = string.Empty;
if (axisX >= 0) 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; button6.BackColor = PUB.iLock[axisX].IsEmpty() ? Color.FromArgb(224, 224, 224) : Color.Orange;
} }
else else
@@ -579,7 +579,7 @@ namespace Project.Dialog
} }
if (axisY >= 0) 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; button5.BackColor = PUB.iLock[axisY].IsEmpty() ? Color.FromArgb(224, 224, 224) : Color.Orange;
} }
else else
@@ -589,7 +589,7 @@ namespace Project.Dialog
} }
if (axisZ >= 0) 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; button4.BackColor = PUB.iLock[axisZ].IsEmpty() ? Color.FromArgb(224, 224, 224) : Color.Orange;
} }
else else

View File

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

View File

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

View File

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

View File

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

View File

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

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")); 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 = 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); //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); UpdateList(list, dataGridView1, dataGridView2);
@@ -80,7 +80,7 @@ namespace Project.Dialog
UpdateList(listday, dataGridView3, dataGridView4); 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(); dvS.Rows.Clear();
dvB.Rows.Clear(); dvB.Rows.Clear();

View File

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

View File

@@ -117,7 +117,7 @@ namespace Project.Dialog
return; return;
} }
//저장소초기화 //저장소초기화
this.dataSet1.Component_Reel_Result.Clear(); this.dataSet1.K4EE_Component_Reel_Result.Clear();
System.Diagnostics.Stopwatch wat = new System.Diagnostics.Stopwatch(); System.Diagnostics.Stopwatch wat = new System.Diagnostics.Stopwatch();
wat.Restart(); wat.Restart();
@@ -127,7 +127,7 @@ namespace Project.Dialog
if (search.isEmpty()) search = "%"; if (search.isEmpty()) search = "%";
else search = "%" + 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(); wat.Stop();
@@ -207,7 +207,7 @@ namespace Project.Dialog
} }
else 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); 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(double)) Sheet.writeNum(row, i, (double)dr.Cells[i].Value);
else if (dType == typeof(int)) Sheet.writeNum(row, i, (int)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; var drv = this.bs.Current as DataRowView;
if (drv == null) return; 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)) using(var f = new Dialog.fManualPrint(dr.SID,dr.VLOT, dr.QTY.ToString(),dr.MFGDATE,dr.RID, dr.VNAME, dr.PARTNO))
{ {

View File

@@ -177,7 +177,7 @@ namespace Project.Dialog
if (this.PrintPos.isEmpty() && item.VisionData.SID.isEmpty() == false) if (this.PrintPos.isEmpty() && item.VisionData.SID.isEmpty() == false)
{ {
//프린트위치가없다면 서버를 조회하여 데이터를 찾아준다. - 231005 //프린트위치가없다면 서버를 조회하여 데이터를 찾아준다. - 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); this.PrintPos = taresult.GetPrintPosition(AR.SETTING.Data.McName, item.VisionData.SID);
} }
DisplayPrintPos(this.PrintPos); DisplayPrintPos(this.PrintPos);
@@ -459,7 +459,7 @@ namespace Project.Dialog
{ {
try 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(); var dr = ta.GetBySID(PUB.MCCode, lvValue).FirstOrDefault();
if (dr != null) //자료가잇는 경우에만 적용 if (dr != null) //자료가잇는 경우에만 적용
@@ -603,8 +603,8 @@ namespace Project.Dialog
} }
//sid 가 변경되었으나 해당 sid 인쇄위치 및 customer / part no 값을 확인 합니다. //sid 가 변경되었으나 해당 sid 인쇄위치 및 customer / part no 값을 확인 합니다.
var taSID = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter(); var taSID = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter();
var taPRN = new DataSet1TableAdapters.Component_Reel_Print_InformationTableAdapter(); var taPRN = new DataSet1TableAdapters.K4EE_Component_Reel_Print_InformationTableAdapter();
try try
{ {
@@ -692,9 +692,9 @@ namespace Project.Dialog
new SqlParameter("sd", sd), new SqlParameter("sd", sd),
}; };
DataSet1.Component_Reel_ResultRow preData = null; DataSet1.K4EE_Component_Reel_ResultRow preData = null;
var preDatas = DBHelper.Get(sql, ps); 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 => //var preData = db2.Component_Reel_Result.AsNoTracking().Where(t =>
//t.JTYPE == PUB.Result.JobType2 && //t.JTYPE == PUB.Result.JobType2 &&
@@ -1083,7 +1083,7 @@ namespace Project.Dialog
return; return;
} }
var sid = tbSID.Text.Trim(); 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(); var dr = db.GetBySID(PUB.MCCode, sid).FirstOrDefault();
if (dr == null) if (dr == null)
@@ -1114,20 +1114,8 @@ namespace Project.Dialog
private void btCustAutoInput_Click(object sender, EventArgs e) 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(); var sid = tbSID.Text.Trim();
if (sid.isEmpty()) if (sid.isEmpty())
@@ -1153,7 +1141,7 @@ namespace Project.Dialog
var vlot = this.tbVLOT.Text.Trim(); var vlot = this.tbVLOT.Text.Trim();
if (vlot.isEmpty() == false) 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(); var dr2 = taResult.GetByLastVLotOne(AR.SETTING.Data.McName, vlot).FirstOrDefault();
if (dr2 != null) 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 amksid = string.Empty;
var dtSIDInfo = db.GetData(PUB.MCCode); var dtSIDInfo = db.GetData(PUB.MCCode);
@@ -2070,7 +2058,7 @@ namespace Project.Dialog
var dlg = UTIL.MsgQ("SID 에서 인쇄 위치를 검색 할까요?"); var dlg = UTIL.MsgQ("SID 에서 인쇄 위치를 검색 할까요?");
if (dlg != DialogResult.Yes) return; 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(); var dr = db.GetBySID(PUB.MCCode, sid).FirstOrDefault();
if (dr == null || dr.PrintPosition.isEmpty()) if (dr == null || dr.PrintPosition.isEmpty())
@@ -2087,7 +2075,7 @@ namespace Project.Dialog
private void button1_Click_1(object sender, EventArgs e) 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)"; var tabName = "K4EE_Component_Reel_Result with (no lock)";
@@ -2199,7 +2187,7 @@ namespace Project.Dialog
{ {
var sid = this.tbSID.Text.Trim(); var sid = this.tbSID.Text.Trim();
if (sid.isEmpty()) return; 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(); var dr = db.GetBySID(PUB.MCCode, sid).FirstOrDefault();
if (dr == null || dr.PrintPosition.isEmpty()) if (dr == null || dr.PrintPosition.isEmpty())

View File

@@ -287,7 +287,7 @@ namespace Project.Dialog
var itemdata = vidx == eWorkPort.Left ? PUB.Result.ItemDataL : PUB.Result.ItemDataR; 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 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) if (dr == null)
{ {
var ermsg = string.Format("다음 guid 를 찾을수 없어 검증취소 를 변경하지 못함 vidx={2},guid={0},sid={1}", itemdata.guid, itemdata.VisionData.SID, vidx); var ermsg = string.Format("다음 guid 를 찾을수 없어 검증취소 를 변경하지 못함 vidx={2},guid={0},sid={1}", itemdata.guid, itemdata.VisionData.SID, vidx);

View File

@@ -24,10 +24,10 @@ namespace Project.Dialog
this.Show(); this.Show();
Application.DoEvents(); Application.DoEvents();
var ta = new DataSet1TableAdapters.Component_Reel_CustInfoTableAdapter(); var ta = new DataSet1TableAdapters.K4EE_Component_Reel_CustInfoTableAdapter();
var dt = ta.GetData(); var dt = ta.GetData();
this.listView1.Items.Clear(); 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; if (item.code.isEmpty()) continue;
var lv = this.listView1.Items.Add(item.code); var lv = this.listView1.Items.Add(item.code);

View File

@@ -52,7 +52,6 @@
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.GrpSidConvData = new System.Windows.Forms.GroupBox(); this.GrpSidConvData = new System.Windows.Forms.GroupBox();
this.chkCVSave = new System.Windows.Forms.CheckBox(); this.chkCVSave = new System.Windows.Forms.CheckBox();
this.chkCVApplyQtyMax = new System.Windows.Forms.CheckBox();
this.chkCVApplyBatch = new System.Windows.Forms.CheckBox(); this.chkCVApplyBatch = new System.Windows.Forms.CheckBox();
this.chkCVWhereLot = new System.Windows.Forms.CheckBox(); this.chkCVWhereLot = new System.Windows.Forms.CheckBox();
this.chkCVApplyPrint = new System.Windows.Forms.CheckBox(); this.chkCVApplyPrint = new System.Windows.Forms.CheckBox();
@@ -78,9 +77,7 @@
this.chkDayApplyCust = new System.Windows.Forms.CheckBox(); this.chkDayApplyCust = new System.Windows.Forms.CheckBox();
this.chkDayApplyPart = new System.Windows.Forms.CheckBox(); this.chkDayApplyPart = new System.Windows.Forms.CheckBox();
this.grpApplySidinfo = new System.Windows.Forms.GroupBox(); this.grpApplySidinfo = new System.Windows.Forms.GroupBox();
this.chkInfoWhereMC = new System.Windows.Forms.CheckBox();
this.chkInfoWhereLot = 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.chkInfoApplyBatch = new System.Windows.Forms.CheckBox();
this.chkInfoSave = new System.Windows.Forms.CheckBox(); this.chkInfoSave = new System.Windows.Forms.CheckBox();
this.chkInfoApplyPrint = new System.Windows.Forms.CheckBox(); this.chkInfoApplyPrint = new System.Windows.Forms.CheckBox();
@@ -443,7 +440,6 @@
// GrpSidConvData // GrpSidConvData
// //
this.GrpSidConvData.Controls.Add(this.chkCVSave); this.GrpSidConvData.Controls.Add(this.chkCVSave);
this.GrpSidConvData.Controls.Add(this.chkCVApplyQtyMax);
this.GrpSidConvData.Controls.Add(this.chkCVApplyBatch); this.GrpSidConvData.Controls.Add(this.chkCVApplyBatch);
this.GrpSidConvData.Controls.Add(this.chkCVWhereLot); this.GrpSidConvData.Controls.Add(this.chkCVWhereLot);
this.GrpSidConvData.Controls.Add(this.chkCVApplyPrint); this.GrpSidConvData.Controls.Add(this.chkCVApplyPrint);
@@ -479,18 +475,6 @@
this.chkCVSave.Text = "변경 정보를 서버에 기록 합니다"; this.chkCVSave.Text = "변경 정보를 서버에 기록 합니다";
this.chkCVSave.UseVisualStyleBackColor = true; 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 // chkCVApplyBatch
// //
this.chkCVApplyBatch.AutoSize = true; this.chkCVApplyBatch.AutoSize = true;
@@ -778,9 +762,7 @@
// //
// grpApplySidinfo // grpApplySidinfo
// //
this.grpApplySidinfo.Controls.Add(this.chkInfoWhereMC);
this.grpApplySidinfo.Controls.Add(this.chkInfoWhereLot); this.grpApplySidinfo.Controls.Add(this.chkInfoWhereLot);
this.grpApplySidinfo.Controls.Add(this.chkInfoApplyQty);
this.grpApplySidinfo.Controls.Add(this.chkInfoApplyBatch); this.grpApplySidinfo.Controls.Add(this.chkInfoApplyBatch);
this.grpApplySidinfo.Controls.Add(this.chkInfoSave); this.grpApplySidinfo.Controls.Add(this.chkInfoSave);
this.grpApplySidinfo.Controls.Add(this.chkInfoApplyPrint); this.grpApplySidinfo.Controls.Add(this.chkInfoApplyPrint);
@@ -803,18 +785,6 @@
this.grpApplySidinfo.TabStop = false; this.grpApplySidinfo.TabStop = false;
this.grpApplySidinfo.Text = "입력정보 적용"; 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 // chkInfoWhereLot
// //
this.chkInfoWhereLot.AutoSize = true; this.chkInfoWhereLot.AutoSize = true;
@@ -827,18 +797,6 @@
this.chkInfoWhereLot.Text = "VLOT"; this.chkInfoWhereLot.Text = "VLOT";
this.chkInfoWhereLot.UseVisualStyleBackColor = true; 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 // chkInfoApplyBatch
// //
this.chkInfoApplyBatch.AutoSize = true; this.chkInfoApplyBatch.AutoSize = true;
@@ -1193,7 +1151,6 @@
private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Panel panel5;
private System.Windows.Forms.ComboBox cmbCustCode; private System.Windows.Forms.ComboBox cmbCustCode;
private System.Windows.Forms.CheckBox chkInfoApplyBatch; private System.Windows.Forms.CheckBox chkInfoApplyBatch;
private System.Windows.Forms.CheckBox chkInfoApplyQty;
private System.Windows.Forms.CheckBox chkDayWhereLot; private System.Windows.Forms.CheckBox chkDayWhereLot;
private System.Windows.Forms.CheckBox chkInfoWhereLot; private System.Windows.Forms.CheckBox chkInfoWhereLot;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
@@ -1202,9 +1159,7 @@
private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.CheckBox chkInfoWhereMC;
private System.Windows.Forms.CheckBox chkCVSave; private System.Windows.Forms.CheckBox chkCVSave;
private System.Windows.Forms.CheckBox chkCVApplyQtyMax;
private System.Windows.Forms.CheckBox chkCVApplyBatch; private System.Windows.Forms.CheckBox chkCVApplyBatch;
private System.Windows.Forms.CheckBox chkCVWhereLot; private System.Windows.Forms.CheckBox chkCVWhereLot;
private System.Windows.Forms.CheckBox chkCVApplyPrint; private System.Windows.Forms.CheckBox chkCVApplyPrint;

View File

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

View File

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

View File

@@ -69,7 +69,7 @@ namespace Project.Dialog
if (sidNew.isEmpty()) lv.SubItems.Add("--"); if (sidNew.isEmpty()) lv.SubItems.Add("--");
else 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(); var list = db.GetbySIDNoCustCode(PUB.MCCode, sidNew).ToList();
if (list.Any() == true) if (list.Any() == true)

View File

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

View File

@@ -19,6 +19,17 @@ namespace Project.Dialog
InitializeComponent(); InitializeComponent();
this.fn = fn_; this.fn = fn_;
this.FormClosed += FZPLEditor_FormClosed; 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) private void FZPLEditor_FormClosed(object sender, FormClosedEventArgs e)
@@ -28,7 +39,9 @@ namespace Project.Dialog
private void fZPLEditor_Load(object sender, EventArgs e) 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); this.richTextBox1.Text = System.IO.File.ReadAllText(this.fn, System.Text.Encoding.Default);
PUB.log.RaiseMsg += Log_RaiseMsg; PUB.log.RaiseMsg += Log_RaiseMsg;
} }

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"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </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> </root>

View File

@@ -33,7 +33,7 @@
this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel3 = 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.logTextBox1 = new arCtl.LogTextBox();
this.gridView1 = new arCtl.GridView.GridView(); this.gridView1 = new arCtl.GridView.GridView();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -328,7 +328,7 @@
private arCtl.LogTextBox logTextBox1; private arCtl.LogTextBox logTextBox1;
private System.Windows.Forms.Timer timer1; 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.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
private arCtl.GridView.GridView gridView1; private arCtl.GridView.GridView gridView1;

View File

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

View File

@@ -20,50 +20,12 @@ namespace Project
[STAThread] [STAThread]
static void Main() static void Main()
{ {
//중복실행방지
var guidAttr = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(GuidAttribute), true);
if (guidAttr != null)
{
var guida = (GuidAttribute)guidAttr[0];
var guidstr = guida.Value;
Mutex mtx = new Mutex(true, guidstr);
var success = mtx.WaitOne(new TimeSpan(0, 0, 1));
if (success == false)
{
//MessageBox.Show("중복실행 불가\n\n프로그램이 실행 중 입니다");
//"※ Amkor Standard Label Attach"
var list = System.Diagnostics.Process.GetProcesses();
var prc = list.Where(t => t.ProcessName == "Amkor" && t.MainModule.FileVersionInfo.FileDescription.Contains("Amkor Standard Label")).FirstOrDefault();
if (prc != null)
{
var dlg = MessageBox.Show(
"중복 실행이 감지 되었습니다.\r\n" +
"현재 실행중인 프로그램을 종료 할까요?\r\n" +
"프로그램은 다시 실행하세요", "중복실행", MessageBoxButtons.YesNo,
MessageBoxIcon.Question);
if (dlg == DialogResult.Yes)
{
prc.Kill();
}
}
return;
}
}
//if(IsAdmin()==false)
//{
// var dlg = MessageBox.Show(
// "이 프로그램은 관리자 모드로 실행해야 합니다", "중복실행", MessageBoxButtons.YesNo,
// MessageBoxIcon.Question);
// return;
//}
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
if (CheckSingleInstance() == false) return;
Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException); Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
Application.Run(new FMain()); Application.Run(new FMain());
@@ -80,19 +42,80 @@ namespace Project
return false; return false;
} }
/// <summary>
/// 중복실행 방지 체크
/// </summary>
/// <returns>단일 인스턴스인 경우 true, 중복실행인 경우 false</returns>
static bool CheckSingleInstance()
{
string processName = Process.GetCurrentProcess().ProcessName;
Process[] processes = Process.GetProcessesByName(processName);
if (processes.Length > 1)
{
// 중복실행 감지
string message = $"⚠️ {Application.ProductName} 프로그램이 이미 실행 중입니다!\n\n" +
"동시에 여러 개의 프로그램을 실행할 수 없습니다.\n\n" +
"해결방법을 선택하세요:";
var result = MessageBox.Show(message + "\n\n예(Y): 기존 프로그램을 종료하고 새로 시작\n아니오(N): 현재 실행을 취소",
"중복실행 감지",
MessageBoxButtons.YesNo,
MessageBoxIcon.Warning);
if (result == DialogResult.Yes)
{
// 기존 프로세스들을 종료
try
{
int currentProcessId = Process.GetCurrentProcess().Id;
foreach (Process process in processes)
{
if (process.Id != currentProcessId)
{
process.Kill();
process.WaitForExit(3000); // 3초 대기
}
}
// 잠시 대기 후 계속 진행
Thread.Sleep(1000);
return true;
}
catch (Exception ex)
{
MessageBox.Show($"기존 프로그램 종료 중 오류가 발생했습니다:\n{ex.Message}\n\n" +
"작업관리자에서 수동으로 종료해주세요.",
"오류", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
else
{
// 현재 실행을 취소
return false;
}
}
return true; // 단일 인스턴스
}
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
string emsg = "Fatal Error(UHE)\n\n" + e.ExceptionObject.ToString(); string emsg = "Fatal Error(UHE)\n\n" + e.ExceptionObject.ToString();
if (PUB.log != null)
{
PUB.log.AddE(emsg); PUB.log.AddE(emsg);
PUB.log.Flush(); PUB.log.Flush();
}
UTIL.SaveBugReport(emsg); UTIL.SaveBugReport(emsg);
Shutdown(); Shutdown();
var f = new AR.Dialog.fErrorException(emsg); using (var f = new AR.Dialog.fErrorException(emsg))
f.ShowDialog(); f.ShowDialog();
Application.ExitThread(); Application.ExitThread();
} }
@@ -114,12 +137,14 @@ namespace Project
{ {
string emsg = "Fatal Error(ATE)\n\n" + e.Exception.ToString(); string emsg = "Fatal Error(ATE)\n\n" + e.Exception.ToString();
//emsg += "stack:" + e.Exception.StackTrace; if(PUB.log != null)
{
PUB.log.AddE(emsg); PUB.log.AddE(emsg);
PUB.log.Flush(); PUB.log.Flush();
}
UTIL.SaveBugReport(emsg); UTIL.SaveBugReport(emsg);
Shutdown(); Shutdown();
var f = new AR.Dialog.fErrorException(emsg); using (var f = new AR.Dialog.fErrorException(emsg))
f.ShowDialog(); f.ShowDialog();
Application.ExitThread(); Application.ExitThread();
} }

View File

@@ -71,60 +71,6 @@ namespace Project.Properties {
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute(@"^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR6,6~SD15^JUS^LRN^CI0^XZ
^XA
^MMT
^PW519
^LL0200
^LS25
^FO205,5^GB305,186,4^FS
^FT25,170^BQN,2,4
^FDLA,
{qrData}
^FS
^FO205,9^GB0,183,4^FS
^FO250,9^GB0,183,4^FS
^FO209,34^GB299,0,4^FS
^FO209,65^GB299,0,4^FS
^FO207,95^GB300,0,4^FS
^FO207,126^GB303,0,4^FS
^FT211,30^A0N,23,24^FDSID^FS
^FT210,59^A0N,23,24^FDLOT^FS
^FT215,91^A0N,23,24^FDPN^FS
^FT212,153^A0N,23,24^FDRID^FS
^FT210,120^A0N,23,24^FDQ'ty^FS
^FT260,31^A0N,23,24^FD
{sid}
^FS
^FT260,60^A0N,23,24^FD
{lot}
^FS
^FT258,93^A0N,27,16^FD
{partnum}
^FS
^FT256,150^A0N,21,19^FD
{rid}
^FS
^FT259,121^A0N,23,24^FD
{qty}
^FS
^FO207,157^GB303,0,4^FS
^FT212,182^A0N,20,19^FDDate^FS
^FT260,183^A0N,23,24^FD
{mfg}
^FS
^PQ1,0,1,Y^XZ")]
public string ZPL {
get {
return ((string)(this["ZPL"]));
}
set {
this["ZPL"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute(@"^XA [global::System.Configuration.DefaultSettingValueAttribute(@"^XA

View File

@@ -14,51 +14,6 @@
<Setting Name="libxl" Type="System.String" Scope="User"> <Setting Name="libxl" Type="System.String" Scope="User">
<Value Profile="(Default)">Amkor Technology/windows-242f240302c3e50d6cb1686ba2q4k0o9</Value> <Value Profile="(Default)">Amkor Technology/windows-242f240302c3e50d6cb1686ba2q4k0o9</Value>
</Setting> </Setting>
<Setting Name="ZPL" Type="System.String" Scope="User">
<Value Profile="(Default)">^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR6,6~SD15^JUS^LRN^CI0^XZ
^XA
^MMT
^PW519
^LL0200
^LS25
^FO205,5^GB305,186,4^FS
^FT25,170^BQN,2,4
^FDLA,
{qrData}
^FS
^FO205,9^GB0,183,4^FS
^FO250,9^GB0,183,4^FS
^FO209,34^GB299,0,4^FS
^FO209,65^GB299,0,4^FS
^FO207,95^GB300,0,4^FS
^FO207,126^GB303,0,4^FS
^FT211,30^A0N,23,24^FDSID^FS
^FT210,59^A0N,23,24^FDLOT^FS
^FT215,91^A0N,23,24^FDPN^FS
^FT212,153^A0N,23,24^FDRID^FS
^FT210,120^A0N,23,24^FDQ'ty^FS
^FT260,31^A0N,23,24^FD
{sid}
^FS
^FT260,60^A0N,23,24^FD
{lot}
^FS
^FT258,93^A0N,27,16^FD
{partnum}
^FS
^FT256,150^A0N,21,19^FD
{rid}
^FS
^FT259,121^A0N,23,24^FD
{qty}
^FS
^FO207,157^GB303,0,4^FS
^FT212,182^A0N,20,19^FDDate^FS
^FT260,183^A0N,23,24^FD
{mfg}
^FS
^PQ1,0,1,Y^XZ</Value>
</Setting>
<Setting Name="ZPL7" Type="System.String" Scope="User"> <Setting Name="ZPL7" Type="System.String" Scope="User">
<Value Profile="(Default)">^XA <Value Profile="(Default)">^XA
^MMT ^MMT

View File

@@ -23,7 +23,7 @@ namespace Project
{ {
public static class PUB public static class PUB
{ {
public static string MCCode = "IB"; public static string MCCode = "R0";
public static Class.StatusMessage StatusMessage { get; set; } = new Class.StatusMessage(); public static Class.StatusMessage StatusMessage { get; set; } = new Class.StatusMessage();
public static string[] WaitMessage = new string[] { "", "", "", "", "", "", "", "", "", "", "" }; public static string[] WaitMessage = new string[] { "", "", "", "", "", "", "", "", "", "", "" };
@@ -240,6 +240,9 @@ namespace Project
//초기화 //초기화
PUB.Result.vModel.Title = string.Empty; PUB.Result.vModel.Title = string.Empty;
PUB.PrinterL.ZPLFileName = "zpl.txt"; //기본파일로 설정
PUB.PrinterR.ZPLFileName = "zpl.txt";
var modelVision = PUB.mdm.GetDataV(modelName); var modelVision = PUB.mdm.GetDataV(modelName);
if (modelVision != null) if (modelVision != null)
{ {
@@ -284,6 +287,24 @@ namespace Project
UpLoadBarcodeConfig(PUB.keyenceR); UpLoadBarcodeConfig(PUB.keyenceR);
} }
if (mv.bOwnZPL)
{
var fn = UTIL.MakePath("Model", mv.idx.ToString(), "zpl.txt");
if (System.IO.File.Exists(fn))
{
PUB.PrinterL.ZPLFileName = fn;
PUB.PrinterR.ZPLFileName = fn;
PUB.log.AddI($"전용 ZPL 설정 {fn}");
}
else
{
PUB.log.AddE($"전용 ZPL파일이 없습니다 {fn}");
}
}
else
{
PUB.log.AddI($"공용 ZPL파일을 사용합니다");
}
return true; return true;
} }
else else
@@ -373,7 +394,7 @@ namespace Project
//기존 SID정보에서 데이터를 취합니다. //기존 SID정보에서 데이터를 취합니다.
var mc = AR.SETTING.Data.McName; var mc = AR.SETTING.Data.McName;
PUB.log.AddAT($"환경설정에서 ECS SKIP이 되었습니다 기존 정보에서 데이터를 생성합니다 MC={mc}"); PUB.log.AddAT($"환경설정에서 ECS SKIP이 되었습니다 기존 정보에서 데이터를 생성합니다 MC={mc}");
using (var tainfo = new DataSet1TableAdapters.Component_Reel_SID_InformationTableAdapter()) using (var tainfo = new DataSet1TableAdapters.K4EE_Component_Reel_SID_InformationTableAdapter())
{ {
var cntd = tainfo.DeleteAll("IB"); var cntd = tainfo.DeleteAll("IB");
PUB.log.AddAT($"{cntd}건의 자료가 삭제됨"); PUB.log.AddAT($"{cntd}건의 자료가 삭제됨");
@@ -435,7 +456,7 @@ namespace Project
try try
{ {
//sid정보테이블을 다시 불러온다 //sid정보테이블을 다시 불러온다
var taConv = new DataSet1TableAdapters.Component_Reel_SID_ConvertTableAdapter(); var taConv = new DataSet1TableAdapters.K4EE_Component_Reel_SID_ConvertTableAdapter();
PUB.Result.DTSidConvert.Clear(); PUB.Result.DTSidConvert.Clear();
taConv.Fill(PUB.Result.DTSidConvert); taConv.Fill(PUB.Result.DTSidConvert);
PUB.Result.DTSidConvert.AcceptChanges(); PUB.Result.DTSidConvert.AcceptChanges();
@@ -451,6 +472,86 @@ namespace Project
} }
} }
/// <summary>
/// 지정된 VisionData에 해당 값을 기록 합니다
/// ColName 이 하드코딩되어있으니 필드명이 변경되면 값을 변경해야 함
/// </summary>
/// <param name="vdata"></param>
/// <param name="colName"></param>
/// <param name="vStr"></param>
/// <returns></returns>
public static bool UpdateSIDInfoData(ref Class.VisionData vdata, string colNameOrg, string vStr)
{
var colName = colNameOrg.ToLower().Trim();
if (colName == "custcode" || colName == "cust_code")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.CUSTCODE}=>{vStr}");
vdata.CUSTCODE = vStr;
return true;
}
else if (colName == "partno" || colName == "part_no")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.PARTNO}=>{vStr}");
vdata.PARTNO = vStr;
vdata.PARTNO_Trust = true;
return true;
}
else if (colName == "printposition" || colName == "pos")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.PrintPositionData}=>{vStr}");
vdata.PrintPositionData = vStr;
vdata.PrintPositionCheck = true;
return true;
}
else if (colName == "vname" || colName == "vendername" || colName == "vendorname" || colName == "vendor_nm")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.VNAME}=>{vStr}");
vdata.VNAME = vStr;
vdata.VNAME_Trust = true;
return true;
}
else if (colName == "venderlot" || colName == "vendorlot" || colName == "vendor_lot")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.VLOT}=>{vStr}");
vdata.VLOT = vStr;
vdata.VLOT_Trust = true;
return true;
}
else if (colName == "sid")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.SID}=>{vStr}");
vdata.SID = vStr;
vdata.SID_Trust = vdata.SID.Length == 9;
if (vStr.Length != 9)
{
PUB.log.AddE($"DB SID LEN ERROR:{vStr},LEN={vStr.Length}");
}
return true;
}
else if (colName == "batch" || colName == "batch_no")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.BATCH}=>{vStr}");
vdata.BATCH = vStr;
return true;
}
else if (colName == "qtymax")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.BATCH}=>{vStr}");
vdata.QTYMAX = vStr;
return true;
}
else if (colName == "attach")
{
PUB.log.Add($"UpdateSIDInfoData [{colNameOrg}] {vdata.Target}=>{vStr}");
vdata.Target = vStr;
return true;
}
return false;
}
public static string SIDCovert(string oldsid, string src, out bool err) public static string SIDCovert(string oldsid, string src, out bool err)
{ {
err = true; err = true;
@@ -768,12 +869,12 @@ namespace Project
{ {
try try
{ {
using (var ta = new DataSet1TableAdapters.Component_Reel_RegExRuleTableAdapter()) using (var ta = new DataSet1TableAdapters.K4EE_Component_Reel_RegExRuleTableAdapter())
{ {
ta.ClearBeforeFill = true; ta.ClearBeforeFill = true;
if (ignore) ta.FillIgnore(PUB.mdm.dataSet.Component_Reel_RegExRule, custname); if (ignore) ta.FillIgnore(PUB.mdm.dataSet.K4EE_Component_Reel_RegExRule, custname);
else ta.Fill(PUB.mdm.dataSet.Component_Reel_RegExRule, custname); else ta.Fill(PUB.mdm.dataSet.K4EE_Component_Reel_RegExRule, custname);
PUB.mdm.dataSet.Component_Reel_RegExRule.AcceptChanges(); PUB.mdm.dataSet.K4EE_Component_Reel_RegExRule.AcceptChanges();
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -783,7 +884,7 @@ namespace Project
} }
//data //data
foreach (DataSet1.Component_Reel_RegExRuleRow dr in PUB.mdm.dataSet.Component_Reel_RegExRule) foreach (DataSet1.K4EE_Component_Reel_RegExRuleRow dr in PUB.mdm.dataSet.K4EE_Component_Reel_RegExRule)
{ {
if (ignore) if (ignore)
{ {
@@ -834,11 +935,11 @@ namespace Project
{ {
try try
{ {
using (var ta = new DataSet1TableAdapters.Component_Reel_PrintRegExRuleTableAdapter()) using (var ta = new DataSet1TableAdapters.K4EE_Component_Reel_PrintRegExRuleTableAdapter())
{ {
ta.ClearBeforeFill = true; ta.ClearBeforeFill = true;
ta.Fill(PUB.mdm.dataSet.Component_Reel_PrintRegExRule); ta.Fill(PUB.mdm.dataSet.K4EE_Component_Reel_PrintRegExRule);
PUB.mdm.dataSet.Component_Reel_RegExRule.AcceptChanges(); PUB.mdm.dataSet.K4EE_Component_Reel_RegExRule.AcceptChanges();
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -849,7 +950,7 @@ namespace Project
//data //data
foreach (DataSet1.Component_Reel_PrintRegExRuleRow dr in PUB.mdm.dataSet.Component_Reel_PrintRegExRule) foreach (DataSet1.K4EE_Component_Reel_PrintRegExRuleRow dr in PUB.mdm.dataSet.K4EE_Component_Reel_PrintRegExRule)
{ {
if (dr.Groups.isEmpty() || dr.Pattern.isEmpty()) continue; if (dr.Groups.isEmpty() || dr.Pattern.isEmpty()) continue;
@@ -970,16 +1071,11 @@ namespace Project
popup.WindowOpen += popup_WindowOpen; popup.WindowOpen += popup_WindowOpen;
//zpl파일 만든다. //zpl파일 만든다.
var fn = System.IO.Path.Combine(UTIL.CurrentPath, "zpl.txt"); var fn = Path.Combine(UTIL.CurrentPath, "zpl.txt");
if (System.IO.File.Exists(fn) == false) if (File.Exists(fn) == false)
{ File.WriteAllText(fn, Properties.Settings.Default.ZPL7, Encoding.Default);
System.IO.File.WriteAllText(fn, Properties.Settings.Default.ZPL, System.Text.Encoding.Default);
} }
}
static void popup_WindowOpen(object sender, EventArgs e) static void popup_WindowOpen(object sender, EventArgs e)
{ {
var msgdata = sender as MessageWindow.CMessageData; var msgdata = sender as MessageWindow.CMessageData;
@@ -1033,8 +1129,8 @@ namespace Project
dbmCount = new Manager.DatabaseManagerCount(); dbmCount = new Manager.DatabaseManagerCount();
dbmCount.dataPath = AR.SETTING.Data.Path_Data; //200113 dbmCount.dataPath = AR.SETTING.Data.Path_Data; //200113
dio = new arDev.AjinEXTEK.DIO(); dio = new arDev.AjinEXTEK.DIO(arDev.AjinEXTEK.ELibraryType.AXT);
mot = new arDev.AjinEXTEK.MOT(); mot = new arDev.AjinEXTEK.MOT(arDev.AjinEXTEK.ELibraryType.AXT);
// flag = new Flag(); // flag = new Flag();

View File

@@ -110,7 +110,13 @@ namespace Project
private string KeyenceBarcodeDataF = string.Empty; private string KeyenceBarcodeDataF = string.Empty;
private string KeyenceBarcodeDataR = string.Empty; private string KeyenceBarcodeDataR = string.Empty;
//List<Class.KeyenceBarcodeData> barcodelist = new List<Class.KeyenceBarcodeData>();
/// <summary>
/// 키엔스로부터 받은 데이터를 분석한다.
/// </summary>
/// <param name="response"></param>
/// <param name="Source"></param>
void ParseBarcode(string response, string Source) void ParseBarcode(string response, string Source)
{ {
@@ -155,26 +161,15 @@ namespace Project
continue; continue;
} }
var MatchList = RegX.Matches(resp.Trim()); var MatchList = RegX.Matches(resp.Trim());
var buf = MatchList[0].Groups; var buf = MatchList[0].Groups;
//var buf = resp.Split(':'); //데이터는 :로 분리되어있음
//if (buf.Length != 7) //데이터는 총 6개의 데이터로 구성됨
//{
// PUB.log.AddE("***바코드 응답데이터 오류 값(키엔스 전송포맷을 확인하세요) " + resp);
// gridView2.setTitle(8, 1, "ERR");
// continue;
//}
var angle = 0; var angle = 0;
Boolean STDData = false; //들어온 자료가 amkor std 바코드여부 var sym = buf[1].Value; //symbol
var sym = buf[1].Value; var vData = buf[2].Value.Trim(); //data
var vData = buf[2].Value.Trim();
if (Source == "R") KeyenceBarcodeDataR = vData; //rear
if (Source == "R") KeyenceBarcodeDataR = vData; else KeyenceBarcodeDataF = vData; //front
else KeyenceBarcodeDataF = vData;
//바코드 무시조건 확인 //바코드 무시조건 확인
//if (PUB.Result.BCDIgnorePattern != null) //if (PUB.Result.BCDIgnorePattern != null)
@@ -235,12 +230,10 @@ namespace Project
theta = angbcd.Angle; theta = angbcd.Angle;
} }
var theta_rad = -theta * Math.PI / 180.0; var theta_rad = -theta * Math.PI / 180.0;
var PX = (int)(Math.Cos(theta_rad) * (vertextCP.X - ReelCP.X) - Math.Sin(theta_rad) * (vertextCP.Y - ReelCP.Y)) + ReelCP.X; var PX = (int)(Math.Cos(theta_rad) * (vertextCP.X - ReelCP.X) - Math.Sin(theta_rad) * (vertextCP.Y - ReelCP.Y)) + ReelCP.X;
var PY = (int)(Math.Sin(theta_rad) * (vertextCP.X - ReelCP.X) + Math.Cos(theta_rad) * (vertextCP.Y - ReelCP.Y)) + ReelCP.Y; var PY = (int)(Math.Sin(theta_rad) * (vertextCP.X - ReelCP.X) + Math.Cos(theta_rad) * (vertextCP.Y - ReelCP.Y)) + ReelCP.Y;
float LabelAngRad = (float)(Math.Atan2(PY - ReelCP.Y, PX - ReelCP.X));// 2; //라벨의 위치값을 찾아서 입력해야한다. float LabelAngRad = (float)(Math.Atan2(PY - ReelCP.Y, PX - ReelCP.X));// 2; //라벨의 위치값을 찾아서 입력해야한다.
var labelpos = (float)(LabelAngRad * 180.0 / Math.PI); var labelpos = (float)(LabelAngRad * 180.0 / Math.PI);
if (labelpos < 0) labelpos = 360 + labelpos; if (labelpos < 0) labelpos = 360 + labelpos;
@@ -269,9 +262,8 @@ namespace Project
var bcdin = itemC.VisionData.barcodelist.ContainsKey(valuekey);//.Where(t => t.Value.CheckIntersect(vertextCP, vData) == true).FirstOrDefault(); var bcdin = itemC.VisionData.barcodelist.ContainsKey(valuekey);//.Where(t => t.Value.CheckIntersect(vertextCP, vData) == true).FirstOrDefault();
if (bcdin == false) if (bcdin == false)
{ {
//신규바코드데이터이므로 추가한다.
PUB.logKeyence.Add($"{resp.Replace("\n", "").Replace("\r", "")}"); PUB.logKeyence.Add($"{resp.Replace("\n", "").Replace("\r", "")}");
//없다면 추가한다.
var newitem = new Class.KeyenceBarcodeData() var newitem = new Class.KeyenceBarcodeData()
{ {
AmkorData = new StdLabelPrint.CAmkorSTDBarcode(vData), AmkorData = new StdLabelPrint.CAmkorSTDBarcode(vData),
@@ -285,11 +277,11 @@ namespace Project
}; };
var addok = itemC.VisionData.barcodelist.TryAdd(valuekey, newitem); var addok = itemC.VisionData.barcodelist.TryAdd(valuekey, newitem);
if (addok) PUB.log.Add($"[NEW:{sym}] " + Source + " " + vData); if (addok) PUB.log.Add($"[O]BCD RESERV[NEW:{sym}] " + Source + " " + vData);
else PUB.log.AddE($"X-[NEW:{sym}] " + Source + " " + vData); else PUB.log.AddE($"[X]BCD RESERV[NEW:{sym}] " + Source + " " + vData);
itemC.VisionData.UpdateBarcodePositionData(); itemC.VisionData.UpdateBarcodePositionData();
itemC.VisionData.BarcodeTouched = true; itemC.VisionData.BarcodeDirty = true;
} }
else else
{ {
@@ -310,10 +302,10 @@ namespace Project
}; };
//기존정보를 지우고 //기존정보를 지우고
PUB.log.Add($"[UPD:{sym}] " + Source + " " + vData); PUB.log.Add($"[UPD]BCD RESERV:{sym}] " + Source + " " + vData);
itemC.VisionData.barcodelist[valuekey] = newitem; itemC.VisionData.barcodelist[valuekey] = newitem;
itemC.VisionData.UpdateBarcodePositionData(); itemC.VisionData.UpdateBarcodePositionData();
itemC.VisionData.BarcodeTouched = true; itemC.VisionData.BarcodeDirty = true;
} }
} }
} }

View File

@@ -210,7 +210,7 @@ namespace Project
catch { } catch { }
for (int i = 0; i < 3; i++) for (short i = 0; i < 3; i++)
{ {
if (PUB.mot != null && PUB.mot.IsInit) if (PUB.mot != null && PUB.mot.IsInit)
{ {

View File

@@ -64,7 +64,7 @@ namespace Project
var limport = new List<string>(); var limport = new List<string>();
if (PUB.mot.HasLimitError == true) if (PUB.mot.HasLimitError == true)
{ {
for (int i = 0; i < PUB.system.MotaxisCount; i++) for (short i = 0; i < PUB.system.MotaxisCount; i++)
{ {
if (PUB.mot.IsUse(i) == false) continue; if (PUB.mot.IsUse(i) == false) continue;
if (PUB.mot.IsLimitN(i)) if (PUB.mot.IsLimitN(i))

View File

@@ -12,7 +12,7 @@ namespace Project
private void _SM_MAIN_ERROR(Boolean isFirst, eSMStep Step, TimeSpan StepTime) private void _SM_MAIN_ERROR(Boolean isFirst, eSMStep Step, TimeSpan StepTime)
{ {
//모션의 위치를 저장해준다. - 재시작시 변경이 잇다면 오류로 처리한다 //모션의 위치를 저장해준다. - 재시작시 변경이 잇다면 오류로 처리한다
for (int i = 0; i < PUB.mot.DeviceCount; i++) for (short i = 0; i < PUB.mot.DeviceCount; i++)
PUB.Result.PreventMotionPosition[i] = PUB.mot.GetLastCmdPos(i); PUB.Result.PreventMotionPosition[i] = PUB.mot.GetLastCmdPos(i);
var errorMessage = string.Empty; var errorMessage = string.Empty;

View File

@@ -88,7 +88,7 @@ namespace Project
if (PUB.sm.seq.Get(cmdIndex) == idx++) if (PUB.sm.seq.Get(cmdIndex) == idx++)
{ {
bool vQtyOK = false; bool vQtyOK = false;
var vdata = itemC.VisionData;
//동작중이아니라면 처리하지 않음 //동작중이아니라면 처리하지 않음
if (PUB.sm.getNewStep != eSMStep.RUN) return EResultKeyence.Wait; if (PUB.sm.getNewStep != eSMStep.RUN) return EResultKeyence.Wait;
@@ -98,17 +98,17 @@ namespace Project
var systembypassmode = SETTING.Data.SystemBypass; var systembypassmode = SETTING.Data.SystemBypass;
if (systembypassmode && PUB.flag.get(eVarBool.FG_RDY_PORT_PC)) if (systembypassmode && PUB.flag.get(eVarBool.FG_RDY_PORT_PC))
{ {
PUB.Result.ItemDataC.VisionData.SetRID("BP" + DateTime.Now.ToString("yyyyMMddHHmmss"), "bp"); vdata.VisionData.SetRID("BP" + DateTime.Now.ToString("yyyyMMddHHmmss"), "bp");
PUB.Result.ItemDataC.VisionData.SID = ("100000000"); vdata.VisionData.SID = ("100000000");
PUB.Result.ItemDataC.VisionData.VNAME = "BYPASS"; vdata.VisionData.VNAME = "BYPASS";
PUB.Result.ItemDataC.VisionData.MFGDATE = DateTime.Now.ToString("yyyy-MM-dd"); vdata.VisionData.MFGDATE = DateTime.Now.ToString("yyyy-MM-dd");
PUB.Result.ItemDataC.VisionData.VLOT = "BYPASS"; vdata.VisionData.VLOT = "BYPASS";
PUB.Result.ItemDataC.VisionData.CUSTCODE = "0000"; vdata.VisionData.CUSTCODE = "0000";
PUB.Result.ItemDataC.VisionData.CUSTNAME = "BYPASS"; vdata.VisionData.CUSTNAME = "BYPASS";
PUB.Result.ItemDataC.VisionData.QTY = "10000"; vdata.VisionData.QTY = "10000";
PUB.Result.ItemDataC.VisionData.ConfirmUser = true; vdata.VisionData.ConfirmUser = true;
PUB.Result.ItemDataC.VisionData.PrintPositionData = "1"; vdata.VisionData.PrintPositionData = "1";
PUB.Result.ItemDataC.VisionData.PrintPositionCheck = true; vdata.VisionData.PrintPositionCheck = true;
return EResultKeyence.Complete; return EResultKeyence.Complete;
} }
@@ -184,6 +184,160 @@ namespace Project
} }
} }
//기본 벤더이름
if (OPT_BYPASS == false && PUB.Result.vModel.Def_Vname.isEmpty() == false)
{
if (itemC.VisionData.VNAME.Equals(PUB.Result.vModel.Def_Vname) == false)
{
itemC.VisionData.VNAME = PUB.Result.vModel.Def_Vname;
itemC.VisionData.VNAME_Trust = true;
PUB.log.Add($"Defaul V.Name Set to {PUB.Result.vModel.Def_Vname}");
}
}
//기본 MFG
if (OPT_BYPASS == false && PUB.Result.vModel.Def_MFG.isEmpty() == false)
{
if (itemC.VisionData.MFGDATE.Equals(PUB.Result.vModel.Def_MFG) == false)
{
itemC.VisionData.MFGDATE = PUB.Result.vModel.Def_MFG;
itemC.VisionData.MFGDATE_Trust = true;
PUB.log.Add($"Defaul MFGDATE Set to {PUB.Result.vModel.Def_MFG}");
}
}
//옵션설정에 따른 외부데이터 가져오기 작업
bool NewBarcodeUpdated = false;
//SID정보테이블에서 정보 추출
if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true)
{
Boolean Apply = true;
//select columns
List<string> fields = new List<string>();
if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CustCode");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PartNo");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_PrintPos] && vdata.PrintPositionData.isEmpty()) fields.Add("PrintPosition");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VenderName");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("batch"); //220921
if (VAR.BOOL[eVarBool.Opt_SID_Apply_qty] && (vdata.SID_Trust == false || vdata.QTYMAX.isEmpty())) fields.Add("qtymax"); //220921
fields.Add("attach"); //231026
//where coluns
List<string> wheres = new List<string>();
//wheres.Add($"MC='{COMM.SETTING.Data.McName}");
if (VAR.BOOL[eVarBool.Opt_SID_Where_CustCode])
{
if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CustCode='{vdata.CUSTCODE}'");
else Apply = false;
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_PartNo])
{
if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PartNo='{vdata.PARTNO}'");
else Apply = false;
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_SID])
{
//if sid convert logic
if (VAR.BOOL[eVarBool.Opt_SIDConvert])
{
if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false)
wheres.Add($"SID='{vdata.SID}'");
else Apply = false;
}
else
{
if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'");
else Apply = false;
}
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013
{
if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false)
wheres.Add($"(VenderLot like '{vdata.VLOT}' or VenderLot like '%,{vdata.VLOT}' or VenderLot like '{vdata.VLOT},%' or VenderLot like '%,{vdata.VLOT},%')");
else Apply = false;
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_MC]) //231006
{
wheres.Add($"attach='{AR.SETTING.Data.McName}'");
}
//if query data . no error
if (Apply && fields.Count > 0 && wheres.Count > 0)
{
var mcname = SETTING.Data.McName;
if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode;
var SQL = "select top 1 " + string.Join(",", fields) +
" from K4EE_Component_Reel_SID_Information WITH(NOLOCK)" +
" where mc='" + mcname + "' and " + string.Join(" and ", wheres) +
" order by wdate desc";
var SQLC = "select count(*)" +
" from K4EE_Component_Reel_SID_Information WITH(NOLOCK)" +
" where mc='" + mcname + "' and " + string.Join(" and ", wheres);
if (PUB.Result.ItemDataC.VisionData.LastQueryStringSID.Equals(SQL) == false)
{
PUB.log.Add($"DATABAES : SID INFORMATIION QUERY");
PUB.log.Add(SQL);
var CS = Properties.Settings.Default.CS;
var CN = new System.Data.SqlClient.SqlConnection(CS);
var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN);
if (CN.State == System.Data.ConnectionState.Closed) CN.Open();
//데이터가 중복으로 존재하는지 확인한다. 231006
CMD.CommandText = SQLC;
var cnt = int.Parse(CMD.ExecuteScalar().ToString());
if (cnt == 1)
{
CMD.CommandText = SQL;
var DAR = CMD.ExecuteReader();
while (DAR.Read())
{
//loop select columns
for (int i = 0; i < fields.Count; i++)
{
var colName = fields[i];
var v = DAR[colName];
if (v != null)
{
var vStr = v.ToString().RemoveNoneASCII().Trim();
if (vStr.isEmpty()) continue;
if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true;
}
}
}
DAR.Close();
}
CMD.Dispose();
if (CN.State == System.Data.ConnectionState.Open) CN.Close();
CN.Dispose();
PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL;
}
}
}
//WMS정보테이블에서 정보 추출
//SID변환정보에서 정보 추출
//기존 작업내역에서 정보 추출
if (itemC.VisionData.BarcodeDirty == true && NewBarcodeUpdated == false)
{
itemC.VisionData.BarcodeDirty = false;
}
//릴Id 신규부여 //릴Id 신규부여
if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_NewReelID]) if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_NewReelID])
{ {
@@ -223,28 +377,8 @@ namespace Project
} }
} }
//기본 벤더이름
if (OPT_BYPASS == false && PUB.Result.vModel.Def_Vname.isEmpty() == false)
{
if (itemC.VisionData.VNAME.Equals(PUB.Result.vModel.Def_Vname) == false)
{
itemC.VisionData.VNAME = PUB.Result.vModel.Def_Vname;
itemC.VisionData.VNAME_Trust = true;
PUB.log.Add($"Defaul V.Name Set to {PUB.Result.vModel.Def_Vname}");
}
}
//기본 MFG
if (OPT_BYPASS == false && PUB.Result.vModel.Def_MFG.isEmpty() == false)
{
if (itemC.VisionData.MFGDATE.Equals(PUB.Result.vModel.Def_MFG) == false)
{
itemC.VisionData.MFGDATE = PUB.Result.vModel.Def_MFG;
itemC.VisionData.MFGDATE_Trust = true;
PUB.log.Add($"Defaul MFGDATE Set to {PUB.Result.vModel.Def_MFG}");
}
}
//데이터확정 및 완료처리
if (itemC.VisionData.Confirm) if (itemC.VisionData.Confirm)
{ {
//이미 완료된 데이터 //이미 완료된 데이터
@@ -313,7 +447,7 @@ namespace Project
//var Jobtype = VAR.STR[eVarString.JOB_TYPE]; //var Jobtype = VAR.STR[eVarString.JOB_TYPE];
var OPT_BYPASS = SETTING.Data.SystemBypass;// Jobtype == "BP"; var OPT_BYPASS = SETTING.Data.SystemBypass;// Jobtype == "BP";
var CVMode = VAR.BOOL[eVarBool.Use_Conveyor]; var CVMode = VAR.BOOL[eVarBool.Use_Conveyor];
var CustomerCode = VAR.STR[eVarString.JOB_CUSTOMER_CODE];
if (item.VisionData.Confirm) if (item.VisionData.Confirm)
{ {
//사용자에의해 완성된 자료는 완료된 자료이다 //사용자에의해 완성된 자료는 완료된 자료이다
@@ -325,6 +459,13 @@ namespace Project
//이전작업내역에서 데이터를 쓸것이 있다면 기록한다 //이전작업내역에서 데이터를 쓸것이 있다면 기록한다
//Customer Code
if (OPT_BYPASS == false && item.VisionData.CUSTCODE.isEmpty() && CustomerCode.isEmpty() == false)
{
item.VisionData.CUSTCODE = CustomerCode;
PUB.log.Add($"[FIX] CUSTOMER CODE => {CustomerCode}");
}
//서버의수량업데이트기능 //서버의수량업데이트기능
if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_ServerQty]) if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_ServerQty])
{ {
@@ -387,8 +528,8 @@ namespace Project
var SID = item.VisionData.SID; var SID = item.VisionData.SID;
var MCName = VAR.BOOL[eVarBool.Use_Conveyor] ? "IB" : SETTING.Data.McName; var MCName = VAR.BOOL[eVarBool.Use_Conveyor] ? "IB" : SETTING.Data.McName;
var ta = new DataSet1TableAdapters.QueriesTableAdapter(); var ta = new DataSet1TableAdapters.QueriesTableAdapter();
var exist = ta.CheckSIDExist(MCName, SID) > 0; var exist = ta.CheckSIDExist(SID) > 0;
PUB.log.Add($"SID 존재여부 검사 KEY:{MCName},SID:{item.VisionData.SID},Result={exist}"); PUB.log.Add($"SID Exist Check SID:{item.VisionData.SID},Result={exist}");
if (exist == false) if (exist == false)
{ {
PUB.Result.SetResultMessage(eResult.OPERATION, eECode.NOSIDINFOFROMDB, eNextStep.PAUSE, SID); PUB.Result.SetResultMessage(eResult.OPERATION, eECode.NOSIDINFOFROMDB, eNextStep.PAUSE, SID);
@@ -398,21 +539,39 @@ namespace Project
//sid변환기능확인 //sid변환기능확인
var SIDOK = false; var SIDOK = false;
if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_SIDConvert]) if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_SIDConvert] && VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] == false)
{ {
//변환된 정보가 없다면 변환을 진행한다 //변환된 정보가 없다면 변환을 진행한다
if (item.VisionData.SID0.isEmpty() && item.VisionData.SID_Trust && item.VisionData.SID.isEmpty() == false) if (item.VisionData.SID0.isEmpty() && item.VisionData.SID_Trust && item.VisionData.SID.isEmpty() == false)
{ {
//현재SID가 정상 시드라면 변환을 시작한다 //이 sid가 존재여부확인 후 없는 sid라면 더이상 처리하지 않는다 230510
if (PUB.Result.DTSidConvertEmptyList.Contains(item.VisionData.SID))
{
//_SM_RUN_VISION_SIDCONV(item); //존재하지 않는 SID로 이미 확인되었다
}
else if (PUB.Result.DTSidConvertMultiList.Contains(item.VisionData.SID))
{
//다중sid로 인해 처리하지 않는다
}
else
{
var newsid = PUB.SIDCovert(item.VisionData.SID, "SPS_BarcodeProcess", out bool converr);
if (converr)
{
if (PUB.sm.Step == eSMStep.RUN)
PUB.log.AddE(newsid);
}
else
{
item.VisionData.SID0 = item.VisionData.SID; //기존자료를 0으로 백업한다
item.VisionData.SID = newsid; //신규 SID를 기록
}
}
} }
//시드값이 유효한지 확인한다. //시드값이 유효한지 확인한다.
SIDOK = item.VisionData.SID_Trust && item.VisionData.SID0.isEmpty() == false && item.VisionData.SID.isEmpty() == false; SIDOK = item.VisionData.SID_Trust && item.VisionData.SID0.isEmpty() == false && item.VisionData.SID.isEmpty() == false;
} }
else SIDOK = item.VisionData.SID_Trust; //시드변환을 사용하지 않으므로 시드값여부에따라 다르다 else SIDOK = (item.VisionData.SID_Trust && item.VisionData.SID.isEmpty() == false); //시드변환을 사용하지 않으므로 시드값여부에따라 다르다
//사용자확인이 필요한 옵션이라면 사용한다 //사용자확인이 필요한 옵션이라면 사용한다
if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_UserConfim]) if (OPT_BYPASS == false && VAR.BOOL[eVarBool.Opt_UserConfim])
@@ -420,7 +579,6 @@ namespace Project
if (NeedConfirm == false) if (NeedConfirm == false)
{ {
if (mainjob) item.VisionData.bcdMessage.Add("사용자 확인 필요"); if (mainjob) item.VisionData.bcdMessage.Add("사용자 확인 필요");
//if (mainjob) PUB.log.Add($"사용자 확인 옵션으로 인해 창을 표시 합니다{Source}");
NeedConfirm = true; NeedConfirm = true;
} }
} }
@@ -435,7 +593,6 @@ namespace Project
if (VAR.BOOL[eVarBool.Opt_DisablePrinter] == false) if (VAR.BOOL[eVarBool.Opt_DisablePrinter] == false)
{ {
if (mainjob) item.VisionData.bcdMessage.Add("첫번째 릴 확인 필요"); if (mainjob) item.VisionData.bcdMessage.Add("첫번째 릴 확인 필요");
//if (mainjob) PUB.log.Add($"처음 작업이므로 사용자 확인창을 표시 합니다{Source}");
NeedConfirm = true; NeedConfirm = true;
} }
} }
@@ -475,18 +632,13 @@ namespace Project
item.VisionData.PrintPositionCheck = true; item.VisionData.PrintPositionCheck = true;
PUB.log.AddI($"현 작업정보에서 프린트위치 찾음 SID:{item.VisionData.SID},값={preprnpos}"); PUB.log.AddI($"현 작업정보에서 프린트위치 찾음 SID:{item.VisionData.SID},값={preprnpos}");
} }
else else if (NeedConfirm == false)
{
if (NeedConfirm == false)
{ {
//현작업내에서의 정보를 찾아서 적용한다 231005 //현작업내에서의 정보를 찾아서 적용한다 231005
//if (mainjob) PUB.log.AddAT("프린트 위치 결정이 완료되지 않아. 사용자 선택화면을 팝업합니다");
if (mainjob) item.VisionData.bcdMessage.Add("부착위치 없음"); if (mainjob) item.VisionData.bcdMessage.Add("부착위치 없음");
NeedConfirm = true; NeedConfirm = true;
} }
} }
}
} }
//바이패스모드에서 벤더네임이지정(101시드에 벤더네임이 없다) //바이패스모드에서 벤더네임이지정(101시드에 벤더네임이 없다)
@@ -504,6 +656,7 @@ namespace Project
item.VisionData.PARTNO_Trust && item.VisionData.PARTNO_Trust &&
item.VisionData.QTY_Trust && item.VisionData.QTY_Trust &&
item.VisionData.RID_Trust && item.VisionData.RID_Trust &&
item.VisionData.SID_Trust &&
SIDOK && item.VisionData.VLOT_Trust && SIDOK && item.VisionData.VLOT_Trust &&
item.VisionData.VNAME_Trust) item.VisionData.VNAME_Trust)
{ {
@@ -546,104 +699,11 @@ namespace Project
VAR.TIME.Set(eVarTime.KEYENCEWAIT, newtime); VAR.TIME.Set(eVarTime.KEYENCEWAIT, newtime);
} }
} }
else else if (PUB.Result.ItemDataC.VisionData.ConfirmAuto == false)
{
////ecs on 컨베이어때만 사용한다
//bool warndata = false;
//if (SETTING.Data.ECSSkip == false && CVMode)
//{
// //모두 찾은상태에서는 활성화여부를 추가 확인한다.
// var sid = item.VisionData.SID;
// var bat = item.VisionData.BATCH;
// //현 시점의 활성화 목록을 가져온다
// var activelist = PUB.GetECSActiveSIDList();
// //해당sid+bat 가 활성화된것인지 확인한다.
// bool active = false;
// string active_sid = "";
// string active_bat = "";
// var sidorder = 0;
// var sidx = 0;
// foreach (var actItem in activelist)
// {
// if (actItem.Item4)
// {
// if(active_sid.isEmpty())
// {
// active_sid = actItem.Item1;
// active_bat = actItem.Item2;
// }
// }
// if (actItem.Item1.Equals(sid) && actItem.Item2.Equals(bat))
// {
// active = actItem.Item4;
// sidorder = sidx; //순서를 저장한다. 0부터 시작하는값이다.
// }
// if (actItem.Item3 == SETTING.Data.McName)
// sidx += 1;
// }
// //활성화된 sid가 아니다
// if (active == false)
// {
// if (sidorder > 1) //2번째는 무조건 에러
// {
// PUB.log.AddE($"active sid 아니고 {sidorder + 1}번 항목이므로 오류 처리한다.");
// warndata = true;
// }
// else
// {
// //활성sid의 작업데이터가있으면 ok
// var qa = new DataSet1TableAdapters.QueriesTableAdapter();
// var existreadat = qa.GetIBResultCountBySIDBatch(DateTime.Now.AddHours(-6), active_sid, active_sid) > 0;
// //활성sid의 작업데이터가있으면 ok
// if (existreadat)
// {
// PUB.log.AddAT($"active sid 는 아니지만 활성sid({active_sid}{active_sid}) 의 기록이 있어 진행 합니다");
// warndata = false;
// }
// else
// {
// PUB.log.AddE($"active sid 아니고 활성sid({active_sid}{active_sid}) 의 기록이 없어 진행 불가");
// warndata = true;
// }
// //없으면 ng
// }
// }
// //오류발생조건이나, 이미 발생했다면 처리하지 않는다.
// if (warndata)
// {
// if (warninactivelist.Contains(sid + bat) == false)
// {
// warninactivelist.Add(sid + bat);
// }
// else
// {
// PUB.log.AddAT($"이미 경고한 sid+bqt이므로 넘어갑니다({sid}{bat})");
// warndata = false;
// }
// }
//}
//if (warndata)
//{
// PUB.Result.SetResultMessage(eResult.OPERATION, eECode.NOECSDATAACTIVE, eNextStep.PAUSE, item.VisionData.SID, item.VisionData.BATCH);
// return;
//}
//else
//{
if (PUB.Result.ItemDataC.VisionData.ConfirmAuto == false)
{ {
PUB.logDbg.Add($"비젼 자동 확정 처리 {Source}"); PUB.logDbg.Add($"비젼 자동 확정 처리 {Source}");
PUB.Result.ItemDataC.VisionData.ConfirmAuto = true; PUB.Result.ItemDataC.VisionData.ConfirmAuto = true;
} }
//}
}
} }

View File

@@ -52,13 +52,13 @@ namespace Project
if (iLockM.IsEmpty() == false && MotMoveM) if (iLockM.IsEmpty() == false && MotMoveM)
{ {
var locklistX = MOT.GetActiveLockList(axisM, iLockM); var locklistX = MOT.GetActiveLockList(axisM, iLockM);
PUB.mot.MoveStop("ILock(" + string.Join(",", locklistX) + ")", (int)axisM); PUB.mot.MoveStop("ILock(" + string.Join(",", locklistX) + ")", (short)axisM);
} }
if (iLockZ.IsEmpty() == false && MotMoveZ) if (iLockZ.IsEmpty() == false && MotMoveZ)
{ {
var locklistZ = MOT.GetActiveLockList(axisZ, iLockZ); var locklistZ = MOT.GetActiveLockList(axisZ, iLockZ);
PUB.mot.MoveStop("ILock(" + string.Join(",", locklistZ) + ")", (int)axisZ); PUB.mot.MoveStop("ILock(" + string.Join(",", locklistZ) + ")", (short)axisZ);
} }

View File

@@ -52,13 +52,13 @@ namespace Project
if (iLockM.IsEmpty() == false && MotMoveM) if (iLockM.IsEmpty() == false && MotMoveM)
{ {
var locklistX = MOT.GetActiveLockList(axisM, iLockM); var locklistX = MOT.GetActiveLockList(axisM, iLockM);
PUB.mot.MoveStop("ILock(" + string.Join(",", locklistX) + ")", (int)axisM); PUB.mot.MoveStop("ILock(" + string.Join(",", locklistX) + ")", (short)axisM);
} }
if (iLockZ.IsEmpty() == false && MotMoveZ) if (iLockZ.IsEmpty() == false && MotMoveZ)
{ {
var locklistZ = MOT.GetActiveLockList(axisZ, iLockZ); var locklistZ = MOT.GetActiveLockList(axisZ, iLockZ);
PUB.mot.MoveStop("ILock(" + string.Join(",", locklistZ) + ")", (int)axisZ); PUB.mot.MoveStop("ILock(" + string.Join(",", locklistZ) + ")", (short)axisZ);
} }

View File

@@ -49,7 +49,7 @@ namespace Project
var OPT_BYPASS = SETTING.Data.SystemBypass;// PUB.OPT_BYPASS(target); var OPT_BYPASS = SETTING.Data.SystemBypass;// PUB.OPT_BYPASS(target);
using (var taResult = new DataSet1TableAdapters.Component_Reel_ResultTableAdapter()) using (var taResult = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter())
{ {
//QTY 0값은 없을 수도있다(해당 값은 서버조회여부에다라 다르다) //QTY 0값은 없을 수도있다(해당 값은 서버조회여부에다라 다르다)
int? qtyorg = null; int? qtyorg = null;
@@ -60,8 +60,8 @@ namespace Project
else if (item.VisionData.ConfirmUser) remark = "[확인]" + remark; //사용자 확인데이터 비고에 추가 else if (item.VisionData.ConfirmUser) remark = "[확인]" + remark; //사용자 확인데이터 비고에 추가
if (OPT_BYPASS) remark = "(BYPASS)" + remark; if (OPT_BYPASS) remark = "(BYPASS)" + remark;
DataSet1.Component_Reel_ResultRow newdr = this.dataSet1.Component_Reel_Result.Where(t => t.JGUID.Equals(item.guid)).FirstOrDefault(); DataSet1.K4EE_Component_Reel_ResultRow newdr = this.dataSet1.K4EE_Component_Reel_Result.Where(t => t.JGUID.Equals(item.guid)).FirstOrDefault();
if (newdr == null) newdr = this.dataSet1.Component_Reel_Result.NewComponent_Reel_ResultRow(); if (newdr == null) newdr = this.dataSet1.K4EE_Component_Reel_Result.NewK4EE_Component_Reel_ResultRow();
//else newdr = dt.Rows[0] as DataSet1.Component_Reel_ResultRow; //else newdr = dt.Rows[0] as DataSet1.Component_Reel_ResultRow;
if (item.JobStart.Year != 1982) newdr.STIME = item.JobStart; if (item.JobStart.Year != 1982) newdr.STIME = item.JobStart;
@@ -118,10 +118,11 @@ namespace Project
newdr.GUID = PUB.Result.guid; //220921 newdr.GUID = PUB.Result.guid; //220921
newdr.JGUID = item.guid; newdr.JGUID = item.guid;
newdr.wdate = DateTime.Now; newdr.wdate = DateTime.Now;
this.dataSet1.Component_Reel_Result.AddComponent_Reel_ResultRow(newdr); this.dataSet1.K4EE_Component_Reel_Result.AddK4EE_Component_Reel_ResultRow(newdr);
} }
else newdr.EndEdit(); else newdr.EndEdit();
var ta = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
var cnt = ta.Update(newdr); var cnt = ta.Update(newdr);
newdr.AcceptChanges(); newdr.AcceptChanges();
if (cnt == 0) PUB.log.AddE("Save Error"); if (cnt == 0) PUB.log.AddE("Save Error");

View File

@@ -21,9 +21,6 @@ namespace Project
} }
} }
//인터락설정(공용) //인터락설정(공용)
Set_InterLock(); Set_InterLock();
@@ -33,7 +30,6 @@ namespace Project
hmi1.CVRightBusy = PUB.iLockCVR.get((int)eILockCV.BUSY); hmi1.CVRightBusy = PUB.iLockCVR.get((int)eILockCV.BUSY);
hmi1.CVRightReady = PUB.iLockCVR.get((int)eILockCV.EXTBUSY); hmi1.CVRightReady = PUB.iLockCVR.get((int)eILockCV.EXTBUSY);
//XMOVE 시에 RESET 키를 이용한 장치 초기화 작업 //XMOVE 시에 RESET 키를 이용한 장치 초기화 작업
if (PUB.sm.Step == eSMStep.IDLE) if (PUB.sm.Step == eSMStep.IDLE)
if (PUB.mot.HasHomeSetOff == true) if (PUB.mot.HasHomeSetOff == true)
@@ -87,10 +83,6 @@ namespace Project
if (PUB.dio.IsInit) if (PUB.dio.IsInit)
Func_AutoRoomLight(); Func_AutoRoomLight();
//AIR공급중단체크 - Sensitive 에 작동시간을 직접 입력했다(delay time)
//if (Pub.dio.IsInit)
//Func_CheckAirOffCondition();
//부저확인 //부저확인
if (PUB.dio.IsInit) if (PUB.dio.IsInit)
Func_BuzzerControl(); Func_BuzzerControl();
@@ -102,46 +94,9 @@ namespace Project
//포트의 UP/DN 모터 //포트의 UP/DN 모터
PortZMotorAutoOff(); PortZMotorAutoOff();
//포트의 마그넷 작동
PortMagnet(); PortMagnet();
//바코드동작처리 - 210103
//var qrdatas1 = ProcessBarcodeQue(0);
//var qrdatas2 = ProcessBarcodeQue(2);
////왼쪽비젼에서 데이터가 있었다
//if (qrdatas1.Count > 0)
//{
// if (PUB.flag.get(eVarBool.PRC_VISIONL) == false)
// {
// PUB.log.AddAT("비젼(L) READY가 아니므로 처리하지 않음");
// }
// else
// {
// //처리가 완료되지 않은경우엠ㄴ 사용한다.
// if (PUB.flag.get(eVarBool.END_VISIONL) == false)
// RecvQRProcess(qrdatas1, eWorkPort.Left);
// else PUB.log.AddAT("비젼(L) 이전작업이 완료되어 처리하지 않음");
// }
//}
////오른쪽비젼에서 데이터가 있었다
//if (qrdatas2.Count > 0)
//{
// if (PUB.flag.get(eVarBool.PRC_VISIONR) == false)
// {
// PUB.log.AddAT("비젼(R) READY가 아니므로 처리하지 않음");
// }
// else
// {
// //비젼처리가 완료되지 않은경우에만 사용한다
// if (PUB.flag.get(eVarBool.END_VISIONR) == false)
// RecvQRProcess(qrdatas2, eWorkPort.Right);
// else PUB.log.AddAT("비젼(R) 이전작업이 완료되어 처리하지 않음");
// }
//}
//}
//동작중에 데이터가 reset 되는 코드 임시로 모니터링한다. //동작중에 데이터가 reset 되는 코드 임시로 모니터링한다.
if (PUB.sm.Step != eSMStep.IDLE && PUB.sm.Step != eSMStep.HOME_FULL && PUB.sm.Step != eSMStep.HOME_QUICK) if (PUB.sm.Step != eSMStep.IDLE && PUB.sm.Step != eSMStep.HOME_FULL && PUB.sm.Step != eSMStep.HOME_QUICK)
{ {
@@ -305,26 +260,5 @@ namespace Project
} }
} }
//void Func_CheckAirOffCondition()
//{
// if (Pub.sm.Step < eSMStep.IDLE) return;
// //181226
// var airSw = Util_DO.GetIOInput(eDIName.BUT_AIRF);
// if (airSw == true && AirOff == true && AirOffStart.Year != 1982)
// {
// //스위치가 눌려져있고, 눌린 시간이 설정되어 있는 경우
// //스위치 ON 시간을 계산한다
// var ts = DateTime.Now - AirOffStart;
// if (ts.TotalMilliseconds >= COMM.SETTING.Data.AirOFFTimer)
// {
// Util_DO.SetAIR(false);
// AirOff = false;
// AirOffStart = DateTime.Parse("1982-11-23");
// Pub.log.AddAT("AIR OFF by User");
// }
// }
//}
} }
} }

View File

@@ -38,8 +38,6 @@ namespace Project
else patsEx = patternsEx.Where(t => t.IsEnable == true).OrderBy(t => t.Seq).ToList(); else patsEx = patternsEx.Where(t => t.IsEnable == true).OrderBy(t => t.Seq).ToList();
} }
if (pats.Any() == false) if (pats.Any() == false)
{ {
PUB.log.AddAT($"등록된 패턴이 없습니다(SYM={barcodeSymbol})"); PUB.log.AddAT($"등록된 패턴이 없습니다(SYM={barcodeSymbol})");
@@ -68,11 +66,8 @@ namespace Project
IgnoreBarcode = true; IgnoreBarcode = true;
return new Tuple<int, List<string>>(0, new List<string>()); return new Tuple<int, List<string>>(0, new List<string>());
} }
} }
//이 바코드가 무시바코드에 있는지 먼저 검사한다 220718 //이 바코드가 무시바코드에 있는지 먼저 검사한다 220718
foreach (var pt in patsEx) foreach (var pt in patsEx)
{ {
@@ -163,6 +158,8 @@ namespace Project
if (vdata.Confirm) return; if (vdata.Confirm) return;
var vm = PUB.Result.vModel; var vm = PUB.Result.vModel;
//바코드목록에서 정규식값으로 각 필드값을 기록한다.
lock (vdata.barcodelist) lock (vdata.barcodelist)
{ {
foreach (var item in vdata.barcodelist) foreach (var item in vdata.barcodelist)
@@ -186,135 +183,11 @@ namespace Project
} }
} }
//assign customer code - fixed data
if (vdata.CUSTCODE.isEmpty() && VAR.STR[eVarString.JOB_CUSTOMER_CODE].isEmpty() == false)
{
vdata.CUSTCODE = VAR.STR[eVarString.JOB_CUSTOMER_CODE];
PUB.log.Add($"Cutomer Code 고정값 사용 : {vdata.CUSTCODE}");
}
//SiD CONVERT
if (VAR.BOOL[eVarBool.Opt_SIDConvert])
{
if (PUB.flag.get(eVarBool.FG_WAIT_LOADERINFO) == false && VAR.BOOL[eVarBool.JOB_Empty_SIDConvertInfo] == false)
{
//원본시드(sid0)가 비어있는데 sid과 확정되었다면 변환작업을 진행한다
if (vdata.SID0.isEmpty() && vdata.SID.isEmpty() == false && vdata.SID_Trust)
{
//이 sid가 존재여부확인 후 없는 sid라면 더이상 처리하지 않는다 230510
if (PUB.Result.DTSidConvertEmptyList.Contains(vdata.SID))
{
//존재하지 않는 SID로 이미 확인되었다
}
else if (PUB.Result.DTSidConvertMultiList.Contains(vdata.SID))
{
//다중sid로 인해 처리하지 않는다
}
else
{
var newsid = PUB.SIDCovert(vdata.SID, "SPS_BarcodeProcess", out bool converr);
if (converr)
{
if (PUB.sm.Step == eSMStep.RUN)
PUB.log.AddE(newsid);
}
else
{
vdata.SID0 = vdata.SID;
vdata.SID = newsid;
}
}
}
}
}
//정규식혹은 바코드 룰에 의해 데이터가 바뀌었더라도 모델 기준으로 진행한다
if (PUB.Result.vModel.Def_Vname.isEmpty() == false)
{
if (itemC.VisionData.VNAME.Equals(PUB.Result.vModel.Def_Vname) == false)
{
itemC.VisionData.VNAME = PUB.Result.vModel.Def_Vname.Trim();
itemC.VisionData.VNAME_Trust = true;
PUB.log.Add($"Defaul V.Name Set to {PUB.Result.vModel.Def_Vname}");
}
}
if (PUB.Result.vModel.Def_MFG.isEmpty() == false)
{
if (itemC.VisionData.MFGDATE.Equals(PUB.Result.vModel.Def_MFG) == false)
{
itemC.VisionData.MFGDATE = PUB.Result.vModel.Def_MFG.Trim();
itemC.VisionData.MFGDATE_Trust = true;
PUB.log.Add($"Defaul MFGDATE Set to {PUB.Result.vModel.Def_MFG}");
}
}
////New ReelID
/// this process run ( 3_keyence_read.cs )
//if (VAR.BOOL[eVarBool.Opt_NewReelID) && PUB.sm.isRunning)
//{
// if (vdata.temp_custcode.Length == 4 && vdata.RID0.isEmpty() && vdata.RIDNew == false)
// {
// //backup old reel id
// vdata.RID0 = vdata.RID;
// vdata.RIDNew = true;
// var newid = Amkor.RestfulService.Allocation_Unique_ReelID_AmkorSTD(vdata.temp_custcode, "4", "A", out string err);
// if (newid.isEmpty() == false)
// {
// //remain original reel id
// vdata.SetRID( newid,"SPS");
// PUB.log.AddI($"New REELID:{newid}");
// }
// }
//}
//릴ID 신규발행
if (PUB.sm.Step == eSMStep.RUN && vdata.CUSTCODE.isEmpty() == false && vdata.SID.isEmpty() == false)
{
if (VAR.BOOL[eVarBool.Opt_NewReelID])
{
if (itemC.VisionData.RIDNew == false && itemC.VisionData.CUSTCODE.isEmpty() == false)
{
var newid = PUB.MakeNewREELID(vdata.SID);// Amkor.RestfulService.Allocation_Unique_ReelID_AmkorSTD(itemC.VisionData.CUSTCODE, "4", "A", out string errmsg);
if (newid.success)
{
//backup origin reel id
itemC.VisionData.RID0 = itemC.VisionData.RID;
//set new reel id
itemC.VisionData.SetRID(newid.newid, "SPS:CHKDATACOMPLETE");// = newid;
itemC.VisionData.RIDNew = true; //applied new reel id
//서버의수량업데이트기능이 켜져있다면 해당 값을 제거해준다. (다시 조회되도록 함)
if (VAR.BOOL[eVarBool.Opt_ServerQty])
{
//이미 수량업데이트된 경우이므로 복원시켜준다
if (itemC.VisionData.QTY0.isEmpty() == false)
{
PUB.log.AddAT($"릴아이디 변경으로 인해 수량을 복원합니다({itemC.VisionData.QTY}->{itemC.VisionData.QTY0})");
itemC.VisionData.QTY = itemC.VisionData.QTY0;
itemC.VisionData.QTY0 = string.Empty;
}
}
}
else
{
var logtime = VAR.TIME.RUN((int)eVarTime.LOG_NEWIDERROR);
if (logtime.TotalSeconds >= 3000)
{
PUB.log.AddAT($"Reel_ID 생성실패 : {newid.message}");
VAR.TIME.Update(eVarTime.LOG_NEWIDERROR);
}
}
}
}
}
//바코드가 변경된 경우이다, 자동채우기 기능이 있다면 사용한다 //바코드가 변경된 경우이다, 자동채우기 기능이 있다면 사용한다
bool NewBarcodeUpdated = false; bool NewBarcodeUpdated = false;
if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeTouched == true)
//SID정보테이블에서 정보 추출
if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true)
{ {
Boolean Apply = true; Boolean Apply = true;
@@ -377,19 +250,15 @@ namespace Project
if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode; if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode;
var SQL = "select top 1 " + string.Join(",", fields) + var SQL = "select top 1 " + string.Join(",", fields) +
" from Component_Reel_SID_Information WITH(NOLOCK)" + " from K4EE_Component_Reel_SID_Information WITH(NOLOCK)" +
" where mc='" + mcname + "' and " + string.Join(" and ", wheres) + " where mc='" + mcname + "' and " + string.Join(" and ", wheres) +
" order by wdate desc"; " order by wdate desc";
var SQLC = "select count(*)" + var SQLC = "select count(*)" +
" from Component_Reel_SID_Information WITH(NOLOCK)" + " from K4EE_Component_Reel_SID_Information WITH(NOLOCK)" +
" where mc='" + mcname + "' and " + string.Join(" and ", wheres); " where mc='" + mcname + "' and " + string.Join(" and ", wheres);
if (PUB.Result.ItemDataC.VisionData.LastQueryString.Equals(SQL)) if (PUB.Result.ItemDataC.VisionData.LastQueryStringSID.Equals(SQL) == false)
{
//같은 쿼리이므로 처리하지 않는다
}
else
{ {
PUB.log.Add($"DATABAES : SID INFORMATIION QUERY"); PUB.log.Add($"DATABAES : SID INFORMATIION QUERY");
@@ -418,75 +287,7 @@ namespace Project
var vStr = v.ToString().RemoveNoneASCII().Trim(); var vStr = v.ToString().RemoveNoneASCII().Trim();
if (vStr.isEmpty()) continue; if (vStr.isEmpty()) continue;
//O_Trust == false)) fields.Add("PartNo"); if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true;
//ields.Add("PrintPosition");
//ta.VNAME.isEmpty())) fields.Add("VenderName");
//Empty())) fields.Add("SID");
//value is not empty
if (colName == "CustCode")
{
PUB.log.Add($"AUP [{colName}] {vdata.CUSTCODE}=>{vStr}");
vdata.CUSTCODE = vStr;
NewBarcodeUpdated = true;
}
else if (colName == "PartNo")
{
PUB.log.Add($"AUP [{colName}] {vdata.PARTNO}=>{vStr}");
vdata.PARTNO = vStr;
vdata.PARTNO_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "PrintPosition")
{
PUB.log.Add($"AUP [{colName}] {vdata.PrintPositionData}=>{vStr}");
vdata.PrintPositionData = vStr;
vdata.PrintPositionCheck = true;
NewBarcodeUpdated = true;
}
else if (colName == "VenderName")
{
PUB.log.Add($"AUP [{colName}] {vdata.VNAME}=>{vStr}");
vdata.VNAME = vStr;
vdata.VNAME_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "VenderLot")
{
PUB.log.Add($"AUP [{colName}] {vdata.VLOT}=>{vStr}");
vdata.VLOT = vStr;
vdata.VLOT_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "SID")
{
PUB.log.Add($"AUP [{colName}] {vdata.SID}=>{vStr}");
vdata.SID = vStr;
vdata.SID_Trust = vdata.SID.Length == 9;
if (vStr.Length != 9)
{
PUB.log.AddE($"DB SID LEN ERROR:{vStr},LEN={vStr.Length}");
}
NewBarcodeUpdated = true;
}
else if (colName == "batch")
{
PUB.log.Add($"AUP [{colName}] {vdata.BATCH}=>{vStr}");
vdata.BATCH = vStr;
NewBarcodeUpdated = true;
}
else if (colName == "qtymax")
{
PUB.log.Add($"AUP [{colName}] {vdata.BATCH}=>{vStr}");
vdata.QTYMAX = vStr;
NewBarcodeUpdated = true;
}
else if (colName.ToLower() == "attach")
{
PUB.log.Add($"attach [{colName}] {vdata.Target}=>{vStr}");
vdata.Target = vStr;
NewBarcodeUpdated = true;
}
} }
} }
} }
@@ -495,13 +296,111 @@ namespace Project
CMD.Dispose(); CMD.Dispose();
if (CN.State == System.Data.ConnectionState.Open) CN.Close(); if (CN.State == System.Data.ConnectionState.Open) CN.Close();
CN.Dispose(); CN.Dispose();
PUB.Result.ItemDataC.VisionData.LastQueryString = SQL; PUB.Result.ItemDataC.VisionData.LastQueryStringSID = SQL;
} }
} }
} }
//[WMS] SID정보테이블에서 정보 추출(프린트정보는 없음)
if (VAR.BOOL[eVarBool.Opt_ApplySIDInfo] && vdata.BarcodeDirty == true)
{
Boolean Apply = true;
if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && vdata.BarcodeTouched == true) //select columns
List<string> fields = new List<string>();
if (VAR.BOOL[eVarBool.Opt_SID_Apply_CustCode] && vdata.CUSTCODE.isEmpty()) fields.Add("CUST_CODE");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] && (vdata.PARTNO.isEmpty() || vdata.PARTNO_Trust == false)) fields.Add("PART_NO");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VENDOR_NM");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID");
if (VAR.BOOL[eVarBool.Opt_SID_Apply_batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("BATCH_NO"); //220921
//where coluns
List<string> wheres = new List<string>();
if (VAR.BOOL[eVarBool.Opt_SID_Where_CustCode])
{
if (vdata.CUSTCODE.isEmpty() == false) wheres.Add($"CUST_CODE='{vdata.CUSTCODE}'");
else Apply = false;
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_PartNo])
{
if (vdata.PARTNO_Trust && vdata.PARTNO.isEmpty() == false) wheres.Add($"PART_NO='{vdata.PARTNO}'");
else Apply = false;
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_SID])
{
if (VAR.BOOL[eVarBool.Opt_SIDConvert]) //if sid convert logic
{
if (vdata.SID_Trust && vdata.SID0.isEmpty() == false && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'");
else Apply = false;
}
else
{
if (vdata.SID_Trust && vdata.SID.isEmpty() == false) wheres.Add($"SID='{vdata.SID}'");
else Apply = false;
}
}
if (VAR.BOOL[eVarBool.Opt_SID_Where_VLOT]) //221013
{
if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VENDER_LOT = '{vdata.VLOT}'");
else Apply = false;
}
//if query data . no error
if (Apply && fields.Count > 0 && wheres.Count > 0)
{
var mcname = VAR.BOOL[eVarBool.Use_Conveyor] ? PUB.MCCode : SETTING.Data.McName;
var TableName = "VW_GET_MAX_QTY_VENDOR_LOT";
var whereState = " where " + string.Join(" and ", wheres);
var selectFields = string.Join(",", fields);
var SQL = $"select top 1 {selectFields} from {TableName} WITH(NOLOCK) {whereState}";
var SQLC = $"select count(*) from {TableName} WITH(NOLOCK) {whereState}";
if (PUB.Result.ItemDataC.VisionData.LastQueryStringWMS.Equals(SQL) == false) //같은 쿼리는 처리하지 않는다
{
PUB.log.Add($"DATABAES : WMS INFORMATIION QUERY");
PUB.log.Add(SQL);
var CS = Properties.Settings.Default.CS;
var CN = new System.Data.SqlClient.SqlConnection(CS);
var CMD = new System.Data.SqlClient.SqlCommand(SQL, CN);
if (CN.State == System.Data.ConnectionState.Closed) CN.Open();
//데이터가 중복으로 존재하는지 확인한다. 231006
CMD.CommandText = SQLC;
var cnt = int.Parse(CMD.ExecuteScalar().ToString());
if (cnt == 1)
{
CMD.CommandText = SQL;
var DAR = CMD.ExecuteReader();
while (DAR.Read())
{
//loop select columns
for (int i = 0; i < fields.Count; i++)
{
var colName = fields[i];
var v = DAR[colName];
if (v != null)
{
var vStr = v.ToString().RemoveNoneASCII().Trim();
if (vStr.isEmpty()) continue;
if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true;
}
}
}
DAR.Close();
}
CMD.Dispose();
if (CN.State == System.Data.ConnectionState.Open) CN.Close();
CN.Dispose();
PUB.Result.ItemDataC.VisionData.LastQueryStringWMS = SQL;
}
}
}
//시드변환정보에서 정보 추출
if (VAR.BOOL[eVarBool.Opt_ApplySIDConv] && vdata.BarcodeDirty == true)
{ {
Boolean Apply = true; Boolean Apply = true;
@@ -564,19 +463,15 @@ namespace Project
if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode; if (VAR.BOOL[eVarBool.Use_Conveyor]) mcname = PUB.MCCode;
var SQL = "select top 1 " + string.Join(",", fields) + var SQL = "select top 1 " + string.Join(",", fields) +
" from Component_Reel_SID_Convert WITH(NOLOCK)" + " from K4EE_Component_Reel_SID_Convert WITH(NOLOCK)" +
" where " + string.Join(" and ", wheres) + " where " + string.Join(" and ", wheres) +
" order by wdate desc"; " order by wdate desc";
var SQLC = "select count(*)" + var SQLC = "select count(*)" +
" from Component_Reel_SID_Convert WITH(NOLOCK)" + " from K4EE_Component_Reel_SID_Convert WITH(NOLOCK)" +
" where " + string.Join(" and ", wheres); " where " + string.Join(" and ", wheres);
if (PUB.Result.ItemDataC.VisionData.LastQueryString.Equals(SQL)) if (PUB.Result.ItemDataC.VisionData.LastQueryStringCNV.Equals(SQL) == false)
{
//같은 쿼리이므로 처리하지 않는다
}
else
{ {
PUB.log.Add($"DATABAES : SID(CONV) INFORMATIION QUERY"); PUB.log.Add($"DATABAES : SID(CONV) INFORMATIION QUERY");
@@ -605,75 +500,7 @@ namespace Project
var vStr = v.ToString().RemoveNoneASCII().Trim(); var vStr = v.ToString().RemoveNoneASCII().Trim();
if (vStr.isEmpty()) continue; if (vStr.isEmpty()) continue;
//O_Trust == false)) fields.Add("PartNo"); if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr)) NewBarcodeUpdated = true;
//ields.Add("PrintPosition");
//ta.VNAME.isEmpty())) fields.Add("VenderName");
//Empty())) fields.Add("SID");
//value is not empty
if (colName == "CustCode")
{
PUB.log.Add($"AUP [{colName}] {vdata.CUSTCODE}=>{vStr}");
vdata.CUSTCODE = vStr;
NewBarcodeUpdated = true;
}
else if (colName == "PartNo")
{
PUB.log.Add($"AUP [{colName}] {vdata.PARTNO}=>{vStr}");
vdata.PARTNO = vStr;
vdata.PARTNO_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "PrintPosition")
{
PUB.log.Add($"AUP [{colName}] {vdata.PrintPositionData}=>{vStr}");
vdata.PrintPositionData = vStr;
vdata.PrintPositionCheck = true;
NewBarcodeUpdated = true;
}
else if (colName == "VenderName")
{
PUB.log.Add($"AUP [{colName}] {vdata.VNAME}=>{vStr}");
vdata.VNAME = vStr;
vdata.VNAME_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "VenderLot")
{
PUB.log.Add($"AUP [{colName}] {vdata.VLOT}=>{vStr}");
vdata.VLOT = vStr;
vdata.VLOT_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "SID")
{
PUB.log.Add($"AUP [{colName}] {vdata.SID}=>{vStr}");
vdata.SID = vStr;
vdata.SID_Trust = vdata.SID.Length == 9;
if (vStr.Length != 9)
{
PUB.log.AddE($"DB SID LEN ERROR:{vStr},LEN={vStr.Length}");
}
NewBarcodeUpdated = true;
}
else if (colName == "batch")
{
PUB.log.Add($"AUP [{colName}] {vdata.BATCH}=>{vStr}");
vdata.BATCH = vStr;
NewBarcodeUpdated = true;
}
else if (colName == "qtymax")
{
PUB.log.Add($"AUP [{colName}] {vdata.BATCH}=>{vStr}");
vdata.QTYMAX = vStr;
NewBarcodeUpdated = true;
}
else if (colName.ToLower() == "attach")
{
PUB.log.Add($"attach [{colName}] {vdata.Target}=>{vStr}");
vdata.Target = vStr;
NewBarcodeUpdated = true;
}
} }
} }
} }
@@ -682,13 +509,13 @@ namespace Project
CMD.Dispose(); CMD.Dispose();
if (CN.State == System.Data.ConnectionState.Open) CN.Close(); if (CN.State == System.Data.ConnectionState.Open) CN.Close();
CN.Dispose(); CN.Dispose();
PUB.Result.ItemDataC.VisionData.LastQueryString = SQL; PUB.Result.ItemDataC.VisionData.LastQueryStringCNV = SQL;
} }
} }
} }
//기존 작업에서 데이터를 찾아서 쓴다 //기존 작업에서 데이터를 찾아서 쓴다
if (VAR.BOOL[eVarBool.Opt_ApplyJobInfo] && vdata.BarcodeTouched == true) if (VAR.BOOL[eVarBool.Opt_ApplyJobInfo] && vdata.BarcodeDirty == true)
{ {
Boolean Apply = true; Boolean Apply = true;
@@ -729,7 +556,7 @@ namespace Project
PUB.log.Add($"DATABAES : RESULT QUERY"); PUB.log.Add($"DATABAES : RESULT QUERY");
var SQL = "select top 1 " + string.Join(",", fields) + var SQL = "select top 1 " + string.Join(",", fields) +
" from Component_Reel_Result WITH(NOLOCK) " + " from K4EE_Component_Reel_Result WITH(NOLOCK) " +
$" where mc = '{AR.SETTING.Data.McName}'" + $" where mc = '{AR.SETTING.Data.McName}'" +
$" and prnattach = 1 and stime >= '{DateTime.Now.AddHours(-3).ToString("yyyy-MM-dd HH:mm:ss")}'" + $" and prnattach = 1 and stime >= '{DateTime.Now.AddHours(-3).ToString("yyyy-MM-dd HH:mm:ss")}'" +
$" and " + string.Join(" and ", wheres) + $" and " + string.Join(" and ", wheres) +
@@ -760,54 +587,9 @@ namespace Project
var vStr = v.ToString().RemoveNoneASCII().Trim(); var vStr = v.ToString().RemoveNoneASCII().Trim();
if (vStr.isEmpty()) continue; if (vStr.isEmpty()) continue;
//O_Trust == false)) fields.Add("PartNo"); if (PUB.UpdateSIDInfoData(ref vdata, colName, vStr))
//ields.Add("PrintPosition");
//ta.VNAME.isEmpty())) fields.Add("VenderName");
//Empty())) fields.Add("SID");
//value is not empty
if (colName == "CUSTCODE")
{
PUB.log.Add($"JUP [{colName}] {vdata.CUSTCODE}=>{vStr}");
vdata.CUSTCODE = vStr;
NewBarcodeUpdated = true; NewBarcodeUpdated = true;
} }
else if (colName == "PARTNO")
{
PUB.log.Add($"JUP [{colName}] {vdata.PARTNO}=>{vStr}");
vdata.PARTNO = vStr;
vdata.PARTNO_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "POS")
{
PUB.log.Add($"JUP [{colName}] {vdata.PrintPositionData}=>{vStr}");
vdata.PrintPositionData = vStr;
vdata.PrintPositionCheck = true;
NewBarcodeUpdated = true;
}
else if (colName == "VNAME")
{
PUB.log.Add($"JUP [{colName}] {vdata.VNAME}=>{vStr}");
vdata.VNAME = vStr;
vdata.VNAME_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "VenderLot")
{
PUB.log.Add($"JUP [{colName}] {vdata.VLOT}=>{vStr}");
vdata.VLOT = vStr;
vdata.VLOT_Trust = true;
NewBarcodeUpdated = true;
}
else if (colName == "SID")
{
PUB.log.Add($"JUP [{colName}] {vdata.SID}=>{vStr}");
vdata.SID = vStr;
vdata.SID_Trust = true;
NewBarcodeUpdated = true;
}
}
} }
} }
DAR.Close(); DAR.Close();
@@ -818,28 +600,10 @@ namespace Project
} }
} }
if (PUB.sm.Step == eSMStep.RUN)
{
var CVMode = VAR.BOOL[eVarBool.Use_Conveyor];
if (itemC.VisionData.VNAME.isEmpty() == false &&
itemC.VisionData.VLOT.isEmpty() == false &&
itemC.VisionData.SID.Length == 9 &&
itemC.VisionData.MFGDATE.isEmpty() == false &&
(itemC.VisionData.PARTNO.isEmpty() == false) &&
itemC.VisionData.BATCH.isEmpty() == false &&
itemC.VisionData.RID.isEmpty() == false)
{
//모든값이 입력되어 있다면 조건 체크후 진행할 수 있도록 한다
CheckDataComplte(itemC, "SPS-BARCODEPROCESS", false); //2206211400
}
//CheckDataComplte(PUB.Result.ItemDataC, "SPS-BARCODEPROCESS");
}
//바코드 처리 여부 변경 //바코드 처리 여부 변경
if (vdata.BarcodeTouched == true && NewBarcodeUpdated == false) if (vdata.BarcodeDirty == true && NewBarcodeUpdated == false)
{ {
vdata.BarcodeTouched = false; vdata.BarcodeDirty = false;
var a = PUB.Result.ItemDataC.VisionData.BarcodeTouched;
} }

View File

@@ -101,7 +101,7 @@ namespace Project
if (PUB.sm.seq.Get(cmdIndex) == idx++) if (PUB.sm.seq.Get(cmdIndex) == idx++)
{ {
//홈 설정여부플래그 OFF //홈 설정여부플래그 OFF
for (int i = 0; i < PUB.mot.DeviceCount; i++) for (short i = 0; i < PUB.mot.DeviceCount; i++)
{ {
if (PUB.mot.IsUse(i) == false) continue; if (PUB.mot.IsUse(i) == false) continue;
PUB.mot.SetHomeSet(i, false); PUB.mot.SetHomeSet(i, false);

View File

@@ -77,16 +77,6 @@ namespace Project
PUB.sm.RaiseStateProgress(++progress, "공간 확인", ProgressMax, fColor); System.Threading.Thread.Sleep(5); PUB.sm.RaiseStateProgress(++progress, "공간 확인", ProgressMax, fColor); System.Threading.Thread.Sleep(5);
CheckFreeSpace(); //181225 CheckFreeSpace(); //181225
//모델자동선택 181206
PUB.sm.RaiseStateProgress(++progress, "이전모델 확인", ProgressMax, fColor); System.Threading.Thread.Sleep(5);
//
if (PUB.uSetting.LastModelV != "") PUB.SelectModelV(PUB.uSetting.LastModelV, false);
var motionmodel = PUB.uSetting.LastModelM;
if (motionmodel.isEmpty()) motionmodel = PUB.Result.vModel.Motion;
if (motionmodel.ToUpper().StartsWith("CONV")) PUB.flag.set(eVarBool.Use_Conveyor, true, "load");
else PUB.flag.set(eVarBool.Use_Conveyor, false, "load");
PUB.SelectModelM(motionmodel, false);
//프린터설정 //프린터설정
PUB.sm.RaiseStateProgress(++progress, "프린터설정", ProgressMax, fColor); System.Threading.Thread.Sleep(5); PUB.sm.RaiseStateProgress(++progress, "프린터설정", ProgressMax, fColor); System.Threading.Thread.Sleep(5);
@@ -99,6 +89,18 @@ namespace Project
PUB.PrinterR.BaudRate = AR.SETTING.Data.PrintR_Baud; PUB.PrinterR.BaudRate = AR.SETTING.Data.PrintR_Baud;
PUB.flag.set(eVarBool.FG_INIT_PRINTER, true, "INIT"); PUB.flag.set(eVarBool.FG_INIT_PRINTER, true, "INIT");
//모델자동선택 181206
PUB.sm.RaiseStateProgress(++progress, "이전모델 확인", ProgressMax, fColor); System.Threading.Thread.Sleep(5);
//
if (PUB.uSetting.LastModelV != "") PUB.SelectModelV(PUB.uSetting.LastModelV, false);
var motionmodel = PUB.uSetting.LastModelM;
if (motionmodel.isEmpty()) motionmodel = PUB.Result.vModel.Motion;
if (motionmodel.ToUpper().StartsWith("CONV")) PUB.flag.set(eVarBool.Use_Conveyor, true, "load");
else PUB.flag.set(eVarBool.Use_Conveyor, false, "load");
PUB.SelectModelM(motionmodel, false);
PUB.sm.RaiseStateProgress(ProgressMax, "초기화 완료", ProgressMax, Color.Gold); System.Threading.Thread.Sleep(5); PUB.sm.RaiseStateProgress(ProgressMax, "초기화 완료", ProgressMax, Color.Gold); System.Threading.Thread.Sleep(5);
PUB.log.Add("init finish"); PUB.log.Add("init finish");
@@ -153,7 +155,13 @@ namespace Project
PUB.mot.SetAlarmClearOff(); PUB.mot.SetAlarmClearOff();
//7개의 축을 사용한다 //7개의 축을 사용한다
for (int i = 0; i < PUB.system.MotaxisCount; i++) if (PUB.mot.IsInit == false)
{
PUB.log.AddE("모션보드 초기화 오류로 설정을 진행하지 않습니다");
}
else
{
for (short i = 0; i < PUB.system.MotaxisCount; i++)
{ {
//설정파일이 있다면 불러온다 //설정파일이 있다면 불러온다
var file = System.IO.Path.Combine(UTIL.CurrentPath, "Model", "axis" + i.ToString() + ".motaxt"); var file = System.IO.Path.Combine(UTIL.CurrentPath, "Model", "axis" + i.ToString() + ".motaxt");
@@ -183,12 +191,7 @@ namespace Project
//softlimit 적용 - 201214 //softlimit 적용 - 201214
UpdateSoftLimit(); UpdateSoftLimit();
//PUB.mot.[(short)eAxis.Z_PICKER] = true;
//PUB.mot.useBrake[(short)eAxis.PL_UPDN] = true;
//PUB.mot.useBrake[(short)eAxis.PR_UPDN] = true;
if (PUB.mot.IsInit)
{
PUB.log.Add("MOT RUN MONITOR"); PUB.log.Add("MOT RUN MONITOR");
PUB.mot.RunMonitor(); PUB.mot.RunMonitor();
PUB.log.AddAT("ALL SERVO ON"); PUB.log.AddAT("ALL SERVO ON");

View File

@@ -44,7 +44,7 @@ namespace Project
} }
var reason = string.Join(",", lst); var reason = string.Join(",", lst);
PUB.log.Add("MOT", $"모터정지사유({e.Axis}):{reason}:bit={bitstatus}"); PUB.log.Add("MOT", $"모터정지사유({e.axis}):{reason}:bit={bitstatus}");
} }

View File

@@ -263,6 +263,11 @@
<Compile Include="Class\ItemData.cs" /> <Compile Include="Class\ItemData.cs" />
<Compile Include="Controller\ModelController.cs" /> <Compile Include="Controller\ModelController.cs" />
<Compile Include="Controller\StateController.cs" /> <Compile Include="Controller\StateController.cs" />
<Compile Include="DataSet11.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>DataSet1.xsd</DependentUpon>
</Compile>
<Compile Include="Device\KeyenceBarcode.cs" /> <Compile Include="Device\KeyenceBarcode.cs" />
<Compile Include="Device\SATOPrinterAPI.cs" /> <Compile Include="Device\SATOPrinterAPI.cs" />
<Compile Include="Device\SATOPrinter.cs" /> <Compile Include="Device\SATOPrinter.cs" />
@@ -471,11 +476,6 @@
<Compile Include="DataSet1.cs"> <Compile Include="DataSet1.cs">
<DependentUpon>DataSet1.xsd</DependentUpon> <DependentUpon>DataSet1.xsd</DependentUpon>
</Compile> </Compile>
<Compile Include="DataSet1.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>DataSet1.xsd</DependentUpon>
</Compile>
<Compile Include="Dialog\Quick_Control.cs.cs"> <Compile Include="Dialog\Quick_Control.cs.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@@ -672,9 +672,7 @@
<Compile Include="UIControl\CtlBase.Designer.cs"> <Compile Include="UIControl\CtlBase.Designer.cs">
<DependentUpon>CtlBase.cs</DependentUpon> <DependentUpon>CtlBase.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="UIControl\CtlContainer.cs"> <Compile Include="UIControl\CtlContainer.cs" />
<SubType>Component</SubType>
</Compile>
<Compile Include="UIControl\CtlContainer.Designer.cs"> <Compile Include="UIControl\CtlContainer.Designer.cs">
<DependentUpon>CtlContainer.cs</DependentUpon> <DependentUpon>CtlContainer.cs</DependentUpon>
</Compile> </Compile>
@@ -1025,13 +1023,9 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CapCleaningControl\UIControl.csproj"> <ProjectReference Include="..\Sub\arAjinextek\Library\arAjinextek_Union\arAjinextek_Union.csproj">
<Project>{9264cd2e-7cf8-4237-a69f-dcda984e0613}</Project> <Project>{62370293-92aa-4b73-b61f-5c343eeb4ded}</Project>
<Name>UIControl</Name> <Name>arAjinextek_Union</Name>
</ProjectReference>
<ProjectReference Include="..\Sub\arAzinAxt\arAzinAxt.csproj">
<Project>{4f457e76-bf83-4b98-8565-ae87d7d16744}</Project>
<Name>arAzinAxt</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Sub\arFrameControl\arFrameControl.csproj"> <ProjectReference Include="..\Sub\arFrameControl\arFrameControl.csproj">
<Project>{a16c9667-5241-4313-888e-548375f85d29}</Project> <Project>{a16c9667-5241-4313-888e-548375f85d29}</Project>
@@ -1061,6 +1055,10 @@
<Project>{b18d3b96-2fdf-4ed9-9a49-d9b8cee4ed6d}</Project> <Project>{b18d3b96-2fdf-4ed9-9a49-d9b8cee4ed6d}</Project>
<Name>StdLabelPrint</Name> <Name>StdLabelPrint</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Sub\UIControl\UIControl.csproj">
<Project>{9264cd2e-7cf8-4237-a69f-dcda984e0613}</Project>
<Name>UIControl</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<ItemGroup> <ItemGroup>

View File

@@ -30,19 +30,20 @@
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSetting)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSetting));
this.button1 = new System.Windows.Forms.Button(); this.btSave = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btSystemBypass = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button(); this.btbuzAfterFinish = new System.Windows.Forms.Button();
this.button13 = new System.Windows.Forms.Button(); this.button13 = new System.Windows.Forms.Button();
this.button14 = new System.Windows.Forms.Button(); this.button14 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button();
this.btmag2 = new System.Windows.Forms.Button(); this.btmag2 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button(); this.btRoomLamp = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button();
this.btPickerVac = new System.Windows.Forms.Button(); this.btPickerVac = new System.Windows.Forms.Button();
this.btPort1 = new System.Windows.Forms.Button(); this.btPort1 = new System.Windows.Forms.Button();
@@ -84,14 +85,13 @@
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.button12 = new System.Windows.Forms.Button(); this.btDefIO = new System.Windows.Forms.Button();
this.button11 = new System.Windows.Forms.Button(); this.btDefError = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button(); this.btOpenZPL = new System.Windows.Forms.Button();
this.bsRecipient = new System.Windows.Forms.BindingSource(this.components); this.bsRecipient = new System.Windows.Forms.BindingSource(this.components);
this.bsMailForm = new System.Windows.Forms.BindingSource(this.components); this.bsMailForm = new System.Windows.Forms.BindingSource(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components); this.errorProvider1 = new System.Windows.Forms.ErrorProvider(this.components);
this.btSystemBypass = new System.Windows.Forms.Button();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
@@ -110,21 +110,21 @@
((System.ComponentModel.ISupportInitialize)(this.errorProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// button1 // btSave
// //
this.button1.Dock = System.Windows.Forms.DockStyle.Fill; this.btSave.Dock = System.Windows.Forms.DockStyle.Fill;
this.button1.Location = new System.Drawing.Point(5, 5); this.btSave.Location = new System.Drawing.Point(5, 5);
this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.button1.Name = "button1"; this.btSave.Name = "btSave";
this.button1.Size = new System.Drawing.Size(604, 53); this.btSave.Size = new System.Drawing.Size(604, 53);
this.button1.TabIndex = 0; this.btSave.TabIndex = 0;
this.button1.Text = "저장(&S)"; this.btSave.Text = "저장(&S)";
this.button1.UseVisualStyleBackColor = true; this.btSave.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click); this.btSave.Click += new System.EventHandler(this.button1_Click);
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.button1); this.panel1.Controls.Add(this.btSave);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel1.Location = new System.Drawing.Point(0, 623); this.panel1.Location = new System.Drawing.Point(0, 623);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
@@ -141,7 +141,7 @@
this.propertyGrid1.Location = new System.Drawing.Point(3, 3); this.propertyGrid1.Location = new System.Drawing.Point(3, 3);
this.propertyGrid1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.propertyGrid1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.propertyGrid1.Name = "propertyGrid1"; this.propertyGrid1.Name = "propertyGrid1";
this.propertyGrid1.Size = new System.Drawing.Size(600, 536); this.propertyGrid1.Size = new System.Drawing.Size(600, 584);
this.propertyGrid1.TabIndex = 1; this.propertyGrid1.TabIndex = 1;
// //
// tabControl1 // tabControl1
@@ -175,12 +175,12 @@
// //
this.groupBox1.Controls.Add(this.btSystemBypass); this.groupBox1.Controls.Add(this.btSystemBypass);
this.groupBox1.Controls.Add(this.button7); this.groupBox1.Controls.Add(this.button7);
this.groupBox1.Controls.Add(this.button10); this.groupBox1.Controls.Add(this.btbuzAfterFinish);
this.groupBox1.Controls.Add(this.button13); this.groupBox1.Controls.Add(this.button13);
this.groupBox1.Controls.Add(this.button14); this.groupBox1.Controls.Add(this.button14);
this.groupBox1.Controls.Add(this.button3); this.groupBox1.Controls.Add(this.button3);
this.groupBox1.Controls.Add(this.btmag2); this.groupBox1.Controls.Add(this.btmag2);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.btRoomLamp);
this.groupBox1.Controls.Add(this.button6); this.groupBox1.Controls.Add(this.button6);
this.groupBox1.Controls.Add(this.btPickerVac); this.groupBox1.Controls.Add(this.btPickerVac);
this.groupBox1.Controls.Add(this.btPort1); this.groupBox1.Controls.Add(this.btPort1);
@@ -204,6 +204,16 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "기능 사용"; this.groupBox1.Text = "기능 사용";
// //
// btSystemBypass
//
this.btSystemBypass.Location = new System.Drawing.Point(53, 349);
this.btSystemBypass.Name = "btSystemBypass";
this.btSystemBypass.Size = new System.Drawing.Size(479, 42);
this.btSystemBypass.TabIndex = 49;
this.btSystemBypass.Text = "SYSTEM BYPASS";
this.btSystemBypass.UseVisualStyleBackColor = true;
this.btSystemBypass.Click += new System.EventHandler(this.button8_Click);
//
// button7 // button7
// //
this.button7.Location = new System.Drawing.Point(230, 279); this.button7.Location = new System.Drawing.Point(230, 279);
@@ -214,16 +224,16 @@
this.button7.UseVisualStyleBackColor = true; this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click_2); this.button7.Click += new System.EventHandler(this.button7_Click_2);
// //
// button10 // btbuzAfterFinish
// //
this.button10.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold); this.btbuzAfterFinish.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.button10.Location = new System.Drawing.Point(18, 30); this.btbuzAfterFinish.Location = new System.Drawing.Point(18, 30);
this.button10.Name = "button10"; this.btbuzAfterFinish.Name = "btbuzAfterFinish";
this.button10.Size = new System.Drawing.Size(135, 43); this.btbuzAfterFinish.Size = new System.Drawing.Size(135, 43);
this.button10.TabIndex = 25; this.btbuzAfterFinish.TabIndex = 25;
this.button10.Text = "작업완료 후 부저"; this.btbuzAfterFinish.Text = "작업완료 후 부저";
this.button10.UseVisualStyleBackColor = true; this.btbuzAfterFinish.UseVisualStyleBackColor = true;
this.button10.Click += new System.EventHandler(this.button10_Click); this.btbuzAfterFinish.Click += new System.EventHandler(this.button10_Click);
// //
// button13 // button13
// //
@@ -266,15 +276,15 @@
this.btmag2.UseVisualStyleBackColor = true; this.btmag2.UseVisualStyleBackColor = true;
this.btmag2.Click += new System.EventHandler(this.button5_Click_1); this.btmag2.Click += new System.EventHandler(this.button5_Click_1);
// //
// button2 // btRoomLamp
// //
this.button2.Location = new System.Drawing.Point(429, 30); this.btRoomLamp.Location = new System.Drawing.Point(429, 30);
this.button2.Name = "button2"; this.btRoomLamp.Name = "btRoomLamp";
this.button2.Size = new System.Drawing.Size(135, 43); this.btRoomLamp.Size = new System.Drawing.Size(135, 43);
this.button2.TabIndex = 28; this.btRoomLamp.TabIndex = 28;
this.button2.Text = "내부조명"; this.btRoomLamp.Text = "내부조명";
this.button2.UseVisualStyleBackColor = true; this.btRoomLamp.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click_2); this.btRoomLamp.Click += new System.EventHandler(this.button2_Click_2);
// //
// button6 // button6
// //
@@ -572,7 +582,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(606, 542); this.tabPage1.Size = new System.Drawing.Size(606, 590);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "상세설정"; this.tabPage1.Text = "상세설정";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
@@ -584,7 +594,7 @@
this.tabPage3.Controls.Add(this.toolStrip1); this.tabPage3.Controls.Add(this.toolStrip1);
this.tabPage3.Location = new System.Drawing.Point(4, 29); this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(606, 542); this.tabPage3.Size = new System.Drawing.Size(606, 590);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "언어설정"; this.tabPage3.Text = "언어설정";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
@@ -602,7 +612,7 @@
this.dataGridView1.Location = new System.Drawing.Point(0, 25); this.dataGridView1.Location = new System.Drawing.Point(0, 25);
this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(606, 495); this.dataGridView1.Size = new System.Drawing.Size(606, 543);
this.dataGridView1.TabIndex = 2; this.dataGridView1.TabIndex = 2;
// //
// keyDataGridViewTextBoxColumn // keyDataGridViewTextBoxColumn
@@ -632,7 +642,7 @@
// //
this.statusStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lbFile}); this.lbFile});
this.statusStrip2.Location = new System.Drawing.Point(0, 520); this.statusStrip2.Location = new System.Drawing.Point(0, 568);
this.statusStrip2.Name = "statusStrip2"; this.statusStrip2.Name = "statusStrip2";
this.statusStrip2.Size = new System.Drawing.Size(606, 22); this.statusStrip2.Size = new System.Drawing.Size(606, 22);
this.statusStrip2.TabIndex = 1; this.statusStrip2.TabIndex = 1;
@@ -659,7 +669,7 @@
// //
// toolStripButton1 // toolStripButton1
// //
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.Image = global::Project.Properties.Resources.icons8_plus_40;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(75, 22); this.toolStripButton1.Size = new System.Drawing.Size(75, 22);
@@ -668,7 +678,7 @@
// //
// toolStripButton3 // toolStripButton3
// //
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.Image = global::Project.Properties.Resources.icons8_repeat_40;
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(75, 22); this.toolStripButton3.Size = new System.Drawing.Size(75, 22);
@@ -678,7 +688,7 @@
// toolStripButton4 // toolStripButton4
// //
this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); this.toolStripButton4.Image = global::Project.Properties.Resources.icons8_checked_40;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4"; this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(51, 22); this.toolStripButton4.Size = new System.Drawing.Size(51, 22);
@@ -688,7 +698,7 @@
// toolStripButton2 // toolStripButton2
// //
this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.Image = global::Project.Properties.Resources.icons8_save_40;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(51, 22); this.toolStripButton2.Size = new System.Drawing.Size(51, 22);
@@ -697,45 +707,45 @@
// //
// tabPage4 // tabPage4
// //
this.tabPage4.Controls.Add(this.button12); this.tabPage4.Controls.Add(this.btDefIO);
this.tabPage4.Controls.Add(this.button11); this.tabPage4.Controls.Add(this.btDefError);
this.tabPage4.Controls.Add(this.button4); this.tabPage4.Controls.Add(this.btOpenZPL);
this.tabPage4.Location = new System.Drawing.Point(4, 29); this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(606, 542); this.tabPage4.Size = new System.Drawing.Size(606, 590);
this.tabPage4.TabIndex = 3; this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "기타"; this.tabPage4.Text = "기타";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
// //
// button12 // btDefIO
// //
this.button12.Location = new System.Drawing.Point(23, 135); this.btDefIO.Location = new System.Drawing.Point(23, 135);
this.button12.Name = "button12"; this.btDefIO.Name = "btDefIO";
this.button12.Size = new System.Drawing.Size(189, 43); this.btDefIO.Size = new System.Drawing.Size(189, 43);
this.button12.TabIndex = 48; this.btDefIO.TabIndex = 48;
this.button12.Text = "I/O 설명 정의"; this.btDefIO.Text = "I/O 설명 정의";
this.button12.UseVisualStyleBackColor = true; this.btDefIO.UseVisualStyleBackColor = true;
this.button12.Click += new System.EventHandler(this.button12_Click); this.btDefIO.Click += new System.EventHandler(this.button12_Click);
// //
// button11 // btDefError
// //
this.button11.Location = new System.Drawing.Point(23, 75); this.btDefError.Location = new System.Drawing.Point(23, 75);
this.button11.Name = "button11"; this.btDefError.Name = "btDefError";
this.button11.Size = new System.Drawing.Size(189, 43); this.btDefError.Size = new System.Drawing.Size(189, 43);
this.button11.TabIndex = 47; this.btDefError.TabIndex = 47;
this.button11.Text = "오류 메세지 정의"; this.btDefError.Text = "오류 메세지 정의";
this.button11.UseVisualStyleBackColor = true; this.btDefError.UseVisualStyleBackColor = true;
this.button11.Click += new System.EventHandler(this.button11_Click); this.btDefError.Click += new System.EventHandler(this.button11_Click);
// //
// button4 // btOpenZPL
// //
this.button4.Location = new System.Drawing.Point(23, 15); this.btOpenZPL.Location = new System.Drawing.Point(23, 15);
this.button4.Name = "button4"; this.btOpenZPL.Name = "btOpenZPL";
this.button4.Size = new System.Drawing.Size(189, 43); this.btOpenZPL.Size = new System.Drawing.Size(189, 43);
this.button4.TabIndex = 46; this.btOpenZPL.TabIndex = 46;
this.button4.Text = "ZPL 열기"; this.btOpenZPL.Text = "ZPL 열기";
this.button4.UseVisualStyleBackColor = true; this.btOpenZPL.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click_3); this.btOpenZPL.Click += new System.EventHandler(this.btOpenZPL_Click);
// //
// bsRecipient // bsRecipient
// //
@@ -751,16 +761,6 @@
// //
this.errorProvider1.ContainerControl = this; this.errorProvider1.ContainerControl = this;
// //
// btSystemBypass
//
this.btSystemBypass.Location = new System.Drawing.Point(53, 349);
this.btSystemBypass.Name = "btSystemBypass";
this.btSystemBypass.Size = new System.Drawing.Size(479, 42);
this.btSystemBypass.TabIndex = 49;
this.btSystemBypass.Text = "SYSTEM BYPASS";
this.btSystemBypass.UseVisualStyleBackColor = true;
this.btSystemBypass.Click += new System.EventHandler(this.button8_Click);
//
// fSetting // fSetting
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
@@ -803,7 +803,7 @@
#endregion #endregion
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button btSave;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.PropertyGrid propertyGrid1; private System.Windows.Forms.PropertyGrid propertyGrid1;
private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabControl1;
@@ -836,7 +836,7 @@
private System.Windows.Forms.Button btTWLamp; private System.Windows.Forms.Button btTWLamp;
private System.Windows.Forms.BindingSource bsRecipient; private System.Windows.Forms.BindingSource bsRecipient;
private System.Windows.Forms.BindingSource bsMailForm; private System.Windows.Forms.BindingSource bsMailForm;
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button btRoomLamp;
private System.Windows.Forms.Button btPickerVac; private System.Windows.Forms.Button btPickerVac;
private System.Windows.Forms.Button btRightVac; private System.Windows.Forms.Button btRightVac;
private System.Windows.Forms.Button btLeftVac; private System.Windows.Forms.Button btLeftVac;
@@ -857,10 +857,10 @@
private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button6;
private System.Windows.Forms.Button button5; private System.Windows.Forms.Button button5;
private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.Button button4; private System.Windows.Forms.Button btOpenZPL;
private System.Windows.Forms.Button button10; private System.Windows.Forms.Button btbuzAfterFinish;
private System.Windows.Forms.Button button12; private System.Windows.Forms.Button btDefIO;
private System.Windows.Forms.Button button11; private System.Windows.Forms.Button btDefError;
private System.Windows.Forms.Button button13; private System.Windows.Forms.Button button13;
private System.Windows.Forms.Button button14; private System.Windows.Forms.Button button14;
private System.Windows.Forms.Button button7; private System.Windows.Forms.Button button7;

View File

@@ -57,7 +57,7 @@ namespace Project
btBuz.BackColor = dummySetting.Disable_Buzzer == false ? Color.Lime : Color.Tomato; btBuz.BackColor = dummySetting.Disable_Buzzer == false ? Color.Lime : Color.Tomato;
this.btTWLamp.BackColor = dummySetting.Disable_TowerLamp ? Color.Tomato : Color.Lime; this.btTWLamp.BackColor = dummySetting.Disable_TowerLamp ? Color.Tomato : Color.Lime;
this.button2.BackColor = dummySetting.Disable_RoomLight == true ? Color.Tomato : Color.Lime; this.btRoomLamp.BackColor = dummySetting.Disable_RoomLight == true ? Color.Tomato : Color.Lime;
//진공사용여부 //진공사용여부
this.btLeftVac.BackColor = dummySetting.Disable_PLVac ? Color.Tomato : Color.Lime; this.btLeftVac.BackColor = dummySetting.Disable_PLVac ? Color.Tomato : Color.Lime;
@@ -97,7 +97,7 @@ namespace Project
this.button13.BackColor = dummySetting.Disable_PLAir == false ? Color.Lime : Color.Tomato; this.button13.BackColor = dummySetting.Disable_PLAir == false ? Color.Lime : Color.Tomato;
this.button14.BackColor = dummySetting.Disable_PRAir == false ? Color.Lime : Color.Tomato; this.button14.BackColor = dummySetting.Disable_PRAir == false ? Color.Lime : Color.Tomato;
this.button10.BackColor = dummySetting.Force_JobEndBuzzer ? Color.Gold : SystemColors.Control; this.btbuzAfterFinish.BackColor = dummySetting.Force_JobEndBuzzer ? Color.Gold : SystemColors.Control;
this.button7.BackColor = dummySetting.Enable_PickerCylinder ? Color.Lime : Color.Tomato; this.button7.BackColor = dummySetting.Enable_PickerCylinder ? Color.Lime : Color.Tomato;
this.btSystemBypass.BackColor = dummySetting.SystemBypass ? Color.DarkBlue : Color.Transparent; this.btSystemBypass.BackColor = dummySetting.SystemBypass ? Color.DarkBlue : Color.Transparent;
this.btSystemBypass.ForeColor = dummySetting.SystemBypass ? Color.White : Color.Black; this.btSystemBypass.ForeColor = dummySetting.SystemBypass ? Color.White : Color.Black;
@@ -457,17 +457,16 @@ namespace Project
private void button4_Click_3(object sender, EventArgs e) private void btOpenZPL_Click(object sender, EventArgs e)
{ {
var fi = new System.IO.FileInfo(AR.SETTING.Data.baseZPLFile); var fi = new System.IO.FileInfo("zpl.txt");
if (fi.Exists == false) if (fi.Exists == false)
{ {
System.IO.File.WriteAllText(fi.FullName, Properties.Settings.Default.ZPL7, System.Text.Encoding.Default); System.IO.File.WriteAllText(fi.FullName, Properties.Settings.Default.ZPL7, System.Text.Encoding.Default);
UTIL.MsgI("ZPL파일을 신규 생성 했습니다\n" + fi.FullName); UTIL.MsgI("ZPL파일을 신규 생성 했습니다\n" + fi.FullName);
} }
var f = new Dialog.fZPLEditor(fi.FullName); using (var f = new Dialog.fZPLEditor(fi.FullName))
f.ShowDialog(); f.ShowDialog();
//Util.RunExplorer(fi.FullName);
} }

View File

@@ -129,67 +129,6 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>305, 17</value> <value>305, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="bsRecipient.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsRecipient.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>660, 17</value> <value>660, 17</value>
</metadata> </metadata>
@@ -205,6 +144,7 @@
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>60</value> <value>60</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAYAAAAAAAEAIAASGgAAZgAAAICAAAABACAAKAgBAHgaAABAQAAAAQAgAChCAACgIgEAMDAAAAEA AAABAAYAAAAAAAEAIAASGgAAZgAAAICAAAABACAAKAgBAHgaAABAQAAAAQAgAChCAACgIgEAMDAAAAEA

View File

@@ -107,7 +107,7 @@ namespace Project.Dialog
if (e.ColumnIndex != 13) return; if (e.ColumnIndex != 13) return;
var val = int.Parse(idx.ToString()); var val = short.Parse(idx.ToString());
PUB.mot.ShowParameter(val); PUB.mot.ShowParameter(val);
} }

View File

@@ -42,7 +42,7 @@ namespace Project.Dialog
private void button2_Click_1(object sender, EventArgs e) private void button2_Click_1(object sender, EventArgs e)
{ {
var but = sender as Button; var but = sender as Button;
var idx = int.Parse(but.Tag.ToString()); var idx = short.Parse(but.Tag.ToString());
PUB.mot.ShowParameter(idx); PUB.mot.ShowParameter(idx);
} }
} }

View File

@@ -1,36 +1,36 @@
namespace UIControl //namespace UIControl
{ //{
partial class CtlContainer // partial class CtlContainer
{ // {
/// <summary> // /// <summary>
/// 필수 디자이너 변수입니다. // /// 필수 디자이너 변수입니다.
/// </summary> // /// </summary>
private System.ComponentModel.IContainer components = null; // private System.ComponentModel.IContainer components = null;
/// <summary> // /// <summary>
/// 사용 중인 모든 리소스를 정리합니다. // /// 사용 중인 모든 리소스를 정리합니다.
/// </summary> // /// </summary>
/// <param name="disposing">관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다.</param> // /// <param name="disposing">관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다.</param>
protected override void Dispose(bool disposing) // protected override void Dispose(bool disposing)
{ // {
if (disposing && (components != null)) // if (disposing && (components != null))
{ // {
components.Dispose(); // components.Dispose();
} // }
base.Dispose(disposing); // base.Dispose(disposing);
} // }
#region // #region 구성 요소 디자이너에서 생성한 코
/// <summary> // /// <summary>
/// 디자이너 지원에 필요한 메서드입니다. // /// 디자이너 지원에 필요한 메서드입니다.
/// 이 메서드의 내용을 코드 편집기로 수정하지 마세요. // /// 이 메서드의 내용을 코드 편집기로 수정하지 마세요.
/// </summary> // /// </summary>
private void InitializeComponent() // private void InitializeComponent()
{ // {
components = new System.ComponentModel.Container(); // components = new System.ComponentModel.Container();
} // }
#endregion // #endregion
} // }
} //}

View File

@@ -1,86 +1,86 @@
using System; //using System;
using System.Collections.Generic; //using System.Collections.Generic;
using System.ComponentModel; //using System.ComponentModel;
using System.Drawing; //using System.Drawing;
using System.Data; //using System.Data;
using System.Linq; //using System.Linq;
using System.Text; //using System.Text;
using System.Threading.Tasks; //using System.Threading.Tasks;
using System.Windows.Forms; //using System.Windows.Forms;
namespace UIControl //namespace UIControl
{ //{
public partial class CtlContainer : GroupBox // public partial class CtlContainer : GroupBox
{ // {
arDev.AjinEXTEK.Emulator.CEmuleDIO devIO; // arDev.AjinEXTEK.emu.Emulator.CEmuleDIO devIO;
arDev.AjinEXTEK.Emulator.CEmulMOT devMOT; // arDev.AjinEXTEK.Emulator.CEmulMOT devMOT;
public CtlContainer() // public CtlContainer()
{ // {
InitializeComponent(); // InitializeComponent();
} // }
public void updateControl() // public void updateControl()
{ // {
updateControl(this.Controls); // updateControl(this.Controls);
} // }
public void setDevice(arDev.AjinEXTEK.Emulator.CEmuleDIO dio, arDev.AjinEXTEK.Emulator.CEmulMOT mot) // public void setDevice(arDev.AjinEXTEK.Emulator.CEmuleDIO dio, arDev.AjinEXTEK.Emulator.CEmulMOT mot)
{ // {
this.devIO = dio; // this.devIO = dio;
this.devMOT = mot; // this.devMOT = mot;
} // }
public void updateControl(System.Windows.Forms.Control.ControlCollection ctl) // public void updateControl(System.Windows.Forms.Control.ControlCollection ctl)
{ // {
if (devIO == null && devMOT == null) throw new Exception("디바이스(IO/MOT)가 설정되지 않았습니다"); // if (devIO == null && devMOT == null) throw new Exception("디바이스(IO/MOT)가 설정되지 않았습니다");
foreach (Control c in ctl) // foreach (Control c in ctl)
{ // {
if (c.HasChildren) // if (c.HasChildren)
{ // {
updateControl(c.Controls); // updateControl(c.Controls);
} // }
else if (c is UIControl.CtlBase) // else if (c is UIControl.CtlBase)
{ // {
var cc = c as UIControl.CtlBase; // var cc = c as UIControl.CtlBase;
foreach (var pin in cc.PinList) // foreach (var pin in cc.PinList)
{ // {
if (pin.PinIndex != -1) // if (pin.PinIndex != -1)
{ // {
if (pin.ValueDirection == UIControl.eValueDirection.input) // if (pin.ValueDirection == UIControl.eValueDirection.input)
{ // {
//io의 값을 컨트롤에 적용해줘야한다 // //io의 값을 컨트롤에 적용해줘야한다
if (pin.Output) // if (pin.Output)
{ // {
pin.Raw = devIO.Output[pin.PinIndex]; // pin.Raw = devIO.Output[pin.PinIndex];
} // }
else // else
{ // {
pin.Raw = devIO.Input[pin.PinIndex]; // pin.Raw = devIO.Input[pin.PinIndex];
} // }
} // }
else // else
{ // {
//컨트롤의 값을 io에 적용해줘야 한다 // //컨트롤의 값을 io에 적용해줘야 한다
if (pin.Output) // if (pin.Output)
{ // {
//devIO.Output[pin.PinIndex] = pin.Value; // //devIO.Output[pin.PinIndex] = pin.Value;
devIO.SetOutput(pin.PinIndex, pin.Value); // devIO.SetOutput(pin.PinIndex, pin.Value);
} // }
else // else
{ // {
// devIO.Input[pin.PinIndex] = pin.Value; // // devIO.Input[pin.PinIndex] = pin.Value;
devIO.SetInput(pin.PinIndex, pin.Value); // devIO.SetInput(pin.PinIndex, pin.Value);
} // }
} // }
} // }
} // }
cc.UpdateValue(); // cc.UpdateValue();
cc.Invalidate(); // cc.Invalidate();
} // }
} // }
} // }
} // }
} //}

View File

@@ -28,7 +28,7 @@ namespace Project
public static Boolean CheckMotionLimitError() public static Boolean CheckMotionLimitError()
{ {
for (int i = 0; i < PUB.mot.DeviceCount; i++) for (short i = 0; i < PUB.mot.DeviceCount; i++)
{ {
if (PUB.mot.IsUse(i) == false) continue; //미사용축은 제외한다. if (PUB.mot.IsUse(i) == false) continue; //미사용축은 제외한다.
//if (PUB.system.UseAxis(i) == false) continue; //if (PUB.system.UseAxis(i) == false) continue;
@@ -51,7 +51,7 @@ namespace Project
public static Boolean CheckMotionPos(eAxis Motaxis, TimeSpan stepTime, double pos, double speed, double acc, double dcc, string source, Boolean useInterLocak = true, int timeoutSec = 0, float inpaccr = 0f) public static Boolean CheckMotionPos(eAxis Motaxis, TimeSpan stepTime, double pos, double speed, double acc, double dcc, string source, Boolean useInterLocak = true, int timeoutSec = 0, float inpaccr = 0f)
{ {
var axis = (int)Motaxis; var axis = (short)Motaxis;
//타임아웃 적용 191213 //타임아웃 적용 191213
if (timeoutSec == 0) timeoutSec = AR.SETTING.Data.Timeout_MotionCommand; if (timeoutSec == 0) timeoutSec = AR.SETTING.Data.Timeout_MotionCommand;
@@ -135,7 +135,7 @@ namespace Project
//홈을 잡지 않았다면 오류로 처리함\ //홈을 잡지 않았다면 오류로 처리함\
//eYPPosition retval = eYPPosition.Unknown; //eYPPosition retval = eYPPosition.Unknown;
var motIndex = (int)axis; var motIndex = (short)axis;
if (PUB.mot.IsInit == false) return "ERROR";// (T)ePickYPosition.ERROR; //200213 if (PUB.mot.IsInit == false) return "ERROR";// (T)ePickYPosition.ERROR; //200213
if (PUB.mot.IsHomeSet(motIndex) == false) return "ERROR";//ePickYPosition.ERROR; if (PUB.mot.IsHomeSet(motIndex) == false) return "ERROR";//ePickYPosition.ERROR;
@@ -193,7 +193,7 @@ namespace Project
public static Boolean isAxisSaftyZone(eAxis axis, int allowoffset = 2) public static Boolean isAxisSaftyZone(eAxis axis, int allowoffset = 2)
{ {
//홈을 잡지 않았다면 오류로 처리함 //홈을 잡지 않았다면 오류로 처리함
var motIndex = (int)axis; var motIndex = (short)axis;
if (PUB.mot.IsInit == false) return false; if (PUB.mot.IsInit == false) return false;
if (PUB.mot.IsHomeSet(motIndex) == false) return false; if (PUB.mot.IsHomeSet(motIndex) == false) return false;
if (PUB.Result == null || PUB.Result.isSetmModel == false) return false; if (PUB.Result == null || PUB.Result.isSetmModel == false) return false;
@@ -282,7 +282,7 @@ namespace Project
} }
//홈이 잡힌상태일때 //홈이 잡힌상태일때
if (PUB.mot.IsHomeSet((int)axis)) if (PUB.mot.IsHomeSet((short)axis))
{ {
if (axis == eAxis.PX_PICK) if (axis == eAxis.PX_PICK)
{ {
@@ -336,9 +336,9 @@ namespace Project
/// <returns></returns> /// <returns></returns>
private static sPositionData GetAxPos(eAxis axis, int pos) private static sPositionData GetAxPos(eAxis axis, int pos)
{ {
return GetAxpos((int)axis, pos); return GetAxpos((short)axis, pos);
} }
private static sPositionData GetAxpos(int axis, int pos) private static sPositionData GetAxpos(short axis, int pos)
{ {
var retval = new sPositionData(); var retval = new sPositionData();
retval.Clear(); retval.Clear();
@@ -408,8 +408,8 @@ namespace Project
public static void Stop(eAxis axis, string reason, Boolean estop = false) public static void Stop(eAxis axis, string reason, Boolean estop = false)
{ {
if (PUB.mot.IsInit == false) return; if (PUB.mot.IsInit == false) return;
if (PUB.mot.IsServAlarm((int)axis)) return; if (PUB.mot.IsServAlarm((short)axis)) return;
PUB.mot.MoveStop(reason, (int)axis, estop); PUB.mot.MoveStop(reason, (short)axis, estop);
} }
@@ -421,7 +421,7 @@ namespace Project
} }
public static double getPositionOffset(eAxis axis, double cmdPos) public static double getPositionOffset(eAxis axis, double cmdPos)
{ {
return getPositionOffset((int)axis, cmdPos); return getPositionOffset((short)axis, cmdPos);
} }
/// <summary> /// <summary>
@@ -439,15 +439,15 @@ namespace Project
/// <param name="axis"></param> /// <param name="axis"></param>
/// <param name="cmdPos"></param> /// <param name="cmdPos"></param>
/// <returns></returns> /// <returns></returns>
public static double getPositionOffset(int axis, double cmdPos) public static double getPositionOffset(short axis, double cmdPos)
{ {
var coffset = (PUB.mot.GetActPos((int)axis) - cmdPos); var coffset = (PUB.mot.GetActPos(axis) - cmdPos);
return coffset;// return coffset < offset; return coffset;// return coffset < offset;
} }
public static bool getPositionMatch(eAxis axis, double cmdPos, double offset = 0.1) public static bool getPositionMatch(eAxis axis, double cmdPos, double offset = 0.1)
{ {
return getPositionMatch((int)axis, cmdPos, offset); return getPositionMatch((short)axis, cmdPos, offset);
} }
public static bool getPositionMatch(sPositionData pos, double offset = 0.1) public static bool getPositionMatch(sPositionData pos, double offset = 0.1)
@@ -456,7 +456,7 @@ namespace Project
} }
public static bool getPositionMatch(int axis, double cmdPos, double offset = 0.1) public static bool getPositionMatch(short axis, double cmdPos, double offset = 0.1)
{ {
var actpos = PUB.mot.GetActPos(axis); var actpos = PUB.mot.GetActPos(axis);
var coffset = Math.Abs(actpos - cmdPos); var coffset = Math.Abs(actpos - cmdPos);
@@ -552,7 +552,7 @@ namespace Project
if (validchk == true) if (validchk == true)
{ {
//현재위치보다 작으면 ccw //현재위치보다 작으면 ccw
var isCW = pos_mm >= PUB.mot.GetActPos((int)axis); var isCW = pos_mm >= PUB.mot.GetActPos((short)axis);
if (!Move_Validation(axis, isCW, out Message)) if (!Move_Validation(axis, isCW, out Message))
{ {
PUB.log.AddE(string.Format("[{0}-Axis] Move Error : {1}", axis, Message)); PUB.log.AddE(string.Format("[{0}-Axis] Move Error : {1}", axis, Message));
@@ -582,7 +582,7 @@ namespace Project
} }
public static Boolean JOG(int _Axis, MOTION_DIRECTION Dir, double _Vel, double _Acc, double _Dec, Boolean sCurve = false, Boolean EnableValidCheck = true, Boolean UserInterLock = true) public static Boolean JOG(short _Axis, MOTION_DIRECTION Dir, double _Vel, double _Acc, double _Dec, Boolean sCurve = false, Boolean EnableValidCheck = true, Boolean UserInterLock = true)
{ {
eAxis axis = (eAxis)_Axis; eAxis axis = (eAxis)_Axis;

View File

@@ -74,51 +74,6 @@
<setting name="libxl" serializeAs="String"> <setting name="libxl" serializeAs="String">
<value>Amkor Technology/windows-242f240302c3e50d6cb1686ba2q4k0o9</value> <value>Amkor Technology/windows-242f240302c3e50d6cb1686ba2q4k0o9</value>
</setting> </setting>
<setting name="ZPL" serializeAs="String">
<value>^XA~TA000~JSN^LT0^MNW^MTT^PON^PMN^LH0,0^JMA^PR6,6~SD15^JUS^LRN^CI0^XZ
^XA
^MMT
^PW519
^LL0200
^LS25
^FO205,5^GB305,186,4^FS
^FT25,170^BQN,2,4
^FDLA,
{qrData}
^FS
^FO205,9^GB0,183,4^FS
^FO250,9^GB0,183,4^FS
^FO209,34^GB299,0,4^FS
^FO209,65^GB299,0,4^FS
^FO207,95^GB300,0,4^FS
^FO207,126^GB303,0,4^FS
^FT211,30^A0N,23,24^FDSID^FS
^FT210,59^A0N,23,24^FDLOT^FS
^FT215,91^A0N,23,24^FDPN^FS
^FT212,153^A0N,23,24^FDRID^FS
^FT210,120^A0N,23,24^FDQ'ty^FS
^FT260,31^A0N,23,24^FD
{sid}
^FS
^FT260,60^A0N,23,24^FD
{lot}
^FS
^FT258,93^A0N,27,16^FD
{partnum}
^FS
^FT256,150^A0N,21,19^FD
{rid}
^FS
^FT259,121^A0N,23,24^FD
{qty}
^FS
^FO207,157^GB303,0,4^FS
^FT212,182^A0N,20,19^FDDate^FS
^FT260,183^A0N,23,24^FD
{mfg}
^FS
^PQ1,0,1,Y^XZ</value>
</setting>
<setting name="ZPL7" serializeAs="String"> <setting name="ZPL7" serializeAs="String">
<value>^XA <value>^XA
^MMT ^MMT

View File

@@ -30,10 +30,7 @@
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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 dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -191,6 +188,9 @@
arCtl.ListView2.Cell cell95 = new arCtl.ListView2.Cell(); arCtl.ListView2.Cell cell95 = new arCtl.ListView2.Cell();
arCtl.ListView2.Cell cell96 = new arCtl.ListView2.Cell(); arCtl.ListView2.Cell cell96 = new arCtl.ListView2.Cell();
arCtl.ListView2.ItemStyle itemStyle2 = new arCtl.ListView2.ItemStyle(); arCtl.ListView2.ItemStyle itemStyle2 = new arCtl.ListView2.ItemStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.tmDisplay = new System.Windows.Forms.Timer(this.components); this.tmDisplay = new System.Windows.Forms.Timer(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.arLabel76 = new arCtl.arLabel(); this.arLabel76 = new arCtl.arLabel();
@@ -213,13 +213,8 @@
this.arDatagridView1 = new arCtl.arDatagridView(); this.arDatagridView1 = new arCtl.arDatagridView();
this.target = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.target = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.JTYPE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.JTYPE = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.sTIMEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PTIME = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.PTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.sIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.rIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VNAME = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.VNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_loc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.qTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.qtymax = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.qtymax = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.MFGDATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.MFGDATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.VLOT = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.VLOT = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -237,8 +232,6 @@
this.GUID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.GUID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dataSet1 = new Project.DataSet1();
this.cmCam = new System.Windows.Forms.ContextMenuStrip(this.components); this.cmCam = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.liveViewProcessOnOffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.liveViewProcessOnOffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -413,12 +406,16 @@
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.hmi1 = new UIControl.HMI(); this.hmi1 = new UIControl.HMI();
this.listView21 = new arCtl.ListView2(); this.listView21 = new arCtl.ListView2();
this.ta = new Project.DataSet1TableAdapters.Component_Reel_ResultTableAdapter(); this.sTIMEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.sIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.rIDDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_loc = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.qTYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dataSet1 = new Project.DataSet1();
this.panBottom.SuspendLayout(); this.panBottom.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).BeginInit();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit();
this.cmCam.SuspendLayout(); this.cmCam.SuspendLayout();
this.panel37.SuspendLayout(); this.panel37.SuspendLayout();
this.panel10.SuspendLayout(); this.panel10.SuspendLayout();
@@ -445,6 +442,8 @@
this.panel9.SuspendLayout(); this.panel9.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// tmDisplay // tmDisplay
@@ -1098,16 +1097,6 @@
this.JTYPE.ReadOnly = true; this.JTYPE.ReadOnly = true;
this.JTYPE.Width = 81; this.JTYPE.Width = 81;
// //
// sTIMEDataGridViewTextBoxColumn
//
this.sTIMEDataGridViewTextBoxColumn.DataPropertyName = "STIME";
dataGridViewCellStyle1.Format = "HH:mm:ss";
this.sTIMEDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
this.sTIMEDataGridViewTextBoxColumn.HeaderText = "START";
this.sTIMEDataGridViewTextBoxColumn.Name = "sTIMEDataGridViewTextBoxColumn";
this.sTIMEDataGridViewTextBoxColumn.ReadOnly = true;
this.sTIMEDataGridViewTextBoxColumn.Width = 74;
//
// PTIME // PTIME
// //
this.PTIME.DataPropertyName = "BATCH"; this.PTIME.DataPropertyName = "BATCH";
@@ -1118,27 +1107,6 @@
this.PTIME.ReadOnly = true; this.PTIME.ReadOnly = true;
this.PTIME.Width = 77; this.PTIME.Width = 77;
// //
// sIDDataGridViewTextBoxColumn
//
this.sIDDataGridViewTextBoxColumn.DataPropertyName = "SID";
dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.sIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
this.sIDDataGridViewTextBoxColumn.HeaderText = "SID";
this.sIDDataGridViewTextBoxColumn.Name = "sIDDataGridViewTextBoxColumn";
this.sIDDataGridViewTextBoxColumn.ReadOnly = true;
this.sIDDataGridViewTextBoxColumn.Width = 57;
//
// rIDDataGridViewTextBoxColumn
//
this.rIDDataGridViewTextBoxColumn.DataPropertyName = "RID";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.rIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
this.rIDDataGridViewTextBoxColumn.HeaderText = "RID";
this.rIDDataGridViewTextBoxColumn.Name = "rIDDataGridViewTextBoxColumn";
this.rIDDataGridViewTextBoxColumn.ReadOnly = true;
this.rIDDataGridViewTextBoxColumn.Width = 58;
//
// VNAME // VNAME
// //
this.VNAME.DataPropertyName = "VNAME"; this.VNAME.DataPropertyName = "VNAME";
@@ -1149,23 +1117,6 @@
this.VNAME.ReadOnly = true; this.VNAME.ReadOnly = true;
this.VNAME.Width = 87; this.VNAME.Width = 87;
// //
// dvc_loc
//
this.dvc_loc.DataPropertyName = "LOC";
this.dvc_loc.HeaderText = "LOC";
this.dvc_loc.Name = "dvc_loc";
this.dvc_loc.ReadOnly = true;
this.dvc_loc.Visible = false;
this.dvc_loc.Width = 55;
//
// qTYDataGridViewTextBoxColumn
//
this.qTYDataGridViewTextBoxColumn.DataPropertyName = "QTY";
this.qTYDataGridViewTextBoxColumn.HeaderText = "QTY";
this.qTYDataGridViewTextBoxColumn.Name = "qTYDataGridViewTextBoxColumn";
this.qTYDataGridViewTextBoxColumn.ReadOnly = true;
this.qTYDataGridViewTextBoxColumn.Width = 61;
//
// qtymax // qtymax
// //
this.qtymax.DataPropertyName = "qtymax"; this.qtymax.DataPropertyName = "qtymax";
@@ -1315,17 +1266,6 @@
this.ToolStripMenuItem.Text = "새로고침"; this.ToolStripMenuItem.Text = "새로고침";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click_1); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click_1);
// //
// bs
//
this.bs.DataMember = "Component_Reel_Result";
this.bs.DataSource = this.dataSet1;
this.bs.Sort = "STIME desc";
//
// dataSet1
//
this.dataSet1.DataSetName = "DataSet1";
this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// cmCam // cmCam
// //
this.cmCam.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmCam.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1639,7 +1579,7 @@
this.toolStripMenuItem16, this.toolStripMenuItem16,
this.getImageToolStripMenuItem}); this.getImageToolStripMenuItem});
this.cmDebug.Name = "cmVision"; this.cmDebug.Name = "cmVision";
this.cmDebug.Size = new System.Drawing.Size(254, 612); this.cmDebug.Size = new System.Drawing.Size(254, 590);
// //
// inboundToolStripMenuItem // inboundToolStripMenuItem
// //
@@ -1655,28 +1595,28 @@
// postDataToolStripMenuItem // postDataToolStripMenuItem
// //
this.postDataToolStripMenuItem.Name = "postDataToolStripMenuItem"; this.postDataToolStripMenuItem.Name = "postDataToolStripMenuItem";
this.postDataToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.postDataToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.postDataToolStripMenuItem.Text = "Post Data"; this.postDataToolStripMenuItem.Text = "Post Data";
this.postDataToolStripMenuItem.Click += new System.EventHandler(this.postDataToolStripMenuItem_Click); this.postDataToolStripMenuItem.Click += new System.EventHandler(this.postDataToolStripMenuItem_Click);
// //
// manualPrintToolStripMenuItem // manualPrintToolStripMenuItem
// //
this.manualPrintToolStripMenuItem.Name = "manualPrintToolStripMenuItem"; this.manualPrintToolStripMenuItem.Name = "manualPrintToolStripMenuItem";
this.manualPrintToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.manualPrintToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.manualPrintToolStripMenuItem.Text = "Manual Print"; this.manualPrintToolStripMenuItem.Text = "Manual Print";
this.manualPrintToolStripMenuItem.Click += new System.EventHandler(this.manualPrintToolStripMenuItem_Click); this.manualPrintToolStripMenuItem.Click += new System.EventHandler(this.manualPrintToolStripMenuItem_Click);
// //
// apiCheckToolStripMenuItem // apiCheckToolStripMenuItem
// //
this.apiCheckToolStripMenuItem.Name = "apiCheckToolStripMenuItem"; this.apiCheckToolStripMenuItem.Name = "apiCheckToolStripMenuItem";
this.apiCheckToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.apiCheckToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.apiCheckToolStripMenuItem.Text = "api check"; this.apiCheckToolStripMenuItem.Text = "api check";
this.apiCheckToolStripMenuItem.Click += new System.EventHandler(this.apiCheckToolStripMenuItem_Click); this.apiCheckToolStripMenuItem.Click += new System.EventHandler(this.apiCheckToolStripMenuItem_Click);
// //
// barcodeTestToolStripMenuItem // barcodeTestToolStripMenuItem
// //
this.barcodeTestToolStripMenuItem.Name = "barcodeTestToolStripMenuItem"; this.barcodeTestToolStripMenuItem.Name = "barcodeTestToolStripMenuItem";
this.barcodeTestToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.barcodeTestToolStripMenuItem.Size = new System.Drawing.Size(158, 22);
this.barcodeTestToolStripMenuItem.Text = "Barcode Test"; this.barcodeTestToolStripMenuItem.Text = "Barcode Test";
this.barcodeTestToolStripMenuItem.Click += new System.EventHandler(this.barcodeTestToolStripMenuItem_Click); this.barcodeTestToolStripMenuItem.Click += new System.EventHandler(this.barcodeTestToolStripMenuItem_Click);
// //
@@ -2267,7 +2207,7 @@
// //
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40;
this.ToolStripMenuItem.Name = "모델선택ToolStripMenuItem"; this.ToolStripMenuItem.Name = "모델선택ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.ToolStripMenuItem.Text = "작업 모델"; this.ToolStripMenuItem.Text = "작업 모델";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
@@ -2275,20 +2215,20 @@
// //
this.btModelMot.Image = global::Project.Properties.Resources.Motor; this.btModelMot.Image = global::Project.Properties.Resources.Motor;
this.btModelMot.Name = "btModelMot"; this.btModelMot.Name = "btModelMot";
this.btModelMot.Size = new System.Drawing.Size(204, 46); this.btModelMot.Size = new System.Drawing.Size(126, 22);
this.btModelMot.Text = "모션 모델"; this.btModelMot.Text = "모션 모델";
this.btModelMot.Click += new System.EventHandler(this.toolStripMenuItem23_Click); this.btModelMot.Click += new System.EventHandler(this.toolStripMenuItem23_Click);
// //
// toolStripMenuItem12 // toolStripMenuItem12
// //
this.toolStripMenuItem12.Name = "toolStripMenuItem12"; this.toolStripMenuItem12.Name = "toolStripMenuItem12";
this.toolStripMenuItem12.Size = new System.Drawing.Size(201, 6); this.toolStripMenuItem12.Size = new System.Drawing.Size(123, 6);
// //
// 바코드룰ToolStripMenuItem // 바코드룰ToolStripMenuItem
// //
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_add_40; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_add_40;
this.ToolStripMenuItem.Name = "바코드룰ToolStripMenuItem"; this.ToolStripMenuItem.Name = "바코드룰ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.ToolStripMenuItem.Text = "바코드 룰"; this.ToolStripMenuItem.Text = "바코드 룰";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
@@ -2296,7 +2236,7 @@
// //
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_printer_48; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_printer_48;
this.ToolStripMenuItem.Name = "프린트룰ToolStripMenuItem"; this.ToolStripMenuItem.Name = "프린트룰ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.ToolStripMenuItem.Text = "프린트 룰"; this.ToolStripMenuItem.Text = "프린트 룰";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
@@ -2307,7 +2247,7 @@
this.ToolStripMenuItem}); this.ToolStripMenuItem});
this.sID정보ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_save_to_grid_40; this.sID정보ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_save_to_grid_40;
this.sID정보ToolStripMenuItem.Name = "sID정보ToolStripMenuItem"; this.sID정보ToolStripMenuItem.Name = "sID정보ToolStripMenuItem";
this.sID정보ToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.sID정보ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.sID정보ToolStripMenuItem.Text = "SID 정보"; this.sID정보ToolStripMenuItem.Text = "SID 정보";
this.sID정보ToolStripMenuItem.Click += new System.EventHandler(this.sID정보ToolStripMenuItem_Click); this.sID정보ToolStripMenuItem.Click += new System.EventHandler(this.sID정보ToolStripMenuItem_Click);
// //
@@ -2315,7 +2255,7 @@
// //
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Right; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Right;
this.ToolStripMenuItem.Name = "프로그램열기ToolStripMenuItem"; this.ToolStripMenuItem.Name = "프로그램열기ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(246, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
this.ToolStripMenuItem.Text = "프로그램 열기"; this.ToolStripMenuItem.Text = "프로그램 열기";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
@@ -2323,7 +2263,7 @@
// //
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Right; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Right;
this.ToolStripMenuItem.Name = "인바운드데이터업데이트ToolStripMenuItem"; this.ToolStripMenuItem.Name = "인바운드데이터업데이트ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(246, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
this.ToolStripMenuItem.Text = "인바운드 데이터 업데이트"; this.ToolStripMenuItem.Text = "인바운드 데이터 업데이트";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
@@ -2431,7 +2371,7 @@
// //
this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image"))); this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image")));
this.toolStripMenuItem11.Name = "toolStripMenuItem11"; this.toolStripMenuItem11.Name = "toolStripMenuItem11";
this.toolStripMenuItem11.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem11.Size = new System.Drawing.Size(134, 22);
this.toolStripMenuItem11.Text = "프로그램"; this.toolStripMenuItem11.Text = "프로그램";
this.toolStripMenuItem11.Click += new System.EventHandler(this.toolStripMenuItem11_Click); this.toolStripMenuItem11.Click += new System.EventHandler(this.toolStripMenuItem11_Click);
// //
@@ -2439,7 +2379,7 @@
// //
this.toolStripMenuItem13.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem13.Image"))); this.toolStripMenuItem13.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem13.Image")));
this.toolStripMenuItem13.Name = "toolStripMenuItem13"; this.toolStripMenuItem13.Name = "toolStripMenuItem13";
this.toolStripMenuItem13.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem13.Size = new System.Drawing.Size(134, 22);
this.toolStripMenuItem13.Text = "로그"; this.toolStripMenuItem13.Text = "로그";
this.toolStripMenuItem13.Click += new System.EventHandler(this.toolStripMenuItem13_Click); this.toolStripMenuItem13.Click += new System.EventHandler(this.toolStripMenuItem13_Click);
// //
@@ -2447,7 +2387,7 @@
// //
this.toolStripMenuItem14.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem14.Image"))); this.toolStripMenuItem14.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem14.Image")));
this.toolStripMenuItem14.Name = "toolStripMenuItem14"; this.toolStripMenuItem14.Name = "toolStripMenuItem14";
this.toolStripMenuItem14.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem14.Size = new System.Drawing.Size(134, 22);
this.toolStripMenuItem14.Text = "캡처"; this.toolStripMenuItem14.Text = "캡처";
this.toolStripMenuItem14.Click += new System.EventHandler(this.toolStripMenuItem14_Click); this.toolStripMenuItem14.Click += new System.EventHandler(this.toolStripMenuItem14_Click);
// //
@@ -2455,7 +2395,7 @@
// //
this.toolStripMenuItem15.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem15.Image"))); this.toolStripMenuItem15.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem15.Image")));
this.toolStripMenuItem15.Name = "toolStripMenuItem15"; this.toolStripMenuItem15.Name = "toolStripMenuItem15";
this.toolStripMenuItem15.Size = new System.Drawing.Size(158, 46); this.toolStripMenuItem15.Size = new System.Drawing.Size(134, 22);
this.toolStripMenuItem15.Text = "저장데이터"; this.toolStripMenuItem15.Text = "저장데이터";
this.toolStripMenuItem15.Click += new System.EventHandler(this.toolStripMenuItem15_Click); this.toolStripMenuItem15.Click += new System.EventHandler(this.toolStripMenuItem15_Click);
// //
@@ -2492,7 +2432,7 @@
// sWPLCToolStripMenuItem // sWPLCToolStripMenuItem
// //
this.sWPLCToolStripMenuItem.Name = "sWPLCToolStripMenuItem"; this.sWPLCToolStripMenuItem.Name = "sWPLCToolStripMenuItem";
this.sWPLCToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.sWPLCToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.sWPLCToolStripMenuItem.Text = "S/W PLC"; this.sWPLCToolStripMenuItem.Text = "S/W PLC";
this.sWPLCToolStripMenuItem.Click += new System.EventHandler(this.sWPLCToolStripMenuItem_Click); this.sWPLCToolStripMenuItem.Click += new System.EventHandler(this.sWPLCToolStripMenuItem_Click);
// //
@@ -2512,7 +2452,7 @@
// //
this.btManage.Image = global::Project.Properties.Resources.icons8_control_panel_40; this.btManage.Image = global::Project.Properties.Resources.icons8_control_panel_40;
this.btManage.Name = "btManage"; this.btManage.Name = "btManage";
this.btManage.Size = new System.Drawing.Size(204, 46); this.btManage.Size = new System.Drawing.Size(122, 22);
this.btManage.Text = "관리"; this.btManage.Text = "관리";
this.btManage.Click += new System.EventHandler(this.ToolStripMenuItem_Click_1); this.btManage.Click += new System.EventHandler(this.ToolStripMenuItem_Click_1);
// //
@@ -2520,7 +2460,7 @@
// //
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_object_40;
this.ToolStripMenuItem.Name = "빠른실행ToolStripMenuItem"; this.ToolStripMenuItem.Name = "빠른실행ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
this.ToolStripMenuItem.Text = "빠른실행"; this.ToolStripMenuItem.Text = "빠른실행";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
@@ -2604,27 +2544,27 @@
this.toolStripMenuItem30}); this.toolStripMenuItem30});
this.LToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Left; this.LToolStripMenuItem.Image = global::Project.Properties.Resources.Arrow_Left;
this.LToolStripMenuItem.Name = "바코드LToolStripMenuItem"; this.LToolStripMenuItem.Name = "바코드LToolStripMenuItem";
this.LToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.LToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.LToolStripMenuItem.Text = "바코드"; this.LToolStripMenuItem.Text = "바코드";
this.LToolStripMenuItem.Click += new System.EventHandler(this.button1_Click_1); this.LToolStripMenuItem.Click += new System.EventHandler(this.button1_Click_1);
// //
// 연결ToolStripMenuItem // 연결ToolStripMenuItem
// //
this.ToolStripMenuItem.Name = "연결ToolStripMenuItem"; this.ToolStripMenuItem.Name = "연결ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(156, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.ToolStripMenuItem.Text = "연결"; this.ToolStripMenuItem.Text = "연결";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click); this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
// //
// toolStripMenuItem26 // toolStripMenuItem26
// //
this.toolStripMenuItem26.Name = "toolStripMenuItem26"; this.toolStripMenuItem26.Name = "toolStripMenuItem26";
this.toolStripMenuItem26.Size = new System.Drawing.Size(153, 6); this.toolStripMenuItem26.Size = new System.Drawing.Size(129, 6);
// //
// toolStripMenuItem21 // toolStripMenuItem21
// //
this.toolStripMenuItem21.Image = global::Project.Properties.Resources.icons8_green_circle_40; this.toolStripMenuItem21.Image = global::Project.Properties.Resources.icons8_green_circle_40;
this.toolStripMenuItem21.Name = "toolStripMenuItem21"; this.toolStripMenuItem21.Name = "toolStripMenuItem21";
this.toolStripMenuItem21.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem21.Size = new System.Drawing.Size(132, 22);
this.toolStripMenuItem21.Text = "Trigger On"; this.toolStripMenuItem21.Text = "Trigger On";
this.toolStripMenuItem21.Click += new System.EventHandler(this.toolStripMenuItem21_Click); this.toolStripMenuItem21.Click += new System.EventHandler(this.toolStripMenuItem21_Click);
// //
@@ -2632,20 +2572,20 @@
// //
this.toolStripMenuItem24.Image = global::Project.Properties.Resources.icons8_black_circle_40; this.toolStripMenuItem24.Image = global::Project.Properties.Resources.icons8_black_circle_40;
this.toolStripMenuItem24.Name = "toolStripMenuItem24"; this.toolStripMenuItem24.Name = "toolStripMenuItem24";
this.toolStripMenuItem24.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem24.Size = new System.Drawing.Size(132, 22);
this.toolStripMenuItem24.Text = "Trigger Off"; this.toolStripMenuItem24.Text = "Trigger Off";
this.toolStripMenuItem24.Click += new System.EventHandler(this.toolStripMenuItem24_Click); this.toolStripMenuItem24.Click += new System.EventHandler(this.toolStripMenuItem24_Click);
// //
// toolStripMenuItem6 // toolStripMenuItem6
// //
this.toolStripMenuItem6.Name = "toolStripMenuItem6"; this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(153, 6); this.toolStripMenuItem6.Size = new System.Drawing.Size(129, 6);
// //
// toolStripMenuItem28 // toolStripMenuItem28
// //
this.toolStripMenuItem28.Image = global::Project.Properties.Resources.icons8_green_circle_40; this.toolStripMenuItem28.Image = global::Project.Properties.Resources.icons8_green_circle_40;
this.toolStripMenuItem28.Name = "toolStripMenuItem28"; this.toolStripMenuItem28.Name = "toolStripMenuItem28";
this.toolStripMenuItem28.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem28.Size = new System.Drawing.Size(132, 22);
this.toolStripMenuItem28.Text = "Trigger On"; this.toolStripMenuItem28.Text = "Trigger On";
this.toolStripMenuItem28.Click += new System.EventHandler(this.toolStripMenuItem28_Click); this.toolStripMenuItem28.Click += new System.EventHandler(this.toolStripMenuItem28_Click);
// //
@@ -2653,7 +2593,7 @@
// //
this.toolStripMenuItem30.Image = global::Project.Properties.Resources.icons8_black_circle_40; this.toolStripMenuItem30.Image = global::Project.Properties.Resources.icons8_black_circle_40;
this.toolStripMenuItem30.Name = "toolStripMenuItem30"; this.toolStripMenuItem30.Name = "toolStripMenuItem30";
this.toolStripMenuItem30.Size = new System.Drawing.Size(156, 46); this.toolStripMenuItem30.Size = new System.Drawing.Size(132, 22);
this.toolStripMenuItem30.Text = "Trigger Off"; this.toolStripMenuItem30.Text = "Trigger Off";
this.toolStripMenuItem30.Click += new System.EventHandler(this.toolStripMenuItem30_Click); this.toolStripMenuItem30.Click += new System.EventHandler(this.toolStripMenuItem30_Click);
// //
@@ -2672,27 +2612,27 @@
this.webManagerToolStripMenuItem}); this.webManagerToolStripMenuItem});
this.ToolStripMenuItem.Image = global::Project.Properties.Resources.Barcode; this.ToolStripMenuItem.Image = global::Project.Properties.Resources.Barcode;
this.ToolStripMenuItem.Name = "바코드키엔스ToolStripMenuItem"; this.ToolStripMenuItem.Name = "바코드키엔스ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(204, 46); this.ToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.ToolStripMenuItem.Text = "바코드(키엔스)"; this.ToolStripMenuItem.Text = "바코드(키엔스)";
// //
// toolStripMenuItem17 // toolStripMenuItem17
// //
this.toolStripMenuItem17.Image = global::Project.Properties.Resources.icons8_camera_40; this.toolStripMenuItem17.Image = global::Project.Properties.Resources.icons8_camera_40;
this.toolStripMenuItem17.Name = "toolStripMenuItem17"; this.toolStripMenuItem17.Name = "toolStripMenuItem17";
this.toolStripMenuItem17.Size = new System.Drawing.Size(173, 46); this.toolStripMenuItem17.Size = new System.Drawing.Size(149, 22);
this.toolStripMenuItem17.Text = "Get Image"; this.toolStripMenuItem17.Text = "Get Image";
this.toolStripMenuItem17.Click += new System.EventHandler(this.toolStripMenuItem17_Click); this.toolStripMenuItem17.Click += new System.EventHandler(this.toolStripMenuItem17_Click);
// //
// toolStripMenuItem18 // toolStripMenuItem18
// //
this.toolStripMenuItem18.Name = "toolStripMenuItem18"; this.toolStripMenuItem18.Name = "toolStripMenuItem18";
this.toolStripMenuItem18.Size = new System.Drawing.Size(170, 6); this.toolStripMenuItem18.Size = new System.Drawing.Size(146, 6);
// //
// triggerOnToolStripMenuItem1 // triggerOnToolStripMenuItem1
// //
this.triggerOnToolStripMenuItem1.Image = global::Project.Properties.Resources.icons8_green_circle_40; this.triggerOnToolStripMenuItem1.Image = global::Project.Properties.Resources.icons8_green_circle_40;
this.triggerOnToolStripMenuItem1.Name = "triggerOnToolStripMenuItem1"; this.triggerOnToolStripMenuItem1.Name = "triggerOnToolStripMenuItem1";
this.triggerOnToolStripMenuItem1.Size = new System.Drawing.Size(173, 46); this.triggerOnToolStripMenuItem1.Size = new System.Drawing.Size(149, 22);
this.triggerOnToolStripMenuItem1.Text = "Trigger On"; this.triggerOnToolStripMenuItem1.Text = "Trigger On";
this.triggerOnToolStripMenuItem1.Click += new System.EventHandler(this.triggerOnToolStripMenuItem1_Click); this.triggerOnToolStripMenuItem1.Click += new System.EventHandler(this.triggerOnToolStripMenuItem1_Click);
// //
@@ -2700,20 +2640,20 @@
// //
this.triggerOffToolStripMenuItem1.Image = global::Project.Properties.Resources.icons8_black_circle_40; this.triggerOffToolStripMenuItem1.Image = global::Project.Properties.Resources.icons8_black_circle_40;
this.triggerOffToolStripMenuItem1.Name = "triggerOffToolStripMenuItem1"; this.triggerOffToolStripMenuItem1.Name = "triggerOffToolStripMenuItem1";
this.triggerOffToolStripMenuItem1.Size = new System.Drawing.Size(173, 46); this.triggerOffToolStripMenuItem1.Size = new System.Drawing.Size(149, 22);
this.triggerOffToolStripMenuItem1.Text = "Trigger Off"; this.triggerOffToolStripMenuItem1.Text = "Trigger Off";
this.triggerOffToolStripMenuItem1.Click += new System.EventHandler(this.triggerOffToolStripMenuItem1_Click); this.triggerOffToolStripMenuItem1.Click += new System.EventHandler(this.triggerOffToolStripMenuItem1_Click);
// //
// toolStripMenuItem19 // toolStripMenuItem19
// //
this.toolStripMenuItem19.Name = "toolStripMenuItem19"; this.toolStripMenuItem19.Name = "toolStripMenuItem19";
this.toolStripMenuItem19.Size = new System.Drawing.Size(170, 6); this.toolStripMenuItem19.Size = new System.Drawing.Size(146, 6);
// //
// connectToolStripMenuItem // connectToolStripMenuItem
// //
this.connectToolStripMenuItem.Image = global::Project.Properties.Resources.Socket; this.connectToolStripMenuItem.Image = global::Project.Properties.Resources.Socket;
this.connectToolStripMenuItem.Name = "connectToolStripMenuItem"; this.connectToolStripMenuItem.Name = "connectToolStripMenuItem";
this.connectToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.connectToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.connectToolStripMenuItem.Text = "Connect"; this.connectToolStripMenuItem.Text = "Connect";
this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click); this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click);
// //
@@ -2721,20 +2661,20 @@
// //
this.disConnectToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_unavailable_40; this.disConnectToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_unavailable_40;
this.disConnectToolStripMenuItem.Name = "disConnectToolStripMenuItem"; this.disConnectToolStripMenuItem.Name = "disConnectToolStripMenuItem";
this.disConnectToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.disConnectToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.disConnectToolStripMenuItem.Text = "DisConnect"; this.disConnectToolStripMenuItem.Text = "DisConnect";
this.disConnectToolStripMenuItem.Click += new System.EventHandler(this.disConnectToolStripMenuItem_Click); this.disConnectToolStripMenuItem.Click += new System.EventHandler(this.disConnectToolStripMenuItem_Click);
// //
// toolStripMenuItem20 // toolStripMenuItem20
// //
this.toolStripMenuItem20.Name = "toolStripMenuItem20"; this.toolStripMenuItem20.Name = "toolStripMenuItem20";
this.toolStripMenuItem20.Size = new System.Drawing.Size(170, 6); this.toolStripMenuItem20.Size = new System.Drawing.Size(146, 6);
// //
// resetToolStripMenuItem // resetToolStripMenuItem
// //
this.resetToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_delete_40; this.resetToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_delete_40;
this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
this.resetToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Text = "Reset";
this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
// //
@@ -2742,7 +2682,7 @@
// //
this.webManagerToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_what_40; this.webManagerToolStripMenuItem.Image = global::Project.Properties.Resources.icons8_what_40;
this.webManagerToolStripMenuItem.Name = "webManagerToolStripMenuItem"; this.webManagerToolStripMenuItem.Name = "webManagerToolStripMenuItem";
this.webManagerToolStripMenuItem.Size = new System.Drawing.Size(173, 46); this.webManagerToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.webManagerToolStripMenuItem.Text = "Web Manager"; this.webManagerToolStripMenuItem.Text = "Web Manager";
this.webManagerToolStripMenuItem.Click += new System.EventHandler(this.webManagerToolStripMenuItem_Click); this.webManagerToolStripMenuItem.Click += new System.EventHandler(this.webManagerToolStripMenuItem_Click);
// //
@@ -5060,9 +5000,64 @@
this.listView21.Text = "listView21"; this.listView21.Text = "listView21";
this.listView21.Click += new System.EventHandler(this.listView21_Click); this.listView21.Click += new System.EventHandler(this.listView21_Click);
// //
// ta // sTIMEDataGridViewTextBoxColumn
// //
this.ta.ClearBeforeFill = true; this.sTIMEDataGridViewTextBoxColumn.DataPropertyName = "STIME";
dataGridViewCellStyle1.Format = "HH:mm:ss";
this.sTIMEDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
this.sTIMEDataGridViewTextBoxColumn.HeaderText = "START";
this.sTIMEDataGridViewTextBoxColumn.Name = "sTIMEDataGridViewTextBoxColumn";
this.sTIMEDataGridViewTextBoxColumn.ReadOnly = true;
this.sTIMEDataGridViewTextBoxColumn.Width = 74;
//
// sIDDataGridViewTextBoxColumn
//
this.sIDDataGridViewTextBoxColumn.DataPropertyName = "SID";
dataGridViewCellStyle3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.sIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
this.sIDDataGridViewTextBoxColumn.HeaderText = "SID";
this.sIDDataGridViewTextBoxColumn.Name = "sIDDataGridViewTextBoxColumn";
this.sIDDataGridViewTextBoxColumn.ReadOnly = true;
this.sIDDataGridViewTextBoxColumn.Width = 57;
//
// rIDDataGridViewTextBoxColumn
//
this.rIDDataGridViewTextBoxColumn.DataPropertyName = "RID";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.rIDDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
this.rIDDataGridViewTextBoxColumn.HeaderText = "RID";
this.rIDDataGridViewTextBoxColumn.Name = "rIDDataGridViewTextBoxColumn";
this.rIDDataGridViewTextBoxColumn.ReadOnly = true;
this.rIDDataGridViewTextBoxColumn.Width = 58;
//
// dvc_loc
//
this.dvc_loc.DataPropertyName = "LOC";
this.dvc_loc.HeaderText = "LOC";
this.dvc_loc.Name = "dvc_loc";
this.dvc_loc.ReadOnly = true;
this.dvc_loc.Visible = false;
this.dvc_loc.Width = 59;
//
// qTYDataGridViewTextBoxColumn
//
this.qTYDataGridViewTextBoxColumn.DataPropertyName = "QTY";
this.qTYDataGridViewTextBoxColumn.HeaderText = "QTY";
this.qTYDataGridViewTextBoxColumn.Name = "qTYDataGridViewTextBoxColumn";
this.qTYDataGridViewTextBoxColumn.ReadOnly = true;
this.qTYDataGridViewTextBoxColumn.Width = 61;
//
// bs
//
this.bs.DataMember = "K4EE_Component_Reel_Result";
this.bs.DataSource = this.dataSet1;
this.bs.Sort = "STIME desc";
//
// dataSet1
//
this.dataSet1.DataSetName = "DataSet1";
this.dataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
// //
// FMain // FMain
// //
@@ -5087,8 +5082,6 @@
this.panBottom.ResumeLayout(false); this.panBottom.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.arDatagridView1)).EndInit();
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit();
this.cmCam.ResumeLayout(false); this.cmCam.ResumeLayout(false);
this.panel37.ResumeLayout(false); this.panel37.ResumeLayout(false);
this.panel10.ResumeLayout(false); this.panel10.ResumeLayout(false);
@@ -5116,6 +5109,8 @@
this.panel9.ResumeLayout(false); this.panel9.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataSet1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@@ -5188,7 +5183,6 @@
private arCtl.arDatagridView arDatagridView1; private arCtl.arDatagridView arDatagridView1;
private DataSet1 dataSet1; private DataSet1 dataSet1;
private System.Windows.Forms.BindingSource bs; private System.Windows.Forms.BindingSource bs;
private DataSet1TableAdapters.Component_Reel_ResultTableAdapter ta;
private System.Windows.Forms.Panel panel10; private System.Windows.Forms.Panel panel10;
private System.Windows.Forms.Panel panel37; private System.Windows.Forms.Panel panel37;
private System.Windows.Forms.Panel panel15; private System.Windows.Forms.Panel panel15;

View File

@@ -238,7 +238,8 @@ namespace Project
{ {
try try
{ {
this.ta.FillByLen7(this.dataSet1.Component_Reel_Result, dtstr, dtstr, AR.SETTING.Data.McName); var ta = new DataSet1TableAdapters.K4EE_Component_Reel_ResultTableAdapter();
ta.FillByLen7(this.dataSet1.K4EE_Component_Reel_Result, dtstr, dtstr, AR.SETTING.Data.McName);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -249,7 +250,7 @@ namespace Project
var TS1 = VAR.TIME.RUN(eVarTime.REFRESHLIST); var TS1 = VAR.TIME.RUN(eVarTime.REFRESHLIST);
PUB.log.AddI(string.Format($"목록 새로 고침({0}건) {TS1.TotalSeconds:N1}s", dataSet1.Component_Reel_Result.Count)); PUB.log.AddI(string.Format($"목록 새로 고침({0}건) {TS1.TotalSeconds:N1}s", dataSet1.K4EE_Component_Reel_Result.Count));
////Summary ////Summary
//listView1.Items.Clear(); //listView1.Items.Clear();
@@ -303,7 +304,7 @@ namespace Project
foreach (DataGridViewRow item in this.arDatagridView1.Rows) foreach (DataGridViewRow item in this.arDatagridView1.Rows)
{ {
var drv = item.DataBoundItem as System.Data.DataRowView; var drv = item.DataBoundItem as System.Data.DataRowView;
var dr = drv.Row as DataSet1.Component_Reel_ResultRow; var dr = drv.Row as DataSet1.K4EE_Component_Reel_ResultRow;
if (dr.REMARK.StartsWith("(BYPASS")) if (dr.REMARK.StartsWith("(BYPASS"))
{ {
@@ -652,7 +653,7 @@ namespace Project
{ {
PUB.log.Add("모션 SOFT-LIMIT 설정"); PUB.log.Add("모션 SOFT-LIMIT 설정");
for (int i = 0; i < PUB.mot.DeviceCount; i++) for (short i = 0; i < PUB.mot.DeviceCount; i++)
{ {
if (PUB.system_mot.UseAxis(i) == false) if (PUB.system_mot.UseAxis(i) == false)
{ {
@@ -2210,7 +2211,7 @@ namespace Project
private void ToolStripMenuItem_Click(object sender, EventArgs e) private void ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var fn = AR.SETTING.Data.Sidinfofilename; var fn = AR.SETTING.Data.Sidinfofilename;
if (fn.isEmpty()) fn = @"d:\amkor\sidinfo\update.exe"; if (fn.isEmpty()) fn = UTIL.MakePath("sidinfo","update.exe");
var fi = new System.IO.FileInfo(fn); var fi = new System.IO.FileInfo(fn);
if (fi.Exists == false) if (fi.Exists == false)

View File

@@ -452,16 +452,16 @@
<data name="btManualPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btManualPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAISSURBVGhD7ZPNShtRGIanN6D3EIg7tXeg3flDId3pTkGw YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAISSURBVGhD7ZNBSxRhGMenL5DfYWG7qX2D7FaGsN7qViAo
FBQFkaCFlljRKkVdqA2FZMYIkxmFxIjegHoDLdpNXVhL3NoLSE7n4BtmMvMdKGQm+cB54NnNd94ni2gx QWIgMZiQjIRWhHpQGwp3xg3GHcXVFf0C6RdQtEsdytiudV7Yp33xv8zszPNCsDO7Dzg/+N3mef+/PayR
MTHPiDcP9dFUtfYnVRUiCl9Xa/epan0Yc+HzNECPh2ftN+bChx4MX8yFDzUWhZgLH2osCjEXEgvXV9ri kZFxjRj93XhQqNV/FWpEaThSq18Wao37mEueqwF+PDnrPzGXPPxg8mIuebixNMRc8nBjaYi5hJg+PzFe
TyGlxqKwsact3FygogUaj3XiB0hbxvMYNRaF3k1UtIDnMWosCr2bqGgBz2PUWBR6N1Hx/8ymMyPv0pn7 fCUlN5aGrT1j+uILKjqg9VgvfoCyY0KPcWNpGN5ERQeEHuPG0jC8iYoOCD3GjaVheBMV/8+kaQ1PmNbl
mXRGcPKpaWUImWo4xjd02u6QqYY65CQy1VBHnESmGuqIk8hUQx1xEplqqCNOIlON/2BsYlr09vWLZDLZ M9MiSV41zd9Dph6J8S2fmtYPZOrhDiWJTD3ckSSRqYc7kiQy9XBHkkSmHu5IksjUEz14+Hic+gcGKZ/P
VuXm+OTbphYpMtX4DzoR37C3/2VTixSZavwH1MPt1N+DTDX+A+rRdurvQaaaqdm08JpIJDqqvweZQQzz d1W1+ejJRFuLEpl6oge9iG/ZP3i7rUWJTD3RA+7hbhrtQaae6AH3aDeN9iBTz9ikSWFzuVxPjfYgM47r
rEe3KleOwrBPWYq2S9mKbBcZ7z9g7CWyXXJ2+S/xIVMrj8h2ydvlH/THDC1WviPbRS+eHpAfc9Q6MZDt Hd5yytWTpuT6ByJF27FqRXaAio8eCPYY2QGf/N2/zIdCrf5BdkDR3zvjPxaoVz1FdoCzdbDJfizR8r6L
4vwH5smPeTqHbJe8WRrUrRPnn85fw6oMINulUDjv+nZ4XM+ZJcFZ2Zi17W5kN5M1rFvnA/kRXwtHv5Ab 7IDmf+A5+7FMp5AdUPQqQ055v/lPl69brt5BdkCpdHTT3vQbG16FJKsabd/vQ3Y7trv1/ePnHRJtafsb
ZDdnHu/lTcHcI+QG2crml7ezumDtV30JuUE+7+y+Wt/ZF5xd29ofRG4QIcSL96ub5Q+fNuof174ITsqm cuOsbng7a0WPhLuN3DhLdvHlsu2QaD84M8iN82Zl9e7iyjpJdmFpfQi5cYjoxuzrd3uvrMXG3MJ7kqRq
pZWNkmxEbkxMTEzMs0fT/gFwULetz3Mo6AAAAABJRU5ErkJggg== mpl/W1GNyM3IyMjIuPYYxj/jh7eFcuEfNwAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btJobCancle.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btJobCancle.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1514,9 +1514,6 @@
AADIQQs= AADIQQs=
</value> </value>
</data> </data>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>698, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>69</value> <value>69</value>
</metadata> </metadata>

144
Handler/README.md Normal file
View File

@@ -0,0 +1,144 @@
# ATV Reel Label Attach, Modify & Transfer System
## 개요
ATV(Automatic Test Vehicle) 릴 라벨 부착, 수정 및 전송을 위한 산업 자동화 시스템입니다. 이 시스템은 Windows Forms를 사용하여 C# (.NET Framework 4.8)로 구축되었으며, 모션 컨트롤러, 바코드 리더, 프린터, PLC 등 다양한 하드웨어 구성 요소와 통합됩니다.
## 주요 기능
- **자동 라벨 부착**: 모션 컨트롤러를 통한 정밀한 라벨 부착
- **바코드 인식**: Keyence 바코드 리더를 통한 QR/바코드 스캔
- **라벨 인쇄**: SATO 프린터를 통한 고품질 라벨 인쇄
- **PLC 제어**: 산업용 PLC와의 통신을 통한 장비 제어
- **데이터 관리**: SQL Server 기반 데이터베이스 관리
- **상태 모니터링**: 실시간 장비 상태 및 작업 진행 상황 모니터링
## 시스템 요구사항
- **OS**: Windows 10/11 (x64)
- **Framework**: .NET Framework 4.8
- **Visual Studio**: 2017 이상
- **Database**: SQL Server
### 하드웨어 요구사항
- AzinAxt 모션 컨트롤러 및 드라이버
- Keyence 바코드 리더 SDK
- SATO 프린터 드라이버
- 산업용 PLC (Crevis)
## 빌드 및 실행
### 빌드 명령어
```bash
# Debug 빌드
msbuild "STDLabelAttach(ATV).sln" /p:Configuration=Debug /p:Platform=x86
# Release 빌드
msbuild "STDLabelAttach(ATV).sln" /p:Configuration=Release /p:Platform=x86
# 특정 프로젝트 빌드
msbuild "Project\STDLabelAttach(ATV).csproj" /p:Configuration=Debug
```
### 설정
1. `app.config`에서 데이터베이스 연결 문자열 구성
2. `MotParam/` 폴더의 모션 매개변수 파일 확인
3. 하드웨어 드라이버 설치 및 구성
## 프로젝트 구조
### 주요 프로젝트
- **Project/**: 메인 애플리케이션 (STDLabelAttach(ATV))
- Windows Forms 기반 사용자 인터페이스
- 상태 머신 기반 제어 로직
- 하드웨어 디바이스 인터페이스
- **Project_form2/**: 데이터 처리 수신기 애플리케이션
- SID(Serial ID) 변환 및 처리
- 고객 정보 관리
- 데이터 가져오기/내보내기
- **ResultView/**: 결과 조회 애플리케이션
- 작업 결과 및 히스토리 조회
### 공유 라이브러리 (Sub/)
- **arAzinAxt/**: 모션 컨트롤러 인터페이스
- **arImageViewer_Emgu/**: 이미지 처리 (EmguCV)
- **CommSM/**: 상태 머신 통신
- **StdLabelPrint/**: 표준 라벨 인쇄
## 아키텍처
### 상태 머신 패턴
시스템은 포괄적인 상태 머신 패턴을 사용합니다:
- **Step/**: 주요 작업 단계 (INIT, IDLE, RUN, HOME, FINISH)
- **StateMachine/**: 핵심 상태 머신 로직 및 이벤트 처리
- **RunSequence/**: 특정 작업 시퀀스 실행
### 디바이스 관리
- **모션 제어**: AzinAxt 라이브러리를 통한 정밀한 위치 제어
- **바코드 읽기**: Keyence 스캐너 통합
- **라벨 인쇄**: SATO 프린터 API 연동
- **PLC 통신**: 안전 및 I/O 제어
### 데이터베이스
- **ORM**: Entity Framework 6.2.0
- **모델**: Model1.edmx
- **매니저**: 다양한 데이터 유형별 데이터베이스 매니저
## 개발 가이드
### 주요 파일
- **fMain.cs**: 메인 폼 및 UI 로직
- **Pub.cs**: 전역 변수 및 공통 함수
- **System_Setting.cs**: 시스템 설정 관리
- **StateMachine.cs**: 상태 머신 핵심 로직
### 설정 관리
- **시스템 설정**: `Setting/` 클래스
- **사용자 설정**: `UserSetting.cs`
- **모션 매개변수**: `MotParam/` 폴더
### UI 컨트롤
- **사용자 정의 컨트롤**: `UIControl/` 폴더
- **다이얼로그**: `Dialog/` 폴더
- **리소스**: 이미지 및 아이콘
## 테스트
- 메인 애플리케이션을 통한 수동 테스트
- 실제 하드웨어를 사용한 통합 테스트
- 디버그 다이얼로그를 통한 실시간 모니터링
## 주요 종속성
- Entity Framework 6.2.0
- Newtonsoft.Json 13.0.3
- EmguCV 4.5.1
- Microsoft OWIN 스택
- Keyence AutoID SDK
- SATO Printer API
## 라이선스
내부 사용 전용 - 상업적 재배포 금지
## 연락처
프로젝트 관련 문의사항이 있으시면 시스템 관리자에게 연락해 주세요.
---
*이 문서는 ATV Reel Label Attach, Modify & Transfer System v1.0을 기준으로 작성되었습니다.*

View File

@@ -11,14 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultView", "ResultView\Re
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arFrameControl", "Sub\arFrameControl\arFrameControl.csproj", "{A16C9667-5241-4313-888E-548375F85D29}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arFrameControl", "Sub\arFrameControl\arFrameControl.csproj", "{A16C9667-5241-4313-888E-548375F85D29}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIControl", "CapCleaningControl\UIControl.csproj", "{9264CD2E-7CF8-4237-A69F-DCDA984E0613}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arImageViewer.Emgu", "Sub\arImageViewer_Emgu\arImageViewer.Emgu.csproj", "{ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arImageViewer.Emgu", "Sub\arImageViewer_Emgu\arImageViewer.Emgu.csproj", "{ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StdLabelPrint", "Sub\StdLabelPrint\StdLabelPrint.csproj", "{B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StdLabelPrint", "Sub\StdLabelPrint\StdLabelPrint.csproj", "{B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arAzinAxt", "Sub\arAzinAxt\arAzinAxt.csproj", "{4F457E76-BF83-4B98-8565-AE87D7D16744}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Setting", "Sub\Setting\Setting.csproj", "{48654765-548D-42ED-9238-D65EB3BC99AD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Setting", "Sub\Setting\Setting.csproj", "{48654765-548D-42ED-9238-D65EB3BC99AD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommSM", "Sub\CommSM\arCommSM.csproj", "{D54444F7-1D85-4D5D-B1D1-10D040141A91}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommSM", "Sub\CommSM\arCommSM.csproj", "{D54444F7-1D85-4D5D-B1D1-10D040141A91}"
@@ -28,10 +24,15 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "솔루션 항목", "솔루션 항목", "{2A3A057F-5D22-31FD-628C-DF5EF75AEF1E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "솔루션 항목", "솔루션 항목", "{2A3A057F-5D22-31FD-628C-DF5EF75AEF1E}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
CLAUDE.md = CLAUDE.md CLAUDE.md = CLAUDE.md
README.md = README.md
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoryMapCore", "Sub\MemoryMapCore\MemoryMapCore.csproj", "{140AF52A-5986-4413-BF02-8EA55A61891B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoryMapCore", "Sub\MemoryMapCore\MemoryMapCore.csproj", "{140AF52A-5986-4413-BF02-8EA55A61891B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arAjinextek_Union", "Sub\arAjinextek\Library\arAjinextek_Union\arAjinextek_Union.csproj", "{62370293-92AA-4B73-B61F-5C343EEB4DED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIControl", "Sub\UIControl\UIControl.csproj", "{9264CD2E-7CF8-4237-A69F-DCDA984E0613}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -82,22 +83,6 @@ Global
{A16C9667-5241-4313-888E-548375F85D29}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A16C9667-5241-4313-888E-548375F85D29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A16C9667-5241-4313-888E-548375F85D29}.Release|x64.ActiveCfg = Release|Any CPU {A16C9667-5241-4313-888E-548375F85D29}.Release|x64.ActiveCfg = Release|Any CPU
{A16C9667-5241-4313-888E-548375F85D29}.Release|x86.ActiveCfg = Release|Any CPU {A16C9667-5241-4313-888E-548375F85D29}.Release|x86.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x64.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x64.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x86.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x86.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Any CPU.Build.0 = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x64.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x64.Build.0 = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x86.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x86.Build.0 = Release|Any CPU
{ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}.Debug|Any CPU.Build.0 = Debug|Any CPU {ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -130,22 +115,6 @@ Global
{B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}.Release|x64.Build.0 = Release|Any CPU {B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}.Release|x64.Build.0 = Release|Any CPU
{B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}.Release|x86.ActiveCfg = Release|Any CPU {B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}.Release|x86.ActiveCfg = Release|Any CPU
{B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}.Release|x86.Build.0 = Release|Any CPU {B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D}.Release|x86.Build.0 = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|x64.ActiveCfg = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|x64.Build.0 = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|x86.ActiveCfg = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Debug|x86.Build.0 = Debug|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|Any CPU.Build.0 = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|x64.ActiveCfg = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|x64.Build.0 = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|x86.ActiveCfg = Release|Any CPU
{4F457E76-BF83-4B98-8565-AE87D7D16744}.Release|x86.Build.0 = Release|Any CPU
{48654765-548D-42ED-9238-D65EB3BC99AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {48654765-548D-42ED-9238-D65EB3BC99AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{48654765-548D-42ED-9238-D65EB3BC99AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {48654765-548D-42ED-9238-D65EB3BC99AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{48654765-548D-42ED-9238-D65EB3BC99AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {48654765-548D-42ED-9238-D65EB3BC99AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -210,20 +179,52 @@ Global
{140AF52A-5986-4413-BF02-8EA55A61891B}.Release|x64.Build.0 = Release|Any CPU {140AF52A-5986-4413-BF02-8EA55A61891B}.Release|x64.Build.0 = Release|Any CPU
{140AF52A-5986-4413-BF02-8EA55A61891B}.Release|x86.ActiveCfg = Release|Any CPU {140AF52A-5986-4413-BF02-8EA55A61891B}.Release|x86.ActiveCfg = Release|Any CPU
{140AF52A-5986-4413-BF02-8EA55A61891B}.Release|x86.Build.0 = Release|Any CPU {140AF52A-5986-4413-BF02-8EA55A61891B}.Release|x86.Build.0 = Release|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|Mixed Platforms.Build.0 = Debug|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|x64.ActiveCfg = Debug|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|x64.Build.0 = Debug|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|x86.ActiveCfg = Debug|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Debug|x86.Build.0 = Debug|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|Any CPU.Build.0 = Release|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|Mixed Platforms.ActiveCfg = Release|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|Mixed Platforms.Build.0 = Release|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|x64.ActiveCfg = Release|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|x64.Build.0 = Release|Any CPU
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|x86.ActiveCfg = Release|x86
{62370293-92AA-4B73-B61F-5C343EEB4DED}.Release|x86.Build.0 = Release|x86
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x64.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x64.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x86.ActiveCfg = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Debug|x86.Build.0 = Debug|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Any CPU.Build.0 = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x64.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x64.Build.0 = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x86.ActiveCfg = Release|Any CPU
{9264CD2E-7CF8-4237-A69F-DCDA984E0613}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{A16C9667-5241-4313-888E-548375F85D29} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {A16C9667-5241-4313-888E-548375F85D29} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{9264CD2E-7CF8-4237-A69F-DCDA984E0613} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {ED0D4179-FC0D-48D5-8BB3-CBF0F03D170C} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {B18D3B96-2FDF-4ED9-9A49-D9B8CEE4ED6D} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{4F457E76-BF83-4B98-8565-AE87D7D16744} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{48654765-548D-42ED-9238-D65EB3BC99AD} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {48654765-548D-42ED-9238-D65EB3BC99AD} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{D54444F7-1D85-4D5D-B1D1-10D040141A91} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {D54444F7-1D85-4D5D-B1D1-10D040141A91} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{14E8C9A5-013E-49BA-B435-EFEFC77DD623} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {14E8C9A5-013E-49BA-B435-EFEFC77DD623} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{140AF52A-5986-4413-BF02-8EA55A61891B} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {140AF52A-5986-4413-BF02-8EA55A61891B} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{62370293-92AA-4B73-B61F-5C343EEB4DED} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
{9264CD2E-7CF8-4237-A69F-DCDA984E0613} = {C423C39A-44E7-4F09-B2F7-7943975FF948}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9}

View File

@@ -431,8 +431,7 @@ namespace AR
#region "Printer" #region "Printer"
[Category("Printer"), DisplayName("바코드 외곽 박스 그리기"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] [Category("Printer"), DisplayName("바코드 외곽 박스 그리기"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public Boolean DrawOutbox { get; set; } public Boolean DrawOutbox { get; set; }
[Category("Printer"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public string baseZPLFile { get; set; }
#endregion #endregion
[Category("Joystick"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] [Category("Joystick"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
@@ -531,8 +530,6 @@ namespace AR
var currentpath = AppDomain.CurrentDomain.BaseDirectory; var currentpath = AppDomain.CurrentDomain.BaseDirectory;
if (AutoOffRoomLightMin == 0) AutoOffRoomLightMin = 5; if (AutoOffRoomLightMin == 0) AutoOffRoomLightMin = 5;
if (baseZPLFile.isEmpty())
baseZPLFile = "zpl7.txt";
if (RetryPickOnAngle == 0) RetryPickOnAngle = 79; if (RetryPickOnAngle == 0) RetryPickOnAngle = 79;

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 789 B

After

Width:  |  Height:  |  Size: 789 B

View File

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 778 B

View File

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 778 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 750 B

After

Width:  |  Height:  |  Size: 750 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 865 B

After

Width:  |  Height:  |  Size: 865 B

Some files were not shown because too many files have changed in this diff Show More