..
This commit is contained in:
@@ -194,6 +194,7 @@ namespace Project
|
||||
public DateTime retryTime;
|
||||
public DateTime[] WaitForVar = new DateTime[255];
|
||||
public int ABCount = 0;
|
||||
public bool AutoReelOut = false;
|
||||
|
||||
public CResult()
|
||||
{
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Project
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 모션 축 정보
|
||||
/// </summary>
|
||||
public enum eAxis : byte
|
||||
{
|
||||
PX_PICK = 0,
|
||||
PZ_PICK,
|
||||
PL_MOVE,
|
||||
PL_UPDN,
|
||||
PR_MOVE,
|
||||
PR_UPDN,
|
||||
Z_THETA,
|
||||
}
|
||||
|
||||
|
||||
public enum eAxisName : byte
|
||||
{
|
||||
Picker_X = 0,
|
||||
Picker_Z ,
|
||||
PrinterL_Move,
|
||||
PrinterL_UpDn,
|
||||
PrinterR_Move,
|
||||
PrinterR_UpDn,
|
||||
Spare_00,
|
||||
}
|
||||
}
|
||||
@@ -10,56 +10,86 @@ namespace Project
|
||||
|
||||
public enum ePXLoc : byte
|
||||
{
|
||||
READYL = 0,
|
||||
READYR,
|
||||
PICKON,
|
||||
PICKOFFL,
|
||||
PICKOFFR,
|
||||
[Description("Reel Waiting(Left) Position")]
|
||||
READYL = 0,
|
||||
[Description("Reel Waiting(Right) Position")]
|
||||
READYR,
|
||||
[Description("Reel PickOn Position")]
|
||||
PICKON,
|
||||
[Description("Reel PickOff(Left) Position")]
|
||||
PICKOFFL,
|
||||
[Description("Reel PickOff(Right) Position")]
|
||||
PICKOFFR,
|
||||
}
|
||||
|
||||
public enum ePZLoc : byte
|
||||
{
|
||||
[Description("Ready Position")]
|
||||
READY = 0,
|
||||
PICKON,
|
||||
PICKOFFL,
|
||||
PICKOFFR,
|
||||
[Description("Reel PickOn Position")]
|
||||
PICKON,
|
||||
[Description("Reel PickOff(Left) Position")]
|
||||
PICKOFFL,
|
||||
[Description("Reel PickOff(Right) Position")]
|
||||
PICKOFFR,
|
||||
}
|
||||
|
||||
public enum ePTLoc : byte
|
||||
{
|
||||
READY = 0,
|
||||
[Description("Ready Position")]
|
||||
READY = 0,
|
||||
}
|
||||
|
||||
public enum eLMLoc : byte
|
||||
{
|
||||
READY = 0,
|
||||
PRINTH07,
|
||||
PRINTL07,
|
||||
PRINTM07,
|
||||
PRINTH13,
|
||||
PRINTL13,
|
||||
PRINTM13,
|
||||
[Description("Ready Position")]
|
||||
READY = 0,
|
||||
[Description("7\" High Attach Position")]
|
||||
PRINTH07,
|
||||
[Description("7\" Low Attach Position")]
|
||||
PRINTL07,
|
||||
[Description("7\" Middle Attach Position")]
|
||||
PRINTM07,
|
||||
[Description("13\" High Attach Position")]
|
||||
PRINTH13,
|
||||
[Description("13\" Low Attach Position")]
|
||||
PRINTL13,
|
||||
[Description("13\" Middle Attach Position")]
|
||||
PRINTM13,
|
||||
}
|
||||
public enum eLZLoc : byte
|
||||
{
|
||||
READY = 0,
|
||||
PICKON,
|
||||
PICKOFF,
|
||||
[Description("Ready Position")]
|
||||
READY = 0,
|
||||
[Description("Reel PickOn Position")]
|
||||
PICKON,
|
||||
[Description("Reel PickOff Position")]
|
||||
PICKOFF,
|
||||
}
|
||||
public enum eRMLoc : byte
|
||||
{
|
||||
READY = 0,
|
||||
PRINTH07,
|
||||
PRINTL07,
|
||||
PRINTM07,
|
||||
PRINTH13,
|
||||
PRINTL13,
|
||||
PRINTM13,
|
||||
}
|
||||
[Description("Ready Position")]
|
||||
READY = 0,
|
||||
[Description("7\" High Attach Position")]
|
||||
PRINTH07,
|
||||
[Description("7\" Low Attach Position")]
|
||||
PRINTL07,
|
||||
[Description("7\" Middle Attach Position")]
|
||||
PRINTM07,
|
||||
[Description("13\" High Attach Position")]
|
||||
PRINTH13,
|
||||
[Description("13\" Low Attach Position")]
|
||||
PRINTL13,
|
||||
[Description("13\" Middle Attach Position")]
|
||||
PRINTM13,
|
||||
}
|
||||
public enum eRZLoc : byte
|
||||
{
|
||||
READY = 0,
|
||||
PICKON,
|
||||
PICKOFF,
|
||||
[Description("Ready Position")]
|
||||
READY = 0,
|
||||
[Description("Reel PickOn Position")]
|
||||
PICKON,
|
||||
[Description("Reel PickOff Position")]
|
||||
PICKOFF,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,7 +42,9 @@ namespace Project
|
||||
public bool CheckSIDExsit { get; set; }
|
||||
public bool bOwnZPL { get; set; }
|
||||
public int BSave { get; set; }
|
||||
|
||||
public bool IgnorePartNo { get; set; }
|
||||
public bool IgnoreBatch { get; set; }
|
||||
public int AutoOutConveyor { get; set; }
|
||||
|
||||
|
||||
public ModelInfoV()
|
||||
@@ -53,6 +55,7 @@ namespace Project
|
||||
|
||||
public void ReadValue(DataSet1.OPModelRow dr)
|
||||
{
|
||||
this.AutoOutConveyor= dr.AutoOutConveyor;
|
||||
this.bOwnZPL = dr.bOwnZPL;
|
||||
this.Title = dr.Title;
|
||||
this.Code = dr.Code;
|
||||
@@ -72,45 +75,9 @@ namespace Project
|
||||
this.DisablePrinter = dr.DisablePrinter;
|
||||
this.CheckSIDExsit = dr.CheckSIDExsit;
|
||||
this.BSave = dr.BSave;
|
||||
//this.ByPassSID = dr.ByPassSID;
|
||||
this.IgnoreBatch = dr.IgnoreBatch;
|
||||
this.IgnorePartNo = dr.IgnorePartNo;
|
||||
}
|
||||
public bool WriteValue()
|
||||
{
|
||||
var model = PUB.mdm.GetDataV(this.Title);
|
||||
return WriteValue(ref model);
|
||||
}
|
||||
public bool WriteValue(ref DataSet1.OPModelRow dr)
|
||||
{
|
||||
try
|
||||
{
|
||||
dr.Title = this.Title;
|
||||
dr.Code = this.Code;
|
||||
dr.Motion = this.Motion;
|
||||
dr.BCD_1D = this.BCD_1D;
|
||||
dr.BCD_QR = this.BCD_QR;
|
||||
dr.BCD_DM = this.BCD_DM;
|
||||
dr.vOption = this.vOption;
|
||||
dr.vSIDInfo = this.vSIDInfo;
|
||||
dr.vJobInfo = this.vJobInfo;
|
||||
dr.vSIDConv = this.vSIDConv1;
|
||||
dr.Def_MFG = this.Def_MFG;
|
||||
dr.Def_VName = this.Def_Vname;
|
||||
dr.IgnoreOtherBarcode = this.IgnoreOtherBarcode;
|
||||
dr.DisableCamera = this.DisableCamera;
|
||||
dr.DisablePrinter = this.DisablePrinter;
|
||||
dr.CheckSIDExsit = this.CheckSIDExsit;
|
||||
dr.bOwnZPL = this.bOwnZPL;
|
||||
dr.BSave = this.BSave;
|
||||
dr.EndEdit();
|
||||
PUB.mdm.SaveModelV();
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
PUB.log.AddE("write model error" + ex.Message);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[TypeConverterAttribute(typeof(ExpandableObjectConverter))]
|
||||
|
||||
@@ -469,7 +469,7 @@ namespace Project.Class
|
||||
/// <summary>
|
||||
/// keyence 로 부터 신규 바코드가 업데이트되었다
|
||||
/// </summary>
|
||||
public Boolean BarcodeDirty = false;
|
||||
public Boolean BarcodeTouched = false;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
|
||||
@@ -682,7 +682,7 @@ namespace Project.Class
|
||||
VLOT_Trust = false;
|
||||
VNAME_Trust = false;
|
||||
|
||||
BarcodeDirty = false;
|
||||
BarcodeTouched = false;
|
||||
MCN = string.Empty;
|
||||
Target = string.Empty;
|
||||
|
||||
@@ -749,7 +749,7 @@ namespace Project.Class
|
||||
//obj.PrintForce = this.PrintForce;
|
||||
obj.ReelSize = this.ReelSize;
|
||||
obj.PrintPositionCheck = this.PrintPositionCheck;
|
||||
obj.BarcodeDirty = this.BarcodeDirty;
|
||||
obj.BarcodeTouched = this.BarcodeTouched;
|
||||
|
||||
//라벨위치값 복사
|
||||
for (int i = 0; i < obj.LabelPositionData.Length; i++)
|
||||
@@ -880,7 +880,7 @@ namespace Project.Class
|
||||
//obj.PrintForce = this.PrintForce;
|
||||
obj.ReelSize = this.ReelSize;
|
||||
obj.PrintPositionCheck = this.PrintPositionCheck;
|
||||
obj.BarcodeDirty = this.BarcodeDirty;
|
||||
obj.BarcodeTouched = this.BarcodeTouched;
|
||||
|
||||
//라벨위치값 복사
|
||||
for (int i = 0; i < obj.LabelPositionData.Length; i++)
|
||||
|
||||
@@ -41,11 +41,11 @@ namespace Project
|
||||
|
||||
public sPositionData Clone()
|
||||
{
|
||||
return new sPositionData
|
||||
{
|
||||
Position = this.Position,
|
||||
Acc = this.Acc,
|
||||
Dcc = this.Dcc,
|
||||
return new sPositionData
|
||||
{
|
||||
Position = this.Position,
|
||||
Acc = this.Acc,
|
||||
Dcc = this.Dcc,
|
||||
//isError = this.isError,
|
||||
Message = this.Message,
|
||||
Speed = this.Speed,
|
||||
|
||||
Reference in New Issue
Block a user