Skip to content

刘韬 / SO1007_XLC_Store

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

1

1 个父辈 aedc9e67
内嵌 并排
正在显示 10 个修改的文件 包含 56 行增加 和 289 行删除
Common/Common.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace> <RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>MyCommon</AssemblyName> <AssemblyName>MyCommon</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace> <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName> <AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
LoadCVSLibrary/storeConfig/config/Robot_Config.cs deleted 100644 → 0
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.LoadCSVLibrary
{
public class Robot_Config : DeviceConfig
{
public Robot_Config()
: base()
{
}
public Robot_Config(int id, string type, string filepath)
: base(id, type, filepath)
{
}
/// <summary>
/// AXIS,,0-行走机构,XAxis,0,HC,,40000,200000,200000,2000,20000,80000,10,300,0,0
/// </summary>
[ConfigProAttribute("XAxis")]
public ConfigMoveAxis XAxis { get; set; }
/// <summary>
/// AXIS,,1-升降轴,YAxis,1,HC,,40000,200000,200000,2000,20000,80000,10,300,0,0
/// </summary>
[ConfigProAttribute("YAxis")]
public ConfigMoveAxis YAxis { get; set; }
/// <summary>
/// AXIS,,2-伸缩轴,ZAxis,2,HC,,40000,200000,200000,1000,4000,15000,10,300,0,0
/// </summary>
[ConfigProAttribute("ZAxis")]
public ConfigMoveAxis ZAxis { get; set; }
/// <summary>
/// AXIS,,3-入料线体顶升电机,InLift_Moto,3,HC,,40000,200000,200000,1000,4000,15000,10,300,0,0
/// </summary>
[ConfigProAttribute("InLift_Moto")]
public ConfigMoveAxis InLift_Moto { get; set; }
/// <summary>
/// AXIS,,4-出料线体顶升电机,OutLift_Moto,4,HC,,40000,200000,200000,1000,4000,15000,10,300,0,0
/// </summary>
[ConfigProAttribute("OutLift_Moto")]
public ConfigMoveAxis OutLift_Moto { get; set; }
/// <summary>
/// PRO,0,IO信号超时时间（秒）,IOSingle_TimerOut,15,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("IOSingle_TimerOut")]
public int IOSingle_TimerOut { get; set; }
/// <summary>
/// PRO,0,气压检测超时,AirCheckSeconds,5,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("AirCheckSeconds")]
public int AirCheckSeconds { get; set; }
/// <summary>
/// PRO,10,行走机构待机点P1,Xaxis_P1,1,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Xaxis_P1")]
public int Xaxis_P1 { get; set; }
/// <summary>
/// PRO,10,行走机构取料点A侧P2,Xaxis_P2,1,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Xaxis_P2")]
public int Xaxis_P2 { get; set; }
/// <summary>
/// PRO,11,升降轴待机点P1,Yaxis_P1,2,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P1")]
public int Yaxis_P1 { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升低点A侧P2,Yaxis_P2,2,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P2")]
public int Yaxis_P2 { get; set; }
/// <summary>
/// PRO,12,伸缩轴待机点P1,Zaxis_P1,3,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Zaxis_P1")]
public int Zaxis_P1 { get; set; }
/// <summary>
/// PRO,12,伸缩轴A面取料点P2,Zaxis_P2,3,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Zaxis_P2")]
public int Zaxis_P2 { get; set; }
/// <summary>
/// PRO,12,伸缩轴B面取料点P3,Zaxis_P3,3,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Zaxis_P3")]
public int Zaxis_P3 { get; set; }
/// <summary>
/// PRO,10,行走机构取料点B侧P3,Xaxis_P3,1,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Xaxis_P3")]
public int Xaxis_P3 { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升低点B侧P3,Yaxis_P3,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P3")]
public int Yaxis_P3 { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升高点A侧P4,Yaxis_P4,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P4")]
public int Yaxis_P4 { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升高点B侧P5,Yaxis_P5,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P5")]
public int Yaxis_P5 { get; set; }
/// <summary>
/// PRO,0,扫码相机,CameraName,asdasdasd,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("CameraName")]
public string CameraName { get; set; }
/// <summary>
/// PRO,0,入料线体顶升电机速度,InLift_Moto_Speed,10,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("InLift_Moto_Speed")]
public int InLift_Moto_Speed { get; set; }
/// <summary>
/// PRO,0,出料线体顶升电机速度,OutLift_Moto_Speed,10,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("OutLift_Moto_Speed")]
public int OutLift_Moto_Speed { get; set; }
/// <summary>
/// PRO,0,入料线体顶升电机下降速度,InLift_Moto_Speed,10,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("InLift_Moto_DownSpeed")]
public int InLift_Moto_DownSpeed { get; set; }
/// <summary>
/// PRO,0,出料线体顶升电机下降速度,OutLift_Moto_Speed,10,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("OutLift_Moto_DownSpeed")]
public int OutLift_Moto_DownSpeed { get; set; }
/// <summary>
/// PRO,41,称重传感器端口,WeightSensorPort,COM1,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("WeightSensorPort")]
public string WeightSensorPort { get; set; }
/// <summary>
/// PRO,40,称重传感器皮重,WeightSensorBase,22,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("WeightSensorBase")]
public int WeightSensorBase { get; set; }
/// <summary>
/// PRO,40,库位最大承重,StoreWeightLimited,30,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("StoreWeightLimited")]
public int StoreWeightLimited { get; set; }
/// <summary>
/// PRO,10,行走机构待机点P1,Xaxis_P1,1,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Xaxis_P1_speed")]
public int Xaxis_P1_speed { get; set; }
/// <summary>
/// PRO,10,行走机构取料点P2,Xaxis_P2,1,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Xaxis_P2_speed")]
public int Xaxis_P2_speed { get; set; }
/// <summary>
/// PRO,11,升降轴待机点P1,Yaxis_P1,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P1_speed")]
public int Yaxis_P1_speed { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升低点A侧P2/入库速度,Yaxis_P2,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P2_speed")]
public int Yaxis_P2_speed { get; set; }
/// <summary>
/// PRO,12,伸缩轴待机点P1,Zaxis_P1,3,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Zaxis_P1_speed")]
public int Zaxis_P1_speed { get; set; }
/// <summary>
/// PRO,12,伸缩轴A面取料点P2,Zaxis_P2,3,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Zaxis_P2_speed")]
public int Zaxis_P2_speed { get; set; }
/// <summary>
/// PRO,12,伸缩轴B面取料点P3,Zaxis_P3,3,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Zaxis_P3_speed")]
public int Zaxis_P3_speed { get; set; }
/// <summary>
/// PRO,10,行走机构取料点B侧P3,Xaxis_P3,1,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Xaxis_P3_speed")]
public int Xaxis_P3_speed { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升前点B侧P3,Yaxis_P3,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P3_speed")]
public int Yaxis_P3_speed { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升高点A侧P4/出库速度,Yaxis_P4,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P4_speed")]
public int Yaxis_P4_speed { get; set; }
/// <summary>
/// PRO,11,升降轴取料提升前点B侧P5,Yaxis_P5,2,,,22,,,,,,,,,
/// </summary>
[ConfigProAttribute("Yaxis_P5_speed")]
public int Yaxis_P5_speed { get; set; }
}
}
LoadConfig/App.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
</configSections> </configSections>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/AutoScanAndLabel.log" /> <file value="logs/AutoScanAndLabel.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8"/>
<appendToFile value="true" /> <appendToFile value="true"/>
<rollingStyle value="Date" /> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd" /> <datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" /> <conversionPattern value="[%date][%t]%-5p %m%n"/>
</layout> </layout>
</appender> </appender>
<logger name="RollingLogFileAppender"> <logger name="RollingLogFileAppender">
<level value="ALL" /> <level value="ALL"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</logger> </logger>
<logger name="HCBOARD"> <logger name="HCBOARD">
<level value="ALL" /> <level value="ALL"/>
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender"/>
</logger> </logger>
<!--<root> <!--<root>
<level value="Info" /> <level value="Info" />
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
</root>--> </root>-->
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
</configuration>
\ No newline at end of file \ No newline at end of file
</configuration>
LoadConfig/LoadConfig.csproj
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>LoadConfig</RootNamespace> <RootNamespace>LoadConfig</RootNamespace>
<AssemblyName>LoadConfig</AssemblyName> <AssemblyName>LoadConfig</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -69,6 +70,7 @@ ...@@ -69,6 +70,7 @@
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
......
LoadConfig/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
// 运行时版本: 4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能导致不正确的行为，如果 // 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，则所做更改将丢失。 // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace LoadConfig.Properties {
namespace LoadConfig.Properties using System;
{
/// <summary> /// <summary>
/// 强类型资源类，用于查找本地化字符串等。 /// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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 {
{
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() internal Resources() {
{
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。 /// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager internal static global::System.Resources.ResourceManager ResourceManager {
{ get {
get if (object.ReferenceEquals(resourceMan, null)) {
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LoadConfig.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LoadConfig.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
} }
} }
/// <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 {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }
......
LoadConfig/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// Runtime Version:4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为，并且如果
// the code is regenerated. // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace LoadConfig.Properties {
namespace LoadConfig.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.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())));
public static Settings Default public static Settings Default {
{ get {
get
{
return defaultInstance; return defaultInstance;
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!