lhiven
/
Rs.DeweyTester
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加在空跑时是否启用料仓

Browse Source
master
lhiven 1 year ago
parent eaeb63b0c3
commit 7ab3cb19d2
5 changed files with 129 additions and 98 deletions
Show Stats Download Patch File Download Diff File

13
Rs.DeweyTester/Commom/GlobalVar.cs
Unescape Escape View File

@ -22,6 +22,19 @@ namespace Rs.Framework
{ {
#region newpro #region newpro
/// <summary>
/// 启用料仓
/// </summary>
[ParameterInit("bool", "true", "system", "启用料仓")]
public static bool EnableStock
{
get
{
return SysConfigParam.GetValue<bool>(nameof(EnableStock));
}
}
public static ECardMode CardMode public static ECardMode CardMode
{ {
get; get;

97
Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -189,8 +189,17 @@ namespace Rs.MotionPlat.Flow
GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave); GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave); GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave);
GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave); GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave);
if(GlobalVar.RunSpace&&!GlobalVar.EnableStock)
{
GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have);
flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
}
else
{
flowStep = EDischargeFlowStep.工作前准备; flowStep = EDischargeFlowStep.工作前准备;
} }
}
else if(button== EButtonType.Cancel) else if(button== EButtonType.Cancel)
{ {
logInfo = GetClassName() + "选择了Cancel"; logInfo = GetClassName() + "选择了Cancel";
@ -273,6 +282,13 @@ namespace Rs.MotionPlat.Flow
} }
else else
{
if(GlobalVar.RunSpace&&!GlobalVar.EnableStock)
{
GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have);
takeSlotIndex = 1;
}
else
{ {
//换料盘 //换料盘
//GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have); //GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have);
@ -304,76 +320,18 @@ namespace Rs.MotionPlat.Flow
takeSlotIndex = 1; takeSlotIndex = 1;
} }
} }
}
} }
break; break;
case EDischargeFlowStep.进料盘产品定位: case EDischargeFlowStep.进料盘产品定位:
if(GlobalVar.RunSpace)
{
flowStep = EDischargeFlowStep.料仓取料;
productLocationResult = OneGrabSixteenManager.Instance.GetResults();
}
else
{
ProductLocationFlow.Instance.Grab(ETrayType.Input, takeSlotIndex); ProductLocationFlow.Instance.Grab(ETrayType.Input, takeSlotIndex);
productLocationResult = OneGrabSixteenManager.Instance.GetResults(); productLocationResult = OneGrabSixteenManager.Instance.GetResults();
if (productLocationResult != null) if (productLocationResult != null || GlobalVar.RunSpace)
{ {
//foreach (ProductLocationResult item in results)
//{
// if(item.Result== EOneGrabSixteenResult.Slant || item.Result== EOneGrabSixteenResult.LocationOkScanBarcodeFail)
// {
// bool exit = false;
// while (!exit)
// {
// //凡是定位失败的，需要定位重拍
// ProductLocationResult vr = FixedGrabProductFlow.Instance.Grab(ETrayType.Input, item.SlotIndex);
// if (vr.Result == EOneGrabSixteenResult.Ok)//拍照OK
// {
// item.Change(vr.SN, vr.OffsetX, vr.OffsetY);
// exit = true;
// }
// else if (vr.Result == EOneGrabSixteenResult.Slant)//拍照失败
// {
// //报警弹框
// EButtonType buttonSelect = Msgbox.ShowDialog(EButtonType.Skip| EButtonType.Retry, $"穴位{item.SlotIndex}定位失败，请把产品手动取走后点击跳过");
// if (buttonSelect == EButtonType.Skip)
// {
// GlobalTray.InputTray.ChangeStatus(item.SlotIndex, ESlotStatus.NotHave);
// exit = true;
// }
// }
// else if (vr.Result == EOneGrabSixteenResult.LocationOkScanBarcodeFail)//定位成功，拍照失败
// {
// //这里需要把产品取到拍照NG料盘中
// //取料
// Nozzle idleNozzle = NozzleManager.GetIdelNozzle();
// StockTakeFlow.Instance.Take(item.SlotIndex, idleNozzle.NozzleIndex);
// //放料
// TraySlot noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
// if (noProductSlot != null)
// {
// StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
// }
// else
// {
// Msgbox.ShowDialog(EButtonType.Ok, "Retest料盘已放满，请更换料盘，更换完成后点击确定");
// GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave);
// ThreePointLocationFlow.Instance.Location(ETrayType.ReTest);
// //放料
// noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
// StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
// }
// exit = true;
// }
// }
// }
//}
//对结果进行处理 //对结果进行处理
flowStep = EDischargeFlowStep.料仓取料; flowStep = EDischargeFlowStep.料仓取料;
} }
}
break; break;
case EDischargeFlowStep.料仓取料: case EDischargeFlowStep.料仓取料:
ProductLocationResult ret = productLocationResult.Where(r => r.SlotIndex == takeSlotIndex).FirstOrDefault(); ProductLocationResult ret = productLocationResult.Where(r => r.SlotIndex == takeSlotIndex).FirstOrDefault();
@ -720,10 +678,19 @@ namespace Rs.MotionPlat.Flow
//{ //{
// DischargeModuleGoSafePosFlow.Instance.GoSafePostion(ESafePosSide.PlaceToStock); // DischargeModuleGoSafePosFlow.Instance.GoSafePostion(ESafePosSide.PlaceToStock);
//} //}
if(GlobalVar.RunSpace&& !GlobalVar.EnableStock)
{
GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave);
ThreePointLocationFlow.Instance.Location(ETrayType.Ok);
}
else
{
DischargeModuleGoSafePosFlow.Instance.GoSafePostion(); DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
TakeTrayFlow.Instance.Take(ETrayType.Empty, ETrayType.Ok, true, true); TakeTrayFlow.Instance.Take(ETrayType.Empty, ETrayType.Ok, true, true);
GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave); GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave);
ThreePointLocationFlow.Instance.Location(ETrayType.Ok); ThreePointLocationFlow.Instance.Location(ETrayType.Ok);
}
//料盘已满 //料盘已满
} }
} }
@ -767,12 +734,20 @@ namespace Rs.MotionPlat.Flow
StockPlaceFlow.Instance.Place(ETrayType.Ng, waitPlaceSlot.Index, placeNozzleIndex); StockPlaceFlow.Instance.Place(ETrayType.Ng, waitPlaceSlot.Index, placeNozzleIndex);
} }
else else
{
if (GlobalVar.RunSpace && !GlobalVar.EnableStock)
{
GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
}
else
{ {
//提示更换料盘 //提示更换料盘
Msgbox.ShowTipDialog(EButtonType.Ok, "NG tray full,please change tray and click ok button", "tip", true); Msgbox.ShowTipDialog(EButtonType.Ok, "NG tray full,please change tray and click ok button", "tip", true);
ThreePointLocationFlow.Instance.Location(ETrayType.Ng); ThreePointLocationFlow.Instance.Location(ETrayType.Ng);
GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave); GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
} }
}
} }
} }
// flowStep = EDischargeFlowStep.到料仓放料位上方; // flowStep = EDischargeFlowStep.到料仓放料位上方;

