Skip to content

孙克 / RC30-AutoInOutStore

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

位置文件表头可以为英文

1 个父辈 0d4dde09
内嵌 并排
正在显示 9 个修改的文件 包含 48 行增加 和 29 行删除
source/ACSingleStore/App.config
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
<add key="DIMS" value="20" /> <add key="DIMS" value="20" />
<add key="DOMS" value="200" /> <add key="DOMS" value="200" />
<add key="SinglePosId" value="1#AC2_1_1_6" /> <add key="SinglePosId" value="1#AC2_1_1_6" />
<!--配置文件的表头格式，0=中文，1=英文-->
<add key ="LibNameType" value ="1"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/ACSingleStore/记录.txt
...@@ -224,3 +224,8 @@ DI9 不要，只判断DI10 ...@@ -224,3 +224,8 @@ DI9 不要，只判断DI10
IO配置修改，改为新的IO配置。 IO配置修改，改为新的IO配置。
吸盘改为夹爪，代码逻辑修改。 吸盘改为夹爪，代码逻辑修改。
linePositions可以中英文切换（默认中文）
位置,优先级,高度,宽度,料仓ID,支持批量操作,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门出料点P4,进出轴吸盘取料点P2
PositionNum,Priority,Height,Width,StoreID,SupportBatch,MiddleAxis_Position_P2,UpDownAxis_OHPosition_P5,UpDownAxis_OLPosition_P6,UpDownAxis_IHPosition_P3,UpDownAxis_ILPosition_P4,InOutAxis_Position_P3,CompressAxis_Position_P2,CompressAxis_CPosition_P3,InOutAxis_DoorOutPosition_P4,InOutAxis_Batch_P2
\ No newline at end of file \ No newline at end of file
source/Common/Setting_Init.cs
...@@ -95,5 +95,7 @@ namespace OnlineStore.Common ...@@ -95,5 +95,7 @@ namespace OnlineStore.Common
public static string SinglePosId = "SinglePosId"; public static string SinglePosId = "SinglePosId";
public static string DeCodeType = "DeCodeType"; public static string DeCodeType = "DeCodeType";
public static string LibNameType = "LibNameType";
} }
} }
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
位置,优先级,高度,宽度,料仓ID,支持批量操作,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门出料点P4,进出轴吸盘取料点P2 PositionNum,Priority,Height,Width,StoreID,SupportBatch,MiddleAxis_Position_P2,UpDownAxis_OHPosition_P5,UpDownAxis_OLPosition_P6,UpDownAxis_IHPosition_P3,UpDownAxis_ILPosition_P4,InOutAxis_Position_P3,CompressAxis_Position_P2,CompressAxis_CPosition_P3,InOutAxis_DoorOutPosition_P4,InOutAxis_Batch_P2
1#AC1_0_1_1,1,24,13,1,1,218800,781000,793000,793000,781000,85000,-200000,-120000,90000,87000 1#AC1_0_1_1,1,24,13,1,1,218800,781000,793000,793000,781000,85000,-200000,-120000,90000,87000
1#AC1_0_1_2,2,24,13,1,1,218800,810000,822000,822000,810000,85000,-200000,-120000,90000,87000 1#AC1_0_1_2,2,24,13,1,1,218800,810000,822000,822000,810000,85000,-200000,-120000,90000,87000
1#AC1_0_1_3,3,24,13,1,1,218800,840500,852500,852500,840500,85000,-200000,-120000,90000,87000 1#AC1_0_1_3,3,24,13,1,1,218800,840500,852500,852500,840500,85000,-200000,-120000,90000,87000
......
source/LoadCVSLibrary/CSVAttribute.cs
...@@ -10,18 +10,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -10,18 +10,22 @@ namespace OnlineStore.LoadCSVLibrary
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)] [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
public class CSVAttribute : Attribute public class CSVAttribute : Attribute
{ {
public CSVAttribute(string fieldName) public CSVAttribute(string fieldNameCN, string filedNameUS, bool IsMust=true)
{ {
FieldName = fieldName; this.IsMustHave = IsMust;
FieldNameCN = fieldNameCN;
FieldNameUS = filedNameUS;
} }
private string fieldName; public CSVAttribute(string fieldNameCN, bool IsMust=true)
public string FieldName
{ {
get { return fieldName; } this.IsMustHave = IsMust;
set { fieldName = value; } FieldNameCN = fieldNameCN;
} }
public string FieldNameCN { get; set; }
public string FieldNameUS { get; set; }
public bool IsMustHave { get; set; }
} }
} }
source/LoadCVSLibrary/CSVReaderBase.cs
using log4net; using log4net;
using OnlineStore.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
...@@ -13,6 +14,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -13,6 +14,7 @@ namespace OnlineStore.LoadCSVLibrary
{ {
public static char Spilt_Char = ','; public static char Spilt_Char = ',';
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static int LibNameType = ConfigAppSettings.GetIntValue(Setting_Init.LibNameType);
/// <summary> /// <summary>
/// 获取一个类所有的《字段，AttributeName列名》集合 /// 获取一个类所有的《字段，AttributeName列名》集合
/// </summary> /// </summary>
...@@ -28,7 +30,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -28,7 +30,11 @@ namespace OnlineStore.LoadCSVLibrary
CSVAttribute att = (CSVAttribute)array[0]; CSVAttribute att = (CSVAttribute)array[0];
if (att != null) if (att != null)
{ {
string csvName = att.FieldName; string csvName = att.FieldNameCN;
if (LibNameType.Equals(1) && (String.IsNullOrEmpty(att.FieldNameUS).Equals(false)))
{
csvName = att.FieldNameUS;
}
proCsvMap.Add(prop.Name, csvName); proCsvMap.Add(prop.Name, csvName);
} }
} }
......
source/LoadCVSLibrary/position/AutoStorePosition.cs
...@@ -11,69 +11,69 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -11,69 +11,69 @@ namespace OnlineStore.LoadCSVLibrary
{ /// <summary> { /// <summary>
/// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX） /// 对应的料仓ID（流水线料仓需要用此字段区分哪个BOX）
/// </summary> /// </summary>
[CSVAttribute("料仓ID")] [CSVAttribute("料仓ID", "StoreID")]
public int StoreId { get; set; } public int StoreId { get; set; }
/// <summary> /// <summary>
/// 支持批量操作,1=支持，0=不支持 /// 支持批量操作,1=支持，0=不支持
/// </summary> /// </summary>
[CSVAttribute("支持批量操作")] [CSVAttribute("支持批量操作", "SupportBatch")]
public int SupportBatch { get; set; } public int SupportBatch { get; set; }
/// <summary> /// <summary>
/// 中轴位置（旋转轴库位点）P2 /// 中轴位置（旋转轴库位点）P2
/// </summary> /// </summary>
[CSVAttribute("中轴位置P2")] [CSVAttribute("中轴位置P2", "MiddleAxis_Position_P2")]
public int MiddleAxis_Position_P2 { get; set; } public int MiddleAxis_Position_P2 { get; set; }
/// <summary> /// <summary>
/// 升降轴（库位出料前点）P5 /// 升降轴（库位出料前点）P5
/// </summary> /// </summary>
[CSVAttribute("升降轴库位出料前点P5")] [CSVAttribute("升降轴库位出料前点P5", "UpDownAxis_OHPosition_P5")]
public int UpDownAxis_OHPosition_P5 { get; set; } public int UpDownAxis_OHPosition_P5 { get; set; }
/// <summary> /// <summary>
/// 升降轴（库位出料缓冲点）P6 /// 升降轴（库位出料缓冲点）P6
/// </summary> /// </summary>
[CSVAttribute("升降轴库位出料缓冲点P6")] [CSVAttribute("升降轴库位出料缓冲点P6", "UpDownAxis_OLPosition_P6")]
public int UpDownAxis_OLPosition_P6 { get; set; } public int UpDownAxis_OLPosition_P6 { get; set; }
/// <summary> /// <summary>
/// 升降轴（库位入料前点）P3 /// 升降轴（库位入料前点）P3
/// </summary> /// </summary>
[CSVAttribute("升降轴库位入料前点P3")] [CSVAttribute("升降轴库位入料前点P3", "UpDownAxis_IHPosition_P3")]
public int UpDownAxis_IHPosition_P3 { get; set; } public int UpDownAxis_IHPosition_P3 { get; set; }
/// <summary> /// <summary>
/// 升降轴（库位入料缓冲点）P4 /// 升降轴（库位入料缓冲点）P4
/// </summary> /// </summary>
[CSVAttribute("升降轴库位入料缓冲点P4")] [CSVAttribute("升降轴库位入料缓冲点P4", "UpDownAxis_ILPosition_P4")]
public int UpDownAxis_ILPosition_P4 { get; set; } public int UpDownAxis_ILPosition_P4 { get; set; }
/// <summary> /// <summary>
/// 进出轴（库位点取料点）P3 /// 进出轴（库位点取料点）P3
/// </summary> /// </summary>
[CSVAttribute("进出轴库位点取料点P3")] [CSVAttribute("进出轴库位点取料点P3", "InOutAxis_Position_P3")]
public int InOutAxis_Position_P3 { get; set; } public int InOutAxis_Position_P3 { get; set; }
/// <summary> /// <summary>
/// 压紧轴（压紧点）P2 /// 压紧轴（压紧点）P2
/// </summary> /// </summary>
[CSVAttribute("压紧轴压紧点P2")] [CSVAttribute("压紧轴压紧点P2", "CompressAxis_Position_P2")]
public int CompressAxis_Position_P2 { get; set; } public int CompressAxis_Position_P2 { get; set; }
/// <summary> /// <summary>
/// 压紧轴（压紧前点）P3 /// 压紧轴（压紧前点）P3
/// </summary> /// </summary>
[CSVAttribute("压紧轴压紧前点P3")] [CSVAttribute("压紧轴压紧前点P3", "CompressAxis_CPosition_P3")]
public int CompressAxis_CPosition_P3 { get; set; } public int CompressAxis_CPosition_P3 { get; set; }
/// <summary> /// <summary>
/// 轴3(进出轴） 进出轴仓门出料点P4 ，料仓门口取料放料点 /// 轴3(进出轴） 进出轴仓门出料点P4 ，料仓门口取料放料点
/// </summary> /// </summary>
[CSVAttribute("进出轴仓门出料点P4")] [CSVAttribute("进出轴仓门出料点P4", "InOutAxis_DoorOutPosition_P4")]
public int InOutAxis_DoorOutPosition_P4 { get; set; } public int InOutAxis_DoorOutPosition_P4 { get; set; }
/// <summary> /// <summary>
/// 轴3(进出轴） 进出轴吸盘取料点P2 ，吸盘下方取放料点，批量出入库时使用 /// 轴3(进出轴） 进出轴吸盘取料点P2 ，吸盘下方取放料点，批量出入库时使用
/// </summary> /// </summary>
[CSVAttribute("进出轴吸盘取料点P2")] [CSVAttribute("进出轴吸盘取料点P2", "InOutAxis_Batch_P2")]
public int InOutAxis_Batch_P2 { get; set; } public int InOutAxis_Batch_P2 { get; set; }
public static bool CheckPosition(AutoStorePosition position, AUTO_SA_Config Config) public static bool CheckPosition(AutoStorePosition position, AUTO_SA_Config Config)
{ {
......
source/LoadCVSLibrary/position/StorePostionBase.cs
...@@ -11,22 +11,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -11,22 +11,22 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 位置 /// 位置
/// </summary> /// </summary>
[CSVAttribute("位置")] [CSVAttribute("位置", "PositionNum")]
public string PositionNum { get; set; } public string PositionNum { get; set; }
/// <summary> /// <summary>
/// 优先级 /// 优先级
/// </summary> /// </summary>
[CSVAttribute("优先级")] [CSVAttribute("优先级","Priority")]
public int Priority { get; set; } public int Priority { get; set; }
/// <summary> /// <summary>
/// 高 /// 高
/// </summary> /// </summary>
[CSVAttribute("高度")] [CSVAttribute("高度", "Height")]
public int BagHeight { get; set; } public int BagHeight { get; set; }
/// <summary> /// <summary>
/// 宽 /// 宽
/// </summary> /// </summary>
[CSVAttribute("宽度")] [CSVAttribute("宽度", "Width")]
public int BagWidth { get; set; } public int BagWidth { get; set; }
} }
} }
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
...@@ -122,13 +122,13 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -122,13 +122,13 @@ namespace OnlineStore.LoadCSVLibrary
//public static string DoorColse_Single = "DoorColse_Single"; //public static string DoorColse_Single = "DoorColse_Single";
/// <summary> /// <summary>
/// 抓取气缸上升端 SuckingDisc_Up X07 DI-07 /// 抓取气缸上升端 ClampingDisc_Up X07 DI-07
/// </summary> /// </summary>
public static string ClampingDisc_Up = "SuckingDisc_Up"; public static string ClampingDisc_Up = "ClampingDisc_Up";
/// <summary> /// <summary>
/// 抓取气缸下降端 SuckingDisc_Down X08 DI-08 /// 抓取气缸下降端 ClampingDisc_Down X08 DI-08
/// </summary> /// </summary>
public static string ClampingDisc_Down = "SuckingDisc_Down"; public static string ClampingDisc_Down = "ClampingDisc_Down";
/// <summary> /// <summary>
/// 料盘宽度检测1 WidthCheck1 208 X09 DI-09 /// 料盘宽度检测1 WidthCheck1 208 X09 DI-09
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!