Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b1cebe83 由 LN
选项

增加皮带线ng处理

1 个父辈 8843c29a
内嵌 并排
正在显示 10 个修改的文件 包含 99 行增加 和 40 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -1005,7 +1005,7 @@ ...@@ -1005,7 +1005,7 @@
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(421, 61); this.txtUpdownP3.Location = new System.Drawing.Point(424, 61);
this.txtUpdownP3.MaxLength = 12; this.txtUpdownP3.MaxLength = 12;
this.txtUpdownP3.Name = "txtUpdownP3"; this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1020,7 +1020,7 @@ ...@@ -1020,7 +1020,7 @@
this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Blue; this.btnUpdownP3.ForeColor = System.Drawing.Color.Blue;
this.btnUpdownP3.Location = new System.Drawing.Point(255, 57); this.btnUpdownP3.Location = new System.Drawing.Point(258, 57);
this.btnUpdownP3.Name = "btnUpdownP3"; this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(163, 34); this.btnUpdownP3.Size = new System.Drawing.Size(163, 34);
...@@ -1048,7 +1048,7 @@ ...@@ -1048,7 +1048,7 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(424, 20); this.txtP1.Location = new System.Drawing.Point(424, 24);
this.txtP1.MaxLength = 12; this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1"; this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1063,7 +1063,7 @@ ...@@ -1063,7 +1063,7 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue; this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(258, 16); this.btnMoveToP1.Location = new System.Drawing.Point(258, 20);
this.btnMoveToP1.Name = "btnMoveToP1"; this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34); this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
...@@ -1077,9 +1077,9 @@ ...@@ -1077,9 +1077,9 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true; this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(182, 22); this.cmbSizeList.Location = new System.Drawing.Point(109, 23);
this.cmbSizeList.Name = "cmbSizeList"; this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(70, 28); this.cmbSizeList.Size = new System.Drawing.Size(143, 28);
this.cmbSizeList.TabIndex = 303; this.cmbSizeList.TabIndex = 303;
this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged); this.cmbSizeList.SelectedIndexChanged += new System.EventHandler(this.cmbSizeList_SelectedIndexChanged);
// //
...@@ -1088,7 +1088,7 @@ ...@@ -1088,7 +1088,7 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(111, 28); this.label4.Location = new System.Drawing.Point(24, 29);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17); this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 302; this.label4.TabIndex = 302;
...@@ -1102,12 +1102,12 @@ ...@@ -1102,12 +1102,12 @@
this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveto.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveto.ForeColor = System.Drawing.Color.Blue; this.btnMoveto.ForeColor = System.Drawing.Color.Blue;
this.btnMoveto.Location = new System.Drawing.Point(16, 56); this.btnMoveto.Location = new System.Drawing.Point(16, 57);
this.btnMoveto.Name = "btnMoveto"; this.btnMoveto.Name = "btnMoveto";
this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveto.Size = new System.Drawing.Size(163, 34); this.btnMoveto.Size = new System.Drawing.Size(163, 34);
this.btnMoveto.TabIndex = 306; this.btnMoveto.TabIndex = 306;
this.btnMoveto.Text = "移栽位置P2"; this.btnMoveto.Text = "托盘放料位置P2";
this.btnMoveto.UseVisualStyleBackColor = true; this.btnMoveto.UseVisualStyleBackColor = true;
this.btnMoveto.Click += new System.EventHandler(this.btnMoveto_Click); this.btnMoveto.Click += new System.EventHandler(this.btnMoveto_Click);
// //
...@@ -1117,7 +1117,7 @@ ...@@ -1117,7 +1117,7 @@
this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtSizePosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSizePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText; this.txtSizePosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtSizePosition.Location = new System.Drawing.Point(182, 60); this.txtSizePosition.Location = new System.Drawing.Point(182, 61);
this.txtSizePosition.MaxLength = 12; this.txtSizePosition.MaxLength = 12;
this.txtSizePosition.Name = "txtSizePosition"; this.txtSizePosition.Name = "txtSizePosition";
this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtSizePosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -430,7 +430,7 @@ namespace OnlineStore.AssemblyLine ...@@ -430,7 +430,7 @@ namespace OnlineStore.AssemblyLine
int size = 0; int size = 0;
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { } try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtSizePosition.Text = equipBean.Config.GetUpdownPositionP2(size).ToString(); txtSizePosition.Text = equipBean.Config.GetUpdownPositionP2(size).ToString();
btnMoveto.Text = size + "寸移栽位置P2 :"; btnMoveto.Text = size + "寸 托盘放料位置P2 :";
} }
private void btnMoveto_Click(object sender, EventArgs e) private void btnMoveto_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -675,7 +675,7 @@ namespace OnlineStore.AssemblyLine ...@@ -675,7 +675,7 @@ namespace OnlineStore.AssemblyLine
txtPosId.Focus(); txtPosId.Focus();
return; return;
} }
LineServer.StartInStore(index, new InOutParam(0, "", posId,0,0)); LineServer.StartInStore(index, new InOutParam(0, "", posId, 0, 0));
} }
} }
......
source/DeviceLibrary/LineConfig/Config_DischargeLine_2.csv
...@@ -35,3 +35,10 @@ DO,0,分盘装置1定位气缸下降SOL,SeparateDevice_Down,7,PRO_AOI_IP_3,0,分盘装置1定位 ...@@ -35,3 +35,10 @@ DO,0,分盘装置1定位气缸下降SOL,SeparateDevice_Down,7,PRO_AOI_IP_3,0,分盘装置1定位
,0,,,13,PRO_AOI_IP_3,0,,Y054,Y054 ,0,,,13,PRO_AOI_IP_3,0,,Y054,Y054
,0,,,14,PRO_AOI_IP_3,0,,Y055,Y055 ,0,,,14,PRO_AOI_IP_3,0,,Y055,Y055
,0,,,15,PRO_AOI_IP_3,0,,Y056,Y056 ,0,,,15,PRO_AOI_IP_3,0,,Y056,Y056
,,,,,,,,,
DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,0,NG料盘推出气缸前进端,X005,X005
DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,0,NG料盘推出气缸后退端,X006,X006
,,,,,,,,,
DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,0,NG料盘推出气缸前进SOL,Y010,Y010
DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,0,NG料盘推出气缸后退SOL,Y011,Y011
,,,,,,,,,
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -964,7 +964,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -964,7 +964,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
TrayInfo info = TrayManager.GetTrayInfo(trayNum); TrayInfo info = TrayManager.GetTrayInfo(trayNum);
InOutParam param = new InOutParam(trayNum, info.WareCode, info.PosId, info.PlateH, info.PlateW); InOutParam param = new InOutParam(trayNum, info.WareCode, info.PosId, info.PlateH, info.PlateW,info.InStoreNG);
//是出料的模块 //是出料的模块
if (Config.IsCanOut.Equals(1)) if (Config.IsCanOut.Equals(1))
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -368,7 +368,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -368,7 +368,7 @@ namespace OnlineStore.DeviceLibrary
{ {
reIndex = i; reIndex = i;
currCode = cc; currCode = cc;
SecondMoveInfo.MoveParam = new InOutParam(cc.TrayNumber, cc.WareCode, cc.PosId, cc.PlateH, cc.PlateW); SecondMoveInfo.MoveParam = new InOutParam(cc.TrayNumber, cc.WareCode, cc.PosId, cc.PlateH, cc.PlateW,cc.InStoreNg);
break; break;
} }
} }
......
source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
...@@ -58,7 +58,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -58,7 +58,7 @@ namespace OnlineStore.DeviceLibrary
} }
#region 出库处理 #region 出库处理
private string posId = ""; private string posId = "";
public bool StartOut(InOutParam moveParam) public bool StartOut(InOutParam moveParam )
{ {
if (MoveInfo.MoveType.Equals(LineMoveType.None)) if (MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
...@@ -145,42 +145,73 @@ namespace OnlineStore.DeviceLibrary ...@@ -145,42 +145,73 @@ namespace OnlineStore.DeviceLibrary
{ {
if (lineRun.InTurn.Equals(false)) if (lineRun.InTurn.Equals(false))
{ {
DLO_07_LineRun(); DLO_LineRun(LineMoveStep.DLO_07_LineRun);
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_07_LineRun)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_07_LineRun))
{ {
if (lineRun.InTurn.Equals(false)) if (lineRun.InTurn.Equals(false))
{ {
if (MoveInfo.MoveParam.InStoreNg)
if (equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH))
{
if (LastTrayPosition > 5)
{ {
MoveInfo.NextMoveStep(LineMoveStep.DLO_08_ExitNoTray); MoveInfo.NextMoveStep(LineMoveStep.DLO_08_NGCylinder_Before);
LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "最后一盘料位置【" + LastTrayPosition + "】，请检查" + ExitTray_Check + "信号是否正确"); LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "NG气缸前进");
equipBean.CylinderMove(MoveInfo, IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before);
} }
else else
{ {
DLO_07_LineRun(); CheckIsNeedRun();
} }
} }
else }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_08_NGCylinder_Before))
{ {
MoveInfo.NextMoveStep(LineMoveStep.DLO_08_ExitNoTray); MoveInfo.NextMoveStep(LineMoveStep.DLO_09_NGCylinder_After);
LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "NG气缸后退");
equipBean.CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_09_NGCylinder_After))
{
MoveInfo.NextMoveStep(LineMoveStep.DLO_08_NGCylinder_Before);
LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "NG气缸后退");
equipBean.CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_09_NGCylinder_After))
{
CheckIsNeedRun();
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_08_ExitNoTray)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_10_LineRun))
{
CheckIsNeedRun();
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_11_ExitNoTray))
{ {
MoveInfo.EndMove(); MoveInfo.EndMove();
LogUtil.info(Name + "出料【" + posId + "】：出口无料盘，出库结束"); LogUtil.info(Name + "出料【" + posId + "】：出口无料盘，出库结束");
} }
} }
private void DLO_07_LineRun() private void CheckIsNeedRun()
{
if (equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH))
{
if (LastTrayPosition > 5)
{
MoveInfo.NextMoveStep(LineMoveStep.DLO_11_ExitNoTray);
LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "最后一盘料位置【" + LastTrayPosition + "】，请检查" + ExitTray_Check + "信号是否正确");
}
else
{
DLO_LineRun(LineMoveStep.DLO_10_LineRun);
}
}
else
{
MoveInfo.NextMoveStep(LineMoveStep.DLO_11_ExitNoTray);
}
}
private void DLO_LineRun(LineMoveStep nextStep)
{ {
if (equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH)) if (equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.HIGH))
{ {
...@@ -198,7 +229,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,7 +229,7 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
} }
MoveInfo.NextMoveStep(LineMoveStep.DLO_07_LineRun); MoveInfo.NextMoveStep(nextStep);
LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "最后一盘料位置【" + LastTrayPosition + "】，出口有料盘，继续转动一个工位"); LogUtil.info(Name + "出料【" + posId + "】：" + MoveInfo.SLog + "最后一盘料位置【" + LastTrayPosition + "】，出口有料盘，继续转动一个工位");
lineRun.StartLineRun(LineRun_Do, ExitLocation_Check, LineEndProcess); lineRun.StartLineRun(LineRun_Do, ExitLocation_Check, LineEndProcess);
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -77,6 +77,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -77,6 +77,11 @@ namespace OnlineStore.DeviceLibrary
} }
private bool CheckIsNeedOutStore() private bool CheckIsNeedOutStore()
{ {
TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum);
if (trayInfo.InStoreNG && this.Config.SidesWayNum.Equals(4))
{
return true;
}
//TODO 判断是否是需要移栽出料的料盘 //TODO 判断是否是需要移栽出料的料盘
return false; return false;
} }
...@@ -145,7 +150,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -145,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
if (CheckIsNeedOutStore()) if (CheckIsNeedOutStore())
{ {
TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum); TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum);
InOutParam param = new InOutParam(currTrayNum, trayInfo.WareCode, trayInfo.PosId, trayInfo.PlateH, trayInfo.PlateW); InOutParam param = new InOutParam(currTrayNum, trayInfo.WareCode, trayInfo.PosId, trayInfo.PlateH, trayInfo.PlateW,trayInfo.InStoreNG);
CheckLog("托盘阻挡是需要出库" + param.ToStr() + "：" + SecondMoveInfo.SLog + "等待1秒后顶升上升 ）"); CheckLog("托盘阻挡是需要出库" + param.ToStr() + "：" + SecondMoveInfo.SLog + "等待1秒后顶升上升 ）");
SecondMoveInfo.MoveParam = param; SecondMoveInfo.MoveParam = param;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime);
...@@ -316,7 +321,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -316,7 +321,7 @@ namespace OnlineStore.DeviceLibrary
OutLog("出库 " + MoveInfo.SLog + " : 上下气缸上升，同时出库皮带线开始出库准备"); OutLog("出库 " + MoveInfo.SLog + " : 上下气缸上升，同时出库皮带线开始出库准备");
// CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Down, IO_Type.UpDownCylinder_Up); // CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Down, IO_Type.UpDownCylinder_Up);
UpdownUpMove(); UpdownUpMove();
StartLineOut(); StartLineOut(MoveInfo.MoveParam);
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_04_UpDownCylinderUp)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_04_UpDownCylinderUp))
{ {
...@@ -443,7 +448,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -443,7 +448,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
private void StartLineOut() private void StartLineOut(InOutParam param)
{ {
OutTrayLineBean outline = GetDisLine(); OutTrayLineBean outline = GetDisLine();
...@@ -453,7 +458,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -453,7 +458,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
outline.StartOut(MoveInfo.MoveParam); outline.StartOut(param);
} }
else else
{ {
......
source/DeviceLibrary/model/InOutParam.cs
...@@ -20,8 +20,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -20,8 +20,6 @@ namespace OnlineStore.DeviceLibrary
{ {
this.WareCode = ""; this.WareCode = "";
} }
public InOutParam(int trayCode) public InOutParam(int trayCode)
{ {
WareCode = ""; WareCode = "";
...@@ -30,14 +28,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,14 +28,14 @@ namespace OnlineStore.DeviceLibrary
PlateW =7; PlateW =7;
TrayNumber = trayCode; TrayNumber = trayCode;
} }
public InOutParam(int trayCode, string wareNum, string posId, int plateH, int plateW) public InOutParam(int trayCode, string wareNum, string posId, int plateH, int plateW,bool instoreNg=false)
{ {
WareCode = wareNum; WareCode = wareNum;
PosId = posId; PosId = posId;
this.PlateW = plateW; this.PlateW = plateW;
this.PlateH = plateH; this.PlateH = plateH;
this.TrayNumber = trayCode; this.TrayNumber = trayCode;
this.InStoreNg = instoreNg;
} }
/// <summary> /// <summary>
...@@ -62,9 +60,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -62,9 +60,14 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public int PlateW = 0; public int PlateW = 0;
/// <summary>
/// 是否是入库NG的料盘
/// </summary>
public bool InStoreNg = false;
public string ToStr() public string ToStr()
{ {
return "TrayNumber[" + TrayNumber + "],WareCode[" + WareCode + "],PosId[" + PosId + "],plateW[" + PlateW + "],plateH[" + PlateH + "]"; return "TrayNumber[" + TrayNumber + "],WareCode[" + WareCode + "],PosId[" + PosId + "],plateW[" + PlateW + "],plateH[" + PlateH + "]，InStoreNg["+InStoreNg+"]";
} }
/// <summary> /// <summary>
/// 根据PosId获取对应的料仓ID，若PosId=="",返回-1 /// 根据PosId获取对应的料仓ID，若PosId=="",返回-1
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -1016,9 +1016,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -1016,9 +1016,22 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
DLO_07_LineRun, DLO_07_LineRun,
/// <summary> /// <summary>
/// 皮带线12处理料盘：是NG料盘，NG气缸前进
/// </summary>
DLO_08_NGCylinder_Before,
/// <summary>
/// 皮带线12处理料盘：是NG料盘，NG气缸后退
/// </summary>
DLO_09_NGCylinder_After,
/// <summary>
/// 皮带线12处理料盘：判断出口是否有料盘，有料盘需要转动，没有料盘结束
/// </summary>
DLO_10_LineRun,
/// <summary>
/// 皮带线12处理料盘：出口无料盘，结束， /// 皮带线12处理料盘：出口无料盘，结束，
/// </summary> /// </summary>
DLO_08_ExitNoTray DLO_11_ExitNoTray
#endregion #endregion
#endregion #endregion
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!