10
Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs generated
Unescape Escape View File

@ -39,6 +39,7 @@
this.cboxVirtualAxis = new System.Windows.Forms.CheckBox(); this.cboxVirtualAxis = new System.Windows.Forms.CheckBox();
this.cboxCheckSafeEnable = new System.Windows.Forms.CheckBox(); this.cboxCheckSafeEnable = new System.Windows.Forms.CheckBox();
this.cboxEnableIndexTimeStatistics = new System.Windows.Forms.CheckBox(); this.cboxEnableIndexTimeStatistics = new System.Windows.Forms.CheckBox();
this.cboxEnableStock = new System.Windows.Forms.CheckBox();
this.cboxRunSpace = new System.Windows.Forms.CheckBox(); this.cboxRunSpace = new System.Windows.Forms.CheckBox();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.btnSaveRelCategory = new System.Windows.Forms.Button(); this.btnSaveRelCategory = new System.Windows.Forms.Button();
@ -149,6 +150,7 @@
this.groupBox8.Controls.Add(this.cboxVirtualAxis); this.groupBox8.Controls.Add(this.cboxVirtualAxis);
this.groupBox8.Controls.Add(this.cboxCheckSafeEnable); this.groupBox8.Controls.Add(this.cboxCheckSafeEnable);
this.groupBox8.Controls.Add(this.cboxEnableIndexTimeStatistics); this.groupBox8.Controls.Add(this.cboxEnableIndexTimeStatistics);
this.groupBox8.Controls.Add(this.cboxEnableStock);
this.groupBox8.Controls.Add(this.cboxRunSpace); this.groupBox8.Controls.Add(this.cboxRunSpace);
resources.ApplyResources(this.groupBox8, "groupBox8"); resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.ForeColor = System.Drawing.Color.White; this.groupBox8.ForeColor = System.Drawing.Color.White;
@ -215,6 +217,13 @@
this.cboxEnableIndexTimeStatistics.UseVisualStyleBackColor = true; this.cboxEnableIndexTimeStatistics.UseVisualStyleBackColor = true;
this.cboxEnableIndexTimeStatistics.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged); this.cboxEnableIndexTimeStatistics.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
// //
// cboxEnableStock
//
resources.ApplyResources(this.cboxEnableStock, "cboxEnableStock");
this.cboxEnableStock.Name = "cboxEnableStock";
this.cboxEnableStock.UseVisualStyleBackColor = true;
this.cboxEnableStock.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxRunSpace // cboxRunSpace
// //
resources.ApplyResources(this.cboxRunSpace, "cboxRunSpace"); resources.ApplyResources(this.cboxRunSpace, "cboxRunSpace");
@ -934,5 +943,6 @@
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnSaveRelCategory; private System.Windows.Forms.Button btnSaveRelCategory;
private System.Windows.Forms.CheckBox cboxEnableStock;
} }
} }

