Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d8649f39 由 几米阳光
选项

定位气缸改为两组。增加二维码学习功能。左右门增加开关

1 个父辈 784fae19
内嵌 并排
正在显示 29 个修改的文件 包含 168 行增加 和 747 行删除
dll/Basler.Pylon.dll 0 → 100644
此文件类型无法预览
dll/CodeLibrary.dll 0 → 100644
此文件类型无法预览
dll/DataMatrix.net.dll 0 → 100644
此文件类型无法预览
dll/zxing.dll 0 → 100644
此文件类型无法预览
source/ACServoDriveTest/ACServoDriveTest.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ACServoDriveTest</RootNamespace> <RootNamespace>ACServoDriveTest</RootNamespace>
<AssemblyName>ACServoDriveTest</AssemblyName> <AssemblyName>ACServoDriveTest</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,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>
<EmbeddedResource Include="FrmACTest.resx"> <EmbeddedResource Include="FrmACTest.resx">
<DependentUpon>FrmACTest.cs</DependentUpon> <DependentUpon>FrmACTest.cs</DependentUpon>
......
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.5" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup> </startup>
</configuration> </configuration>
source/ACServoDriveTest/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
// 运行时版本: 4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将丢失。 // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace ACServoDriveTest.Properties namespace ACServoDriveTest.Properties {
{ using System;
/// <summary> /// <summary>
...@@ -19,31 +19,26 @@ namespace ACServoDriveTest.Properties ...@@ -19,31 +19,26 @@ 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", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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("ACServoDriveTest.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ACServoDriveTest.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
...@@ -52,18 +47,15 @@ namespace ACServoDriveTest.Properties ...@@ -52,18 +47,15 @@ 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 {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }
......
source/ACServoDriveTest/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 ACServoDriveTest.Properties namespace ACServoDriveTest.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", "15.6.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;
} }
} }
......
source/ACSingleStore/ACSingleStore.csproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.ACSingleStore</RootNamespace> <RootNamespace>OnlineStore.ACSingleStore</RootNamespace>
<AssemblyName>ACSingleStore</AssemblyName> <AssemblyName>ACSingleStore</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</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,11 +32,15 @@ ...@@ -31,11 +32,15 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>box.ico</ApplicationIcon> <ApplicationIcon>box.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath> <HintPath>..\..\dll\halcondotnet.dll</HintPath>
</Reference> </Reference>
...@@ -74,12 +79,6 @@ ...@@ -74,12 +79,6 @@
<Compile Include="FrmCamera.Designer.cs"> <Compile Include="FrmCamera.Designer.cs">
<DependentUpon>FrmCamera.cs</DependentUpon> <DependentUpon>FrmCamera.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmCodeLearn.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmCodeLearn.Designer.cs">
<DependentUpon>FrmCodeLearn.cs</DependentUpon>
</Compile>
<Compile Include="FrmIOStatus.cs"> <Compile Include="FrmIOStatus.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -110,9 +109,6 @@ ...@@ -110,9 +109,6 @@
<EmbeddedResource Include="FrmCamera.resx"> <EmbeddedResource Include="FrmCamera.resx">
<DependentUpon>FrmCamera.cs</DependentUpon> <DependentUpon>FrmCamera.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmCodeLearn.resx">
<DependentUpon>FrmCodeLearn.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmIOStatus.resx"> <EmbeddedResource Include="FrmIOStatus.resx">
<DependentUpon>FrmIOStatus.cs</DependentUpon> <DependentUpon>FrmIOStatus.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
source/ACSingleStore/App.config
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
<add key="App_Title" value="AC_SA_料仓"/> <add key="App_Title" value="AC_SA_料仓"/>
<add key="scanner_start_command" value="S"/> <add key="scanner_start_command" value="S"/>
<!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）--> <!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
<add key ="StartBlowValue" value ="4"/> <add key="StartBlowValue" value="4"/>
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）--> <!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
<add key ="StopBlowValue" value ="4"/> <add key="StopBlowValue" value="4"/>
<!--Server address--> <!--Server address-->
<!--<add key="http.server" value="http://localhost:80/"/>--> <!--<add key="http.server" value="http://localhost:80/"/>-->
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
<add key="KTK_MOVE_AxisNo" value="1"/> <add key="KTK_MOVE_AxisNo" value="1"/>
<!--摄像机名称列表配置，用#分割--> <!--摄像机名称列表配置，用#分割-->
<add key ="CameraName" value ="codeCamera"/> <add key="CameraName" value="codeCamera"/>
<!--二维码类型列表配置，用#分割--> <!--二维码类型列表配置，用#分割-->
<add key ="CodeType" value ="Data Matrix ECC 200"/> <add key="CodeType" value="Data Matrix ECC 200"/>
<!--二维码参数文件所在路径，文件名与二维码类型名一样--> <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key ="CodeParamPath" value ="\StoreConfig\AC\"/> <add key="CodeParamPath" value="\StoreConfig\AC\"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</root> </root>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup> </startup>
<!-- 部署服务库项目时，必须将配置文件的内容添加到 <!-- 部署服务库项目时，必须将配置文件的内容添加到
...@@ -68,13 +68,13 @@ ...@@ -68,13 +68,13 @@
<service name="AcStoreWCF.CWSMDBox"> <service name="AcStoreWCF.CWSMDBox">
<endpoint address="" binding="basicHttpBinding" contract="AcStoreWCF.ICWSMDBox"> <endpoint address="" binding="basicHttpBinding" contract="AcStoreWCF.ICWSMDBox">
<identity> <identity>
<dns value="localhost" /> <dns value="localhost"/>
</identity> </identity>
</endpoint> </endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" /> <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
<host> <host>
<baseAddresses> <baseAddresses>
<add baseAddress="http://localhost:8733/Design_Time_Addresses/AcStoreWCF/CWSMDBox/" /> <add baseAddress="http://localhost:8733/Design_Time_Addresses/AcStoreWCF/CWSMDBox/"/>
</baseAddresses> </baseAddresses>
</host> </host>
</service> </service>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<!-- 要接收故障异常详细信息以进行调试， <!-- 要接收故障异常详细信息以进行调试，
请将以下值设置为 true。在部署前设置为 false 请将以下值设置为 true。在部署前设置为 false
以避免泄漏异常信息 --> 以避免泄漏异常信息 -->
<serviceDebug includeExceptionDetailInFaults="False" /> <serviceDebug includeExceptionDetailInFaults="False"/>
</behavior> </behavior>
</serviceBehaviors> </serviceBehaviors>
</behaviors> </behaviors>
......
source/ACSingleStore/FrmBase.Designer.cs
...@@ -29,14 +29,13 @@ ...@@ -29,14 +29,13 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase));
this.SuspendLayout(); this.SuspendLayout();
// //
// FrmBase // FrmBase
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(300, 300); this.ClientSize = new System.Drawing.Size(300, 300);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......
source/ACSingleStore/FrmBase.resx
...@@ -117,9 +117,6 @@ ...@@ -117,9 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="skinEngine1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
source/ACSingleStore/FrmCamera.Designer.cs
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
this.btnOpen = new System.Windows.Forms.Button(); this.btnOpen = new System.Windows.Forms.Button();
this.hWindowControl1 = new HalconDotNet.HWindowControl(); this.hWindowControl1 = new HalconDotNet.HWindowControl();
this.btnExit = new System.Windows.Forms.Button(); this.btnExit = new System.Windows.Forms.Button();
this.btnLearn = new System.Windows.Forms.Button();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -112,22 +111,10 @@ ...@@ -112,22 +111,10 @@
this.btnExit.UseVisualStyleBackColor = true; this.btnExit.UseVisualStyleBackColor = true;
this.btnExit.Click += new System.EventHandler(this.btnExit_Click); this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
// //
// btnLearn
//
this.btnLearn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnLearn.Location = new System.Drawing.Point(523, 129);
this.btnLearn.Name = "btnLearn";
this.btnLearn.Size = new System.Drawing.Size(135, 35);
this.btnLearn.TabIndex = 7;
this.btnLearn.Text = "学习二维码";
this.btnLearn.UseVisualStyleBackColor = true;
this.btnLearn.Click += new System.EventHandler(this.btnLearn_Click);
//
// FrmCamera // FrmCamera
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(670, 395); this.ClientSize = new System.Drawing.Size(670, 395);
this.Controls.Add(this.btnLearn);
this.Controls.Add(this.btnExit); this.Controls.Add(this.btnExit);
this.Controls.Add(this.hWindowControl1); this.Controls.Add(this.hWindowControl1);
this.Controls.Add(this.richTextBox1); this.Controls.Add(this.richTextBox1);
...@@ -150,6 +137,5 @@ ...@@ -150,6 +137,5 @@
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private HalconDotNet.HWindowControl hWindowControl1; private HalconDotNet.HWindowControl hWindowControl1;
private System.Windows.Forms.Button btnExit; private System.Windows.Forms.Button btnExit;
private System.Windows.Forms.Button btnLearn;
} }
} }
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/FrmCamera.cs
 
