Skip to content

李娜 / SO908-XLRStore

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

出库修改

1 个父辈 4025f23b
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 40 行增加 和 18 行删除
source/DeviceLibrary/Config/Config_InputEquip.csv
...@@ -8,6 +8,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,, ...@@ -8,6 +8,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,
PRO,0,是否使用夹爪（1=使用夹爪，0=用吸盘）,UseClampJaw,1,,,,,,,,,,,, PRO,0,是否使用夹爪（1=使用夹爪，0=用吸盘）,UseClampJaw,1,,,,,,,,,,,,
PRO,0,A侧扫码的相机名称(多个用#分隔),CameraNameList_A,GigE:MV-CE200-10GC (00E70964538),,,,,,,,,,,, PRO,0,A侧扫码的相机名称(多个用#分隔),CameraNameList_A,GigE:MV-CE200-10GC (00E70964538),,,,,,,,,,,,
PRO,0,B侧扫码的相机名称(多个用#分隔),CameraNameList_B,GigE:MV-CE200-10GC (00E78064946),,,,,,,,,,,, PRO,0,B侧扫码的相机名称(多个用#分隔),CameraNameList_B,GigE:MV-CE200-10GC (00E78064946),,,,,,,,,,,,
PRO,0,旋转轴到暂存区附近等待时的偏移位置,MiddleOffsetValue,40000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,A侧上料料架-RFID-IP,PRO_RFIP_A,192.168.101.103,,,,,,,,,,,, PRO,0,A侧上料料架-RFID-IP,PRO_RFIP_A,192.168.101.103,,,,,,,,,,,,
PRO,0,B侧上料料架-RFID-IP,PRO_RFIP_B,192.168.101.104,,,,,,,,,,,, PRO,0,B侧上料料架-RFID-IP,PRO_RFIP_B,192.168.101.104,,,,,,,,,,,,
......
source/DeviceLibrary/manager/model/DeviceStep.cs
...@@ -528,10 +528,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -528,10 +528,10 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 入料机构入料 1100 开始 #region 入料机构入料 1100 开始
/// <summary> ///// <summary>
/// 入料料串取料：判断旋转轴是否在P1,不在的话直接到P1 ///// 入料料串取料：判断旋转轴是否在P1,不在的话直接到P1
/// </summary> ///// </summary>
II00_MiddleToP1=1100, //II00_MiddleToP1=1100,
/// <summary> /// <summary>
/// 入库料串取料：升降轴到达P1 /// 入库料串取料：升降轴到达P1
...@@ -590,13 +590,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -590,13 +590,20 @@ namespace OnlineStore.DeviceLibrary
#region 入料->A侧上暂存区 1140 #region 入料->A侧上暂存区 1140
/// <summary> /// <summary>
/// 入料->A侧：等待A上暂存区无料 /// 入料->A侧：取料升降轴 到P4(A上暂存区放料高点)
/// </summary> /// </summary>
II41_WaitNoReel = 1140, II40_UpdownToP4,
/// <summary> /// <summary>
/// 入料->A侧：取料升降轴 到P4(A上暂存区放料高点) ///入料->A侧：暂存区不为空，先旋转轴到P4附近位置
/// </summary>
II41_MiddleTWaitP4,
/// <summary>
/// 入料->A侧：等待A上暂存区无料
/// </summary> /// </summary>
II42_UpdownToP4, II42_WaitNoReel = 1140,
/// <summary> /// <summary>
/// 入料->A侧：取料旋转轴 到P4(A上暂存区放料点) /// 入料->A侧：取料旋转轴 到P4(A上暂存区放料点)
/// </summary> /// </summary>
...@@ -622,14 +629,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -622,14 +629,19 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 入料->B侧上暂存区 1160 #region 入料->B侧上暂存区 1160
/// <summary> /// <summary>
/// 入料->B侧：等待B上暂存区无料 /// 入料->B侧：取料升降轴 到P10（B上暂存区放料高点)
/// </summary> /// </summary>
II61_WaitNoReel, II60_UpdownToP10,
/// <summary> /// <summary>
/// 入料->B侧：取料升降轴 到P10（B上暂存区放料高点) /// 入料->B侧：暂存区有物料，旋转轴先到P5附近等待
/// </summary>
II61_MiddleToWaitP5,
/// <summary>
/// 入料->B侧：等待B上暂存区无料
/// </summary> /// </summary>
II62_UpdownToP10, II62_WaitNoReel,
/// <summary> /// <summary>
/// 入料->B侧：取料旋转轴 到P5 (B上暂存区放料点) /// 入料->B侧：取料旋转轴 到P5 (B上暂存区放料点)
/// </summary> /// </summary>
......
source/DeviceLibrary/storeBean/XLRStoreBean.cs
...@@ -66,7 +66,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -66,7 +66,7 @@ namespace OnlineStore.DeviceLibrary
AgvClient.NodeList.Add(inputConfig.AgvName_A); AgvClient.NodeList.Add(inputConfig.AgvName_A);
AgvClient.NodeList.Add(inputConfig.AgvName_B); AgvClient.NodeList.Add(inputConfig.AgvName_B);
BufferDataManager.InitData();
mainTimer.Enabled = true; mainTimer.Enabled = true;
canStart = true; canStart = true;
AgvClient.Init(); AgvClient.Init();
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
...@@ -58,6 +58,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -58,6 +58,10 @@ namespace OnlineStore.DeviceLibrary
addLastDI(IO_Type.Airpressure_Check, IO_VALUE.LOW); addLastDI(IO_Type.Airpressure_Check, IO_VALUE.LOW);
addLastDI(IO_Type.SuddenStop_BTN, IO_VALUE.LOW); addLastDI(IO_Type.SuddenStop_BTN, IO_VALUE.LOW);
addLastDI(IO_Type.Reset_BTN, IO_VALUE.LOW); addLastDI(IO_Type.Reset_BTN, IO_VALUE.LOW);
if (config.MiddleOffsetValue < 30000)
{
config.MiddleOffsetValue = 40000;
}
runStatus = RunStatus.Wait; runStatus = RunStatus.Wait;
} }
...@@ -421,9 +425,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -421,9 +425,9 @@ namespace OnlineStore.DeviceLibrary
{ {
foreach (BatchMoveBean moveBean in BatchMoveList) foreach (BatchMoveBean moveBean in BatchMoveList)
{ {
if (moveBean.ShelfReadyOut(BufferDataManager.AOutStoreInfo, shelfAutoLeave)) if (moveBean.ShelfReadyOut(posInfo, shelfAutoLeave))
{ {
InOutParam param = new InOutParam(BufferDataManager.AOutStoreInfo.ToCopy()); InOutParam param = new InOutParam(posInfo.ToCopy());
param.ShelfType = moveBean.ShelfType; param.ShelfType = moveBean.ShelfType;
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到料串{param.ShelfType}"); LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到料串{param.ShelfType}");
StartOutstore(param); StartOutstore(param);
......
source/LoadCVSLibrary/storeConfig/config/InputEquip_Config.cs
...@@ -82,6 +82,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -82,6 +82,12 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("AgvName_B")] [ConfigProAttribute("AgvName_B")]
public string AgvName_B { get; set; } public string AgvName_B { get; set; }
/// <summary>
/// PRO,0,旋转轴到暂存区附近等待时的偏移位置,MiddleOffsetValue,40000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("MiddleOffsetValue")]
public int MiddleOffsetValue { get; set; }
/// <summary> /// <summary>
/// PRO,0,提升轴待机点_A侧,BatchAxisP1_A,1000,,,,,,,,,,,, /// PRO,0,提升轴待机点_A侧,BatchAxisP1_A,1000,,,,,,,,,,,,
/// </summary> /// </summary>
......
source/XLRStoreClient/XLRStore.csproj
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
<Reference Include="UserFromControl"> <Reference Include="UserFromControl">
<HintPath>..\..\dll\UserFromControl.dll</HintPath> <HintPath>..\..\dll\UserFromControl.dll</HintPath>
</Reference> </Reference>
<Reference Include="XLRStore, Version=1.0.7818.19677, Culture=neutral, PublicKeyToken=null" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="boxForm\FrmAutoFindPos.cs"> <Compile Include="boxForm\FrmAutoFindPos.cs">
......
source/XLRStoreClient/inputForm/FrmInputEquip.cs
...@@ -360,7 +360,7 @@ namespace OnlineStore.XLRStore ...@@ -360,7 +360,7 @@ namespace OnlineStore.XLRStore
updownAxisP10.SetMoveData(inputEquip.UpdownAxis, config.Updown_P10_Speed,config.Updown_P10_BUpperH); updownAxisP10.SetMoveData(inputEquip.UpdownAxis, config.Updown_P10_Speed,config.Updown_P10_BUpperH);
updownAxisP11.SetMoveData(inputEquip.UpdownAxis, config.Updown_P11_Speed,config.Updown_P11_BUpperL); updownAxisP11.SetMoveData(inputEquip.UpdownAxis, config.Updown_P11_Speed,config.Updown_P11_BUpperL);
updownAxisP12.SetMoveData(inputEquip.UpdownAxis, config.Updown_P12_Speed,config.Updown_P12_BUnderH); updownAxisP12.SetMoveData(inputEquip.UpdownAxis, config.Updown_P12_Speed,config.Updown_P12_BUnderH);
updownAxisP13.SetMoveData(inputEquip.UpdownAxis, config.Updown_P13_Speed,config.Updown_P12_BUnderH); updownAxisP13.SetMoveData(inputEquip.UpdownAxis, config.Updown_P13_Speed,config.Updown_P13_BUnderL);
} }
protected void AddForm(TabControl tabcon, string text, Form form) protected void AddForm(TabControl tabcon, string text, Form form)
...@@ -585,7 +585,7 @@ namespace OnlineStore.XLRStore ...@@ -585,7 +585,7 @@ namespace OnlineStore.XLRStore
inputEquip.Config.Updown_P10_BUpperH = updownAxisP10.PointValue; inputEquip.Config.Updown_P10_BUpperH = updownAxisP10.PointValue;
inputEquip.Config.Updown_P11_BUpperL = updownAxisP11.PointValue; inputEquip.Config.Updown_P11_BUpperL = updownAxisP11.PointValue;
inputEquip.Config.Updown_P12_BUnderH = updownAxisP12.PointValue; inputEquip.Config.Updown_P12_BUnderH = updownAxisP12.PointValue;
inputEquip.Config.Updown_P12_BUnderH = updownAxisP13.PointValue; inputEquip.Config.Updown_P13_BUnderL = updownAxisP13.PointValue;
inputEquip.Config.Middle_P1 = mideleAxisP1.PointValue; inputEquip.Config.Middle_P1 = mideleAxisP1.PointValue;
inputEquip.Config.Middle_P2_ATake = mideleAxisP2.PointValue; inputEquip.Config.Middle_P2_ATake = mideleAxisP2.PointValue;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!