2
Rs.DeweyTester/SysConfig/CommonConfig.cs
Unescape Escape View File

@ -94,7 +94,7 @@ namespace Rs.MotionPlat.SysConfig
PositionHelper.BindPosition(groupBox8); PositionHelper.BindPosition(groupBox8);
if(GlobalUser.IsVender() || GlobalUser.IsSuper()) if(GlobalUser.IsVender() || GlobalUser.IsSuper())
{ {
cboxRunSpace.Visible = cboxVirtualAxis.Visible = cboxEnableVirtuleBarCode.Visible = cboxInputTrayLoop.Visible = cboxCheckSafeEnable.Visible = cboxEnableIndexTimeStatistics.Visible = true; cboxEnableStock.Visible = cboxRunSpace.Visible = cboxVirtualAxis.Visible = cboxEnableVirtuleBarCode.Visible = cboxInputTrayLoop.Visible = cboxCheckSafeEnable.Visible = cboxEnableIndexTimeStatistics.Visible = true;
} }
dataGridView1.AutoGenerateColumns = false; dataGridView1.AutoGenerateColumns = false;
BindMenu(); BindMenu();

37
Rs.DeweyTester/SysConfig/CommonConfig.resx
Unescape Escape View File

@ -384,6 +384,39 @@
<data name="&gt;&gt;cboxEnableIndexTimeStatistics.ZOrder" xml:space="preserve"> <data name="&gt;&gt;cboxEnableIndexTimeStatistics.ZOrder" xml:space="preserve">
<value>7</value> <value>7</value>
</data> </data>
<data name="cboxEnableStock.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cboxEnableStock.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cboxEnableStock.Location" type="System.Drawing.Point, System.Drawing">
<value>174, 224</value>
</data>
<data name="cboxEnableStock.Size" type="System.Drawing.Size, System.Drawing">
<value>96, 16</value>
</data>
<data name="cboxEnableStock.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="cboxEnableStock.Text" xml:space="preserve">
<value>是否启用料仓</value>
</data>
<data name="cboxEnableStock.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;cboxEnableStock.Name" xml:space="preserve">
<value>cboxEnableStock</value>
</data>
<data name="&gt;&gt;cboxEnableStock.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cboxEnableStock.Parent" xml:space="preserve">
<value>groupBox8</value>
</data>
<data name="&gt;&gt;cboxEnableStock.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="cboxRunSpace.AutoSize" type="System.Boolean, mscorlib"> <data name="cboxRunSpace.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
@ -415,7 +448,7 @@
<value>groupBox8</value> <value>groupBox8</value>
</data> </data>
<data name="&gt;&gt;cboxRunSpace.ZOrder" xml:space="preserve"> <data name="&gt;&gt;cboxRunSpace.ZOrder" xml:space="preserve">
<value>8</value> <value>9</value>
</data> </data>
<data name="groupBox8.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="groupBox8.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
@ -2686,6 +2719,6 @@
<value>CommonConfig</value> <value>CommonConfig</value>
</data> </data>
<data name="&gt;&gt;$this.Type" xml:space="preserve"> <data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.9, Culture=neutral, PublicKeyToken=null</value> <value>Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=1.20.24.10, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
</root> </root>
Write Preview
Loading…
Cancel
Save