Skip to content

张东亮 / RC1250-BackFeedLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 41f0bdef 由 张东亮
选项

initial

1 个父辈 35cc8911
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 81 行增加 和 84 行删除
dll/Client.dll 0 → 100644
此文件类型无法预览
dll/Client.xml 0 → 100644
此文件的差异被折叠， 点击展开。
source/BackFeedLine/App.config
......@@ -12,14 +12,14 @@
<!--storeType-->
<add key="store_count" value="1" />
<!--start one store config-->
<add key="Line_Config" value="\LineConfig\FeederLineConfig.csv" />
<add key="Line_Config" value="\LineConfig\LineConfig.csv" />
<add key="Config_Pwd" value="123456" />
<!--IO配置-->
<add key="UseAIOBOX" value="1" />
<add key="DIMS" value="60" />
<add key="DOMS" value="300" />
<!--AGV调度服务器地址-->
<add key="AgvServerIp" value="10.85.199.1" />
<add key="AgvServerIp" value="10.85.199.20" />
<!--是否调试状态-->
<add key="IsInDebug" value="1" />
<add key="Agv_Log_Open" value="1" />
......@@ -37,7 +37,7 @@
</layout>
</appender>
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/TheRFID-vmi.log" />
<file value="logs/TheRFID-line.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
......
source/BackFeedLine/BackFeedLineClient.csproj
......@@ -81,11 +81,11 @@
<Compile Include="FrmBase.Designer.cs">
<DependentUpon>FrmBase.cs</DependentUpon>
</Compile>
<Compile Include="FrmBackFeedClient.cs">
<Compile Include="FrmLineClient.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmBackFeedClient.Designer.cs">
<DependentUpon>FrmBackFeedClient.cs</DependentUpon>
<Compile Include="FrmLineClient.Designer.cs">
<DependentUpon>FrmLineClient.cs</DependentUpon>
</Compile>
<Compile Include="ManagerUtil.cs" />
<Compile Include="Program.cs" />
......@@ -94,8 +94,8 @@
<DependentUpon>FrmBase.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FrmBackFeedClient.resx">
<DependentUpon>FrmBackFeedClient.cs</DependentUpon>
<EmbeddedResource Include="FrmLineClient.resx">
<DependentUpon>FrmLineClient.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
......@@ -146,8 +146,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="BackFeed.ico" />
<Content Include="box.ico" />
<Content Include="DfIcon.ico" />
<Content Include="记录.txt" />
</ItemGroup>
<ItemGroup>
......
source/BackFeedLine/FrmBackFeedClient.Designer.cs → source/BackFeedLine/FrmLineClient.Designer.cs
......@@ -210,9 +210,9 @@
this.cmbStopList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbStopList.FormattingEnabled = true;
this.cmbStopList.Items.AddRange(new object[] {
"Feeder1进料线_阻挡",
"Feeder1进料线_出口阻挡",
"Feeder2出料线_阻挡"});
"进料线_阻挡",
"进料线_出口阻挡",
"出料线_阻挡"});
this.cmbStopList.Location = new System.Drawing.Point(22, 435);
this.cmbStopList.Name = "cmbStopList";
this.cmbStopList.Size = new System.Drawing.Size(153, 28);
......@@ -261,7 +261,7 @@
this.btnOLOutStopDown.Name = "btnOLOutStopDown";
this.btnOLOutStopDown.Size = new System.Drawing.Size(140, 39);
this.btnOLOutStopDown.TabIndex = 281;
this.btnOLOutStopDown.Text = "Feeder2线体出口阻挡下降";
this.btnOLOutStopDown.Text = "出料线体出口阻挡下降";
this.btnOLOutStopDown.UseVisualStyleBackColor = true;
this.btnOLOutStopDown.Click += new System.EventHandler(this.btnOLOutStopDown_Click);
//
......@@ -272,7 +272,7 @@
this.btnOLInStopDown.Name = "btnOLInStopDown";
this.btnOLInStopDown.Size = new System.Drawing.Size(140, 39);
this.btnOLInStopDown.TabIndex = 280;
this.btnOLInStopDown.Text = "Feeder2线体阻挡下降";
this.btnOLInStopDown.Text = "出料线体阻挡下降";
this.btnOLInStopDown.UseVisualStyleBackColor = true;
this.btnOLInStopDown.Click += new System.EventHandler(this.btnOLInStopDown_Click);
//
......@@ -283,7 +283,7 @@
this.btnInLOutStopDown.Name = "btnInLOutStopDown";
this.btnInLOutStopDown.Size = new System.Drawing.Size(140, 39);
this.btnInLOutStopDown.TabIndex = 279;
this.btnInLOutStopDown.Text = "Feeder1出口缓冲打开";
this.btnInLOutStopDown.Text = "入料出口缓冲打开";
this.btnInLOutStopDown.UseVisualStyleBackColor = true;
this.btnInLOutStopDown.Click += new System.EventHandler(this.btnInLOutStopDown_Click);
//
......@@ -294,7 +294,7 @@
this.btnInLInStopDown.Name = "btnInLInStopDown";
this.btnInLInStopDown.Size = new System.Drawing.Size(140, 39);
this.btnInLInStopDown.TabIndex = 278;
this.btnInLInStopDown.Text = "Feeder1线体阻挡下降";
this.btnInLInStopDown.Text = "入料线体阻挡下降";
this.btnInLInStopDown.UseVisualStyleBackColor = true;
this.btnInLInStopDown.Click += new System.EventHandler(this.btnInLInStopDown_Click);
//
......@@ -305,7 +305,7 @@
this.btnInLineRun.Name = "btnInLineRun";
this.btnInLineRun.Size = new System.Drawing.Size(140, 39);
this.btnInLineRun.TabIndex = 276;
this.btnInLineRun.Text = "Feeder1线体运转";
this.btnInLineRun.Text = "入料线体运转";
this.btnInLineRun.UseVisualStyleBackColor = true;
this.btnInLineRun.Click += new System.EventHandler(this.btnInLineRun_Click);
//
......@@ -316,7 +316,7 @@
this.btnOutL.Name = "btnOutL";
this.btnOutL.Size = new System.Drawing.Size(140, 39);
this.btnOutL.TabIndex = 277;
this.btnOutL.Text = "Feeder2线体运转";
this.btnOutL.Text = "出料线体运转";
this.btnOutL.UseVisualStyleBackColor = true;
this.btnOutL.Click += new System.EventHandler(this.btnOutL_Click);
//
......
source/BackFeedLine/FrmBackFeedClient.cs → source/BackFeedLine/FrmLineClient.cs
......@@ -224,7 +224,7 @@ namespace OnlineStore.FeederLineClient
IOManager.instance.CloseAllDO();
IOManager.instance.CloseAllConnection();
feederLine.agvClient.Dispose();
AgvClient.Dispose();
System.Environment.Exit(System.Environment.ExitCode);
}
catch (Exception ex)
......@@ -332,32 +332,32 @@ namespace OnlineStore.FeederLineClient
}
private void btnInLineRun_Click(object sender, EventArgs e)
{
BtnMove(btnInLineRun, "退料1线体运转", "退料1线体停止", IO_Type.L1_Run);
BtnMove(btnInLineRun, "入料线体运转", "入料线体停止", IO_Type.L1_Run);
}
private void btnInLInStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnInLInStopDown, "退料1线体阻挡下降", "退料1线体阻挡上升", IO_Type.L1_StopDown);
BtnMove(btnInLInStopDown, "入料线体阻挡下降", "入料线体阻挡上升", IO_Type.L1_StopDown);
}
private void btnInLOutStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnInLOutStopDown, "退料1出口缓冲打开", "退料1出口缓冲关闭", IO_Type.L1_OutStopDown);
BtnMove(btnInLOutStopDown, "入料出口缓冲打开", "入料出口缓冲关闭", IO_Type.L1_OutStopDown);
}
private void btnOLInStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnOLInStopDown, "退料2线体阻挡下降", "退料2线体阻挡上升", IO_Type.L2_StopDown);
BtnMove(btnOLInStopDown, "出料线体阻挡下降", "出料线体阻挡上升", IO_Type.L2_StopDown);
}
private void btnOutL_Click(object sender, EventArgs e)
{
BtnMove(btnOutL, "退料2线体运转", "退料2线体停止", IO_Type.L2_Run);
BtnMove(btnOutL, "出料线体运转", "出料线体停止", IO_Type.L2_Run);
}
private void btnOLOutStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnOLOutStopDown, "退料2线体出口阻挡下降", "退料2线体出口阻挡上升", IO_Type.L2_OutStopDown);
BtnMove(btnOLOutStopDown, "出料线体出口阻挡下降", "出料线体出口阻挡上升", IO_Type.L2_OutStopDown);
}
private void btnCloseA_Click(object sender, EventArgs e)
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -42,8 +42,8 @@
<Reference Include="Asa.RFID">
<HintPath>..\..\dll\Asa.RFID.dll</HintPath>
</Reference>
<Reference Include="AsaPL.AgvClient">
<HintPath>..\..\dll\AsaPL.AgvClient.dll</HintPath>
<Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath>
</Reference>
<Reference Include="CodeLibrary">
<HintPath>..\..\..\RC32-SZBOSCH-ACSingleStore\dll\CodeLibrary.dll</HintPath>
......@@ -98,7 +98,7 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="LineConfig\FeederLineConfig.csv">
<None Include="LineConfig\LineConfig.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
......
source/DeviceLibrary/LineConfig/FeederLineConfig.csv deleted 100644 → 0
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,192.168.103.28#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,192.168.103.28#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,192.168.103.28,,,,,,,
,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X761,DI-01,0,
DI,退料1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,退料1线入口检测,X762,DI-02,0,
DI,退料1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,退料1线阻挡检测,X763,DI-03,0,
DI,退料1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,退料1线出口检测,X764,DI-04,0,
DI,退料2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,退料2线入口检测,X765,DI-05,0,
DI,退料2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,退料2线阻挡检测,X766,DI-06,0,
DI,退料2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,退料2线出口检测,X767,DI-07,0,
DI,退料1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,退料1线人工取料信号,X768,DI-08,0,
DI,退料1线顶升上升端,L1_Updown_Up_Sig,8,PRO_AOI_IP_1,0,退料1线顶升上升端,X769,DI-09,0,
DI,退料1线顶升下降端,L1_Updown_Down_Sig,9,PRO_AOI_IP_1,0,退料1线顶升下降端,X770,DI-10,0,
DI,退料2线顶升上升端,L2_Updown_Up_Sig,10,PRO_AOI_IP_1,0,退料2线顶升上升端,X771,DI-11,0,
DI,退料2线顶升下降端,L2_Updown_Down_Sig,11,PRO_AOI_IP_1,0,退料2线顶升下降端,X772,DI-12,0,
,,,12,PRO_AOI_IP_1,0,,X773,DI-13,0,
,,,13,PRO_AOI_IP_1,0,,X774,DI-14,0,
,,,14,PRO_AOI_IP_1,0,,X775,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X776,DI-16,0,
DO,退料1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,退料1线驱动电机运转,Y761,DO-01,0,
DO,退料2线驱动电机运转,L2_Run,1,PRO_AOI_IP_1,0,退料2线驱动电机运转,Y762,DO-02,0,
DO,退料1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,退料1线阻挡1下降,Y763,DO-03,0,
DO,退料1线出口缓冲器,L1_OutStopDown,3,PRO_AOI_IP_1,0,退料1线出口缓冲器,Y764,DO-04,0,
DO,退料2线出口阻挡下降,L2_OutStopDown,4,PRO_AOI_IP_1,0,退料2线出口阻挡下降,Y765,DO-05,0,
DO,退料2线阻挡1下降,L2_StopDown,5,PRO_AOI_IP_1,0,退料2线阻挡1下降,Y766,DO-06,0,
DO,退料线横移机构上升SOL,Tranverse_Up_SOL,6,PRO_AOI_IP_1,0,退料线横移机构上升SOL,Y767,DO-07,0,
DO,退料线横移机构下降SOL,Tranverse_Down_SOL,7,PRO_AOI_IP_1,0,退料线横移机构下降SOL,Y768,DO-08,0,
DO,退料线横移电机运转,Tranverse_Run,8,PRO_AOI_IP_1,0,退料线横移电机运转,Y769,DO-09,0,
,,,9,PRO_AOI_IP_1,0,,Y770,DO-10,0,
,,,10,PRO_AOI_IP_1,0,,Y771,DO-11,0,
,,,11,PRO_AOI_IP_1,0,,Y772,DO-12,0,
,,,12,PRO_AOI_IP_1,0,,Y773,DO-13,0,
,,,13,PRO_AOI_IP_1,0,,Y774,DO-14,0,
,,,14,PRO_AOI_IP_1,0,,Y775,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y776,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,退料1线AGV节点名称,L1_AgvName,D21,,,,,,,
PRO,退料2线AGV节点名称,L2_AgvName,D22,,,,,,,
PRO,退料线出口RFIDIP,L2Out_RFIDIP,192.168.103.108,,,,,, ,
PRO,休眠秒数（秒）,SleepSeconds,60,,,,,,,
source/DeviceLibrary/LineConfig/LineConfig.csv 0 → 100644
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,192.168.103.28#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,192.168.103.28#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,192.168.103.28,,,,,,,
,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
DI,进料线体入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,进料线体入口检测,X02,DI-02,0,
DI,进料线体阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,进料线体阻挡检测,X03,DI-03,0,
DI,进料线体出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,进料线体出口检测,X04,DI-04,0,
DI,出料线体入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,出料线体入口检测,X05,DI-05,0,
DI,出料线体阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,出料线体阻挡检测,X06,DI-06,0,
DI,出料线体出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,出料线体出口检测,X07,DI-07,0,
DI,进料线体人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,进料线体人工取料信号,X08,DI-08,0,
DI,入料线体顶升上升端,L1_Updown_Up_Sig,8,PRO_AOI_IP_1,0,入料线体顶升上升端,X09,DI-09,0,
DI,入料线体顶升下降端,L1_Updown_Down_Sig,9,PRO_AOI_IP_1,0,入料线体顶升下降端,X10,DI-10,0,
DI,出料线体顶升上升端,L2_Updown_Up_Sig,10,PRO_AOI_IP_1,0,出料线体顶升上升端,X11,DI-11,0,
DI,出料线体顶升下降端,L2_Updown_Down_Sig,11,PRO_AOI_IP_1,0,出料线体顶升下降端,X12,DI-12,0,
,,,12,PRO_AOI_IP_1,0,,X13,DI-13,0,
,,,13,PRO_AOI_IP_1,0,,X774,DI-14,0,
,,,14,PRO_AOI_IP_1,0,,X775,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X776,DI-16,0,
DO,进料线体驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,进料线体驱动电机运转,Y01,DO-01,0,
DO,出料线体驱动电机运转,L2_Run,1,PRO_AOI_IP_1,0,出料线体驱动电机运转,Y02,DO-02,0,
DO,进料线体阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,进料线体阻挡1下降,Y03,DO-03,0,
DO,进料线体出口缓冲器,L1_OutStopDown,3,PRO_AOI_IP_1,0,进料线体出口缓冲器,Y04,DO-04,0,
DO,出料线体出口阻挡下降,L2_OutStopDown,4,PRO_AOI_IP_1,0,出料线体出口阻挡下降,Y05,DO-05,0,
DO,出料线体阻挡1下降,L2_StopDown,5,PRO_AOI_IP_1,0,出料线体阻挡1下降,Y06,DO-06,0,
DO,横移机构上升SOL,Tranverse_Up_SOL,6,PRO_AOI_IP_1,0,横移机构上升SOL,Y07,DO-07,0,
DO,横移机构下降SOL,Tranverse_Down_SOL,7,PRO_AOI_IP_1,0,横移机构下降SOL,Y08,DO-08,0,
DO,横移电机运转,Tranverse_Run,8,PRO_AOI_IP_1,0,横移电机运转,Y09,DO-09,0,
,,,9,PRO_AOI_IP_1,0,,Y770,DO-10,0,
,,,10,PRO_AOI_IP_1,0,,Y771,DO-11,0,
,,,11,PRO_AOI_IP_1,0,,Y772,DO-12,0,
,,,12,PRO_AOI_IP_1,0,,Y773,DO-13,0,
,,,13,PRO_AOI_IP_1,0,,Y774,DO-14,0,
,,,14,PRO_AOI_IP_1,0,,Y775,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y776,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,入料线体AGV节点名称,L1_AgvName,D3,,,,,,,
PRO,出料线体AGV节点名称,L2_AgvName,D4,,,,,,,
PRO,退料线出口RFIDIP,L2Out_RFIDIP,192.168.103.108,,,,,, ,
PRO,休眠秒数（秒）,SleepSeconds,60,,,,,,,
source/DeviceLibrary/acFeederLine/FeederLineBean.cs

