Skip to content

孙克 / ACSingleStore

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

增加中英文

1 个父辈 4fe808a8
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 119 行增加 和 60 行删除
source/ACSingleStore/FrmAxisDebug.cs
......@@ -69,7 +69,9 @@ namespace OnlineStore.ACSingleStore
{
return true;
}
MyMessage.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
// MyMessage.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
MessageBox.Show(ResourceCulture.GetString( "叉子不在待机位，请先将叉子退回待机位") + "(" + InOutDefaultPosition + ")!",
ResourceCulture.GetString( "警告（叉子在待机位时，才能移动升降轴和旋转轴）"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return false;
}
private void btnMiddleMove_MouseDown(object sender, MouseEventArgs e)
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -139,7 +139,6 @@ namespace OnlineStore.ACSingleStore
string str = ConfigAppSettings.GetValue(Setting_Init.Default_Language);
LogUtil.info("默认语言：" + str);
ResourceCulture.SetCurrentCulture(str);
LogUtil.logBox = this.richTextBox1;
initValue();
this.ShowInTaskbar = true;
......@@ -191,7 +190,7 @@ namespace OnlineStore.ACSingleStore
StoreOpenStatus(true);
}
lblThisSta.Text = store.GetRunStr();
lblThisSta.Text = store.GetRunStr(store.storeRunStatus);
//复位按钮状态显示
if (复位ToolStripMenuItem.Enabled == false)
......@@ -220,14 +219,15 @@ namespace OnlineStore.ACSingleStore
}
}
}
lblWarnMsg.Text = store.WarnMsg;
lblWarnMsg.Text = store.WarnObj.WarnMsg;
if (store.Config.IsHasDoorLimit.Equals(1))
{
if (IOManager.IOValue(IO_Type.Door_Limit).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关";
}else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit)&& IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW))
lblWarnMsg.Text = lblWarnMsg.Text + " "+dooropen;
}
else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit)&& IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关";
}
......@@ -643,7 +643,7 @@ namespace OnlineStore.ACSingleStore
if (store.autoNext)
{
store.autoNext = false;
btnStartAuTo.Text = "开始自动出入库";
btnStartAuTo.Text = StartAuto;
}
else
{
......@@ -659,12 +659,12 @@ namespace OnlineStore.ACSingleStore
store.autoPositionIndex = currIndex;
store.AutoStartIndex = currIndex;
string poText = cmbPosition.Text;
store.autoMsg = "自动出库：" + poText;
store.autoMsg = AutoOut+"：" + poText;
LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
//store.StartOutStoreMove(new InOutStoreParam("", poText));
store.StartInStoreMove(new InOutStoreParam("", poText));
}
btnStartAuTo.Text = "停止自动出入库";
btnStartAuTo.Text = StopAuto;
}
}
}
......
source/ACSingleStore/ResourceCulture.cs
using OnlineStore.Common;
using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
......@@ -44,7 +45,7 @@ namespace OnlineStore
private static char spilt = ',';
private static void LoadData()
{
//ResourceControl.GetStringEvent += GetString;
ResourceControl.GetStringEvent += GetString;
CSVResourceControl.GetStrEvent += GetString;
CSVResourceControl.GetStringEvent += GetString;
CodeLibrary.CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent;
......@@ -345,7 +346,7 @@ namespace OnlineStore
string showMsg = ResourceCulture.GetString(msg, msg, param);
string showTitle = ResourceCulture.GetString("提示");
return MessageBox.Show(showTitle, showMsg);
return MessageBox.Show( showMsg,showTitle);
}
public static DialogResult Show(string msg, string title, MessageBoxButtons but, params object[] param)
{
......
source/ACSingleStore/useControl/AxisMoveControl.cs
......@@ -72,7 +72,9 @@ namespace OnlineStore.ACPackingStore
{
return true;
}
MyMessage.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
// MyMessage.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
MessageBox.Show(ResourceCulture.GetString("叉子不在待机位，请先将叉子退回待机位") + "(" + InOutDefaultPosition + ")!",
ResourceCulture.GetString("警告（叉子在待机位时，才能移动升降轴和旋转轴）"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return false;
}
private void btnAxisAMove_Click(object sender, EventArgs e)
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -71,6 +71,7 @@
<Compile Include="PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACServerManager.cs" />
<Compile Include="PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="ResourceControl.cs" />
<Compile Include="store\LineMoveP.cs" />
<Compile Include="store\LineAlarm.cs">
<SubType>Code</SubType>
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -139,8 +139,8 @@ namespace OnlineStore.DeviceLibrary
if (!msg.Equals(""))
{
isOk = false;
WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, StoreMove.MoveType);
// WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), msg, StoreMove.MoveType);
break;
}
}
......@@ -155,8 +155,9 @@ namespace OnlineStore.DeviceLibrary
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
{
ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
//WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
SetWarnMsg(ResourceControl.WaitSingleTimeOut, io.DisplayStr, wait.IoValue.ToString());
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnObj.WarnMsg, StoreMove.MoveType);
LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
isOk = false;
break;
......@@ -204,10 +205,11 @@ namespace OnlineStore.DeviceLibrary
}
else if (span.TotalSeconds > StoreMove.TimeOutSeconds)
{
WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
+ "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(LOGGER, WarnMsg,100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType);
// WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
// + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1)+"");
LogUtil.error(LOGGER, WarnObj.WarnMsg,100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnObj.WarnMsg, StoreMove.MoveType);
}
}
private static DateTime lastComRHomeTime = DateTime.Now;
......
source/DeviceLibrary/store/KTK_DeviceBase.cs
......@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 提示消息，一般发给服务器后清空（LineBean表示报警提示消息，BoxBean表示出入库失败的原因记录）
/// </summary>
public string WarnMsg = "";
// public string WarnMsg = "";
/// <summary>
/// 日志颜色
/// </summary>
......@@ -101,67 +101,68 @@ namespace OnlineStore.DeviceLibrary
protected abstract void InStoreProcess();
#endregion
public string GetRunStr()
public string GetRunStr(StoreRunStatus runStatus )
{
string sta = "运行中";
string sta = ResourceControl.GetString(ResourceControl.Run, "运行中");
string aa = "";
switch (storeRunStatus)
switch (runStatus)
{
case StoreRunStatus.Busy:
sta = "忙碌";
sta = ResourceControl.GetString(ResourceControl.Busy, "忙碌");
break;
case StoreRunStatus.HomeMoving:
sta = "原点返回";
sta = ResourceControl.GetString(ResourceControl.HomeMove, "原点返回");
break;
case StoreRunStatus.Reset:
sta = "重置";
sta = ResourceControl.GetString(ResourceControl.Reset, "重置");
break;
case StoreRunStatus.Runing:
sta = "运行中";
sta = ResourceControl.GetString(ResourceControl.Runing, "运行中");
break;
case StoreRunStatus.Wait:
sta = "等待启动";
sta = ResourceControl.GetString(ResourceControl.Wait, "等待启动");
break;
}
if (storeRunStatus > StoreRunStatus.Wait)
if (runStatus > StoreRunStatus.Wait)
{
//"0":"急停中", "1":"设备联机", "2":"故障中", "3":"入库执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中",
switch (storeStatus)
{
case StoreStatus.Debugging:
aa = "设备调试中";
aa = ResourceControl.GetString(ResourceControl.Debugging, "设备调试中");
break;
case StoreStatus.InStoreEnd:
aa = "料盘入仓位完成";
aa = ResourceControl.GetString(ResourceControl.InStoreEnd, "料盘入仓位完成");
break;
case StoreStatus.InStoreExecute:
aa = "入库执行中";
aa = ResourceControl.GetString(ResourceControl.InStoreExecute, "入库执行中");
break;
case StoreStatus.InTrouble:
aa = "故障中";
aa = ResourceControl.GetString(ResourceControl.InTrouble, "故障中");
break;
case StoreStatus.OutStoreBoxEnd:
aa = "料盘出仓位完成";
aa = ResourceControl.GetString(ResourceControl.OutStoreBoxEnd, "料盘出仓位完成");
break;
case StoreStatus.OutStoreExecute:
aa = "出库执行中";
aa = ResourceControl.GetString(ResourceControl.OutStoreExecute, "出库执行中");
break;
case StoreStatus.StoreOnline:
aa = "设备联机";
aa = ResourceControl.GetString(ResourceControl.StoreOnline, "设备联机");
break;
case StoreStatus.SuddenStop:
aa = "急停中";
aa = ResourceControl.GetString(ResourceControl.SuddenStop, "急停中");
break;
case StoreStatus.OutMoveExecute:
aa = "出库完成";
aa = ResourceControl.GetString(ResourceControl.OutMoveExecute, "出库完成");
break;
case StoreStatus.InStoreFaild:
aa = "入库失败（" + WarnMsg + "）";
aa = ResourceControl.GetString(ResourceControl.InStoreFailed, "入库失败") + "（" + WarnObj.WarnMsg + "）";
break;
case StoreStatus.OutStoreFaild:
aa = "出库失败（" + WarnMsg + "）";
aa = ResourceControl.GetString(ResourceControl.OutStoreFailed, "出库失败") + "（" + WarnObj.WarnMsg + "）";
break;
}
if (!aa.Equals(""))
......@@ -178,6 +179,50 @@ namespace OnlineStore.DeviceLibrary
return sta;
}
}
public WarnInfo WarnObj = new WarnInfo();
public void SetWarnMsg(string code="", params string[] param)
{
if (code.Equals(""))
{
// WarnMsg =msg;
WarnObj.WarnMsg = "";
WarnObj.MsgCode = "";
WarnObj.MsgParam = param;
}
else
{
// WarnMsg = String.Format(msg, param);
WarnObj.WarnMsg = ResourceControl.GetString(code, param);
WarnObj.MsgCode = code;
WarnObj.MsgParam = param;
}
}
public void SetWarnMsgAndLog(string code, params string[] param)
{
SetWarnMsg(code, param);
LogUtil.error("WarnObj: Type[" + WarnObj.MsgCode + "]Msg[" + WarnObj.WarnMsg + "]");
}
public void SetWaitWarnMsg(string myType, string type, params string[] param)
{
WarnObj.WarnMsg = myType;
WarnObj.MsgCode = type;
WarnObj.MsgParam = param;
}
}
public class WarnInfo
{
public WarnInfo()
{
MsgCode = "";
WarnMsg = "";
MsgParam = null;
}
public string MsgCode { set; get; }
public string WarnMsg { set; get; }
public string[] MsgParam { set; get; }
}
}
source/DeviceLibrary/store/KTK_Store.cs
......@@ -280,8 +280,10 @@ namespace OnlineStore.DeviceLibrary
}
else
{
msg = StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount
+ "]，误差过大，需要报警";
//msg = StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount
// + "]，误差过大，需要报警";
SetWarnMsgAndLog(ResourceControl.AxisMoveAlarm, StoreMove.MoveStep + "", moveAxis.GetNameStr(), targetPosition + "", outCount + "");
msg = WarnObj.WarnMsg;
LogUtil.error(LOGGER, msg);
}
}
......@@ -309,7 +311,10 @@ namespace OnlineStore.DeviceLibrary
}
else
{
msg = StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，误差过大，需要报警";
//msg = StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，误差过大，需要报警";
SetWarnMsgAndLog(ResourceControl.AxisHomeMoveAlarm, StoreMove.MoveStep + "", moveAxis.GetNameStr(), outCount + "");
msg = WarnObj.WarnMsg;
LogUtil.error(LOGGER, msg);
}
}
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -247,39 +247,40 @@ namespace OnlineStore.DeviceLibrary
{
if (IsHomeMove)
{
return "轴【" + AxisInfo.DisplayStr + "】原点返回";
return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.HomeMove, "原点返回");
}
else
{
return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】";
return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.AbsMove, "绝对运动") + "【" + TargetPosition + "】";
}
}
else if (WaitType == 2)
{
return "IO信号等待，IO类型【" + IoType + "】,等待值【" + IoValue + "】";
return ResourceControl.GetString(ResourceControl.WaitIo, "IO信号等待") + "【" + IoType + "】=【" + IoValue + "】";
}
else if (WaitType == 3)
{
return "时间等待：【" + TimeMSeconds + "】毫秒";
return ResourceControl.GetString(ResourceControl.WaitTime, "时间等待：") + "【" + TimeMSeconds + "】";
}
else if (WaitType == 4)
else if (WaitType ==4)
{
return "电钢目标位置：【" + TargetPosition + "】 ";
return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
}
else if (WaitType == 5)
else if (WaitType ==5)
{
return "硕科电机目标位置：【" + TargetPosition + "】 ";
return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
}
else if (WaitType == 6)
else if (WaitType ==6)
{
return "轴【" + AxisInfo.DisplayStr + "】ORG信号：【" + IoValue + "】 ";
}else if (WaitType == 7)
return "【" + AxisInfo.DisplayStr + "】ORG：【" + IoValue + "】 ";
}
else if (WaitType ==7)
{
return "料盘高度【" + HeightValue + "】 ";
return ResourceControl.GetString(ResourceControl.trayHeight, "料盘高度") + "【" + HeightValue + "】 ";
}
else
{
return "Wait位置类型：WaitType=【" + WaitType + "】";
return "WaitType=【" + WaitType + "】";
}
}
/// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!