Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 34de589f
内嵌 并排
正在显示 29 个修改的文件 包含 65 行增加 和 150 行删除
ABBRobotTest/App.config
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<add key="Line_feedingEquip_count" value="4" /> <add key="Line_feedingEquip_count" value="4" />
<add key="Line_providingEquip_count" value="4" /> <add key="Line_providingEquip_count" value="4" />
<add key ="Line_dischargeLine_count" value ="2"/> <add key ="Line_dischargeLine_count" value ="2"/>
<!--start one store config--> <!--start oneSecondMoveconfig-->
<add key="ConfigPath_Line" value="\LineConfig\Config_Line.csv" /> <add key="ConfigPath_Line" value="\LineConfig\Config_Line.csv" />
<add key="ConfigPath_MoveEquip" value="\LineConfig\MoveEquip\Config_MoveEquip.csv" /> <add key="ConfigPath_MoveEquip" value="\LineConfig\MoveEquip\Config_MoveEquip.csv" />
<add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" /> <add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" />
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<add key ="ConfigPath_DischargeLine" value ="\LineConfig\Config_DischargeLine.csv"/> <add key ="ConfigPath_DischargeLine" value ="\LineConfig\Config_DischargeLine.csv"/>
<add key="Line_Type" value="RC_LINE" /> <add key="Line_Type" value="RC_LINE" />
<add key="Line_CID" value="rc1250" /> <add key="Line_CID" value="rc1250" />
<!--end one store config--> <!--end oneSecondMoveconfig-->
<!--摄像机名称列表配置，用#分割--> <!--摄像机名称列表配置，用#分割-->
<add key="CameraName" value="GigE:MV-CE100-30GC (00C69898519)#GigE:MV-CE100-30GC (00C95305929)" /> <add key="CameraName" value="GigE:MV-CE100-30GC (00C69898519)#GigE:MV-CE100-30GC (00C95305929)" />
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code--> <!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
......
source/AssemblyLineClient/App.config
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" /> <add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" />
<add key="ConfigPath_ProvidingEquip" value="\LineConfig\Config_ProvidingEquip.csv" /> <add key="ConfigPath_ProvidingEquip" value="\LineConfig\Config_ProvidingEquip.csv" />
<add key ="ConfigPath_DischargeLine" value ="\LineConfig\Config_DischargeLine.csv"/> <add key ="ConfigPath_DischargeLine" value ="\LineConfig\Config_DischargeLine.csv"/>
<add key="Line_Type" value="RC_LINE" /> <add key="Line_Type" value="Line" />
<add key="Line_CID" value="rc1250" /> <add key="Line_CID" value="rc1250" />
<!--end one store config--> <!--end one store config-->
<!--摄像机名称列表配置，用#分割--> <!--摄像机名称列表配置，用#分割-->
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -531,7 +531,7 @@ namespace OnlineStore.AssemblyLine ...@@ -531,7 +531,7 @@ namespace OnlineStore.AssemblyLine
int position = FormUtil.GetIntValue(txtSizePosition); int position = FormUtil.GetIntValue(txtSizePosition);
if (position != -1) if (position != -1)
{ {
int speed = equipBean.Config.BatchAxis_DownSpeed; int speed = equipBean.Config.UpdownAxis_DownSpeed;
LogUtil.info("点击【移栽位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info("点击【移栽位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
ACServerManager.AbsMove(portName, SlvAddr, position, speed); ACServerManager.AbsMove(portName, SlvAddr, position, speed);
} }
...@@ -600,7 +600,7 @@ namespace OnlineStore.AssemblyLine ...@@ -600,7 +600,7 @@ namespace OnlineStore.AssemblyLine
int position = FormUtil.GetIntValue(txtBoxP); int position = FormUtil.GetIntValue(txtBoxP);
if (position != -1) if (position != -1)
{ {
int speed = equipBean.Config.BatchAxis_DownSpeed; int speed = equipBean.Config.UpdownAxis_DownSpeed;
LogUtil.info("点击【料仓门口下降位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info("点击【料仓门口下降位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
ACServerManager.AbsMove(portName, SlvAddr, position, speed); ACServerManager.AbsMove(portName, SlvAddr, position, speed);
} }
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -48,9 +48,9 @@ namespace OnlineStore.AssemblyLine ...@@ -48,9 +48,9 @@ namespace OnlineStore.AssemblyLine
List<MoveEquip> moveEquipList = new List<MoveEquip>(lineBean.MoveEquipMap.Values); List<MoveEquip> moveEquipList = new List<MoveEquip>(lineBean.MoveEquipMap.Values);
for (int i = 0; i < moveEquipList.Count; i++) for (int i = 0; i < moveEquipList.Count; i++)
{ {
MoveEquip store = moveEquipList[i]; MoveEquip equip = moveEquipList[i];
FrmMoveEquip test = new FrmMoveEquip(store); FrmMoveEquip test = new FrmMoveEquip(equip);
AddForm(" " + store.Name, test); AddForm(" " + equip.Name, test);
} }
List<FeedingEquip> feeds = new List<FeedingEquip>(lineBean.FeedingEquipMap.Values); List<FeedingEquip> feeds = new List<FeedingEquip>(lineBean.FeedingEquipMap.Values);
for (int i = 0; i < feeds.Count; i++) for (int i = 0; i < feeds.Count; i++)
...@@ -412,7 +412,7 @@ namespace OnlineStore.AssemblyLine ...@@ -412,7 +412,7 @@ namespace OnlineStore.AssemblyLine
} }
if (lblWarnMsg.Text.Equals("")) if (lblWarnMsg.Text.Equals(""))
{ {
foreach (MoveEquip move in lineBean.AllEquipMap.Values) foreach (EquipBase move in lineBean.AllEquipMap.Values)
{ {
if (move.WarnMsg.Equals("").Equals(false)) if (move.WarnMsg.Equals("").Equals(false))
{ {
......
source/AssemblyLineSystem/App.config
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<!--start one store config--> <!--start one store config-->
<add key="Line_ConfigPath" value="\LineConfig\StoreConfig_line.csv"/> <add key="Line_ConfigPath" value="\LineConfig\StoreConfig_line.csv"/>
<add key="MoveEquip_ConfigPath" value="\LineConfig\StoreConfig.csv"/> <add key="MoveEquip_ConfigPath" value="\LineConfig\StoreConfig.csv"/>
<add key="Line_Type" value="RC_LINE"/> <add key="Line_Type" value="Line"/>
<add key="Line_CID" value="rc1246"/> <add key="Line_CID" value="rc1246"/>
<!--end one store config--> <!--end one store config-->
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="model\TrayInfo.cs" /> <Compile Include="model\TrayInfo.cs" />
<Compile Include="model\StoreMoveInfo.cs"> <Compile Include="model\LineMoveInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="model\KTK_Store.cs" /> <Compile Include="model\KTK_Store.cs" />
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
...@@ -13,6 +13,8 @@ PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,, ...@@ -13,6 +13,8 @@ PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,,
PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,, PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,,
PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,, PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,,
PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,, PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,,
PRO,0,移栽上下轴慢速上升速度,BatchAxis_SlowSpeed,200,,,,,
PRO,0,批量上料轴P1速度,BatchAxis_P1Speed,400,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
...@@ -13,6 +13,8 @@ PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,, ...@@ -13,6 +13,8 @@ PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,,
PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,, PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,,
PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,, PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,,
PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,, PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,,
PRO,0,移栽上下轴慢速上升速度,BatchAxis_SlowSpeed,200,,,,,
PRO,0,批量上料轴P1速度,BatchAxis_P1Speed,400,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
...@@ -13,6 +13,8 @@ PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,, ...@@ -13,6 +13,8 @@ PRO,0,批量上料轴减速度,BatchAxis_DelSpeed,400,,,,,
PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,, PRO,0,批量上料轴原点低速度,BatchAxis_HomeLowSpeed,100,,,,,
PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,, PRO,0,批量上料轴原点高速,BatchAxis_HomeHighSpeed,200,,,,,
PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,, PRO,0,批量上料轴原点加速度,BatchAxis_HomeAddSpeed,200,,,,,
PRO,0,移栽上下轴慢速上升速度,BatchAxis_SlowSpeed,200,,,,,
PRO,0,批量上料轴P1速度,BatchAxis_P1Speed,400,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
......
source/DeviceLibrary/assemblyLine/ALineManager.cs
...@@ -24,7 +24,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -24,7 +24,7 @@ namespace OnlineStore.DeviceLibrary
public static Line_Config Config = null; public static Line_Config Config = null;
public static Dictionary<int, StoreConfig> allConfigMap = null; public static Dictionary<int, DeviceConfig> allConfigMap = null;
public LineManager() public LineManager()
{ {
} }
...@@ -56,14 +56,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -56,14 +56,14 @@ namespace OnlineStore.DeviceLibrary
Dictionary<int, ProvidingEquip_Config> providingECMap = null; Dictionary<int, ProvidingEquip_Config> providingECMap = null;
Dictionary<int, DischargeLine_Config> disChargeLineMap = null; Dictionary<int, DischargeLine_Config> disChargeLineMap = null;
StoreConfig.SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>(); DeviceConfig.SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
StoreConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>(); DeviceConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
StoreConfig.ProIpMap = new Dictionary<string, string>(); DeviceConfig.ProIpMap = new Dictionary<string, string>();
moveECMap = new Dictionary<int, MoveEquip_Config>(); moveECMap = new Dictionary<int, MoveEquip_Config>();
feedingECMap = new Dictionary<int, FeedingEquip_Config>(); feedingECMap = new Dictionary<int, FeedingEquip_Config>();
providingECMap = new Dictionary<int, ProvidingEquip_Config>(); providingECMap = new Dictionary<int, ProvidingEquip_Config>();
disChargeLineMap = new Dictionary<int, DischargeLine_Config>(); disChargeLineMap = new Dictionary<int, DischargeLine_Config>();
allConfigMap = new Dictionary<int, StoreConfig>(); allConfigMap = new Dictionary<int, DeviceConfig>();
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
if (server.Equals("")) if (server.Equals(""))
{ {
...@@ -80,13 +80,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -80,13 +80,13 @@ namespace OnlineStore.DeviceLibrary
isInit = true; isInit = true;
string lineType = ConfigAppSettings.GetValue(Setting_Init.Line_Type); string lineType = ConfigAppSettings.GetValue(Setting_Init.Line_Type);
LogUtil.info(LOGGER, " 类型=" + lineType + "，开始加载 配置"); LogUtil.info(LOGGER, " 类型=" + lineType + "，开始加载 配置");
if (lineType == StoreType.RC_LINE) if (lineType == DeviceType.Line)
{ {
string appPath = Application.StartupPath; string appPath = Application.StartupPath;
string CID = ConfigAppSettings.GetValue(Setting_Init.Line_CID); string CID = ConfigAppSettings.GetValue(Setting_Init.Line_CID);
string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_Line); string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_Line);
Config = CSVConfigReader.LoadLineConfig(0, CID, StoreType.RC_LINE, linefilePath); Config = CSVConfigReader.LoadLineConfig(0, CID, DeviceType.Line, linefilePath);
allConfigMap.Add(0, Config); allConfigMap.Add(0, Config);
int moveEquipCount = ConfigAppSettings.GetIntValue(Setting_Init.Line_moveEquip_count); int moveEquipCount = ConfigAppSettings.GetIntValue(Setting_Init.Line_moveEquip_count);
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_MoveEquip); string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_MoveEquip);
...@@ -94,7 +94,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -94,7 +94,7 @@ namespace OnlineStore.DeviceLibrary
{ {
string nameStr = i.ToString().PadLeft(2, '0'); string nameStr = i.ToString().PadLeft(2, '0');
string config = appPath + moveEquipConfig.Replace(".csv", "_" + nameStr + ".csv"); string config = appPath + moveEquipConfig.Replace(".csv", "_" + nameStr + ".csv");
MoveEquip_Config moveConfig = CSVConfigReader.LoadMoveConfig(i, config); MoveEquip_Config moveConfig = CSVConfigReader.LoadMoveConfig(i,DeviceType.MoveEquip, config);
int subType = i; int subType = i;
moveConfig.SetIO(subType); moveConfig.SetIO(subType);
moveECMap.Add(i, moveConfig); moveECMap.Add(i, moveConfig);
...@@ -106,8 +106,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -106,8 +106,7 @@ namespace OnlineStore.DeviceLibrary
{ {
int subType = 100 + i; int subType = 100 + i;
string config = appPath + feedingEquipConfig.Replace(".csv", "_" + i + ".csv"); string config = appPath + feedingEquipConfig.Replace(".csv", "_" + i + ".csv");
FeedingEquip_Config moveConfig = CSVConfigReader.LoadFeedingConfig(subType, config); FeedingEquip_Config moveConfig = CSVConfigReader.LoadFeedingConfig(subType,DeviceType.FeedingEquip, config);
moveConfig.SetIO(subType); moveConfig.SetIO(subType);
feedingECMap.Add(subType, moveConfig); feedingECMap.Add(subType, moveConfig);
allConfigMap.Add(subType, moveConfig); allConfigMap.Add(subType, moveConfig);
...@@ -119,8 +118,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -119,8 +118,7 @@ namespace OnlineStore.DeviceLibrary
{ {
int subType = 200 + i; int subType = 200 + i;
string config = appPath + providingEquipConfig.Replace(".csv", "_" + i + ".csv"); string config = appPath + providingEquipConfig.Replace(".csv", "_" + i + ".csv");
ProvidingEquip_Config moveConfig = CSVConfigReader.LoadProvidingConfig(subType, config); ProvidingEquip_Config moveConfig = CSVConfigReader.LoadProvidingConfig(subType,DeviceType.ProvidingEquip, config);
moveConfig.SetIO(subType); moveConfig.SetIO(subType);
providingECMap.Add(subType, moveConfig); providingECMap.Add(subType, moveConfig);
allConfigMap.Add(subType, moveConfig); allConfigMap.Add(subType, moveConfig);
...@@ -132,8 +130,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -132,8 +130,7 @@ namespace OnlineStore.DeviceLibrary
{ {
int subType = 300 + i; int subType = 300 + i;
string config = appPath + dischargeLineConfig.Replace(".csv", "_" + i + ".csv"); string config = appPath + dischargeLineConfig.Replace(".csv", "_" + i + ".csv");
DischargeLine_Config moveConfig = CSVConfigReader.LoadDischargeLineConfig(subType, config); DischargeLine_Config moveConfig = CSVConfigReader.LoadDischargeLineConfig(subType,DeviceType.DischargeLine, config);
moveConfig.SetIO(subType); moveConfig.SetIO(subType);
disChargeLineMap.Add(subType, moveConfig); disChargeLineMap.Add(subType, moveConfig);
allConfigMap.Add(subType, moveConfig); allConfigMap.Add(subType, moveConfig);
...@@ -166,9 +163,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -166,9 +163,7 @@ namespace OnlineStore.DeviceLibrary
//位置配置到文件中 //位置配置到文件中
string appPath = Application.StartupPath; string appPath = Application.StartupPath;
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_MoveEquip); string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_MoveEquip);
string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + config.Id.ToString().PadLeft(2,'0') + ".csv"); string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + config.Id.ToString().PadLeft(2,'0') + ".csv");
// moveECMap[config.Id] = config;
allConfigMap[config.Id] = config; allConfigMap[config.Id] = config;
bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(MoveEquip_Config)); bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(MoveEquip_Config));
if (!result) if (!result)
...@@ -191,7 +186,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -191,7 +186,6 @@ namespace OnlineStore.DeviceLibrary
int id = config.Id - 100; int id = config.Id - 100;
string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id+ ".csv"); string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id+ ".csv");
// feedingECMap[config.Id] = config;
allConfigMap[config.Id] = config; allConfigMap[config.Id] = config;
bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(FeedingEquip_Config)); bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(FeedingEquip_Config));
if (!result) if (!result)
...@@ -213,7 +207,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -213,7 +207,6 @@ namespace OnlineStore.DeviceLibrary
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_ProvidingEquip); string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_ProvidingEquip);
int id = config.Id - 200; int id = config.Id - 200;
string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id + ".csv"); string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id + ".csv");
// providingECMap[config.Id] = config;
allConfigMap[config.Id] = config; allConfigMap[config.Id] = config;
bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(ProvidingEquip_Config)); bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(ProvidingEquip_Config));
if (!result) if (!result)
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -230,15 +230,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -230,15 +230,11 @@ namespace OnlineStore.DeviceLibrary
} }
protected override void StopMoveProcess()
{
}
/// <summary> /// <summary>
/// 停止运动 /// 停止运动
/// </summary> /// </summary>
public override void StopMove() public override void StopMove()
{ {
runStatus = LineRunStatus.Busy; runStatus = LineRunStatus.Busy;
MoveInfo.EndMove(); MoveInfo.EndMove();
SecondMoveInfo.EndMove(); SecondMoveInfo.EndMove();
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -33,7 +33,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -33,7 +33,9 @@ namespace OnlineStore.DeviceLibrary
protected int currMoveTrayNum = 0; protected int currMoveTrayNum = 0;
protected abstract void ReturnHomeProcess(); protected abstract void ReturnHomeProcess();
protected abstract void StopMoveProcess(); protected virtual void StopMoveProcess()
{
}
public abstract void TimerProcess(); public abstract void TimerProcess();
protected abstract void CheckFixtureProcess(); protected abstract void CheckFixtureProcess();
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -221,30 +221,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -221,30 +221,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
protected override void StopMoveProcess()
{
if (MoveInfo.IsInWait)
{
CheckWait(MoveInfo);
}
if (!MoveInfo.IsInWait)
{
switch (MoveInfo.MoveStep)
{
case LineMoveStep.MH_UpDownCylinder_Up:
break;
case LineMoveStep.MH_OtherCylinder_Back:
break;
default: break;
}
}
}
public override void StopMove() public override void StopMove()
{ {
} }
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -948,15 +948,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -948,15 +948,15 @@ namespace OnlineStore.DeviceLibrary
{ {
IsScanCode = false; IsScanCode = false;
foreach (MoveEquip store in this.AllEquipMap.Values) foreach (MoveEquip equip in this.AllEquipMap.Values)
{ {
if (!store.IsDebug) if (!equip.IsDebug)
{ {
store.StopRun(); equip.StopRun();
} }
else else
{ {
store.CloseCylinderStop(); equip.CloseCylinderStop();
} }
} }
MoveInfo.EndMove(); MoveInfo.EndMove();
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -269,10 +269,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -269,10 +269,6 @@ namespace OnlineStore.DeviceLibrary
{ {
ResetProcess(); ResetProcess();
} }
protected override void StopMoveProcess()
{
}
/// <summary> /// <summary>
/// 停止运动 /// 停止运动
/// </summary> /// </summary>
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
...@@ -187,10 +187,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -187,10 +187,6 @@ namespace OnlineStore.DeviceLibrary
{ {
ResetProcess(); ResetProcess();
} }
protected override void StopMoveProcess()
{
}
public override void StopMove() public override void StopMove()
{ {
MoveInfo.EndMove(); MoveInfo.EndMove();
...@@ -206,8 +202,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -206,8 +202,6 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW); IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
} }
public override void StartInStoreMove(InOutParam param) public override void StartInStoreMove(InOutParam param)
{ {
......
source/DeviceLibrary/assemblyLine/TrayManager.cs
...@@ -88,32 +88,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -88,32 +88,7 @@ namespace OnlineStore.DeviceLibrary
} }
return null; return null;
} }
///// <summary>
///// 托盘是否可以累积扔盘，判断是出库的托盘，并且所放的托盘为七寸
///// </summary>
//public static bool IsCanOutPush(int trayNum)
//{
// lock (fixtureMapLock)
// {
// if (fixtureCodeFullMap.ContainsKey(trayNum))
// {
// TrayInfo info = fixtureCodeFullMap[trayNum];
// if (info.IsFull == false)
// {
// return true;
// }
// if (info.InOrOutStore.Equals(2) && info.BagWidth.Equals(CanPushBagWidth))
// {
// return true;
// }
// }
// }
// return false;
//}
//public static void UpdateFixtureValue(int trayNum, bool isFull, int inOrOut)
//{
// UpdateFixtureValue(trayNum, isFull, inOrOut, 0);
//}
/// <summary> /// <summary>
/// 更新对应的盘号（1-6）是否有料盘 /// 更新对应的盘号（1-6）是否有料盘
/// </summary> /// </summary>
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -31,7 +31,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -31,7 +31,7 @@ namespace OnlineStore.DeviceLibrary
/// 提示消息，一般发给服务器后清空（LineBean表示报警提示消息，BoxBean表示出入库失败的原因记录） /// 提示消息，一般发给服务器后清空（LineBean表示报警提示消息，BoxBean表示出入库失败的原因记录）
/// </summary> /// </summary>
public string WarnMsg = ""; public string WarnMsg = "";
public StoreConfig baseConfig = null; public DeviceConfig baseConfig = null;
public string Name { get; set; } public string Name { get; set; }
public int DeviceID { get; set; } public int DeviceID { get; set; }
/// <summary> /// <summary>
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -54,13 +54,12 @@ ...@@ -54,13 +54,12 @@
<Compile Include="storeConfig\config\DischargeLine_Config.cs" /> <Compile Include="storeConfig\config\DischargeLine_Config.cs" />
<Compile Include="storeConfig\config\ProvidingEquip_Config.cs" /> <Compile Include="storeConfig\config\ProvidingEquip_Config.cs" />
<Compile Include="storeConfig\config\MoveEquip_Config.cs" /> <Compile Include="storeConfig\config\MoveEquip_Config.cs" />
<Compile Include="storeConfig\config\StoreType.cs" />
<Compile Include="storeConfig\config\IO_Type.cs" /> <Compile Include="storeConfig\config\IO_Type.cs" />
<Compile Include="CSVAttribute.cs" /> <Compile Include="CSVAttribute.cs" />
<Compile Include="storeConfig\CSVConfigReader.cs" /> <Compile Include="storeConfig\CSVConfigReader.cs" />
<Compile Include="CSVReaderBase.cs" /> <Compile Include="CSVReaderBase.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="storeConfig\config\StoreConfig.cs" /> <Compile Include="storeConfig\config\DeviceConfig.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Common\Common.csproj"> <ProjectReference Include="..\Common\Common.csproj">
......
source/LoadCVSLibrary/storeConfig/CSVConfigReader.cs
...@@ -134,39 +134,33 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -134,39 +134,33 @@ namespace OnlineStore.LoadCSVLibrary
} }
return configList; return configList;
} }
public static Line_Config LoadLineConfig(int storeId, string cid, string storeType, string filePath) public static Line_Config LoadLineConfig(int storeId, string cid ,string type, string filePath)
{ {
Line_Config config = new Line_Config(storeId, cid, storeType, filePath); Line_Config config = new Line_Config(storeId, cid, type, filePath);
return (Line_Config)LoadConfig(config); return (Line_Config)LoadConfig(config);
} }
public static DischargeLine_Config LoadDischargeLineConfig(int storeId, string filePath) public static DischargeLine_Config LoadDischargeLineConfig(int storeId, string type, string filePath)
{ {
DischargeLine_Config config = new DischargeLine_Config(storeId, storeId + "_DischargeLine", "", filePath); DischargeLine_Config config = new DischargeLine_Config(storeId, storeId + "_"+ type, type, filePath);
return (DischargeLine_Config)LoadConfig(config); return (DischargeLine_Config)LoadConfig(config);
} }
public static MoveEquip_Config LoadMoveConfig(int storeId, string type, string filePath)
public static MoveEquip_Config LoadMoveConfig(int storeId, string filePath)
{ {
MoveEquip_Config config = new MoveEquip_Config(storeId, storeId + "_MoveEquip", "", filePath); MoveEquip_Config config = new MoveEquip_Config(storeId, storeId + "_" + type, type, filePath);
return (MoveEquip_Config)LoadConfig(config); return (MoveEquip_Config)LoadConfig(config);
} }
public static FeedingEquip_Config LoadFeedingConfig(int storeId, string filePath) public static FeedingEquip_Config LoadFeedingConfig(int storeId, string type, string filePath)
{ {
FeedingEquip_Config config = new FeedingEquip_Config(storeId, storeId + "_FeedingEquip", "", filePath); FeedingEquip_Config config = new FeedingEquip_Config(storeId, storeId + "_" + type, type, filePath);
return (FeedingEquip_Config)LoadConfig(config); return (FeedingEquip_Config)LoadConfig(config);
} }
public static ProvidingEquip_Config LoadProvidingConfig(int storeId, string filePath) public static ProvidingEquip_Config LoadProvidingConfig(int storeId, string type, string filePath)
{ {
ProvidingEquip_Config config = new ProvidingEquip_Config(storeId, storeId + "_ProvidingEquip", "", filePath); ProvidingEquip_Config config = new ProvidingEquip_Config(storeId, storeId + "_" + type, type, filePath);
return (ProvidingEquip_Config)LoadConfig(config); return (ProvidingEquip_Config)LoadConfig(config);
} }
public static StoreConfig LoadConfig(StoreConfig config) public static DeviceConfig LoadConfig(DeviceConfig config)
{ {
LOGGER.Info("开始读取文件：" + config.ConfigFilePath); LOGGER.Info("开始读取文件：" + config.ConfigFilePath);
if (config == null || config.ConfigFilePath.Equals("")) if (config == null || config.ConfigFilePath.Equals(""))
...@@ -179,7 +173,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -179,7 +173,7 @@ namespace OnlineStore.LoadCSVLibrary
return config; return config;
} }
public static bool SaveConfig(string configStr, StoreConfig config,Type type) public static bool SaveConfig(string configStr, DeviceConfig config,Type type)
{ {
//Type type = typeof(MoveEquip_Config); //Type type = typeof(MoveEquip_Config);
//if(config is FeedingEquip_Config) //if(config is FeedingEquip_Config)
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
...@@ -234,9 +234,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -234,9 +234,9 @@ namespace OnlineStore.LoadCSVLibrary
{ {
get get
{ {
if (StoreConfig.ProIpMap != null && StoreConfig.ProIpMap.ContainsKey(DeviceName)) if (DeviceConfig.ProIpMap != null && DeviceConfig.ProIpMap.ContainsKey(DeviceName))
{ {
return StoreConfig.ProIpMap[DeviceName]; return DeviceConfig.ProIpMap[DeviceName];
} }
return DeviceName; return DeviceName;
} }
......
source/LoadCVSLibrary/storeConfig/config/StoreConfig.cs → source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
...@@ -7,7 +7,7 @@ using System.Text; ...@@ -7,7 +7,7 @@ using System.Text;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
public class StoreConfig public class DeviceConfig
{ {
public static Dictionary<int, Dictionary<string, ConfigIO>> SubDIList { get; set; } public static Dictionary<int, Dictionary<string, ConfigIO>> SubDIList { get; set; }
public static Dictionary<int, Dictionary<string, ConfigIO>> SubDOList { get; set; } public static Dictionary<int, Dictionary<string, ConfigIO>> SubDOList { get; set; }
...@@ -64,12 +64,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -64,12 +64,12 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList = new List<string>(); MustHaveDIList = new List<string>();
MustHaveDOList = new List<string>(); MustHaveDOList = new List<string>();
} }
public StoreConfig() public DeviceConfig()
{ {
initMustHavePro(); initMustHavePro();
} }
public StoreConfig(int id, string cid, string type, string filepath) public DeviceConfig(int id, string cid, string type, string filepath)
{ {
initMustHavePro(); initMustHavePro();
MustHaveDIList = new List<string>(); MustHaveDIList = new List<string>();
...@@ -291,13 +291,13 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -291,13 +291,13 @@ namespace OnlineStore.LoadCSVLibrary
Dictionary<string, ConfigIO> doList = new Dictionary<string, ConfigIO>(); Dictionary<string, ConfigIO> doList = new Dictionary<string, ConfigIO>();
Dictionary<string, ConfigIO> diList = new Dictionary<string, ConfigIO>(); Dictionary<string, ConfigIO> diList = new Dictionary<string, ConfigIO>();
if (StoreConfig.SubDIList.ContainsKey(subType)) if (DeviceConfig.SubDIList.ContainsKey(subType))
{ {
diList = StoreConfig.SubDIList[subType]; diList = DeviceConfig.SubDIList[subType];
} }
if (StoreConfig.SubDOList.ContainsKey(subType)) if (DeviceConfig.SubDOList.ContainsKey(subType))
{ {
doList = StoreConfig.SubDOList[subType]; doList = DeviceConfig.SubDOList[subType];
} }
foreach (string key in diList.Keys) foreach (string key in diList.Keys)
{ {
...@@ -354,4 +354,5 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -354,4 +354,5 @@ namespace OnlineStore.LoadCSVLibrary
public static string DischargeLine = "DischargeLine"; public static string DischargeLine = "DischargeLine";
} }
} }
source/LoadCVSLibrary/storeConfig/config/DischargeLine_Config.cs
...@@ -9,7 +9,7 @@ using System.Threading.Tasks; ...@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
public class DischargeLine_Config : StoreConfig public class DischargeLine_Config : DeviceConfig
{ {
public DischargeLine_Config() public DischargeLine_Config()
: base() : base()
......
source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs
...@@ -9,7 +9,7 @@ using System.Threading.Tasks; ...@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
public class FeedingEquip_Config : StoreConfig public class FeedingEquip_Config : DeviceConfig
{ {
public FeedingEquip_Config() public FeedingEquip_Config()
: base() : base()
......
source/LoadCVSLibrary/storeConfig/config/Line_Config.cs
...@@ -11,7 +11,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -11,7 +11,7 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 流水线配置 /// 流水线配置
/// </summary> /// </summary>
public class Line_Config : StoreConfig public class Line_Config : DeviceConfig
{ {
public Line_Config() public Line_Config()
: base() : base()
......
source/LoadCVSLibrary/storeConfig/config/MoveEquip_Config.cs
...@@ -9,7 +9,7 @@ using System.Threading.Tasks; ...@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
public class MoveEquip_Config : StoreConfig public class MoveEquip_Config : DeviceConfig
{ {
public MoveEquip_Config() public MoveEquip_Config()
: base() : base()
......
source/LoadCVSLibrary/storeConfig/config/ProvidingEquip_Config.cs
...@@ -9,7 +9,7 @@ using System.Threading.Tasks; ...@@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
public class ProvidingEquip_Config : StoreConfig public class ProvidingEquip_Config : DeviceConfig
{ {
public ProvidingEquip_Config() public ProvidingEquip_Config()
: base() : base()
......
source/LoadCVSLibrary/storeConfig/config/StoreType.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OnlineStore.LoadCSVLibrary
{
public class StoreType
{
/// <summary>
/// 流水线装置
/// </summary>
public static string RC_LINE = "RC_LINE";
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!