Skip to content

刘韬 / SO815-AutoInOutStore

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

出库修改

1 个父辈 9f6cc492
内嵌 并排
正在显示 11 个修改的文件 包含 66 行增加 和 24 行删除
source/ACSingleStore/App.config
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<add key ="QRCodeCount" value ="1"/> <add key ="QRCodeCount" value ="1"/>
<add key ="OpenCycleOut" value ="1"/> <add key ="OpenCycleOut" value ="1"/>
<!--IO模块是否主动上传--> <!--IO模块是否主动上传-->
<add key ="AIOAutoUpload" value ="1"/> <add key ="AIOAutoUpload" value ="1"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.groupAuto = new System.Windows.Forms.GroupBox(); this.groupAuto = new System.Windows.Forms.GroupBox();
this.btnCycleOut = new System.Windows.Forms.Button();
this.btnSaveSinglePosId = new System.Windows.Forms.Button(); this.btnSaveSinglePosId = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox1 = new System.Windows.Forms.CheckBox();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
...@@ -237,7 +238,6 @@ ...@@ -237,7 +238,6 @@
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btnCycleOut = new System.Windows.Forms.Button();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.groupAuto.SuspendLayout(); this.groupAuto.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
...@@ -308,6 +308,17 @@ ...@@ -308,6 +308,17 @@
this.groupAuto.TabStop = false; this.groupAuto.TabStop = false;
this.groupAuto.Text = "自动出入库"; this.groupAuto.Text = "自动出入库";
// //
// btnCycleOut
//
this.btnCycleOut.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCycleOut.Location = new System.Drawing.Point(396, 140);
this.btnCycleOut.Name = "btnCycleOut";
this.btnCycleOut.Size = new System.Drawing.Size(157, 38);
this.btnCycleOut.TabIndex = 285;
this.btnCycleOut.Text = "开始循环出库";
this.btnCycleOut.UseVisualStyleBackColor = true;
this.btnCycleOut.Click += new System.EventHandler(this.btnCycleOut_Click);
//
// btnSaveSinglePosId // btnSaveSinglePosId
// //
this.btnSaveSinglePosId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveSinglePosId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -2673,17 +2684,6 @@ ...@@ -2673,17 +2684,6 @@
this.英文ToolStripMenuItem.Text = "英文"; this.英文ToolStripMenuItem.Text = "英文";
this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click); this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
// //
// btnCycleOut
//
this.btnCycleOut.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCycleOut.Location = new System.Drawing.Point(396, 140);
this.btnCycleOut.Name = "btnCycleOut";
this.btnCycleOut.Size = new System.Drawing.Size(157, 38);
this.btnCycleOut.TabIndex = 285;
this.btnCycleOut.Text = "开始循环出库";
this.btnCycleOut.UseVisualStyleBackColor = true;
this.btnCycleOut.Click += new System.EventHandler(this.btnCycleOut_Click);
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -2926,7 +2926,6 @@ ...@@ -2926,7 +2926,6 @@
public System.Windows.Forms.Button btnUpdownP8; public System.Windows.Forms.Button btnUpdownP8;
public System.Windows.Forms.TextBox txtUpdownP2; public System.Windows.Forms.TextBox txtUpdownP2;
public System.Windows.Forms.Button btnUpdownP2; public System.Windows.Forms.Button btnUpdownP2;
private System.Windows.Forms.Label lblBatchMsg;
public System.Windows.Forms.Button btnUpdateSpeed; public System.Windows.Forms.Button btnUpdateSpeed;
private System.Windows.Forms.Label lblOutInfo; private System.Windows.Forms.Label lblOutInfo;
public System.Windows.Forms.TextBox txtInoutP4; public System.Windows.Forms.TextBox txtInoutP4;
...@@ -2955,6 +2954,7 @@ ...@@ -2955,6 +2954,7 @@
private System.Windows.Forms.ToolStripMenuItem 升降轴位置调试ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 升降轴位置调试ToolStripMenuItem;
private System.Windows.Forms.Button btnSaveSinglePosId; private System.Windows.Forms.Button btnSaveSinglePosId;
private System.Windows.Forms.Button btnCycleOut; private System.Windows.Forms.Button btnCycleOut;
private System.Windows.Forms.Label lblBatchMsg;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -437,8 +437,19 @@ namespace OnlineStore.AutoInOutStore ...@@ -437,8 +437,19 @@ namespace OnlineStore.AutoInOutStore
btnSingleTrayIn.Enabled = map[ParamDefine.singleReelIn].Equals(ParamDefine.enable); btnSingleTrayIn.Enabled = map[ParamDefine.singleReelIn].Equals(ParamDefine.enable);
lblDoorStatus.Text = map[ParamDefine.doorStatus]; lblDoorStatus.Text = map[ParamDefine.doorStatus];
lblOutInfo.Visible = !lblWaitTragGo.Visible; lblOutInfo.Visible = !lblWaitTragGo.Visible;
string msg = "";
if (AutomaticBaiting.BatchOutStoreHeight >= store.Config.BatchAxis_MaxHeight)
{
msg = " "+ResourceCulture.GetString(ResourceControl.OutFull, "批量轴已满，请取出料盘");
lblOutInfo.ForeColor = Color.Red;
}
else
{
lblOutInfo.ForeColor = Color.Green;
}
lblOutInfo.Text = ResourceCulture.GetString(ResourceCulture.InstoreInfo,"批量出入库信息： 入库：" )+ AutomaticBaiting.BatchInStoreCount + "," + AutomaticBaiting.BatchInStoreHeight + "mm，" + lblOutInfo.Text = ResourceCulture.GetString(ResourceCulture.InstoreInfo,"批量出入库信息： 入库：" )+ AutomaticBaiting.BatchInStoreCount + "," + AutomaticBaiting.BatchInStoreHeight + "mm，" +
ResourceCulture.GetString(ResourceCulture.oustore , "出库： ") + AutomaticBaiting.BatchOutStoreCount + "," + AutomaticBaiting.BatchOutStoreHeight + "mm"; ResourceCulture.GetString(ResourceCulture.oustore , "出库： ") + AutomaticBaiting.BatchOutStoreCount + "," + AutomaticBaiting.BatchOutStoreHeight + "mm"+msg;
bool isRun = HumitureController.IsRun; bool isRun = HumitureController.IsRun;
btnSelTemp.Enabled = isRun; btnSelTemp.Enabled = isRun;
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -1333,7 +1333,7 @@ ...@@ -1333,7 +1333,7 @@
<data name="启动失败：设备未初始化完成" xml:space="preserve"> <data name="启动失败：设备未初始化完成" xml:space="preserve">
<value>Startup failure: device initialization is not complete</value> <value>Startup failure: device initialization is not complete</value>
</data> </data>
<data name="FrmPositionTool_groupBox1_Text" xml:space="preserve"> <data name="FrmPositionTool_groupBox1_Text" xml:space="preserve">
<value>equipment information</value> <value>equipment information</value>
</data> </data>
...@@ -1367,15 +1367,18 @@ ...@@ -1367,15 +1367,18 @@
<data name="请输入正确的速度" xml:space="preserve"> <data name="请输入正确的速度" xml:space="preserve">
<value>Please enter the correct speed</value> <value>Please enter the correct speed</value>
</data> </data>
<data name="StartCycle" xml:space="preserve"> <data name="StartCycle" xml:space="preserve">
<value>Start looping out</value> <value>Start looping out</value>
</data> </data>
<data name="StopCycle" xml:space="preserve"> <data name="StopCycle" xml:space="preserve">
<value>Stop the loop</value> <value>Stop the loop</value>
</data> </data>
<data name="FrmStoreBox_btnCycleOut_Text" xml:space="preserve"> <data name="FrmStoreBox_btnCycleOut_Text" xml:space="preserve">
<value>Start looping out</value> <value>Start looping out</value>
</data> </data>
<data name="OutFull" xml:space="preserve">
<value>Batch shaft is full, please take out the material tray</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
...@@ -1374,4 +1374,7 @@ ...@@ -1374,4 +1374,7 @@
<data name="FrmStoreBox_btnCycleOut_Text" xml:space="preserve"> <data name="FrmStoreBox_btnCycleOut_Text" xml:space="preserve">
<value>开始循环出库</value> <value>开始循环出库</value>
</data> </data>
<data name="OutFull" xml:space="preserve">
<value>批量轴已满，请取出料盘</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/记录.txt
...@@ -245,3 +245,10 @@ PositionNum,Priority,Height,Width,StoreID,SupportBatch,MiddleAxis_Position_P2,Up ...@@ -245,3 +245,10 @@ PositionNum,Priority,Height,Width,StoreID,SupportBatch,MiddleAxis_Position_P2,Up
增加IO模块主动上传设置。 增加IO模块主动上传设置。
<!--IO模块是否主动上传--> <!--IO模块是否主动上传-->
<add key ="AIOAutoUpload" value ="1"/> <add key ="AIOAutoUpload" value ="1"/>
PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_DownPosition2,200000,,,,,,,
未检测到料盘时，下降高度=BatchAxis_OutDownPosition+料盘高度X系数
增加配置BatchAxis_DownPosition2，当出库检测到料盘时，下降的距离在原来的基础上加上BatchAxis_DownPosition2
更新好了你试下
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/ResourceControl.cs
...@@ -368,5 +368,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -368,5 +368,9 @@ namespace OnlineStore.DeviceLibrary
/// 门未关闭，无法执行出库 /// 门未关闭，无法执行出库
/// </summary> /// </summary>
public static string TheDoorOpen = "TheDoorOpen"; public static string TheDoorOpen = "TheDoorOpen";
/// <summary>
/// 批量轴已满，请取出料盘
/// </summary>
public static string OutFull = "OutFull";
} }
} }
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -163,7 +163,8 @@ PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,, ...@@ -163,7 +163,8 @@ PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,,
PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,, PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,,
PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,2000,,,,,,, PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,2000,,,,,,,
PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,100000,,,,,,, PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,100000,,,,,,,
PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,, PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_DownPosition2,200000,,,,,,,
PRO,(轴五)上料轴最最大料盘高度mm，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
PRO,最后一盘料需要补充的高度,LastTrayAddHeight,0,,,,,,, PRO,最后一盘料需要补充的高度,LastTrayAddHeight,0,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,, PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1662,8 +1662,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -1662,8 +1662,13 @@ namespace OnlineStore.DeviceLibrary
lineOperation.SetMsg(ResourceControl.GetString(ResourceControl.HasWare, "叉子料盘检测有料，请检查"), ResourceControl.HasWare); lineOperation.SetMsg(ResourceControl.GetString(ResourceControl.HasWare, "叉子料盘检测有料，请检查"), ResourceControl.HasWare);
}else if(waitOutStoreList.Count>0 && (!AutomaticBaiting.DoorCloseOK())) }else if(waitOutStoreList.Count>0 && (!AutomaticBaiting.DoorCloseOK()))
{ {
boxStatus.SetMsg(ResourceControl.GetString(ResourceControl.TheDoorOpen, "门锁未关闭，无法出库"), ResourceControl.HasWare); boxStatus.SetMsg(ResourceControl.GetString(ResourceControl.TheDoorOpen, "门锁未关闭，无法出库"), ResourceControl.TheDoorOpen);
lineOperation.SetMsg(ResourceControl.GetString(ResourceControl.TheDoorOpen, "门锁未关闭，无法出库"), ResourceControl.HasWare); lineOperation.SetMsg(ResourceControl.GetString(ResourceControl.TheDoorOpen, "门锁未关闭，无法出库"), ResourceControl.TheDoorOpen);
}
else if(AutomaticBaiting.BatchOutStoreHeight >= Config.BatchAxis_MaxHeight)
{
boxStatus.SetMsg(ResourceControl.GetString(ResourceControl.OutFull, "批量轴已满，请取出料盘"), ResourceControl.OutFull);
lineOperation.SetMsg(ResourceControl.GetString(ResourceControl.OutFull, "批量轴已满，请取出料盘"), ResourceControl.OutFull);
} }
} }
//WarnMsg = ""; //WarnMsg = "";
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -856,7 +856,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -856,7 +856,7 @@ namespace OnlineStore.DeviceLibrary
//如果检测信号亮，需要多下降 //如果检测信号亮，需要多下降
if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
{ {
outDownPosition = outDownPosition + Config.BatchAxis_OutDownPosition; outDownPosition = outDownPosition + Config.BatchAxis_DownPosition2;
} }
//上下料机构下降的距离=料盘最低高度+默认的高度 //上下料机构下降的距离=料盘最低高度+默认的高度
targetValue = GetBatchTargetValue(outDownPosition); targetValue = GetBatchTargetValue(outDownPosition);
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
...@@ -592,7 +592,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -592,7 +592,7 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// PRO(轴五)上料轴最最大料盘高度，到达后无法批量出库 BatchAxis_MaxHeight /// PRO(轴五)上料轴最最大料盘高度mm，到达后无法批量出库 BatchAxis_MaxHeight
///</summary> ///</summary>
[ConfigProAttribute("BatchAxis_MaxHeight", true)] [ConfigProAttribute("BatchAxis_MaxHeight", true)]
public int BatchAxis_MaxHeight { get; set; } public int BatchAxis_MaxHeight { get; set; }
...@@ -697,7 +697,15 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -697,7 +697,15 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("CodeSizeConfig", false)] [ConfigProAttribute("CodeSizeConfig", false)]
public string CodeSizeConfig { get; set; } public string CodeSizeConfig { get; set; }
/// <summary>
/// PRO,(轴五) 上料轴出料时检测到料盘需要下降的高度, BatchAxis_DownPosition2,200000,,,,,,,
/// </summary>
[ConfigProAttribute("BatchAxis_DownPosition2", false)]
public int BatchAxis_DownPosition2 { get; set; }
private Dictionary<string, string> CodeSizeMap = null; private Dictionary<string, string> CodeSizeMap = null;
private static char codeSpilt = '#'; private static char codeSpilt = '#';
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!