Skip to content

孙克 / ACSingleStore

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

增加中英文

1 个父辈 4fe808a8
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 156 行增加 和 86 行删除
source/ACSingleStore/FrmAxisDebug.cs
...@@ -69,7 +69,9 @@ namespace OnlineStore.ACSingleStore ...@@ -69,7 +69,9 @@ namespace OnlineStore.ACSingleStore
{ {
return true; 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; return false;
} }
private void btnMiddleMove_MouseDown(object sender, MouseEventArgs e) private void btnMiddleMove_MouseDown(object sender, MouseEventArgs e)
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -139,7 +139,6 @@ namespace OnlineStore.ACSingleStore ...@@ -139,7 +139,6 @@ namespace OnlineStore.ACSingleStore
string str = ConfigAppSettings.GetValue(Setting_Init.Default_Language); string str = ConfigAppSettings.GetValue(Setting_Init.Default_Language);
LogUtil.info("默认语言：" + str); LogUtil.info("默认语言：" + str);
ResourceCulture.SetCurrentCulture(str); ResourceCulture.SetCurrentCulture(str);
LogUtil.logBox = this.richTextBox1; LogUtil.logBox = this.richTextBox1;
initValue(); initValue();
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
...@@ -191,7 +190,7 @@ namespace OnlineStore.ACSingleStore ...@@ -191,7 +190,7 @@ namespace OnlineStore.ACSingleStore
StoreOpenStatus(true); StoreOpenStatus(true);
} }
lblThisSta.Text = store.GetRunStr(); lblThisSta.Text = store.GetRunStr(store.storeRunStatus);
//复位按钮状态显示 //复位按钮状态显示
if (复位ToolStripMenuItem.Enabled == false) if (复位ToolStripMenuItem.Enabled == false)
...@@ -220,14 +219,15 @@ namespace OnlineStore.ACSingleStore ...@@ -220,14 +219,15 @@ namespace OnlineStore.ACSingleStore
} }
} }
} }
lblWarnMsg.Text = store.WarnMsg; lblWarnMsg.Text = store.WarnObj.WarnMsg;
if (store.Config.IsHasDoorLimit.Equals(1)) if (store.Config.IsHasDoorLimit.Equals(1))
{ {
if (IOManager.IOValue(IO_Type.Door_Limit).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.Door_Limit).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关"; 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)) }
else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit)&& IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关";
} }
...@@ -643,7 +643,7 @@ namespace OnlineStore.ACSingleStore ...@@ -643,7 +643,7 @@ namespace OnlineStore.ACSingleStore
if (store.autoNext) if (store.autoNext)
{ {
store.autoNext = false; store.autoNext = false;
btnStartAuTo.Text = "开始自动出入库"; btnStartAuTo.Text = StartAuto;
} }
else else
{ {
...@@ -659,12 +659,12 @@ namespace OnlineStore.ACSingleStore ...@@ -659,12 +659,12 @@ namespace OnlineStore.ACSingleStore
store.autoPositionIndex = currIndex; store.autoPositionIndex = currIndex;
store.AutoStartIndex = currIndex; store.AutoStartIndex = currIndex;
string poText = cmbPosition.Text; string poText = cmbPosition.Text;
store.autoMsg = "自动出库：" + poText; store.autoMsg = AutoOut+"：" + poText;
LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！"); LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
//store.StartOutStoreMove(new InOutStoreParam("", poText)); //store.StartOutStoreMove(new InOutStoreParam("", poText));
store.StartInStoreMove(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.Common; using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -44,7 +45,7 @@ namespace OnlineStore ...@@ -44,7 +45,7 @@ namespace OnlineStore
private static char spilt = ','; private static char spilt = ',';
private static void LoadData() private static void LoadData()
{ {
//ResourceControl.GetStringEvent += GetString; ResourceControl.GetStringEvent += GetString;
CSVResourceControl.GetStrEvent += GetString; CSVResourceControl.GetStrEvent += GetString;
CSVResourceControl.GetStringEvent += GetString; CSVResourceControl.GetStringEvent += GetString;
CodeLibrary.CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent; CodeLibrary.CodeResourceControl.GetLanguageEvent += CodeResourceControl_GetLanguageEvent;
...@@ -345,7 +346,7 @@ namespace OnlineStore ...@@ -345,7 +346,7 @@ namespace OnlineStore
string showMsg = ResourceCulture.GetString(msg, msg, param); string showMsg = ResourceCulture.GetString(msg, msg, param);
string showTitle = ResourceCulture.GetString("提示"); 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) 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 ...@@ -72,7 +72,9 @@ namespace OnlineStore.ACPackingStore
{ {
return true; 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; return false;
} }
private void btnAxisAMove_Click(object sender, EventArgs e) private void btnAxisAMove_Click(object sender, EventArgs e)
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<Compile Include="PanasonicServo\ACCMDManager.cs" /> <Compile Include="PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACServerManager.cs" /> <Compile Include="PanasonicServo\ACServerManager.cs" />
<Compile Include="PanasonicServo\ACServerManager_Partial.cs" /> <Compile Include="PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="ResourceControl.cs" />
<Compile Include="store\LineMoveP.cs" /> <Compile Include="store\LineMoveP.cs" />
<Compile Include="store\LineAlarm.cs"> <Compile Include="store\LineAlarm.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -124,10 +124,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -124,10 +124,10 @@ namespace OnlineStore.DeviceLibrary
{ {
isInSuddenDown = true; isInSuddenDown = true;
LogUtil.error(LOGGER, StoreName + "收到急停信号,报警急停"); LogUtil.error(LOGGER, StoreName + "收到急停信号,报警急停");
WarnMsg = StoreName + "收到急停信号，报警急停"; // WarnMsg = StoreName + "收到急停信号，报警急停";
SetWarnMsg(ResourceControl.inSuddenStop);
//报警时会关闭所有轴 //报警时会关闭所有轴
Alarm(StoreAlarmType.SuddenStop, "1", WarnMsg, StoreMoveType.None); Alarm(StoreAlarmType.SuddenStop, "1", WarnObj.WarnMsg, StoreMoveType.None);
} }
} }
else else
...@@ -221,7 +221,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -221,7 +221,7 @@ namespace OnlineStore.DeviceLibrary
{ {
isNoAirCheck = false; isNoAirCheck = false;
isInSuddenDown = false; isInSuddenDown = false;
WarnMsg = ""; SetWarnMsg();
CurrInOutACount = 0; CurrInOutACount = 0;
CurrInOutCount = 0; CurrInOutCount = 0;
IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
...@@ -280,7 +280,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -280,7 +280,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Reset; storeRunStatus = StoreRunStatus.Reset;
storeStatus = StoreStatus.ResetMove; storeStatus = StoreStatus.ResetMove;
StoreMove.NewMove(StoreMoveType.StoreReset); StoreMove.NewMove(StoreMoveType.StoreReset);
WarnMsg = ""; SetWarnMsg();
if (!RunAxis(true)) if (!RunAxis(true))
////打开四个轴 ////打开四个轴
...@@ -385,7 +385,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -385,7 +385,7 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.StoreOnline; storeStatus = StoreStatus.StoreOnline;
if (alarmType.Equals(StoreAlarmType.None)) if (alarmType.Equals(StoreAlarmType.None))
{ {
WarnMsg = ""; SetWarnMsg();
} }
break; break;
...@@ -413,7 +413,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -413,7 +413,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Runing; storeRunStatus = StoreRunStatus.Runing;
if (alarmType.Equals(StoreAlarmType.None)) if (alarmType.Equals(StoreAlarmType.None))
{ {
WarnMsg = ""; SetWarnMsg();
} }
break; break;
...@@ -483,7 +483,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -483,7 +483,8 @@ namespace OnlineStore.DeviceLibrary
//如果此时轴三还在报警，需要提示错误并等待 //如果此时轴三还在报警，需要提示错误并等待
if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0) if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
{ {
WarnMsg = "进出轴报警！复位失败，请检查!"; SetWarnMsg(ResourceControl.InoutAlarm);
//WarnMsg = "进出轴报警！复位失败，请检查!";
LogUtil.error(LOGGER, "进出轴报警！复位失败，请检查！"); LogUtil.error(LOGGER, "进出轴报警！复位失败，请检查！");
} }
//复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴 //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
...@@ -509,7 +510,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -509,7 +510,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Runing; storeRunStatus = StoreRunStatus.Runing;
StoreMove.EndMove(); StoreMove.EndMove();
storeStatus = StoreStatus.StoreOnline; storeStatus = StoreStatus.StoreOnline;
WarnMsg = ""; SetWarnMsg();
break; break;
default: break; default: break;
} }
...@@ -580,9 +581,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -580,9 +581,11 @@ namespace OnlineStore.DeviceLibrary
{ {
ACServerManager.ServoOff(axis.DeviceName, axis.GetAxisValue()); ACServerManager.ServoOff(axis.DeviceName, axis.GetAxisValue());
int alarmCode = GetAlarmCodeByAxis(axis); int alarmCode = GetAlarmCodeByAxis(axis);
WarnMsg = StoreName + "打开轴" + axis.Explain + "失败 ";
LogUtil.info(LOGGER, StoreName + WarnMsg); SetWarnMsg(ResourceControl.OpenAxisFail,axis.DisplayStr);
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axis).ToString(), WarnMsg, StoreMove.MoveType); // WarnMsg = StoreName + "打开轴" + axis.Explain + "失败 ";
LogUtil.info(LOGGER, StoreName +WarnObj.WarnMsg);
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axis).ToString(), WarnObj.WarnMsg, StoreMove.MoveType);
return false; return false;
} }
} }
...@@ -632,7 +635,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -632,7 +635,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public override void StopRun() public override void StopRun()
{ {
WarnMsg = ""; SetWarnMsg();
autoNext = false; autoNext = false;
IoCheckTimer.Enabled = false; IoCheckTimer.Enabled = false;
serverConnectTimer.Enabled = false; serverConnectTimer.Enabled = false;
...@@ -748,10 +751,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -748,10 +751,11 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - lastAirCloseTime; TimeSpan span = DateTime.Now - lastAirCloseTime;
if (span.TotalSeconds > Config.AirCheckSeconds) if (span.TotalSeconds > Config.AirCheckSeconds)
{ {
WarnMsg = "未检测到气压信号"; //WarnMsg = "未检测到气压信号";
SetWarnMsg(ResourceControl.NoAIr);
preAirValue = IO_VALUE.LOW; preAirValue = IO_VALUE.LOW;
LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警"); LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
Alarm(StoreAlarmType.NoAirCheck, "2", WarnMsg, StoreMoveType.None); Alarm(StoreAlarmType.NoAirCheck, "2", WarnObj.WarnMsg, StoreMoveType.None);
return; return;
} }
} }
...@@ -945,7 +949,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -945,7 +949,8 @@ namespace OnlineStore.DeviceLibrary
{ {
//收到复位信号 //收到复位信号
LogUtil.info(LOGGER, "收到复位信号，自动复位"); LogUtil.info(LOGGER, "收到复位信号，自动复位");
WarnMsg = "收到复位信号，自动复位"; //WarnMsg = "收到复位信号，自动复位";
SetWarnMsg(ResourceControl.AutoReset);
Reset(); Reset();
} }
} }
...@@ -1111,7 +1116,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1111,7 +1116,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(StoreName + "之前有IO超时异常【" + alarmInfo.alarmDetail + "】,但是当前已经没有在等待中，清理信号超时异常！"); LogUtil.info(StoreName + "之前有IO超时异常【" + alarmInfo.alarmDetail + "】,但是当前已经没有在等待中，清理信号超时异常！");
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
WarnMsg = ""; SetWarnMsg();
} }
} }
} }
...@@ -1224,9 +1229,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1224,9 +1229,10 @@ namespace OnlineStore.DeviceLibrary
if (alarmIo == 1) if (alarmIo == 1)
{ {
WarnMsg = StoreName + " 运动轴" + axisInfo.Explain + "报警"; //WarnMsg = StoreName + " 运动轴" + axisInfo.Explain + "报警";
SetWarnMsg(ResourceControl.AxisAlarm, axisInfo.DisplayStr);
info.AlarmIoValue = alarmIo; info.AlarmIoValue = alarmIo;
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), WarnMsg, StoreMoveType.None); Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), WarnObj.WarnMsg, StoreMoveType.None);
isInAlarm = true; isInAlarm = true;
} }
else else
...@@ -1389,7 +1395,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1389,7 +1395,8 @@ namespace OnlineStore.DeviceLibrary
string[] posArray = posId.Split('#'); string[] posArray = posId.Split('#');
if (!(posArray.Length == 2)) if (!(posArray.Length == 2))
{ {
WarnMsg = StoreName + "入库库位格式错误：二维码【" + message + "】库位【" + posId + "】"; //WarnMsg = StoreName + "入库库位格式错误：二维码【" + message + "】库位【" + posId + "】";
SetWarnMsg(ResourceControl.InStoreError, message, posId);
LogUtil.error(LOGGER, "服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】"); LogUtil.error(LOGGER, "服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
LogUtil.info(LOGGER, "服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】"); LogUtil.info(LOGGER, "服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
return; return;
...@@ -1400,7 +1407,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1400,7 +1407,9 @@ namespace OnlineStore.DeviceLibrary
ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId); ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId);
if (position == null) if (position == null)
{ //出入库没有找到服务器发送的库位，需要打印日志方便查询原因 { //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
WarnMsg = "入库未找到库位：二维码【" + message + "】库位【" + posId + "】 ";
SetWarnMsg(ResourceControl.InStoreNoPosition, message, posId);
// WarnMsg = "入库未找到库位：二维码【" + message + "】库位【" + posId + "】 ";
LogUtil.error(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】"); LogUtil.error(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
LogUtil.info(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】"); LogUtil.info(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
return; return;
...@@ -1751,10 +1760,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1751,10 +1760,10 @@ namespace OnlineStore.DeviceLibrary
lineOperation.cid = CID; lineOperation.cid = CID;
lineOperation.seq = ConfigAppSettings.nextSeq(); lineOperation.seq = ConfigAppSettings.nextSeq();
lineOperation.status = 1; lineOperation.status = 1;
if (WarnMsg != "") if (WarnObj.WarnMsg != "")
{ {
lineOperation.status = (int)StoreStatus.Warning; lineOperation.status = (int)StoreStatus.Warning;
lineOperation.msg = WarnMsg; lineOperation.msg = WarnObj.WarnMsg;
} }
else if (IsRun) else if (IsRun)
{ {
...@@ -1772,10 +1781,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1772,10 +1781,10 @@ namespace OnlineStore.DeviceLibrary
{ {
boxStatus.status = (int)StoreStatus.Debugging; boxStatus.status = (int)StoreStatus.Debugging;
} }
boxStatus.msg = WarnMsg; boxStatus.msg = WarnObj.WarnMsg;
lineOperation.msg = WarnMsg; lineOperation.msg = WarnObj.WarnMsg;
if (WarnMsg.Equals("")) if (WarnObj.WarnMsg.Equals(""))
{ {
boxStatus.msg = CodeMsg; boxStatus.msg = CodeMsg;
lineOperation.msg = CodeMsg; lineOperation.msg = CodeMsg;
...@@ -1789,7 +1798,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1789,7 +1798,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
CodeMsg = ""; CodeMsg = "";
//WarnMsg = ""; //SetWarnMsg();
//状态 //状态
boxStatus.status = (int)storeStatus; boxStatus.status = (int)storeStatus;
if (IsDebug) if (IsDebug)
...@@ -1916,7 +1925,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1916,7 +1925,8 @@ namespace OnlineStore.DeviceLibrary
string[] posArray = posId.Split('#'); string[] posArray = posId.Split('#');
if (posArray.Length != 2) if (posArray.Length != 2)
{ {
WarnMsg = StoreName + "出库格式错误：库位号【" + posId + "】"; //WarnMsg = StoreName + "出库格式错误：库位号【" + posId + "】";
SetWarnMsg(ResourceControl.OutStoreError, posId);
LogUtil.error(LOGGER, "收到服务器出库命令：库位号【" + posId + "】格式错误"); LogUtil.error(LOGGER, "收到服务器出库命令：库位号【" + posId + "】格式错误");
continue; continue;
} }
...@@ -1927,7 +1937,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1927,7 +1937,8 @@ namespace OnlineStore.DeviceLibrary
if (position == null) if (position == null)
{ {
//出入库没有找到服务器发送的库位，需要打印日志方便查询原因 //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
WarnMsg = StoreName + "出库未找库位：【" + posId + "】"; //WarnMsg = StoreName + "出库未找库位：【" + posId + "】";
SetWarnMsg(ResourceControl.OutStoreNoPosition, posId);
LogUtil.error(LOGGER, "收到服务器出库命令：未找到【" + posId + "】的库位信息"); LogUtil.error(LOGGER, "收到服务器出库命令：未找到【" + posId + "】的库位信息");
continue; continue;
} }
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -139,8 +139,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -139,8 +139,8 @@ namespace OnlineStore.DeviceLibrary
if (!msg.Equals("")) if (!msg.Equals(""))
{ {
isOk = false; isOk = false;
WarnMsg = msg; // WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, StoreMove.MoveType); Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), msg, StoreMove.MoveType);
break; break;
} }
} }
...@@ -155,8 +155,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,8 +155,9 @@ namespace OnlineStore.DeviceLibrary
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs) if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
{ {
ConfigIO io = Config.getWaitIO(wait.IoType); ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！"; //WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType); 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); LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
isOk = false; isOk = false;
break; break;
...@@ -204,10 +205,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -204,10 +205,11 @@ namespace OnlineStore.DeviceLibrary
} }
else if (span.TotalSeconds > StoreMove.TimeOutSeconds) else if (span.TotalSeconds > StoreMove.TimeOutSeconds)
{ {
WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg // WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
+ "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒"; // + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(LOGGER, WarnMsg,100); SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1)+"");
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType); LogUtil.error(LOGGER, WarnObj.WarnMsg,100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnObj.WarnMsg, StoreMove.MoveType);
} }
} }
private static DateTime lastComRHomeTime = DateTime.Now; private static DateTime lastComRHomeTime = DateTime.Now;
......
source/DeviceLibrary/store/KTK_DeviceBase.cs
...@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 提示消息，一般发给服务器后清空（LineBean表示报警提示消息，BoxBean表示出入库失败的原因记录） /// 提示消息，一般发给服务器后清空（LineBean表示报警提示消息，BoxBean表示出入库失败的原因记录）
/// </summary> /// </summary>
public string WarnMsg = ""; // public string WarnMsg = "";
/// <summary> /// <summary>
/// 日志颜色 /// 日志颜色
/// </summary> /// </summary>
...@@ -103,65 +103,66 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,65 +103,66 @@ namespace OnlineStore.DeviceLibrary
public string GetRunStr()
public string GetRunStr(StoreRunStatus runStatus )
{ {
string sta = "运行中"; string sta = ResourceControl.GetString(ResourceControl.Run, "运行中");
string aa = ""; string aa = "";
switch (storeRunStatus) switch (runStatus)
{ {
case StoreRunStatus.Busy: case StoreRunStatus.Busy:
sta = "忙碌"; sta = ResourceControl.GetString(ResourceControl.Busy, "忙碌");
break; break;
case StoreRunStatus.HomeMoving: case StoreRunStatus.HomeMoving:
sta = "原点返回"; sta = ResourceControl.GetString(ResourceControl.HomeMove, "原点返回");
break; break;
case StoreRunStatus.Reset: case StoreRunStatus.Reset:
sta = "重置"; sta = ResourceControl.GetString(ResourceControl.Reset, "重置");
break; break;
case StoreRunStatus.Runing: case StoreRunStatus.Runing:
sta = "运行中"; sta = ResourceControl.GetString(ResourceControl.Runing, "运行中");
break; break;
case StoreRunStatus.Wait: case StoreRunStatus.Wait:
sta = "等待启动"; sta = ResourceControl.GetString(ResourceControl.Wait, "等待启动");
break; break;
} }
if (storeRunStatus > StoreRunStatus.Wait) if (runStatus > StoreRunStatus.Wait)
{ {
//"0":"急停中", "1":"设备联机", "2":"故障中", "3":"入库执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中", //"0":"急停中", "1":"设备联机", "2":"故障中", "3":"入库执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中",
switch (storeStatus) switch (storeStatus)
{ {
case StoreStatus.Debugging: case StoreStatus.Debugging:
aa = "设备调试中"; aa = ResourceControl.GetString(ResourceControl.Debugging, "设备调试中");
break; break;
case StoreStatus.InStoreEnd: case StoreStatus.InStoreEnd:
aa = "料盘入仓位完成"; aa = ResourceControl.GetString(ResourceControl.InStoreEnd, "料盘入仓位完成");
break; break;
case StoreStatus.InStoreExecute: case StoreStatus.InStoreExecute:
aa = "入库执行中"; aa = ResourceControl.GetString(ResourceControl.InStoreExecute, "入库执行中");
break; break;
case StoreStatus.InTrouble: case StoreStatus.InTrouble:
aa = "故障中"; aa = ResourceControl.GetString(ResourceControl.InTrouble, "故障中");
break; break;
case StoreStatus.OutStoreBoxEnd: case StoreStatus.OutStoreBoxEnd:
aa = "料盘出仓位完成"; aa = ResourceControl.GetString(ResourceControl.OutStoreBoxEnd, "料盘出仓位完成");
break; break;
case StoreStatus.OutStoreExecute: case StoreStatus.OutStoreExecute:
aa = "出库执行中"; aa = ResourceControl.GetString(ResourceControl.OutStoreExecute, "出库执行中");
break; break;
case StoreStatus.StoreOnline: case StoreStatus.StoreOnline:
aa = "设备联机"; aa = ResourceControl.GetString(ResourceControl.StoreOnline, "设备联机");
break; break;
case StoreStatus.SuddenStop: case StoreStatus.SuddenStop:
aa = "急停中"; aa = ResourceControl.GetString(ResourceControl.SuddenStop, "急停中");
break; break;
case StoreStatus.OutMoveExecute: case StoreStatus.OutMoveExecute:
aa = "出库完成"; aa = ResourceControl.GetString(ResourceControl.OutMoveExecute, "出库完成");
break; break;
case StoreStatus.InStoreFaild: case StoreStatus.InStoreFaild:
aa = "入库失败（" + WarnMsg + "）"; aa = ResourceControl.GetString(ResourceControl.InStoreFailed, "入库失败") + "（" + WarnObj.WarnMsg + "）";
break; break;
case StoreStatus.OutStoreFaild: case StoreStatus.OutStoreFaild:
aa = "出库失败（" + WarnMsg + "）"; aa = ResourceControl.GetString(ResourceControl.OutStoreFailed, "出库失败") + "（" + WarnObj.WarnMsg + "）";
break; break;
} }
if (!aa.Equals("")) if (!aa.Equals(""))
...@@ -178,6 +179,50 @@ namespace OnlineStore.DeviceLibrary ...@@ -178,6 +179,50 @@ namespace OnlineStore.DeviceLibrary
return sta; 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 ...@@ -280,8 +280,10 @@ namespace OnlineStore.DeviceLibrary
} }
else 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); LogUtil.error(LOGGER, msg);
} }
} }
...@@ -309,7 +311,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -309,7 +311,10 @@ namespace OnlineStore.DeviceLibrary
} }
else 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); LogUtil.error(LOGGER, msg);
} }
} }
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -247,39 +247,40 @@ namespace OnlineStore.DeviceLibrary ...@@ -247,39 +247,40 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IsHomeMove) if (IsHomeMove)
{ {
return "轴【" + AxisInfo.DisplayStr + "】原点返回"; return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.HomeMove, "原点返回");
} }
else else
{ {
return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】"; return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.AbsMove, "绝对运动") + "【" + TargetPosition + "】";
} }
} }
else if (WaitType == 2) else if (WaitType == 2)
{ {
return "IO信号等待，IO类型【" + IoType + "】,等待值【" + IoValue + "】"; return ResourceControl.GetString(ResourceControl.WaitIo, "IO信号等待") + "【" + IoType + "】=【" + IoValue + "】";
} }
else if (WaitType == 3) 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 + "】 "; return "【" + AxisInfo.DisplayStr + "】ORG：【" + IoValue + "】 ";
}else if (WaitType == 7) }
else if (WaitType ==7)
{ {
return "料盘高度【" + HeightValue + "】 "; return ResourceControl.GetString(ResourceControl.trayHeight, "料盘高度") + "【" + HeightValue + "】 ";
} }
else else
{ {
return "Wait位置类型：WaitType=【" + WaitType + "】"; return "WaitType=【" + WaitType + "】";
} }
} }
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!