Skip to content

孙克 / ACSingleStore

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

2

1 个父辈 ae38ff02
内嵌 并排
正在显示 4 个修改的文件 包含 16 行增加 和 7 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -382,8 +382,11 @@ namespace OnlineStore.ACSingleStore ...@@ -382,8 +382,11 @@ namespace OnlineStore.ACSingleStore
lblWarnMsg.Text = lblWarnMsg.Text + " " + rdooropen; lblWarnMsg.Text = lblWarnMsg.Text + " " + rdooropen;
} }
else { else {
if (StoreManager.Store.WarnObj.WarnMsg.IndexOf("前门未关")!=-1)
if (StoreManager.Store.WarnObj.MsgCode.IndexOf("前门未关")>=0)
StoreManager.Store.SetWarnMsg(""); StoreManager.Store.SetWarnMsg("");
if (lblWarnMsg.Text.IndexOf("前门未关")>=0)
lblWarnMsg.Text="";
} }
} }
//如果不在出入库中，且叉子上有信号，需要提示检查叉子 //如果不在出入库中，且叉子上有信号，需要提示检查叉子
......
source/ACSingleStore/Properties/AssemblyInfo.cs
...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices; ...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore fd1e4366da8300c3cc4261347a5ba92c58118031")] [assembly: AssemblyProduct("SO951-HC-ACSingleStore ae38ff02713c40eeb236c27ade9cb6698e5aa49a")]
[assembly: AssemblyCopyright("Copyright ? 2017")] [assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -972,18 +972,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -972,18 +972,23 @@ namespace OnlineStore.DeviceLibrary
} }
//绿灯闪 //绿灯闪
if ((StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore) //if ((StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore)
|| storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset)) // || storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
//if ((storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset)) if ((storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
&& IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH)) && IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
{ {
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
} }
else else if (StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore))
{ {
//绿灯灭
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
}else
//绿灯亮 //绿灯亮
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
}
//黄灯 //黄灯
if (StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore) if (StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore)
|| TempOrHumidityIsAlarm || isTemp30M) || TempOrHumidityIsAlarm || isTemp30M)
......
source/DeviceLibrary/store/KTK_DeviceBase.cs
...@@ -187,6 +187,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -187,6 +187,7 @@ namespace OnlineStore.DeviceLibrary
// WarnMsg =msg; // WarnMsg =msg;
WarnObj.WarnMsg = ""; WarnObj.WarnMsg = "";
WarnObj.WarnMsgEn = ""; WarnObj.WarnMsgEn = "";
WarnObj.WarnMsgJp = "";
WarnObj.MsgCode = ""; WarnObj.MsgCode = "";
WarnObj.MsgParam = param; WarnObj.MsgParam = param;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!