Skip to content

刘韬 / SO815-AutoInOutStore

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

出入库时需要检测叉子是否有料

1 个父辈 a547da51
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 72 行增加 和 59 行删除
source/ACSingleStore/App.config
......@@ -28,7 +28,7 @@
<add key="CameraName" value="GigE:acA3800-10gc (23124327)#GigE:acA3800-10gc (23172285)" />
<!--二维码类型列表配置，用#分割-->
<add key="CodeType" value="QR Code" />
<add key="CodeType" value="Data Matrix ECC 200#QR Code" />
<add key="CodeType" value="Data Matrix ECC 200#QR Code#PDF417" />
<!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\CodeParam\" />
<add key="InOutDefaultPosition" value="50000000" />
......
source/ACSingleStore/FrmBase.cs
......@@ -51,7 +51,7 @@ namespace OnlineStore.AutoInOutStore
LogUtil.info("版本号[" + version + "][" + str + "][" + GetCodeNum() + "]");
return str;
}
internal static string GetCodeNum(string codeName = "RC1252-AutoInOutStore")
internal static string GetCodeNum(string codeName = "RC1252-AutoInOutStore-N")
{
byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
string result = "";
......
source/ACSingleStore/ResourceCulture.cs
......@@ -16,7 +16,7 @@ namespace OnlineStore.AutoInOutStore
{
public class ResourceCulture
{
public static bool ShowLog = false ;
public static bool ShowLog = false;
public static string China = "zh-CN";
public static string English = "en-US";
public static string German = "ge-DE";
......@@ -45,8 +45,10 @@ namespace OnlineStore.AutoInOutStore
}
CurrLanguage = name;
Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
LoadAllRes();
}
public static void LoaAllRes()
public static void LoadAllRes()
{
if (rm == null)
{
......@@ -55,8 +57,10 @@ namespace OnlineStore.AutoInOutStore
//CultureInfo ci = Thread.CurrentThread.CurrentCulture;
Dictionary<string, string> chinaMap = GetRMap(China);
Dictionary<string, string> englishMap = GetRMap(English);
List<string> keyList = new List<string>(chinaMap.Keys);
keyList = (from m in keyList orderby m select m).ToList<string>();
List<string> resulList = new List<string>();
foreach(string key in chinaMap.Keys)
foreach (string key in keyList)
{
string china = chinaMap[key];
string english = "";
......@@ -70,7 +74,7 @@ namespace OnlineStore.AutoInOutStore
File.WriteAllLines("D:\\storeResource.csv", resulList.ToArray());
}
private static Dictionary<string ,string > GetRMap(string lan)
private static Dictionary<string, string> GetRMap(string lan)
{
Dictionary<string, string> chinaMap = new Dictionary<string, string>();
CultureInfo ci = new CultureInfo(lan);
......@@ -208,11 +212,11 @@ namespace OnlineStore.AutoInOutStore
{
return className + spiltStr + propertyName;
}
public static string GetTextIdStr(string className, string controlName )
public static string GetTextIdStr(string className, string controlName)
{
return className + spiltStr + controlName + spiltStr + Text;
}
public static string GetTextIdStr(string className )
public static string GetTextIdStr(string className)
{
return className + spiltStr + Text;
}
......
source/DeviceLibrary/store/StoreMoveStep.cs
......@@ -105,20 +105,20 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 13=重置中（原点返回和重置都发此状态）
/// </summary>
ResetMove=13,
ResetMove = 13,
/// <summary>
/// 14=批量上料中
/// </summary>
BatchInStore=14,
BatchInStore = 14,
/// <summary>
///15= 扫码失败或无库位料盘送出
/// </summary>
SendTrayOut=15,
SendTrayOut = 15,
/// <summary>
/// 16=批量上料模块复位中
/// </summary>
BatchReset=16,
BatchReset = 16,
}
/// <summary>
......@@ -134,12 +134,12 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料仓原点返回和重置步骤，，定位气缸下降
/// </summary>
BOX_H_LocationCylinderBack=010,
BOX_H_LocationCylinderBack = 010,
/// <summary>
/// 料仓原点返回和重置步骤，轴三先相对走3000
/// </summary>
BOX_H_InOutMove=011,
BOX_H_InOutMove = 011,
/// <summary>
/// 料仓原点返回和重置步骤，，轴三进出轴先返回原点
/// </summary>
......@@ -160,12 +160,12 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 旋转轴返回P1
/// </summary>
BOX_H_MiddleAxisToP1=016,
BOX_H_MiddleAxisToP1 = 016,
/// <summary>
/// 叉子先退回P1
/// </summary>
BOX_M_H_InOutToP1=018,
BOX_M_H_InOutToP1 = 018,
/// <summary>
/// 旋转轴回原点
/// </summary>
......@@ -213,7 +213,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
///料仓出库，，定位气缸下降
/// </summary>
SO_01_LocationCylinderDown =101,
SO_01_LocationCylinderDown = 101,
/// <summary>
///料仓出库：叉子先运动到P1
/// </summary>
......@@ -249,14 +249,19 @@ namespace OnlineStore.DeviceLibrary
SO_08_ToDoorPosition = 108,
/// <summary>
/// 到达门口后，判断叉子料盘检测信号
/// </summary>
SO_09_CheckFixture,
/// <summary>
/// 料仓出库，定位气缸退回（有压紧轴的不需要此步骤），，定位气缸退回(Y104-1/PCI5O1-84) (Y104-2/PCI5O1-91) (Y104-2/PCI5O1-96) 退回到位
/// </summary>
SO_09_LocationCylinder_Down = 109,
SO_10_LocationCylinder_Down,
/// <summary>
/// 料仓出库，，叉子进出料口，，轴3（ 叉子） 至P2（ 进料口取料点）
/// /// </summary>
SO_10_DeviceToDoor = 110,
SO_11_DeviceToDoor,
///// <summary>
///// 料仓出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
///// </summary>
......@@ -269,23 +274,23 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料仓出库，升降轴下降，压紧轴放松
/// </summary>
SO_11_PutTray = 111,
SO_12_PutTray,
/// <summary>
/// 叉子返回待机位
/// </summary>
SO_13_InoutBack=112,
SO_13_InoutBack,
/// <summary>
/// 等待拿走物品
/// </summary>
SO_14_WaitTake=114,
SO_14_WaitTake,
/// <summary>
/// 升降轴走到门口位置
/// </summary>
SO_21_OpenDoor=121,
SO_21_OpenDoor = 121,
/// <summary>
/// 等待操作人员拿走料盘
/// </summary>
SO_22_WaitTrayGo=122,
SO_22_WaitTrayGo = 122,
///// <summary>
......@@ -321,11 +326,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入库检测
/// </summary>
SI_00_TrayCheck =200,
SI_00_TrayCheck = 200,
/// <summary>
/// 入库，。定位气缸下降
/// </summary>
SI_01_LocationCylinderDown=201,
SI_01_LocationCylinderDown = 201,
/// <summary>
/// 入库。。进出轴（叉子）先返回P1
/// </summary>
......@@ -351,12 +356,16 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 压紧轴压紧后，升降轴稍微下降之后叉子再后退
/// </summary>
SI_061_UpdownAxisDown=215,
SI_061_UpdownAxisDown = 215,
/// <summary>
/// 入库。。叉子 从入料口抽出，轴3（ 叉子） 至P1（ 待机点）
/// </summary>
SI_07_DeviceBackFromDoor = 207,
SI_07_InoutToP1 = 207,
/// <summary>
/// 拿到料盘后判断叉子料盘检测信号
/// </summary>
SI_071_CheckFixture = 216,
/// <summary>
/// 入库。。，定位气缸伸出 (有压紧轴的不需要此步骤)
/// </summary>
......@@ -391,7 +400,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入库未取到PosID，，升降轴到门口， 打开仓门
/// </summary>
SI_21_DeviceToDoor= 221,
SI_21_DeviceToDoor = 221,
/// <summary>
/// 入库未取到PosID，叉子走到门口位置， 打开仓门
/// </summary>
......@@ -400,7 +409,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 压紧轴走到压紧前点
/// </summary>
SI_23_ComToP3=223,
SI_23_ComToP3 = 223,
/// <summary>
///入库未取到PosID，， 打开仓门
/// </summary>
......@@ -423,11 +432,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 单盘入库：等待操作人员放入料盘
/// </summary>
SIS_33_WaitTray= 303,
SIS_33_WaitTray = 303,
/// <summary>
/// 单盘入库：确认放入料盘，关闭仓门，升降轴走 到P7，压紧轴压紧
/// </summary>
SIS_34_GetTray= 304,
SIS_34_GetTray = 304,
/// <summary>
/// 单盘入库：确认放入料盘，关闭仓门，进出轴后退到P1
/// </summary>
......@@ -446,7 +455,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 单盘入库：扫码
/// </summary>
SIS_38_ScanCode =308,
SIS_38_ScanCode = 308,
/// <summary>
/// 单盘入库：获取入库库位号
......@@ -456,12 +465,12 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 单盘入库：启动新的入库
/// </summary>
SIS_40_StartInStore= 340,
SIS_40_StartInStore = 340,
/// <summary>
/// 单盘入库：开始送出料盘
/// </summary>
SIS_41_StartSendTrayOut= 341,
SIS_41_StartSendTrayOut = 341,
#endregion
......@@ -470,7 +479,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 开始复位
/// </summary>
AUTO_R00_Start =1100,
AUTO_R00_Start = 1100,
/// <summary>
/// 关闭门锁
/// </summary>
......@@ -487,11 +496,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 上料轴返回0点
/// </summary>
AUTO_R04_AutoBack=1104,
AUTO_R04_AutoBack = 1104,
/// <summary>
/// 上料轴移动到待机点
/// </summary>
AUTO_R05_ToP2=1105,
AUTO_R05_ToP2 = 1105,
#endregion
......@@ -500,52 +509,52 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 开始自动上料
/// </summary>
AUTO_I01_Wait=1201,
AUTO_I01_Wait = 1201,
/// <summary>
/// 先上升到料盘检测1（上料机构）信号亮
/// </summary>
AUTO_I02_MoveToUp=1202,
AUTO_I02_MoveToUp = 1202,
/// <summary>
/// 扫码
/// </summary>
AUTO_I03_ScanCode=1203,
AUTO_I03_ScanCode = 1203,
/// <summary>
/// 吸盘下降
/// </summary>
AUTO_I04_SuckingDisc_Down=1204,
AUTO_I04_SuckingDisc_Down = 1204,
/// <summary>
/// 吸盘吸料盘
/// </summary>
AUTO_I05_SuckingDisc_Work=1205,
AUTO_I05_SuckingDisc_Work = 1205,
/// <summary>
/// 吸盘上升 ，
/// </summary>
AUTO_I06_SuckingDisc_Up=1206,
AUTO_I06_SuckingDisc_Up = 1206,
/// <summary>
/// 批量上下料料轴上升
/// </summary>
AUTO_I07_BatchAxisUp=1207,
AUTO_I07_BatchAxisUp = 1207,
/// <summary>
/// 从服务器获取PosID
/// </summary>
AUTO_I08_GetPosId=1208,
AUTO_I08_GetPosId = 1208,
/// <summary>
/// 等待料盘被叉子拿走
/// </summary>
AUTO_I09_WaitTrayLeave=1209,
AUTO_I09_WaitTrayLeave = 1209,
/// <summary>
/// 未扫到码：等待操作人员拿走料盘
/// </summary>
AUTO_I10_WaitTrayGo=1210,
AUTO_I10_WaitTrayGo = 1210,
/// <summary>
/// 批量上下轴开始回原点
/// </summary>
AUTO_I11_BatchAxisHome=1211,
AUTO_I11_BatchAxisHome = 1211,
......@@ -554,37 +563,37 @@ namespace OnlineStore.DeviceLibrary
#region 自动上下料出料功能
AUTO_O00_Wait=1300,
AUTO_O00_Wait = 1300,
/// <summary>
/// 批量轴先匀速下降到X12不亮
/// </summary>
AUTO_O01_BatchAxisDown=1301,
AUTO_O01_BatchAxisDown = 1301,
/// <summary>
/// 打开门锁
/// </summary>
AUTO_O02_WaitDoorOpen =1302,
AUTO_O02_WaitDoorOpen = 1302,
/// <summary>
/// 等待出料检测信号关闭
/// </summary>
AUTO_O03_WaitOutSingleLow=1303,
AUTO_O03_WaitOutSingleLow = 1303,
/// <summary>
/// 向上运动，等待DI12亮或者极限亮停止
/// </summary>
AUTO_O04_SpeedMove=1304,
AUTO_O04_SpeedMove = 1304,
/// <summary>
/// 极限亮，返回P2点
/// </summary>
AUTO_O08_BackToP2=1308,
AUTO_O08_BackToP2 = 1308,
/// <summary>
/// 等待X12灭
/// </summary>
AUTO_O06_WaitDI12Low=1306,
AUTO_O06_WaitDI12Low = 1306,
/// <summary>
/// 等待1秒钟后在下降
/// </summary>
AUTO_O07_WaitDown=1307,
AUTO_O07_WaitDown = 1307,
#endregion
......@@ -624,11 +633,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 批量上下料模块报警
/// </summary>
BatchAlarm =110,
BatchAlarm = 110,
/// <summary>
/// 批量上下轴报警
/// </summary>
BatchAxisAlarm=120,
BatchAxisAlarm = 120,
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!