using AsaPL;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -21,7 +20,6 @@ namespace OnlineStore.DeviceLibrary
public LineMoveInfo MoveInfo = null;
public AlarmType alarmType = AlarmType.None;
public RunStatus runStatus = RunStatus.Wait;
public AgvClient agvClient;
public string WarnMsg = "";
private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
private System.Timers.Timer mainTimer = new System.Timers.Timer();
......@@ -46,14 +44,15 @@ namespace OnlineStore.DeviceLibrary
IOManager.Init();
IOManager.instance.ConnectionIOList(Config.DIODeviceNameList);
AgvClient.NodeList.Add(config.L2_AgvName);
AgvClient.NodeList.Add(config.L1_AgvName);
mainTimer.Enabled = false;
int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
if (isAuto == 1)
{
mainTimer.Enabled = true;
}
agvClient = new AgvClient();
agvClient.Init();
AgvClient.Init();
//Thread.Sleep(300);
}
......@@ -164,7 +163,7 @@ namespace OnlineStore.DeviceLibrary
WarnMsg = "";
RFIDManager.Close();
agvClient.SetCancelState(true);
AgvClient.SetCancelState(true);
mainTimer.Enabled = false;
serverConnectTimer.Enabled = false;
StopMove();
......@@ -346,10 +345,10 @@ namespace OnlineStore.DeviceLibrary
}
}
stopwatch.Stop();
Thread.Sleep(5000);
IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
LogUtil.info(" 横移电机停止");
Thread.Sleep(5000);
IOManager.CIOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.LOW);
Thread.Sleep(1000);
IOManager.CIOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
......@@ -363,7 +362,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - il_lastCallAgvTime;
//退料1出口有料架，退料2入口空
//出口信号需要持续6秒钟
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 6)
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW) && IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH) && span.TotalSeconds > 6)
{
if (LineManager.checkWatch(ol_tranverseShelfWatch, 2000))
{
......
source/DeviceLibrary/acFeederLine/FeederLineBean_Partial.cs
......@@ -130,8 +130,8 @@ namespace OnlineStore.DeviceLibrary
{
//return "进料线出口" + Config.L2_AgvName + "：" + AgvClient.GetAction(Config.L2_AgvName) + "，料架： " + LastInShelfId + "\r\n" +
// "出料线进口" + Config.L1_AgvName + "：" + AgvClient.GetAction(Config.L1_AgvName) + "，料架： " + LastOutShelfId + "\r\n";
return "退料1线入料口" + Config.L1_AgvName + "：" +agvClient.Feeder_In_Msg+ "\r\n" + //"料架： " + LastInShelfId + AgvClient.GetAction(Config.L1_AgvName)
"退料2线出料口" + Config.L2_AgvName + "：" + "料架： " + LastOutShelfId +" "+ agvClient.Feeder_Out_Msg + "\r\n";//+ "料架： " + LastOutShelfId + AgvClient.GetAction(Config.L2_AgvName) +
return "入料线体入料口" + Config.L1_AgvName + "：" + AgvClient.GetAction(Config.L1_AgvName) + "\r\n" + //"料架： " + LastInShelfId + AgvClient.GetAction(Config.L1_AgvName)
"出料线体出料口" + Config.L2_AgvName + "：" + AgvClient.GetAction(Config.L2_AgvName) + "料架： " + LastOutShelfId +"\r\n";//+ "料架： " + LastOutShelfId + AgvClient.GetAction(Config.L2_AgvName) +
}
#endregion
......@@ -170,8 +170,8 @@ namespace OnlineStore.DeviceLibrary
needCheckList.Add(IO_Type.L2_StopDown);
}
bool agvBusy = false;
if (agvClient.D21_InProcess || agvClient.D22_InProcess)
agvBusy = true;
//if (agvClient.D21_InProcess || agvClient.D22_InProcess)
// agvBusy = true;
if (agvBusy && IsSleep)
{
UpdateSleep(false);
......
source/DeviceLibrary/acFeederLine/LineManager.cs
......@@ -60,14 +60,14 @@ namespace OnlineStore.DeviceLibrary
string appPath = Application.StartupPath;
string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.Line_Config);
LogUtil.info(LOGGER, " 开始加载Feeder流水线配置：" + linefilePath);
LogUtil.info(LOGGER, " 开始加载线体配置：" + linefilePath);
RobotConfig storeConfig = CSVConfigReader.LoadConfig(linefilePath);
Config = (FeederLineConfig)storeConfig;
feederLine = new FeederLineBean(Config);
LogUtil.info(LOGGER, "加载Feeder流水线完成！");
LogUtil.info(LOGGER, "加载线体配置完成！");
return feederLine;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!