Skip to content

李娜 / SO827-OutletEquip

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

1

1 个父辈 6794238b
全部展开
内嵌 并排
正在显示 21 个修改的文件 包含 68 行增加 和 1043 行删除
ProCopyClient/App.config deleted 100644 → 0
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<appSettings>
<add key="ProName" value="ACSingleStore" />
</appSettings>
</configuration>
\ No newline at end of file \ No newline at end of file
ProCopyClient/ConfigAppSettings.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Configuration;
using System.Threading;
using System.Xml;
using System.Windows.Forms;
namespace ProCopyClient
{
public class ConfigAppSettings
{
public static string GetValue(string keyStr, string storeStr)
{
string key = keyStr + storeStr;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return GetValue(keyStr);
}
else
{
return config.AppSettings.Settings[key].Value;
}
}
public static decimal GetNumValue(string keyStr, string storeStr)
{
string key = keyStr + storeStr;
decimal a = 0;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return GetNumValue(keyStr);
}
else
{
{
Decimal.TryParse(config.AppSettings.Settings[key].Value, out a);
}
}
return a;
}
public static int GetIntValue(string keyStr, string storeStr)
{
string key = keyStr + storeStr;
int a = 0;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return GetIntValue(keyStr);
}
else
{
{
Int32.TryParse(config.AppSettings.Settings[key].Value, out a);
}
} return a;
}
public static string GetValue(string key)
{
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return "";
}
else
{
return config.AppSettings.Settings[key].Value;
}
}
public static decimal GetNumValue(string key)
{
decimal a = 0;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return a;
}
else
{
{
Decimal.TryParse(config.AppSettings.Settings[key].Value, out a);
}
}
return a;
}
public static int GetIntValue(string key)
{
int a = 0;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
return a;
}
else
{
{
Int32.TryParse(config.AppSettings.Settings[key].Value, out a);
}
} return a;
}
public static void SaveValue(string key, int value)
{
SaveValue(key, value.ToString());
}
public static void SaveValue(string key, string value)
{
try
{
if (key.Equals("") || value.Equals(""))
{
//return;
}
//增加的内容写在appSettings段下 <add key="RegCode" value="0"/>
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
SetValue(key, value);
}
else
{
UpdateConfig(key, value);
}
}
catch (Exception ex)
{
//LogUtil.error(LOGGER, "SaveValue保存配置出错：AppKey=" + key + "，AppValue=" + value + "," + ex.StackTrace);
}
}
/// <summary>
/// 更新配置文件信息
/// </summary>
/// <param name="name">配置文件字段名称</param>
/// <param name="Xvalue">值</param>
private static void UpdateConfig(string name, string Xvalue)
{
try
{
XmlDocument doc = new XmlDocument();
doc.Load(Application.ExecutablePath + ".config");
XmlNode node = doc.SelectSingleNode(@"//add[@key='" + name + "']");
XmlElement ele = (XmlElement)node;
ele.SetAttribute("value", Xvalue);
doc.Save(Application.ExecutablePath + ".config");
}
catch (Exception ex)
{
// LogUtil.error(LOGGER, "UpdateConfig保存配置出错：name=" + name + "，Xvalue=" + Xvalue + "," + ex.StackTrace);
}
}
///<summary>
///向.config文件的appKey结写入信息AppValue 保存设置
///</summary>
///<param name="AppKey">节点名</param>
///<param name="AppValue">值</param>
private static void SetValue(String AppKey, String AppValue)
{
try
{
XmlDocument xDoc = new XmlDocument();
xDoc.Load(System.Windows.Forms.Application.ExecutablePath + ".config");
XmlNode xNode;
XmlElement xElem1;
XmlElement xElem2;
xNode = xDoc.SelectSingleNode("//appSettings");
xElem1 = (XmlElement)xNode.SelectSingleNode("//add[@key='" + AppKey + "']");
if (xElem1 != null)
xElem1.SetAttribute("value", AppValue);
else
{
xElem2 = xDoc.CreateElement("add");
xElem2.SetAttribute("key", AppKey);
xElem2.SetAttribute("value", AppValue);
xNode.AppendChild(xElem2);
}
xDoc.Save(System.Windows.Forms.Application.ExecutablePath + ".config");
}
catch (Exception ex)
{
// LogUtil.error(LOGGER, "SetValue保存配置出错：AppKey=" + AppKey + "，AppValue=" + AppValue + "," + ex.StackTrace);
}
}
}
}
ProCopyClient/FrmMain.Designer.cs deleted 100644 → 0
namespace ProCopyClient
{
partial class FrmMain
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows 窗体设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.txtProName = new System.Windows.Forms.TextBox();
this.button3 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// button1
//
this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(100, 187);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(217, 55);
this.button1.TabIndex = 0;
this.button1.Text = "L-R-程序 更新文件复制";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// button2
//
this.button2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(100, 112);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(217, 55);
this.button2.TabIndex = 1;
this.button2.Text = "单个程序 更新文件复制";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(58, 40);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(79, 20);
this.label1.TabIndex = 2;
this.label1.Text = "程序名称：";
//
// txtProName
//
this.txtProName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtProName.Location = new System.Drawing.Point(143, 37);
this.txtProName.Name = "txtProName";
this.txtProName.Size = new System.Drawing.Size(192, 26);
this.txtProName.TabIndex = 3;
this.txtProName.Text = "ACSingleStore";
//
// button3
//
this.button3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.Location = new System.Drawing.Point(389, 187);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(93, 55);
this.button3.TabIndex = 4;
this.button3.Text = "退出";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(494, 283);
this.Controls.Add(this.button3);
this.Controls.Add(this.txtProName);
this.Controls.Add(this.label1);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Name = "FrmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "客户端复制";
this.Load += new System.EventHandler(this.FrmMain_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtProName;
private System.Windows.Forms.Button button3;
}
}
ProCopyClient/FrmMain.cs deleted 100644 → 0
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 ProCopyClient
{
public partial class FrmMain : Form
{
public FrmMain()
{
InitializeComponent();
}
private void button1_Click(object sender, EventArgs e)
{
try
{
string path = Application.StartupPath + "/Debug/";
if (Directory.Exists(path).Equals(false))
{
MessageBox.Show("未找到Debug文件夹");
return;
}
string proName = txtProName.Text.Trim();
ConfigAppSettings.SaveValue("ProName", proName);
string date = DateTime.Now.ToString("yyyyMMdd");
string leftPath = Application.StartupPath + "\\" + date + "-" + proName + "L-更新" + "\\";
string rightPath = Application.StartupPath + "\\" + date + "-" + proName + "R-更新" + "\\";
if (Directory.Exists(leftPath))
{
Directory.Delete(leftPath, true);
}
if (Directory.Exists(rightPath))
{
Directory.Delete(rightPath, true);
}
Directory.CreateDirectory(leftPath);
Directory.CreateDirectory(rightPath);
//将此目录的更新文件，复制到上一层的文件夹中
string[] fileList = Directory.GetFiles(path);
foreach (string file in fileList)
{
FileInfo fileInfo = new FileInfo(file);
TimeSpan span = DateTime.Now - fileInfo.LastWriteTime;
string exName = Path.GetExtension(file);
string fileName = Path.GetFileName(file);
if (span.TotalDays < 1)
{
if (exName.ToLower().Equals(".dll"))
{
File.Copy(file, leftPath + fileName);
File.Copy(file, rightPath + fileName);
}
else if (exName.ToLower().Equals(".exe"))
{
string f = Path.GetFileNameWithoutExtension(file);
File.Copy(file, leftPath + f + "L" + exName);
File.Copy(file, rightPath + f + "R" + exName);
}
}
}
MessageBox.Show("更新文件复制完成");
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString());
}
}
private void button2_Click(object sender, EventArgs e)
{
try
{
string path = Application.StartupPath + "/Debug/";
if (Directory.Exists(path).Equals(false))
{
MessageBox.Show("未找到Debug文件夹");
return;
}
string proName = txtProName.Text.Trim();
ConfigAppSettings.SaveValue("ProName", proName);
string date = DateTime.Now.ToString("yyyyMMdd");
string leftPath = Application.StartupPath + "\\" + date + "-" + proName + "-更新" + "\\";
if (Directory.Exists(leftPath))
{
Directory.Delete(leftPath, true);
}
Directory.CreateDirectory(leftPath);
//将此目录的更新文件，复制到上一层的文件夹中
string[] fileList = Directory.GetFiles(path);
foreach (string file in fileList)
{
FileInfo fileInfo = new FileInfo(file);
TimeSpan span = DateTime.Now - fileInfo.LastWriteTime;
string exName = Path.GetExtension(file);
string fileName = Path.GetFileName(file);
if (span.TotalDays < 1)
{
if (exName.ToLower().Equals(".dll"))
{
File.Copy(file, leftPath + fileName);
}
else if (exName.ToLower().Equals(".pdb"))
{
File.Copy(file, leftPath + fileName);
}
else if (exName.ToLower().Equals(".exe"))
{
string f = Path.GetFileNameWithoutExtension(file);
File.Copy(file, leftPath + f + "" + exName);
}
}
}
MessageBox.Show("更新文件复制完成");
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString());
}
}
private void button3_Click(object sender, EventArgs e)
{
this.Close();
}
private void FrmMain_Load(object sender, EventArgs e)
{
txtProName.Text = ConfigAppSettings.GetValue("ProName");
}
}
}
ProCopyClient/FrmMain.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>
</root>
\ No newline at end of file \ No newline at end of file
ProCopyClient/ProCopyClient.csproj deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{63ED00F8-B7E2-4674-859C-22B11625CAE8}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>ProCopyClient</RootNamespace>
<AssemblyName>ProCopyClient</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\source\HCSingleStore\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConfigAppSettings.cs" />
<Compile Include="FrmMain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmMain.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="FrmMain.resx">
<DependentUpon>FrmMain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file \ No newline at end of file
ProCopyClient/Program.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ProCopyClient
{
static class Program
{
/// <summary>
/// 应用程序的主入口点。
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FrmMain());
}
}
}
ProCopyClient/Properties/AssemblyInfo.cs deleted 100644 → 0
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("ProCopyClient")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ProCopyClient")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("63ed00f8-b7e2-4674-859c-22b11625cae8")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
ProCopyClient/Properties/Resources.Designer.cs deleted 100644 → 0
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace ProCopyClient.Properties
{
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProCopyClient.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 覆盖当前线程的 CurrentUICulture 属性
/// 使用此强类型的资源类的资源查找。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}
ProCopyClient/Properties/Resources.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.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: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" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</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" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file \ No newline at end of file
ProCopyClient/Properties/Settings.Designer.cs deleted 100644 → 0
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace ProCopyClient.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}
ProCopyClient/Properties/Settings.settings deleted 100644 → 0
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
source/DeviceLibrary/bean/EquipBean_Partial.cs
...@@ -352,7 +352,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -352,7 +352,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(WarnMsg); LogUtil.error(WarnMsg);
} }
MoveInfo.NextMoveStep(MoveStep.SI_12_AxisToP1); MoveInfo.NextMoveStep(MoveStep.SI_12_AxisToP1);
InStoreLog(" 所有轴回到待机点，升降轴到P1 [" + moveP.UpDown_P1 + "]，旋转轴到P1 [" + moveP.Middle_P1 + "],，压紧轴到P3 [" + moveP.ComPress_P3 + "]"); InStoreLog(" 所有轴回到待机点，升降轴到P1 [" + moveP.UpDown_P1 + "]，旋转轴到P1 [" + moveP.Middle_P1 + "], 压紧轴到P3 [" + moveP.ComPress_P3 + "]");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed); ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
......
source/DeviceLibrary/bean/WorkStation.cs
...@@ -81,9 +81,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -81,9 +81,7 @@ namespace OnlineStore.DeviceLibrary
} }
private void ClearShelfId() private void ClearShelfId()
{ {
CurrShelf = new ShelfInfo(); CurrShelf = new ShelfInfo();
} }
public void Reset() public void Reset()
...@@ -193,14 +191,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -193,14 +191,17 @@ namespace OnlineStore.DeviceLibrary
if (CheckShelf(IO_VALUE.HIGH) && (CurrShelf.RealShelf.Equals(""))) if (CheckShelf(IO_VALUE.HIGH) && (CurrShelf.RealShelf.Equals("")))
{ {
LogUtil.info(Name + "检测到料架信号，但是没有料架号，自动复位"); LogUtil.info(Name + "检测到料架信号，但是没有料架号，自动复位");
Reset();
} }
else if (CheckShelf(IO_VALUE.LOW) && (!CurrShelf.RealShelf.Equals(""))) else if (CheckShelf(IO_VALUE.LOW) && (!CurrShelf.RealShelf.Equals("")))
{ {
LogUtil.info(Name + "未检测到料架信号，但是有料架号，自动复位"); LogUtil.info(Name + "未检测到料架信号，但是有料架号，自动复位");
Reset();
} }
if (IOManager.IOValue(DI_InCheck).Equals(IO_VALUE.HIGH) && (CurrShelf.RealShelf.Equals(""))) if (IOManager.IOValue(DI_InCheck).Equals(IO_VALUE.HIGH) && (CurrShelf.RealShelf.Equals("")))
{ {
LogUtil.info(Name + "检测到入口料架信号，但是没有料架号，自动复位"); LogUtil.info(Name + "检测到入口料架信号，但是没有料架号，自动复位");
Reset();
} }
else else
{ {
...@@ -609,7 +610,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -609,7 +610,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (IsBusy) else if (IsBusy)
{ {
result += "[放料中]"; result += "[放料中]";
} }
return result; return result;
} }
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -161,22 +161,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -161,22 +161,22 @@ namespace OnlineStore.DeviceLibrary
#region 出料 #region 出料
/// <summary> ///// <summary>
/// 出料：等待入口检测有料 ///// 出料：等待入口检测有料
/// </summary> ///// </summary>
SI_01_TrayCheck = 201, //SI_01_TrayCheck = 201,
/// <summary> ///// <summary>
///出料：获取料架库位号 /////出料：获取料架库位号
/// </summary> ///// </summary>
SI_02_GetPosition, //SI_02_GetPosition,
/// <summary> ///// <summary>
///出料：等待料架准备完成 /////出料：等待料架准备完成
/// </summary> ///// </summary>
SI_03_WaitShelf, //SI_03_WaitShelf,
/// <summary> ///// <summary>
///出料：顶升气缸上升 /////出料：顶升气缸上升
/// </summary> ///// </summary>
SI_04_LocationUp, //SI_04_LocationUp,
/// <summary> /// <summary>
......
source/HCSingleStore/FrmEquip.cs
...@@ -245,6 +245,7 @@ namespace OnlineStore.ACSingleStore ...@@ -245,6 +245,7 @@ namespace OnlineStore.ACSingleStore
} }
else else
{ {
int v = equip.Config.GetCompP2(8);
MessageBox.Show("请先启动设备！"); MessageBox.Show("请先启动设备！");
} }
} }
......
source/HCSingleStore/FrmIDConfig.Designer.cs
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(281, 137); this.btnNext.Location = new System.Drawing.Point(283, 175);
this.btnNext.Name = "btnNext"; this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45); this.btnNext.Size = new System.Drawing.Size(120, 45);
this.btnNext.TabIndex = 275; this.btnNext.TabIndex = 275;
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
// //
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(138, 137); this.btnBack.Location = new System.Drawing.Point(127, 175);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45); this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 274; this.btnBack.TabIndex = 274;
...@@ -68,37 +68,37 @@ ...@@ -68,37 +68,37 @@
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(19, 34); this.label2.Location = new System.Drawing.Point(8, 51);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(104, 17); this.label2.Size = new System.Drawing.Size(95, 17);
this.label2.TabIndex = 277; this.label2.TabIndex = 277;
this.label2.Text = "设备服务器地址："; this.label2.Text = "设备服务器地址:";
// //
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(43, 87); this.label3.Location = new System.Drawing.Point(32, 114);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(80, 17); this.label3.Size = new System.Drawing.Size(71, 17);
this.label3.TabIndex = 278; this.label3.TabIndex = 278;
this.label3.Text = "流水线地址："; this.label3.Text = "流水线地址:";
// //
// txtLineAddr // txtLineAddr
// //
this.txtLineAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtLineAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLineAddr.Location = new System.Drawing.Point(128, 84); this.txtLineAddr.Location = new System.Drawing.Point(107, 109);
this.txtLineAddr.Name = "txtLineAddr"; this.txtLineAddr.Name = "txtLineAddr";
this.txtLineAddr.Size = new System.Drawing.Size(285, 26); this.txtLineAddr.Size = new System.Drawing.Size(296, 26);
this.txtLineAddr.TabIndex = 279; this.txtLineAddr.TabIndex = 279;
this.txtLineAddr.Text = "10.85.162.124"; this.txtLineAddr.Text = "10.85.162.124";
// //
// txthttpAddr // txthttpAddr
// //
this.txthttpAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txthttpAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txthttpAddr.Location = new System.Drawing.Point(129, 32); this.txthttpAddr.Location = new System.Drawing.Point(108, 46);
this.txthttpAddr.Name = "txthttpAddr"; this.txthttpAddr.Name = "txthttpAddr";
this.txthttpAddr.Size = new System.Drawing.Size(285, 26); this.txthttpAddr.Size = new System.Drawing.Size(296, 26);
this.txthttpAddr.TabIndex = 280; this.txthttpAddr.TabIndex = 280;
this.txthttpAddr.Text = "http://10.85.162.124/myproject/"; this.txthttpAddr.Text = "http://10.85.162.124/myproject/";
// //
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
this.btnReset.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btnReset.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(443, 81); this.btnReset.Location = new System.Drawing.Point(408, 106);
this.btnReset.Name = "btnReset"; this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(89, 33); this.btnReset.Size = new System.Drawing.Size(89, 33);
this.btnReset.TabIndex = 281; this.btnReset.TabIndex = 281;
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Location = new System.Drawing.Point(12, 6); this.groupBox1.Location = new System.Drawing.Point(12, 6);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(584, 209); this.groupBox1.Size = new System.Drawing.Size(520, 247);
this.groupBox1.TabIndex = 283; this.groupBox1.TabIndex = 283;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "设备地址配置"; this.groupBox1.Text = "设备地址配置";
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(608, 227); this.ClientSize = new System.Drawing.Size(544, 265);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Name = "FrmIdConfig"; this.Name = "FrmIdConfig";
this.Text = "设备配置"; this.Text = "设备配置";
......
source/HCSingleStore/FrmLineIO.Designer.cs
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
this.txtDOIndex = new System.Windows.Forms.TextBox(); this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox(); this.txtDoName = new System.Windows.Forms.TextBox();
this.lblAddr = new System.Windows.Forms.Label(); this.lblAddr = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.txtWriteTime = new System.Windows.Forms.TextBox(); this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.cmbWriteIO = new System.Windows.Forms.ComboBox(); this.cmbWriteIO = new System.Windows.Forms.ComboBox();
...@@ -73,7 +72,7 @@ ...@@ -73,7 +72,7 @@
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1001, 642); this.panel1.Size = new System.Drawing.Size(1001, 588);
this.panel1.TabIndex = 248; this.panel1.TabIndex = 248;
// //
// groupBox1 // groupBox1
...@@ -302,7 +301,6 @@ ...@@ -302,7 +301,6 @@
this.groupBox4.Controls.Add(this.txtDOIndex); this.groupBox4.Controls.Add(this.txtDOIndex);
this.groupBox4.Controls.Add(this.txtDoName); this.groupBox4.Controls.Add(this.txtDoName);
this.groupBox4.Controls.Add(this.lblAddr); this.groupBox4.Controls.Add(this.lblAddr);
this.groupBox4.Controls.Add(this.label14);
this.groupBox4.Controls.Add(this.txtWriteTime); this.groupBox4.Controls.Add(this.txtWriteTime);
this.groupBox4.Controls.Add(this.label5); this.groupBox4.Controls.Add(this.label5);
this.groupBox4.Controls.Add(this.cmbWriteIO); this.groupBox4.Controls.Add(this.cmbWriteIO);
...@@ -343,50 +341,35 @@ ...@@ -343,50 +341,35 @@
// txtDOIndex // txtDOIndex
// //
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(386, 24); this.txtDOIndex.Location = new System.Drawing.Point(418, 21);
this.txtDOIndex.MaxLength = 10; this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex"; this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(36, 26); this.txtDOIndex.Size = new System.Drawing.Size(36, 26);
this.txtDOIndex.TabIndex = 242; this.txtDOIndex.TabIndex = 242;
this.txtDOIndex.Text = "0"; this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
// //
// txtDoName // txtDoName
// //
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(308, 24); this.txtDoName.Location = new System.Drawing.Point(397, 20);
this.txtDoName.MaxLength = 10; this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName"; this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(36, 26); this.txtDoName.Size = new System.Drawing.Size(36, 26);
this.txtDoName.TabIndex = 241; this.txtDoName.TabIndex = 241;
this.txtDoName.Text = "0"; this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
// //
// lblAddr // lblAddr
// //
this.lblAddr.AutoSize = true; this.lblAddr.AutoSize = true;
this.lblAddr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblAddr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(270, 29); this.lblAddr.Location = new System.Drawing.Point(358, 30);
this.lblAddr.Name = "lblAddr"; this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(35, 17); this.lblAddr.Size = new System.Drawing.Size(35, 17);
this.lblAddr.TabIndex = 240; this.lblAddr.TabIndex = 240;
this.lblAddr.Text = "设备:"; this.lblAddr.Text = "设备:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label14
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(348, 29);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 239;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Visible = false;
//
// txtWriteTime // txtWriteTime
// //
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -417,7 +400,7 @@ ...@@ -417,7 +400,7 @@
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(24, 23); this.cmbWriteIO.Location = new System.Drawing.Point(24, 23);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(243, 28); this.cmbWriteIO.Size = new System.Drawing.Size(326, 28);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged); this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
...@@ -431,7 +414,7 @@ ...@@ -431,7 +414,7 @@
this.panel2.Controls.Add(this.groupBox5); this.panel2.Controls.Add(this.groupBox5);
this.panel2.Location = new System.Drawing.Point(6, 4); this.panel2.Location = new System.Drawing.Point(6, 4);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(498, 634); this.panel2.Size = new System.Drawing.Size(498, 580);
this.panel2.TabIndex = 241; this.panel2.TabIndex = 241;
// //
// groupBox6 // groupBox6
...@@ -442,7 +425,7 @@ ...@@ -442,7 +425,7 @@
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(5, 4); this.groupBox6.Location = new System.Drawing.Point(5, 4);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(240, 622); this.groupBox6.Size = new System.Drawing.Size(249, 568);
this.groupBox6.TabIndex = 106; this.groupBox6.TabIndex = 106;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "DI列表"; this.groupBox6.Text = "DI列表";
...@@ -460,7 +443,7 @@ ...@@ -460,7 +443,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 602); this.tableLayoutPanel1.Size = new System.Drawing.Size(238, 548);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox5 // groupBox5
...@@ -469,9 +452,9 @@ ...@@ -469,9 +452,9 @@
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Controls.Add(this.tableLayoutPanel2); this.groupBox5.Controls.Add(this.tableLayoutPanel2);
this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox5.Location = new System.Drawing.Point(251, 4); this.groupBox5.Location = new System.Drawing.Point(259, 4);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(240, 622); this.groupBox5.Size = new System.Drawing.Size(232, 568);
this.groupBox5.TabIndex = 107; this.groupBox5.TabIndex = 107;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "DO列表"; this.groupBox5.Text = "DO列表";
...@@ -489,14 +472,14 @@ ...@@ -489,14 +472,14 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 602); this.tableLayoutPanel2.Size = new System.Drawing.Size(221, 548);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// FrmLineIO // FrmLineIO
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1001, 642); this.ClientSize = new System.Drawing.Size(1001, 588);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
...@@ -541,7 +524,6 @@ ...@@ -541,7 +524,6 @@
private System.Windows.Forms.TextBox txtDOIndex; private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.TextBox txtDoName; private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label lblAddr; private System.Windows.Forms.Label lblAddr;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtWriteTime; private System.Windows.Forms.TextBox txtWriteTime;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.ComboBox cmbWriteIO; private System.Windows.Forms.ComboBox cmbWriteIO;
......
source/HCSingleStore/FrmLineIO.cs
...@@ -38,7 +38,7 @@ namespace OnlineStore.ACSingleStore ...@@ -38,7 +38,7 @@ namespace OnlineStore.ACSingleStore
foreach (ConfigIO ioValue in EquipManager.Config.DIList.Values) foreach (ConfigIO ioValue in EquipManager.Config.DIList.Values)
{ {
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName,230,28); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName, 230, 28);
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
...@@ -52,7 +52,7 @@ namespace OnlineStore.ACSingleStore ...@@ -52,7 +52,7 @@ namespace OnlineStore.ACSingleStore
roleindex = 0; roleindex = 0;
foreach (ConfigIO ioValue in EquipManager.Config.DOList.Values) foreach (ConfigIO ioValue in EquipManager.Config.DOList.Values)
{ {
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName, 230, 28); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName, 220, 28);
control.Click += Control_Click; control.Click += Control_Click;
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
......
source/LoadCVSLibrary/storeConfig/config/EquipConfig.cs
...@@ -10,10 +10,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -10,10 +10,12 @@ namespace OnlineStore.LoadCSVLibrary
public EquipConfig() public EquipConfig()
: base() : base()
{ {
CompP2Map = new Lazy<Dictionary<int, int>>(() => LoadCompP2Map());
} }
public EquipConfig(int id, string cid, string type, string filepath) public EquipConfig(int id, string cid, string type, string filepath)
: base(id, cid, type, filepath) : base(id, cid, type, filepath)
{ {
CompP2Map = new Lazy<Dictionary<int, int>>(() => LoadCompP2Map());
} }
/// <summary> /// <summary>
...@@ -237,25 +239,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -237,25 +239,22 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("CompAxis_P2_List", false)] [ConfigProAttribute("CompAxis_P2_List", false)]
public string CompAxis_P2_List { get; set; } public string CompAxis_P2_List { get; set; }
private Dictionary<int, int> CompP2Map = null; public Lazy<Dictionary<int, int>> CompP2Map;
public Dictionary<int, int> LoadCompP2Map() private Dictionary<int, int> LoadCompP2Map()
{ {
Dictionary<int, int> dataMap = new Dictionary<int, int>();
try try
{ {
if (CompP2Map == null) string[] arrayList = CompAxis_P2_List.Split(';');
foreach (string str in arrayList)
{ {
CompP2Map = new Dictionary<int, int>(); string[] arrStr = str.Split('=');
string[] arrayList = CompAxis_P2_List.Split(';'); if (arrStr.Length == 2)
foreach (string str in arrayList)
{ {
string[] arrStr = str.Split('='); int height = Convert.ToInt32(arrStr[0].Trim());
if (arrStr.Length == 2) int comp2 = Convert.ToInt32(arrStr[1].Trim());
{ dataMap.Add(height, comp2);
int height = Convert.ToInt32(arrStr[0].Trim());
int comp2 = Convert.ToInt32(arrStr[1].Trim());
CompP2Map.Add(height, comp2);
}
} }
} }
} }
...@@ -263,17 +262,13 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -263,17 +262,13 @@ namespace OnlineStore.LoadCSVLibrary
{ {
} }
return CompP2Map; return dataMap;
} }
public int GetCompP2(int height) public int GetCompP2(int height)
{ {
if (CompP2Map == null) if (CompP2Map.Value.ContainsKey(height))
{
LoadCompP2Map();
}
if (CompP2Map.ContainsKey(height))
{ {
return CompP2Map[height]; return CompP2Map.Value[height];
} }
return 0; return 0;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!