Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a5fe1738 由 刘韬
选项

添加出库料串已满的提示

1 个父辈 8e235319
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 78 行增加 和 21 行删除
source/ACSingleStore/AutoInOutStore.csproj
......@@ -237,6 +237,7 @@
<Content Include="image\us\pPoint.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="resources\en-US.txt" />
<Content Include="resources\resources.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......
source/ACSingleStore/FrmBase.cs
......@@ -72,7 +72,7 @@ namespace OnlineStore.AutoInOutStore
{
if (CurrLanguage.Equals(ResourceCulture.CurrLanguage))
{
return;
//return;
}
string className = this.ClassName;
CurrLanguage = ResourceCulture.CurrLanguage;
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -453,6 +453,7 @@
this.groupBox6.Controls.Add(this.btnClearBuzzer);
this.groupBox6.Controls.Add(this.btnSingleTrayIn);
this.groupBox6.Controls.Add(this.lblBatchMsg);
this.groupBox6.Controls.Add(this.lblWarnMsg);
this.groupBox6.Controls.Add(this.btnOpenDoor);
this.groupBox6.Controls.Add(this.lblWaitTragGo);
this.groupBox6.Controls.Add(this.btnWaitTrgGo);
......@@ -688,7 +689,6 @@
this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbAuto);
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(8, 7);
this.groupBox3.Name = "groupBox3";
......@@ -738,7 +738,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(6, 58);
this.lblWarnMsg.Location = new System.Drawing.Point(7, -16);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1218, 40);
this.lblWarnMsg.TabIndex = 224;
......@@ -2017,6 +2017,7 @@
// uc_boxdebug1
//
this.uc_boxdebug1.Location = new System.Drawing.Point(6, 6);
this.uc_boxdebug1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uc_boxdebug1.Name = "uc_boxdebug1";
this.uc_boxdebug1.Size = new System.Drawing.Size(1076, 596);
this.uc_boxdebug1.TabIndex = 0;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -1282,7 +1282,8 @@ namespace OnlineStore.AutoInOutStore
}
CodeLibrary.FrmCodeDecode frm = new FrmCodeDecode();
frm.chbZxing.Checked = false;
frm.ShowDialog();
frm.LanguageProcess();
frm.ShowDialog();
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
}
private void btnReadHomeSingle_Click(object sender, EventArgs e)
......@@ -1707,6 +1708,8 @@ namespace OnlineStore.AutoInOutStore
}
打开日志ToolStripMenuItem.Text = openLog;
}
Application.DoEvents();
LanguageProcess();
}
private void chbDebug_CheckedChanged(object sender, EventArgs e)
......
source/ACSingleStore/Program.cs
......@@ -53,7 +53,6 @@ namespace OnlineStore.AutoInOutStore
[STAThread]
static void Main(string[] Args)
{
var xx = DeviceLibrary.ACServerManager.SpeedToStr(32767, 4);
Environment.CurrentDirectory = Application.StartupPath;
Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
......
source/ACSingleStore/Properties/Resource.en-US.resx
......@@ -1218,4 +1218,10 @@
<data name="FrmStoreBox_tabPage6_Text1" xml:space="preserve">
<value>Storage location</value>
</data>
<data name="BatchOutFail_DoorNotLock" xml:space="preserve">
<value>Batch delivery failed, the door lock is not closed</value>
</data>
<data name="BatchFull" xml:space="preserve">
<value>The material tray is full, please take out the material</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/Properties/Resource.ja-JP.resx
......@@ -1218,4 +1218,10 @@
<data name="FrmStoreBox_tabPage6_Text" xml:space="preserve">
<value>ロケーションデバッグ</value>
</data>
<data name="BatchOutFail_DoorNotLock" xml:space="preserve">
<value>バッチ配信に失敗しました。ドアロックが閉じていません。</value>
</data>
<data name="BatchFull" xml:space="preserve">
<value>トレイがいっぱいになっていますので、材料を取り出してください</value>
</data>
</root>
\ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
......@@ -1218,4 +1218,7 @@
<data name="FrmStoreBox_tabPage6_Text" xml:space="preserve">
<value>库位调试</value>
</data>
<data name="BatchOutFail_DoorNotLock" xml:space="preserve">
<value>批量出库失败,门锁未关闭</value>
</data>
</root>
\ No newline at end of file
source/Common/util/HttpHelper.cs
......@@ -89,7 +89,7 @@ namespace OnlineStore.Common
}
catch (Exception e)
{
LogUtil.error("PostJson【" + paramData + "】 ERROR:" + e.StackTrace, 1);
LogUtil.error("PostJson["+ url + "]【" + paramData + "】 ERROR:" + e.ToString(), 1);
}
if (isLog == 1)
......
source/DeviceLibrary/ResourceControl.cs
......@@ -355,5 +355,13 @@ namespace OnlineStore.DeviceLibrary
/// 批量轴已满，请取出料盘
/// </summary>
public static string OutFull = "OutFull";
/// <summary>
/// 批量出库失败,门锁未关闭
/// </summary>
public static string BatchOutFail_DoorNotLock= "BatchOutFail_DoorNotLock";
/// <summary>
/// 批量轴已放满
/// </summary>
public static string BatchFull= "BatchFull";
}
}
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -171,13 +171,13 @@ PRO,(轴五)上料轴P3点（上料目标位置）,BatchAxis_P3,1724717,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,10000,,,,,,,
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1491390,,,,,,,
,,,,,,,,,,
PRO,(轴四)压紧轴目标速度,CompAxis_TargetSpeed,330000,,,,,,,
PRO,(轴四)压紧轴加速度,CompAxis_AddSpeed,930000,,,,,,,
PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,930000,,,,,,,
PRO,(轴四)压紧轴目标速度,CompAxis_TargetSpeed,2000,,,,,,,
PRO,(轴四)压紧轴加速度,CompAxis_AddSpeed,2000,,,,,,,
PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,2000,,,,,,,
PRO,(轴四)压紧轴原点低速,CompAxis_HomeLowSpeed,200,,,,,,,
PRO,(轴四)压紧轴原点高速,CompAxis_HomeHighSpeed,200,,,,,,,
PRO,(轴四)压紧轴原点加速度,CompAxis_HomeAddSpeed,2000,,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,1100,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,330000,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,2000,,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,1100,,,,,,,
PRO,特殊二维码尺寸配置,CodeSizeConfig,T;PartNum;1=330x81,,,,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -300,6 +300,8 @@ namespace OnlineStore.DeviceLibrary
if (!AutomaticBaiting.DoorCloseOK())
{
UpdateInOutMsg(logMsg + "失败，门锁未关闭");
//SetWarnMsg(ResourceControl.BatchOutFail_DoorNotLock);
//WarnMsg = Msg;
return false;
}
if (IsBatchWork && (!SupportBatch(posId)))
......@@ -351,13 +353,13 @@ namespace OnlineStore.DeviceLibrary
}
private void SI_03_AxisToP1(LineMoveP moveP)
{
InStoreLog("入库：SI_03 所有轴回待机点，轴2、轴1 到P1, 轴4到P3，吸盘在上升端");
InStoreLog("入库：SI_03 所有轴回待机点，轴2、轴1 到P1, 轴4到P1，吸盘在上升端");
StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
bool needMove = false;
if (!ACServerManager.isInPosition(Config.Comp_Axis, moveP.ComPress_P3))
if (!ACServerManager.isInPosition(Config.Comp_Axis, moveP.ComPress_P1))
{
needMove = true;
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ComMoveToPosition(moveP.ComPress_P1, Config.CompAxis_P1_Speed);
}
if (!ACServerManager.isInPosition(Config.UpDown_Axis, moveP.UpDown_P1))
{
......@@ -558,8 +560,9 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SI_12_PutWareToBag);
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
Thread.Sleep(100);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
Thread.Sleep(500);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_12_PutWareToBag)
{
......@@ -806,6 +809,7 @@ namespace OnlineStore.DeviceLibrary
if (!AutomaticBaiting.DoorCloseOK())
{
UpdateInOutMsg(logMsg + "失败，门锁未关闭");
SetWarnMsg(ResourceControl.BatchOutFail_DoorNotLock);
//LogUtil.error(LOGGER, StoreName + logMsg + " 出错，门锁未关闭");
return false;
}
......@@ -867,6 +871,8 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog("出库：SO_01 定位气缸下降");
//LocationDownAndWait();
}
upfix1 = false;
upfix2 = false;
CodeOrInoutMsg = "";
return true;
}
......@@ -900,18 +906,22 @@ namespace OnlineStore.DeviceLibrary
int outDownPosition = StoreMove.MoveParam.MoveP.BatchAxis_DownValue;
if (StoreMove.IsBatchInOutStore)
{ //如果料盘检测信号不亮，不需要下降这么多
//判断是否在P1点
{
//如果料盘检测信号不亮，不需要下降这么多
//判断是否在P1点
int acPosition = ACServerManager.GetActualtPosition(Config.Batch_Axis);
bool isIn = Math.Abs(acPosition - Config.BatchAxis_P1) < Config.Batch_Axis.CanErrorCountMax;
OutStoreLog($"出库：acPosition:{acPosition}, needup:{needup}, TrayCheck_LoadMaterial:{IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial)}, outDownPosition:{outDownPosition}, BatchAxis_OutDownPosition:{Config.BatchAxis_OutDownPosition}, isIn:{isIn}");
if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW) && outDownPosition > Config.BatchAxis_OutDownPosition && isIn)
{
outDownPosition = outDownPosition - Config.BatchAxis_OutDownPosition;
OutStoreLog($"出库：在p1位置 outDownPosition:{outDownPosition}");
}
//如果检测信号亮，需要多下降
if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
if (needup || IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
{
outDownPosition = outDownPosition + Config.BatchAxis_DownPosition2;
OutStoreLog($"出库：对射亮,需要多下降 outDownPosition:{outDownPosition}");
}
//上下料机构下降的距离=料盘最低高度+默认的高度
targetValue = GetBatchTargetValue(outDownPosition);
......@@ -931,6 +941,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.EndMove();
storeRunStatus = StoreRunStatus.Runing;
InOutEndProcess(posId,StoreMoveType.OutStore);
SetWarnMsg(ResourceControl.BatchFull);
return;
}
}
......@@ -1101,6 +1112,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(LOGGER, StoreName + " 出库 moveStatus=" + StoreMove.MoveStep + "，没有对应的处理！");
}
}
bool upfix1 = false;
bool upfix2 = false;
bool needup = false;
private void SO_02_DeviceBack()
{
StoreMove.NextMoveStep(StoreMoveStep.SO_02_DeviceBack);
......@@ -1108,15 +1123,30 @@ namespace OnlineStore.DeviceLibrary
InOutBackToP1(StoreMove.MoveParam.MoveP.InOut_P1);
if (StoreMove.IsBatchInOutStore)
{
needup = false;
//如果可以直接下降，则不需要匀速上升
int targetValue = GetBatchTargetValue(StoreMove.MoveParam.MoveP.BatchAxis_DownValue);
if (targetValue >= 300000)
if (targetValue < (Config.BatchAxis_P3 - Config.BatchAxis_P2) * 0.1)
{
OutStoreLog("出库：SO_02 批量上下料轴直接下降后目标位置【" + targetValue + "】不需要匀速上升 ");
if (!upfix2)
{
OutStoreLog($"出库：SO_02 2 targetValue:{targetValue}<{(Config.BatchAxis_P3 - Config.BatchAxis_P2) * 0.1} 需要匀速上升 ");
upfix2 = true;
needup = true;
}
}
else if (targetValue < (Config.BatchAxis_P3 - Config.BatchAxis_P2) * 0.5)
{
if (!upfix1)
{
OutStoreLog($"出库：SO_02 1 targetValue:{targetValue}<{(Config.BatchAxis_P3 - Config.BatchAxis_P2) * 0.5} 需要匀速上升 ");
upfix1 = true;
needup = true;
}
}
//如果批量能未检测到料盘，需要把批量轴走到能检测到料盘的位置
else if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW))
if (needup && IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW))
{
StoreMove.TimeOutSeconds = 120;
//ACAxisMove(Config.Batch_Axis, Config.BatchAxis_P1, Config.BatchAxis_P1_Speed);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!