Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c29f3908 由 Dolen Zhang
选项

翻译、出入库亮灯规则

1 个父辈 84085011
全部展开
内嵌 并排
正在显示 22 个修改的文件 包含 68 行增加 和 39 行删除
source/ACServoDriveTest/ACServoDriveTest.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ACServoDriveTest</RootNamespace> <RootNamespace>ACServoDriveTest</RootNamespace>
<AssemblyName>ACServoDriveTest</AssemblyName> <AssemblyName>ACServoDriveTest</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
......
source/ACServoDriveTest/App.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
</configuration> </configuration>
source/ACServoDriveTest/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace ACServoDriveTest.Properties { ...@@ -19,7 +19,7 @@ namespace ACServoDriveTest.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace ACServoDriveTest.Properties { ...@@ -47,8 +47,8 @@ namespace ACServoDriveTest.Properties {
} }
/// <summary> /// <summary>
/// 使用此强类型资源类，为所有资源查找 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
source/ACServoDriveTest/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace ACServoDriveTest.Properties { ...@@ -12,7 +12,7 @@ namespace ACServoDriveTest.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -376,10 +376,12 @@ namespace OnlineStore.ACSingleStore ...@@ -376,10 +376,12 @@ namespace OnlineStore.ACSingleStore
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 + " " + ldooropen; lblWarnMsg.Text = lblWarnMsg.Text + " " + ldooropen;
StoreManager.Store.SetWarnMsg("左侧门未关", "左侧门未关");
} }
else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_RightLimit) && IOManager.IOValue(IO_Type.Door_RightLimit).Equals(IO_VALUE.LOW)) else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_RightLimit) && IOManager.IOValue(IO_Type.Door_RightLimit).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " " + rdooropen; lblWarnMsg.Text = lblWarnMsg.Text + " " + rdooropen;
StoreManager.Store.SetWarnMsg("右侧门未关", "右侧门未关");
} }
else { else {
......
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 ae38ff02713c40eeb236c27ade9cb6698e5aa49a")] [assembly: AssemblyProduct("SO951-HC-ACSingleStore 84085011622eb8df3361eb4caec4c3cefe70c3dd")]
[assembly: AssemblyCopyright("Copyright ? 2017")] [assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
source/ACSingleStore/resources/ja-JP.lngres
...@@ -225,7 +225,7 @@ OpenAxisFail 打开轴{0}失败 軸を開けることが不可{0} ...@@ -225,7 +225,7 @@ OpenAxisFail 打开轴{0}失败 軸を開けることが不可{0}
NoAIr 未检测到气压信号 気圧信号はまだ検出していません。 NoAIr 未检测到气压信号 気圧信号はまだ検出していません。
AutoReset 收到复位信号，自动复位 リセット信号を受け、自動初期化に戻す AutoReset 收到复位信号，自动复位 リセット信号を受け、自動初期化に戻す
AxisAlarm 运动轴{0}报警 運転軸がアラームする{0} AxisAlarm 运动轴{0}报警 運転軸がアラームする{0}
CustAlarm {0} {0} CustAlarm 湿度超限{0}分钟 湿度制限{0}分超過
startFail 启动失败:急停未开 設備が立ち上がらなく、急に止まる startFail 启动失败:急停未开 設備が立ち上がらなく、急に止まる
WaitSingleTimeOut 等待信号{0}={1}超时 信号を待つ、タイムオーバーする{0}={1} WaitSingleTimeOut 等待信号{0}={1}超时 信号を待つ、タイムオーバーする{0}={1}
startFailAir 启动失败:没有气压信号 起動失敗し、気圧信号がない startFailAir 启动失败:没有气压信号 起動失敗し、気圧信号がない
...@@ -344,3 +344,10 @@ AxisTipControl_label_speed_Text 点动速度： タップスピード ...@@ -344,3 +344,10 @@ AxisTipControl_label_speed_Text 点动速度： タップスピード
safety_grating_covered "开门时安全光栅被遮挡,料仓暂停运行." ドアを開けると安全格子が遮られ、設備は運転を一時停止します。 safety_grating_covered "开门时安全光栅被遮挡,料仓暂停运行." ドアを開けると安全格子が遮られ、設備は運転を一時停止します。
take_out_reel_failure "料叉没有成功取出料盘,请检查库位[{0}],取出料盘后请复位." フォークはトレイの取り出しに成功しなかった。保管場所[{0}]を確認し、手動でパレットを取り出し、リセットしてください。 take_out_reel_failure "料叉没有成功取出料盘,请检查库位[{0}],取出料盘后请复位." フォークはトレイの取り出しに成功しなかった。保管場所[{0}]を確認し、手動でパレットを取り出し、リセットしてください。
InStoreExecute 入库执行中 入庫実行中
InStoreEnd 料盘入仓位完成 リール入庫完成
Busy 忙碌 実行中
humiOver 当前湿度：{0}%超出最大湿度{1}% 現在湿度：{0}%最大{1}%より高い
tempOver 当前温度：{0}℃超出最高温度{1}℃ 現在温度：{0}℃最高温度{1}℃より高い
\ No newline at end of file \ No newline at end of file
source/Common/Common.csproj
...@@ -35,9 +35,8 @@ ...@@ -35,9 +35,8 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<SpecificVersion>False</SpecificVersion> <HintPath>..\ACSingleStore\bin\Debug\log4net.dll</HintPath>
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath>
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -38,23 +38,22 @@ ...@@ -38,23 +38,22 @@
<ItemGroup> <ItemGroup>
<Reference Include="Asa.Camera.VisionLib, Version=1.3.7927.28975, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Asa.Camera.VisionLib, Version=1.3.7927.28975, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Camera\CameraVisionLib\bin\Debug\Asa.Camera.VisionLib.dll</HintPath> <HintPath>..\ACSingleStore\bin\Debug\Asa.Camera.VisionLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.IOModule.AIOBOX"> <Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath> <HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference> </Reference>
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary">
<HintPath>..\..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath> <HintPath>..\ACSingleStore\bin\Debug\CodeLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\halcondotnet.dll</HintPath> <HintPath>..\ACSingleStore\bin\Debug\halcondotnet.dll</HintPath>
</Reference> </Reference>
<Reference Include="HuichuanLibrary"> <Reference Include="HuichuanLibrary">
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath> <HintPath>..\ACSingleStore\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<SpecificVersion>False</SpecificVersion> <HintPath>..\ACSingleStore\bin\Debug\log4net.dll</HintPath>
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
......
source/DeviceLibrary/ResourceControl.cs
...@@ -403,5 +403,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -403,5 +403,7 @@ namespace OnlineStore.DeviceLibrary
public static string take_out_reel_failure = "take_out_reel_failure"; public static string take_out_reel_failure = "take_out_reel_failure";
public static string safety_grating_covered = "safety_grating_covered"; public static string safety_grating_covered = "safety_grating_covered";
public static string humiOver = "humiOver";
public static string tempOver = "tempOver";
} }
} }
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -895,12 +895,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -895,12 +895,12 @@ namespace OnlineStore.DeviceLibrary
// 绿 黄 红 // 绿 黄 红
//机器复位中 闪 灭 灭 //机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭 //机器待机中 亮 灭 灭
//机器出入库中 闪 闪 灭 //关闭机器出入库中 闪 闪 灭
//温湿度超限报警中 亮 闪 灭 //温湿度超限报警中 亮 闪 灭
//温湿度超限报警中超过30分钟 亮 闪 闪 //温湿度超限报警中超过30分钟 亮 闪 闪
//机器未启动 灭 灭 灭 //机器未启动 灭 灭 灭
//机器设备故障(非温湿度)报警 亮 灭 闪 //机器设备故障(非温湿度)报警 亮 灭 闪
//开启 机器出入库中 灭 闪 灭
//报警时只需要亮红灯 //报警时只需要亮红灯
DateTime time = DateTime.Now; DateTime time = DateTime.Now;
...@@ -908,10 +908,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -908,10 +908,11 @@ namespace OnlineStore.DeviceLibrary
if (TempOrHumidityIsAlarm) if (TempOrHumidityIsAlarm)
{ {
TimeSpan span = DateTime.Now - TempAlarmTime; TimeSpan span = DateTime.Now - TempAlarmTime;
if (span.Minutes > 40) int minute = 30;
if (span.Minutes > minute)//
{ {
isTemp30M = true; isTemp30M = true;
SetWarnMsg(ResourceControl.CustAlarm, "湿度超限30分钟");//1084 SetWarnMsg(ResourceControl.CustAlarm, minute.ToString());//1084"湿度超限30分钟"
//LogUtil.info("湿度超限30分钟:"+ TempAlarmTime.ToString()); //LogUtil.info("湿度超限30分钟:"+ TempAlarmTime.ToString());
} }
} }
...@@ -990,8 +991,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -990,8 +991,7 @@ 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) || TempOrHumidityIsAlarm || isTemp30M)
|| TempOrHumidityIsAlarm || isTemp30M)
{ {
if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
{ {
...@@ -1529,6 +1529,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1529,6 +1529,7 @@ namespace OnlineStore.DeviceLibrary
{ {
CodeMsg =ResourceControl.GetChinaString(ResourceControl.NoCodeMsg, "没有收到二维码信息，请重新放入料盘"); CodeMsg =ResourceControl.GetChinaString(ResourceControl.NoCodeMsg, "没有收到二维码信息，请重新放入料盘");
CodeMsgEn = ResourceControl.GetEnglishString(ResourceControl.NoCodeMsg, "没有收到二维码信息，请重新放入料盘"); CodeMsgEn = ResourceControl.GetEnglishString(ResourceControl.NoCodeMsg, "没有收到二维码信息，请重新放入料盘");
CodeMsgJp = ResourceControl.GetJapaneseString(ResourceControl.NoCodeMsg, "没有收到二维码信息，请重新放入料盘");
if (CurrScanCount >= MaxScanCount) if (CurrScanCount >= MaxScanCount)
{ {
InStoreFail = true; InStoreFail = true;
...@@ -1578,6 +1579,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1578,6 +1579,8 @@ namespace OnlineStore.DeviceLibrary
InStoreFail = true; InStoreFail = true;
LogUtil.info(LOGGER, StoreName + $"[{src}]" + " 二维码【" + message + "】 服务器反馈 ：" + resultOperation.msg); LogUtil.info(LOGGER, StoreName + $"[{src}]" + " 二维码【" + message + "】 服务器反馈 ：" + resultOperation.msg);
CodeMsg = resultOperation.msg; CodeMsg = resultOperation.msg;
CodeMsgEn = resultOperation.msgEn;
CodeMsgJp= resultOperation.msgJp;
//SetWarnMsg(""); //SetWarnMsg("");
IsScanCode = false; IsScanCode = false;
return; return;
...@@ -2017,19 +2020,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -2017,19 +2020,21 @@ namespace OnlineStore.DeviceLibrary
} }
bool needAlarm = false; bool needAlarm = false;
Debug.WriteLine($"IsInBlowing:{IsInBlowing},Max_Humidity:{Max_Humidity},humidity:{humidity}"); Debug.WriteLine($"IsInBlowing:{IsInBlowing},Max_Humidity:{Max_Humidity},humidity:{humidity}");
if (humidity <= Max_Humidity) { //if (humidity <= Max_Humidity) {
TempOrHumidityIsAlarm = false; // TempOrHumidityIsAlarm = false;
TempAlarmTime = DateTime.Now; // TempAlarmTime = DateTime.Now;
} //}
else //else
if (IsInBlowing && humidity > Max_Humidity)//如果开始吹气并且当前达到报警值 if (IsInBlowing && humidity > Max_Humidity)//如果开始吹气并且当前达到报警值
{ {
needAlarm = true; needAlarm = true;
SetWarnMsg(ResourceControl.humiOver, humidity.ToString(), Max_Humidity.ToString());
} }
else if (temp > Max_Temperature && Max_Temperature > 0) else if (temp > Max_Temperature && Max_Temperature > 0)
{ {
LOGGER.Info("当前温度【" + param.Temperate + "】超过最高温度【" + Max_Temperature + "】，开始报警！"); LOGGER.Info("当前温度【" + param.Temperate + "】超过最高温度【" + Max_Temperature + "】，开始报警！");
needAlarm = true; needAlarm = true;
SetWarnMsg(ResourceControl.tempOver, param.Temperate.ToString(), Max_Temperature.ToString());
//Thread.Sleep(100); //Thread.Sleep(100);
IOManager.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.LOW); IOManager.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.LOW);
} }
...@@ -2048,6 +2053,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -2048,6 +2053,7 @@ namespace OnlineStore.DeviceLibrary
{ {
TempOrHumidityIsAlarm = false; TempOrHumidityIsAlarm = false;
TempAlarmTime = DateTime.Now; TempAlarmTime = DateTime.Now;
SetWarnMsg("");
} }
if (needAlarm) if (needAlarm)
{ {
...@@ -2075,6 +2081,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -2075,6 +2081,7 @@ namespace OnlineStore.DeviceLibrary
private string CodeMsg = ""; private string CodeMsg = "";
private string CodeMsgEn = ""; private string CodeMsgEn = "";
private string CodeMsgJp = "";
private bool isInProcess = false; private bool isInProcess = false;
public void server_connect_timer_Tick(object sender, EventArgs e) public void server_connect_timer_Tick(object sender, EventArgs e)
{ {
...@@ -2158,8 +2165,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -2158,8 +2165,10 @@ namespace OnlineStore.DeviceLibrary
{ {
boxStatus.msg = CodeMsg; boxStatus.msg = CodeMsg;
boxStatus.msgEn = CodeMsgEn; boxStatus.msgEn = CodeMsgEn;
boxStatus.msgJp = CodeMsgJp;
lineOperation.msg = CodeMsg; lineOperation.msg = CodeMsg;
lineOperation.msgEn = CodeMsgEn; lineOperation.msgEn = CodeMsgEn;
lineOperation.msgJp = CodeMsgJp;
} }
//if (CodeMsg.Equals("")) //if (CodeMsg.Equals(""))
if (WarnObj.WarnMsg.Equals("")) if (WarnObj.WarnMsg.Equals(""))
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -933,15 +933,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -933,15 +933,15 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0)); StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor(); OpenDoor();
} }
else if (StoreMove.TimeOutSeconds > 60*10) { else if (StoreMove.IsTimeOut(out double timeout)) {
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
{ {
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.TrayCheck_Door.ToString() + "=LOW", ""); //1085 SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.TrayCheck_Door.ToString() + "=LOW", timeout.ToString("f1")+"s"); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100); LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
} }
else if(IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW)) else if(IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW))
{ {
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.SafetyLightCurtains.ToString()+"=HIGH", ""); //1085 SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.SafetyLightCurtains.ToString()+"=HIGH", timeout.ToString("f1") + "s"); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100); LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
} }
} }
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -90,6 +90,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -90,6 +90,16 @@ namespace OnlineStore.DeviceLibrary
OneWaitCanEndStep = false; OneWaitCanEndStep = false;
CanWhileCount = 5; CanWhileCount = 5;
} }
public bool IsTimeOut(out double timeoutSec,int timeOutSeconds = 60)
{
TimeSpan span = DateTime.Now - LastSetpTime;
timeoutSec = span.TotalSeconds - timeOutSeconds;
if (timeoutSec>0)
{
return true;
}
return false;
}
/// <summary> /// <summary>
/// 当前步骤执行完成 /// 当前步骤执行完成
/// </summary> /// </summary>
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -33,9 +33,8 @@ ...@@ -33,9 +33,8 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<SpecificVersion>False</SpecificVersion> <HintPath>..\ACSingleStore\bin\Debug\log4net.dll</HintPath>
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
source/UserFromControl/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties { ...@@ -19,7 +19,7 @@ namespace UserFromControl.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -47,8 +47,8 @@ namespace UserFromControl.Properties { ...@@ -47,8 +47,8 @@ namespace UserFromControl.Properties {
} }
/// <summary> /// <summary>
/// 使用此强类型资源类，为所有资源查找 /// 重写当前线程的 CurrentUICulture 属性，对
/// 重写当前线程的 CurrentUICulture 属性。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
......
source/UserFromControl/UserFromControl.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserFromControl</RootNamespace> <RootNamespace>UserFromControl</RootNamespace>
<AssemblyName>UserFromControl</AssemblyName> <AssemblyName>UserFromControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!