using CodeLibrary;
using HalconDotNet; using HalconDotNet;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.DeviceLibrary; using OnlineStore.DeviceLibrary;
...@@ -37,7 +38,6 @@ namespace OnlineStore.ACSingleStore ...@@ -37,7 +38,6 @@ namespace OnlineStore.ACSingleStore
btnCloseCamera.Enabled = open; btnCloseCamera.Enabled = open;
btnGetImage.Enabled = open; btnGetImage.Enabled = open;
timer1.Enabled = open; timer1.Enabled = open;
btnLearn.Enabled = !open;
} }
private void btnGetImage_Click(object sender, EventArgs e) private void btnGetImage_Click(object sender, EventArgs e)
{ {
...@@ -125,12 +125,5 @@ namespace OnlineStore.ACSingleStore ...@@ -125,12 +125,5 @@ namespace OnlineStore.ACSingleStore
this.Close(); this.Close();
} }
private void btnLearn_Click(object sender, EventArgs e)
{
timer1.Enabled = false;
FrmCodeLearn learn = new FrmCodeLearn();
learn.ShowDialog();
timer1.Enabled = true;
}
} }
} }
source/ACSingleStore/FrmCodeLearn.Designer.cs deleted 100644 → 0
namespace OnlineStore.ACSingleStore
{
partial class FrmCodeLearn
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnStop = new System.Windows.Forms.Button();
this.btnOpen = new System.Windows.Forms.Button();
this.hWindowControl1 = new HalconDotNet.HWindowControl();
this.btnExit = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.cmbCameraList = new System.Windows.Forms.ComboBox();
this.cmbCodeType = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.txtParamPath = new System.Windows.Forms.TextBox();
this.lblCount = new System.Windows.Forms.Label();
this.cmbCount = new System.Windows.Forms.ComboBox();
this.richTextBox2 = new System.Windows.Forms.RichTextBox();
this.btnClearLog = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnStop
//
this.btnStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStop.Location = new System.Drawing.Point(779, 68);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(106, 35);
this.btnStop.TabIndex = 3;
this.btnStop.Text = "结束学习";
this.btnStop.UseVisualStyleBackColor = true;
this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
//
// btnOpen
//
this.btnOpen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnOpen.Location = new System.Drawing.Point(779, 27);
this.btnOpen.Name = "btnOpen";
this.btnOpen.Size = new System.Drawing.Size(106, 35);
this.btnOpen.TabIndex = 1;
this.btnOpen.Text = "开始学习";
this.btnOpen.UseVisualStyleBackColor = true;
this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
//
// hWindowControl1
//
this.hWindowControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.hWindowControl1.BackColor = System.Drawing.Color.Black;
this.hWindowControl1.BorderColor = System.Drawing.Color.Black;
this.hWindowControl1.ImagePart = new System.Drawing.Rectangle(0, 0, 640, 480);
this.hWindowControl1.Location = new System.Drawing.Point(6, 126);
this.hWindowControl1.Name = "hWindowControl1";
this.hWindowControl1.Size = new System.Drawing.Size(596, 449);
this.hWindowControl1.TabIndex = 5;
this.hWindowControl1.WindowSize = new System.Drawing.Size(596, 449);
//
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(891, 26);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(106, 35);
this.btnExit.TabIndex = 6;
this.btnExit.Text = "退出";
this.btnExit.UseVisualStyleBackColor = true;
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(25, 15);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(56, 17);
this.label1.TabIndex = 7;
this.label1.Text = "摄像头：";
//
// cmbCameraList
//
this.cmbCameraList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCameraList.FormattingEnabled = true;
this.cmbCameraList.Location = new System.Drawing.Point(88, 11);
this.cmbCameraList.Name = "cmbCameraList";
this.cmbCameraList.Size = new System.Drawing.Size(121, 25);
this.cmbCameraList.TabIndex = 8;
//
// cmbCodeType
//
this.cmbCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCodeType.FormattingEnabled = true;
this.cmbCodeType.Location = new System.Drawing.Point(486, 11);
this.cmbCodeType.Name = "cmbCodeType";
this.cmbCodeType.Size = new System.Drawing.Size(266, 25);
this.cmbCodeType.TabIndex = 10;
this.cmbCodeType.SelectedIndexChanged += new System.EventHandler(this.cmbCodeType_SelectedIndexChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(412, 15);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17);
this.label2.TabIndex = 9;
this.label2.Text = "条码类型：";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(15, 58);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(68, 17);
this.label3.TabIndex = 11;
this.label3.Text = "参数路径：";
//
// txtParamPath
//
this.txtParamPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtParamPath.Location = new System.Drawing.Point(77, 55);
this.txtParamPath.Multiline = true;
this.txtParamPath.Name = "txtParamPath";
this.txtParamPath.Size = new System.Drawing.Size(675, 56);
this.txtParamPath.TabIndex = 12;
//
// lblCount
//
this.lblCount.AutoSize = true;
this.lblCount.Location = new System.Drawing.Point(230, 15);
this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(68, 17);
this.lblCount.TabIndex = 13;
this.lblCount.Text = "条码数量：";
//
// cmbCount
//
this.cmbCount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCount.FormattingEnabled = true;
this.cmbCount.Items.AddRange(new object[] {
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9"});
this.cmbCount.Location = new System.Drawing.Point(305, 11);
this.cmbCount.Name = "cmbCount";
this.cmbCount.Size = new System.Drawing.Size(87, 25);
this.cmbCount.TabIndex = 14;
//
// richTextBox2
//
this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox2.Location = new System.Drawing.Point(608, 126);
this.richTextBox2.Name = "richTextBox2";
this.richTextBox2.Size = new System.Drawing.Size(391, 449);
this.richTextBox2.TabIndex = 15;
this.richTextBox2.Text = "";
//
// btnClearLog
//
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.Location = new System.Drawing.Point(891, 68);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(106, 35);
this.btnClearLog.TabIndex = 16;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = true;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// FrmCodeLearn
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1007, 585);
this.Controls.Add(this.btnClearLog);
this.Controls.Add(this.richTextBox2);
this.Controls.Add(this.cmbCount);
this.Controls.Add(this.lblCount);
this.Controls.Add(this.txtParamPath);
this.Controls.Add(this.label3);
this.Controls.Add(this.cmbCodeType);
this.Controls.Add(this.label2);
this.Controls.Add(this.cmbCameraList);
this.Controls.Add(this.label1);
this.Controls.Add(this.btnExit);
this.Controls.Add(this.hWindowControl1);
this.Controls.Add(this.btnStop);
this.Controls.Add(this.btnOpen);
this.Name = "FrmCodeLearn";
this.Text = "条码参数学习";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmCamera_FormClosed);
this.Load += new System.EventHandler(this.FrmCamera_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button btnOpen;
private System.Windows.Forms.Button btnStop;
private System.Windows.Forms.Timer timer1;
private HalconDotNet.HWindowControl hWindowControl1;
private System.Windows.Forms.Button btnExit;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cmbCameraList;
private System.Windows.Forms.ComboBox cmbCodeType;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtParamPath;
private System.Windows.Forms.Label lblCount;
private System.Windows.Forms.ComboBox cmbCount;
private System.Windows.Forms.RichTextBox richTextBox2;
private System.Windows.Forms.Button btnClearLog;
}
}
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/FrmCodeLearn.cs deleted 100644 → 0
using HalconDotNet;
using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.ACSingleStore
{
public partial class FrmCodeLearn : FrmBase
{
private static string appPath = Application.StartupPath;
private static string path = appPath + ConfigAppSettings.GetValue(Setting_Init.CodeParamPath);
public FrmCodeLearn()
{
InitializeComponent();
}
private void btnOpen_Click(object sender, EventArgs e)
{
string filePath = txtParamPath.Text.Trim();
if (File.Exists(filePath))
{
}
else
{
try
{
File.Create(filePath);
}
catch (Exception ex)
{
LogUtil.error("创建文件：" + filePath + " 失败");
MessageBox.Show("创建文件失败！");
txtParamPath.SelectAll();
txtParamPath.Focus();
return;
}
}
//File.Delete(filePath);
string cameraName = cmbCameraList.Text;
string codeType = this.cmbCodeType.Text;
int count = cmbCount.SelectedIndex + 1;
Task.Factory.StartNew(delegate ()
{
HDevelopCodeLearn.RunHalcon(this.hWindowControl1.HalconWindow, cameraName, codeType, filePath, count);
});
FormStatus(true);
}
private void FormStatus(bool open)
{
btnOpen.Enabled = !open;
btnStop.Enabled = open;
//timer1.Enabled = open;
//cmbCount.Enabled = !open;
//cmbCodeType.Enabled = !open;
//cmbCameraList.Enabled = !open;
}
private void btnStop_Click(object sender, EventArgs e)
{
HDevelopCodeLearn.StopLearn();
FormStatus(false);
}
private void FrmCamera_Load(object sender, EventArgs e)
{
LogUtil.logBox = this.richTextBox2;
HDevelopExport.LoadConfig(ConfigAppSettings.GetValue(Setting_Init.CameraName),ConfigAppSettings.GetValue(Setting_Init.CodeType));
FormStatus(false);
cmbCameraList.DataSource = HDevelopExport.cameraNameList;
if (HDevelopExport.cameraNameList.Count > 0)
{
cmbCameraList.SelectedIndex = 0;
}
cmbCodeType.DataSource = HDevelopExport.codeTypeList;
if (HDevelopExport.codeTypeList.Count > 0)
{
cmbCodeType.SelectedIndex = 0;
}
else
{
cmbCodeType.Items.Add("QR Code");
cmbCodeType.SelectedIndex = 0;
}
string filePath = path + cmbCodeType.Text + ".dcm";
txtParamPath.Text = filePath;
cmbCount.SelectedIndex = 0;
timer1.Start();
}
private void FrmCamera_FormClosed(object sender, FormClosedEventArgs e)
{
if (btnStop.Enabled.Equals(true))
{
btnStop_Click(null, null);
LogUtil.logBox = null;
FormStatus(false);
}
}
private void timer1_Tick(object sender, EventArgs e)
{
if (HDevelopCodeLearn.IsRun)
{
if (btnOpen.Enabled)
{
btnOpen.Enabled = false ;
}
}
else
{
if (btnOpen.Enabled.Equals(false))
{
btnOpen.Enabled = true;
}
}
}
private void btnExit_Click(object sender, EventArgs e)
{
this.Close();
}
private void cmbCodeType_SelectedIndexChanged(object sender, EventArgs e)
{
if (cmbCodeType.SelectedIndex >= 0)
{
string filePath = path + cmbCodeType.Text + ".dcm";
txtParamPath.Text = filePath;
}
}
private void btnClearLog_Click(object sender, EventArgs e)
{
LogUtil.ClearLog();
}
}
}
source/ACSingleStore/FrmCodeLearn.resx deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.学习二维码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -1693,7 +1694,8 @@ ...@@ -1693,7 +1694,8 @@
this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.轴卡点动ToolStripMenuItem, this.轴卡点动ToolStripMenuItem,
this.扫码测试ToolStripMenuItem, this.扫码测试ToolStripMenuItem,
this.摄像机调试ToolStripMenuItem}); this.摄像机调试ToolStripMenuItem,
this.学习二维码ToolStripMenuItem});
this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem"; this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem";
this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(68, 21); this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.设备调试ToolStripMenuItem.Text = "设备调试"; this.设备调试ToolStripMenuItem.Text = "设备调试";
...@@ -1701,21 +1703,21 @@ ...@@ -1701,21 +1703,21 @@
// 轴卡点动ToolStripMenuItem // 轴卡点动ToolStripMenuItem
// //
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem"; this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动"; this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click); this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
// //
// 扫码测试ToolStripMenuItem // 扫码测试ToolStripMenuItem
// //
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem"; this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.扫码测试ToolStripMenuItem.Text = "扫码测试"; this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click); this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
// //
// 摄像机调试ToolStripMenuItem // 摄像机调试ToolStripMenuItem
// //
this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem"; this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.摄像机调试ToolStripMenuItem.Text = "摄像机调试"; this.摄像机调试ToolStripMenuItem.Text = "摄像机调试";
this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click); this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click);
// //
...@@ -1858,6 +1860,13 @@ ...@@ -1858,6 +1860,13 @@
this.notifyIcon1.Text = "料仓客户端"; this.notifyIcon1.Text = "料仓客户端";
this.notifyIcon1.Visible = true; this.notifyIcon1.Visible = true;
// //
// 学习二维码ToolStripMenuItem
//
this.学习二维码ToolStripMenuItem.Name = "学习二维码ToolStripMenuItem";
this.学习二维码ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.学习二维码ToolStripMenuItem.Text = "学习二维码";
this.学习二维码ToolStripMenuItem.Click += new System.EventHandler(this.学习二维码ToolStripMenuItem_Click);
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -2037,6 +2046,7 @@ ...@@ -2037,6 +2046,7 @@
private System.Windows.Forms.NotifyIcon notifyIcon1; private System.Windows.Forms.NotifyIcon notifyIcon1;
private System.Windows.Forms.ToolStripMenuItem 退出ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 退出ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 摄像机调试ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 摄像机调试ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 学习二维码ToolStripMenuItem;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -16,6 +16,7 @@ using log4net; ...@@ -16,6 +16,7 @@ using log4net;
using OnlineStore.DeviceLibrary; using OnlineStore.DeviceLibrary;
using System.IO.Ports; using System.IO.Ports;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using CodeLibrary;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSingleStore
{ {
...@@ -217,6 +218,8 @@ namespace OnlineStore.ACSingleStore ...@@ -217,6 +218,8 @@ namespace OnlineStore.ACSingleStore
} }
lblWarnMsg.Text = store.WarnMsg; lblWarnMsg.Text = store.WarnMsg;
if (store.Config.IsHasDoorLimit.Equals(1))
{
if (store.KNDIOValue(IO_Type.Left_Door_LimitSingle).Equals(IO_VALUE.LOW)) if (store.KNDIOValue(IO_Type.Left_Door_LimitSingle).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关";
...@@ -225,6 +228,7 @@ namespace OnlineStore.ACSingleStore ...@@ -225,6 +228,7 @@ namespace OnlineStore.ACSingleStore
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关";
} }
}
if (store.autoNext) if (store.autoNext)
{ {
string msg = store.autoMsg; string msg = store.autoMsg;
...@@ -1177,5 +1181,14 @@ namespace OnlineStore.ACSingleStore ...@@ -1177,5 +1181,14 @@ namespace OnlineStore.ACSingleStore
FrmCamera frm = new FrmCamera(store); FrmCamera frm = new FrmCamera(store);
frm.ShowDialog(); frm.ShowDialog();
} }
private void 学习二维码ToolStripMenuItem_Click(object sender, EventArgs e)
{
string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
FrmCodeLearn learn = new FrmCodeLearn();
learn.ShowDialog();
}
} }
} }
source/ACSingleStore/记录.txt
120180904新建分支RC23北京料仓 120180904新建分支RC23北京料仓
已修改：定位气缸有两组
二维码学习功能增加
左右侧门增加开关
\ No newline at end of file \ No newline at end of file
source/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>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.DeviceLibrary</RootNamespace> <RootNamespace>OnlineStore.DeviceLibrary</RootNamespace>
<AssemblyName>DeviceLibrary</AssemblyName> <AssemblyName>DeviceLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CodeLibrary">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath>
</Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>C:\Program Files\MVTec\HALCON-12.0\bin\dotnet35\halcondotnet.dll</HintPath> <HintPath>C:\Program Files\MVTec\HALCON-12.0\bin\dotnet35\halcondotnet.dll</HintPath>
</Reference> </Reference>
...@@ -56,7 +59,6 @@ ...@@ -56,7 +59,6 @@
<Compile Include="acSingleStore\AC_SA_BoxBean.cs" /> <Compile Include="acSingleStore\AC_SA_BoxBean.cs" />
<Compile Include="acSingleStore\AC_SA_BoxBean_Partial.cs" /> <Compile Include="acSingleStore\AC_SA_BoxBean_Partial.cs" />
<Compile Include="acSingleStore\ACStoreManager.cs" /> <Compile Include="acSingleStore\ACStoreManager.cs" />
<Compile Include="halcon\HDevelopCodeLearn.cs" />
<Compile Include="halcon\HDevelopExport.cs" /> <Compile Include="halcon\HDevelopExport.cs" />
<Compile Include="KangNaiDe\KNDManager.cs" /> <Compile Include="KangNaiDe\KNDManager.cs" />
<Compile Include="KangNaiDe\MasterTcpClient.cs" /> <Compile Include="KangNaiDe\MasterTcpClient.cs" />
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -46,6 +46,7 @@ PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,229500,,,,,, ...@@ -46,6 +46,7 @@ PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,229500,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,-4800,,,,,, PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,-4800,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,360,,,,,, PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,360,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,1,,,,,, PRO,是否使用定位气缸,IsHasLocationCylinder,1,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,0,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,0,,,,, , PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,0,,,,, ,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,, PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,, PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,
......
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
1#AC1_1_1_3,149,65,325,1,125150,52800,72800,72800,52800,27600,0,0,28600
1#AC1_1_1_4,148,65,325,1,125160,100800,120800,120800,100800,27600,0,0,28600
1#AC1_1_1_5,147,65,325,1,125170,148800,168800,168800,148800,27600,0,0,28600
1#AC1_1_1_6,146,65,325,1,125180,196800,216800,216800,196800,27600,0,0,28600
1#AC1_1_1_7,145,65,325,1,125190,244800,264800,264800,244800,27600,0,0,28600
1#AC1_1_1_8,144,65,325,1,125200,292800,312800,312800,292800,27600,0,0,28600
1#AC1_1_1_9,143,65,325,1,125210,340800,360800,360800,340800,27600,0,0,28600
1#AC1_1_1_10,137,45,420,1,125220,388800,408800,408800,388800,27600,0,0,28600
1#AC1_1_1_11,138,45,420,1,125230,436800,456800,456800,436800,27600,0,0,28600
1#AC1_1_1_12,139,45,420,1,125240,484800,504800,504800,484800,27600,0,0,28600
1#AC1_1_1_13,140,45,420,1,125250,532800,552800,552800,532800,27600,0,0,28600
1#AC1_1_1_14,141,45,420,1,125260,580800,600800,600800,580800,27600,0,0,28600
1#AC1_1_1_15,142,45,420,1,125270,628800,648800,648800,628800,27600,0,0,28600
1#AC1_1_1_16,143,45,420,1,125280,676800,696800,696800,676800,27600,0,0,28600
1#AC1_1_1_17,144,45,420,1,125290,724800,744800,744800,724800,27600,0,0,28600
,,,,,,,,,,,,,
1#AC1_2_1_3,149,65,325,1,125150,52800,72800,72800,52800,27600,0,0,28600 1#AC1_2_1_3,149,65,325,1,125150,52800,72800,72800,52800,27600,0,0,28600
1#AC1_2_1_4,148,65,325,1,125160,100800,120800,120800,100800,27600,0,0,28600 1#AC1_2_1_4,148,65,325,1,125160,100800,120800,120800,100800,27600,0,0,28600
1#AC1_2_1_5,147,65,325,1,125170,148800,168800,168800,148800,27600,0,0,28600 1#AC1_2_1_5,147,65,325,1,125170,148800,168800,168800,148800,27600,0,0,28600
...@@ -14,120 +30,51 @@ ...@@ -14,120 +30,51 @@
1#AC1_2_1_15,142,45,420,1,125270,628800,648800,648800,628800,27600,0,0,28600 1#AC1_2_1_15,142,45,420,1,125270,628800,648800,648800,628800,27600,0,0,28600
1#AC1_2_1_16,143,45,420,1,125280,676800,696800,696800,676800,27600,0,0,28600 1#AC1_2_1_16,143,45,420,1,125280,676800,696800,696800,676800,27600,0,0,28600
1#AC1_2_1_17,144,45,420,1,125290,724800,744800,744800,724800,27600,0,0,28600 1#AC1_2_1_17,144,45,420,1,125290,724800,744800,744800,724800,27600,0,0,28600
1#AC1_2_1_18,145,45,420,1,125300,772800,792800,792800,772800,27600,0,0,28600 ,,,,,,,,,,,,,
1#AC1_2_2_1,146,45,420,1,125310,822000,842000,842000,822200,27600,0,0,28600 1#AC1_3_1_3,149,65,325,1,125150,52800,72800,72800,52800,27600,0,0,28600
1#AC1_2_2_2,147,45,420,1,125400,870000,890000,890000,870000,27600,0,0,28600 1#AC1_3_1_4,148,65,325,1,125160,100800,120800,120800,100800,27600,0,0,28600
1#AC1_2_2_3,148,45,420,1,125430,918000,938000,938000,917800,27600,0,0,28600 1#AC1_3_1_5,147,65,325,1,125170,148800,168800,168800,148800,27600,0,0,28600
1#AC1_2_2_4,149,45,420,1,125460,966000,986000,986000,965600,27600,0,0,28600 1#AC1_3_1_6,146,65,325,1,125180,196800,216800,216800,196800,27600,0,0,28600
1#AC1_2_2_5,150,45,420,1,125490,1014000,1034000,1034000,1013400,27600,0,0,28600 1#AC1_3_1_7,145,65,325,1,125190,244800,264800,264800,244800,27600,0,0,28600
1#AC1_2_2_6,151,45,420,1,125520,1062000,1082000,1082000,1061200,27600,0,0,28600 1#AC1_3_1_8,144,65,325,1,125200,292800,312800,312800,292800,27600,0,0,28600
1#AC1_2_2_7,152,45,420,1,125550,1110000,1130000,1130000,1109000,27600,0,0,28600 1#AC1_3_1_9,143,65,325,1,125210,340800,360800,360800,340800,27600,0,0,28600
1#AC1_2_2_8,153,45,420,1,125580,1158000,1178000,1178000,1156800,27600,0,0,28600 1#AC1_3_1_10,137,45,420,1,125220,388800,408800,408800,388800,27600,0,0,28600
1#AC1_2_2_9,154,45,420,1,125610,1206000,1226000,1226000,1204600,27600,0,0,28600 1#AC1_3_1_11,138,45,420,1,125230,436800,456800,456800,436800,27600,0,0,28600
1#AC1_2_2_10,155,45,420,1,125640,1254000,1274000,1274000,1252400,27600,0,0,28600 1#AC1_3_1_12,139,45,420,1,125240,484800,504800,504800,484800,27600,0,0,28600
1#AC1_2_2_11,156,45,420,1,125670,1302000,1322000,1322000,1300200,27600,0,0,28600 1#AC1_3_1_13,140,45,420,1,125250,532800,552800,552800,532800,27600,0,0,28600
1#AC1_2_2_12,157,45,420,1,125700,1350000,1370000,1370000,1348000,27600,0,0,28600 1#AC1_3_1_14,141,45,420,1,125260,580800,600800,600800,580800,27600,0,0,28600
1#AC1_2_2_13,158,45,420,1,125730,1398000,1418000,1418000,1395800,27600,0,0,28600 1#AC1_3_1_15,142,45,420,1,125270,628800,648800,648800,628800,27600,0,0,28600
1#AC1_2_2_14,159,45,420,1,125760,1446000,1466000,1466000,1443600,27600,0,0,28600 1#AC1_3_1_16,143,45,420,1,125280,676800,696800,696800,676800,27600,0,0,28600
1#AC1_2_2_15,160,45,420,1,125790,1494000,1514000,1514000,1491400,27600,0,0,28600 1#AC1_3_1_17,144,45,420,1,125290,724800,744800,744800,724800,27600,0,0,28600
1#AC1_2_2_16,161,45,420,1,125820,1542000,1562000,1562000,1539200,27600,0,0,28600 ,,,,,,,,,,,,,
1#AC1_2_2_17,162,45,420,1,125850,1590000,1610000,1610000,1587000,27600,0,0,28600 1#AC1_4_1_3,149,65,325,1,125150,52800,72800,72800,52800,27600,0,0,28600
1#AC1_2_2_18,163,45,420,1,125880,1638000,1658000,1658000,1634800,27600,0,0,28600 1#AC1_4_1_4,148,65,325,1,125160,100800,120800,120800,100800,27600,0,0,28600
1#AC1_2_2_19,164,45,420,1,125910,1686000,1706000,1706000,1682600,27600,0,0,28600 1#AC1_4_1_5,147,65,325,1,125170,148800,168800,168800,148800,27600,0,0,28600
,165,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_6,146,65,325,1,125180,196800,216800,216800,196800,27600,0,0,28600
,166,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_7,145,65,325,1,125190,244800,264800,264800,244800,27600,0,0,28600
,167,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_8,144,65,325,1,125200,292800,312800,312800,292800,27600,0,0,28600
,168,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_9,143,65,325,1,125210,340800,360800,360800,340800,27600,0,0,28600
,169,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_10,137,45,420,1,125220,388800,408800,408800,388800,27600,0,0,28600
,170,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_11,138,45,420,1,125230,436800,456800,456800,436800,27600,0,0,28600
,171,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_12,139,45,420,1,125240,484800,504800,504800,484800,27600,0,0,28600
,172,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_13,140,45,420,1,125250,532800,552800,552800,532800,27600,0,0,28600
,173,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_14,141,45,420,1,125260,580800,600800,600800,580800,27600,0,0,28600
,174,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_15,142,45,420,1,125270,628800,648800,648800,628800,27600,0,0,28600
,175,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_16,143,45,420,1,125280,676800,696800,696800,676800,27600,0,0,28600
,176,45,420,1,,,,,,27600,0,0,28600 1#AC1_4_1_17,144,45,420,1,125290,724800,744800,744800,724800,27600,0,0,28600
,177,45,420,1,,,,,,27600,0,0,28600 ,,,,,,,,,,,,,
,178,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_3,149,65,325,1,125150,52800,72800,72800,52800,27600,0,0,28600
,179,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_4,148,65,325,1,125160,100800,120800,120800,100800,27600,0,0,28600
,180,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_5,147,65,325,1,125170,148800,168800,168800,148800,27600,0,0,28600
,181,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_6,146,65,325,1,125180,196800,216800,216800,196800,27600,0,0,28600
,182,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_7,145,65,325,1,125190,244800,264800,264800,244800,27600,0,0,28600
,183,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_8,144,65,325,1,125200,292800,312800,312800,292800,27600,0,0,28600
,184,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_9,143,65,325,1,125210,340800,360800,360800,340800,27600,0,0,28600
,185,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_10,137,45,420,1,125220,388800,408800,408800,388800,27600,0,0,28600
,186,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_11,138,45,420,1,125230,436800,456800,456800,436800,27600,0,0,28600
,187,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_12,139,45,420,1,125240,484800,504800,504800,484800,27600,0,0,28600
,188,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_13,140,45,420,1,125250,532800,552800,552800,532800,27600,0,0,28600
,189,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_14,141,45,420,1,125260,580800,600800,600800,580800,27600,0,0,28600
,190,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_15,142,45,420,1,125270,628800,648800,648800,628800,27600,0,0,28600
,191,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_16,143,45,420,1,125280,676800,696800,696800,676800,27600,0,0,28600
,192,45,420,1,,,,,,27600,0,0,28600 1#AC1_5_1_17,144,45,420,1,125290,724800,744800,744800,724800,27600,0,0,28600
,193,45,420,1,,,,,,27600,0,0,28600
,194,45,420,1,,,,,,27600,0,0,28600
,195,45,420,1,,,,,,27600,0,0,28600
,196,45,420,1,,,,,,27600,0,0,28600
,197,45,420,1,,,,,,27600,0,0,28600
,198,45,420,1,,,,,,27600,0,0,28600
,199,45,420,1,,,,,,27600,0,0,28600
,200,45,420,1,,,,,,27600,0,0,28600
,201,45,420,1,,,,,,27600,0,0,28600
,202,45,420,1,,,,,,27600,0,0,28600
,203,45,420,1,,,,,,27600,0,0,28600
,204,45,420,1,,,,,,27600,0,0,28600
,205,45,420,1,,,,,,27600,0,0,28600
,206,45,420,1,,,,,,27600,0,0,28600
,207,45,420,1,,,,,,27600,0,0,28600
,208,45,420,1,,,,,,27600,0,0,28600
,209,45,420,1,,,,,,27600,0,0,28600
,210,45,420,1,,,,,,27600,0,0,28600
,211,45,420,1,,,,,,27600,0,0,28600
,212,45,420,1,,,,,,27600,0,0,28600
,213,45,420,1,,,,,,27600,0,0,28600
,214,45,420,1,,,,,,27600,0,0,28600
,215,45,420,1,,,,,,27600,0,0,28600
,216,45,420,1,,,,,,27600,0,0,28600
,217,45,420,1,,,,,,27600,0,0,28600
,218,45,420,1,,,,,,27600,0,0,28600
,219,45,420,1,,,,,,27600,0,0,28600
,220,45,420,1,,,,,,27600,0,0,28600
,221,45,420,1,,,,,,27600,0,0,28600
,222,45,420,1,,,,,,27600,0,0,28600
,223,45,420,1,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
,,,,,,,,,,27600,0,0,28600
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -85,6 +85,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -85,6 +85,7 @@ namespace OnlineStore.DeviceLibrary
string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName); string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType); string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
HDevelopExport.LoadConfig(nameStr,codeStr); HDevelopExport.LoadConfig(nameStr,codeStr);
//初始化 //连接设备 //初始化 //连接设备
KNDManager.ConnectionKND(Config.DIODeviceNameList); KNDManager.ConnectionKND(Config.DIODeviceNameList);
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -718,6 +718,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -718,6 +718,8 @@ namespace OnlineStore.DeviceLibrary
KNDIOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW); KNDIOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.LOW)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Down, IO_VALUE.LOW));
} }
} }
private void LocationDownAndWait() private void LocationDownAndWait()
...@@ -728,6 +730,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -728,6 +730,8 @@ namespace OnlineStore.DeviceLibrary
KNDIOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW); KNDIOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.LOW)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Up, IO_VALUE.LOW));
} }
} }
#endregion #endregion
......
source/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.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
...@@ -52,7 +52,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -52,7 +52,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("IsHasLocationCylinder")] [ConfigProAttribute("IsHasLocationCylinder")]
public int IsHasLocationCylinder { get; set; } public int IsHasLocationCylinder { get; set; }
/// <summary>
/// PRO 是否有左右侧门 IsHasDoorLimit 0
/// </summary>
[ConfigProAttribute("IsHasDoorLimit")]
public int IsHasDoorLimit { get; set; }
/// <summary> /// <summary>
/// PRO 扫码枪IP Scanner_Ip 192.168.200.13 /// PRO 扫码枪IP Scanner_Ip 192.168.200.13
/// </summary> /// </summary>
...@@ -474,9 +478,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -474,9 +478,11 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.Door_Down); MustHaveDIList.Add(IO_Type.Door_Down);
MustHaveDIList.Add(IO_Type.LocationCylinder_Down); MustHaveDIList.Add(IO_Type.LocationCylinder_Down);
MustHaveDIList.Add(IO_Type.LocationCylinder_Up); MustHaveDIList.Add(IO_Type.LocationCylinder_Up);
MustHaveDIList.Add(IO_Type.LocationCylinder2_Down);
MustHaveDIList.Add(IO_Type.LocationCylinder2_Up);
MustHaveDIList.Add(IO_Type.Left_Door_LimitSingle); //MustHaveDIList.Add(IO_Type.Left_Door_LimitSingle);
MustHaveDIList.Add(IO_Type.Right_Door_LimitSingle); //MustHaveDIList.Add(IO_Type.Right_Door_LimitSingle);
MustHaveDIList.Add(IO_Type.TrayCheck_3); MustHaveDIList.Add(IO_Type.TrayCheck_3);
MustHaveDIList.Add(IO_Type.TrayCheck_4); MustHaveDIList.Add(IO_Type.TrayCheck_4);
MustHaveDIList.Add(IO_Type.LocationCylinder2_Down); MustHaveDIList.Add(IO_Type.LocationCylinder2_Down);
......
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!