Skip to content

孙克 / ACSingleStore

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

1

1 个父辈 c04197c8
内嵌 并排
正在显示 9 个修改的文件 包含 25 行增加 和 21 行删除
ACSingleStore.sln
...@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserFromControl", "source\U ...@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserFromControl", "source\U
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadCSVLibrary", "source\LoadCVSLibrary\LoadCSVLibrary.csproj", "{064BEBF5-8FAA-4EA2-A5F3-A06E6E7D9251}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadCSVLibrary", "source\LoadCVSLibrary\LoadCSVLibrary.csproj", "{064BEBF5-8FAA-4EA2-A5F3-A06E6E7D9251}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AcStoreWCF", "AcStoreWCF\AcStoreWCF.csproj", "{BC133455-A1C9-4202-8489-16458C7FA5E5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AcStoreWCF", "source\AcStoreWCF\AcStoreWCF.csproj", "{BC133455-A1C9-4202-8489-16458C7FA5E5}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
source/ACSingleStore/ACSingleStore.csproj
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\AcStoreWCF\AcStoreWCF.csproj"> <ProjectReference Include="..\AcStoreWCF\AcStoreWCF.csproj">
<Project>{bc133455-a1c9-4202-8489-16458c7fa5e5}</Project> <Project>{bc133455-a1c9-4202-8489-16458c7fa5e5}</Project>
<Name>AcStoreWCF</Name> <Name>AcStoreWCF</Name>
</ProjectReference> </ProjectReference>
......
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
this.txtPosition1 = new System.Windows.Forms.TextBox(); this.txtPosition1 = new System.Windows.Forms.TextBox();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnCloseWCF = new System.Windows.Forms.Button();
this.btnOpenWCF = new System.Windows.Forms.Button(); this.btnOpenWCF = new System.Windows.Forms.Button();
this.btnCloseWCF = new System.Windows.Forms.Button();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -1584,28 +1584,28 @@ ...@@ -1584,28 +1584,28 @@
// 启动ToolStripMenuItem // 启动ToolStripMenuItem
// //
this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem"; this.启动ToolStripMenuItem.Name = "启动ToolStripMenuItem";
this.启动ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.启动ToolStripMenuItem.Size = new System.Drawing.Size(124, 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(180, 22); this.停止ToolStripMenuItem.Size = new System.Drawing.Size(124, 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(180, 22); this.复位ToolStripMenuItem.Size = new System.Drawing.Size(124, 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(180, 22); this.回待机点ToolStripMenuItem.Size = new System.Drawing.Size(124, 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);
// //
...@@ -1731,6 +1731,7 @@ ...@@ -1731,6 +1731,7 @@
// //
// groupBox4 // groupBox4
// //
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox4.Controls.Add(this.btnStart); this.groupBox4.Controls.Add(this.btnStart);
this.groupBox4.Controls.Add(this.chb3); this.groupBox4.Controls.Add(this.chb3);
this.groupBox4.Controls.Add(this.chb2); this.groupBox4.Controls.Add(this.chb2);
...@@ -1810,6 +1811,8 @@ ...@@ -1810,6 +1811,8 @@
// //
// groupBox3 // groupBox3
// //
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.lblWarnMsg); this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(603, 28); this.groupBox3.Location = new System.Drawing.Point(603, 28);
...@@ -1821,6 +1824,8 @@ ...@@ -1821,6 +1824,8 @@
// //
// groupBox6 // groupBox6
// //
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.btnOpenWCF); this.groupBox6.Controls.Add(this.btnOpenWCF);
this.groupBox6.Controls.Add(this.btnCloseWCF); this.groupBox6.Controls.Add(this.btnCloseWCF);
this.groupBox6.Location = new System.Drawing.Point(603, 645); this.groupBox6.Location = new System.Drawing.Point(603, 645);
...@@ -1830,17 +1835,6 @@ ...@@ -1830,17 +1835,6 @@
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "WCF测试"; this.groupBox6.Text = "WCF测试";
// //
// btnCloseWCF
//
this.btnCloseWCF.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseWCF.Location = new System.Drawing.Point(162, 22);
this.btnCloseWCF.Name = "btnCloseWCF";
this.btnCloseWCF.Size = new System.Drawing.Size(105, 28);
this.btnCloseWCF.TabIndex = 225;
this.btnCloseWCF.Text = "关闭服务";
this.btnCloseWCF.UseVisualStyleBackColor = true;
this.btnCloseWCF.Click += new System.EventHandler(this.btnCloseWCF_Click);
//
// btnOpenWCF // btnOpenWCF
// //
this.btnOpenWCF.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenWCF.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -1852,6 +1846,17 @@ ...@@ -1852,6 +1846,17 @@
this.btnOpenWCF.UseVisualStyleBackColor = true; this.btnOpenWCF.UseVisualStyleBackColor = true;
this.btnOpenWCF.Click += new System.EventHandler(this.btnOpenWCF_Click); this.btnOpenWCF.Click += new System.EventHandler(this.btnOpenWCF_Click);
// //
// btnCloseWCF
//
this.btnCloseWCF.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseWCF.Location = new System.Drawing.Point(162, 22);
this.btnCloseWCF.Name = "btnCloseWCF";
this.btnCloseWCF.Size = new System.Drawing.Size(105, 28);
this.btnCloseWCF.TabIndex = 225;
this.btnCloseWCF.Text = "关闭服务";
this.btnCloseWCF.UseVisualStyleBackColor = true;
this.btnCloseWCF.Click += new System.EventHandler(this.btnCloseWCF_Click);
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -15,8 +15,7 @@ using System.Reflection; ...@@ -15,8 +15,7 @@ using System.Reflection;
using log4net; using log4net;
using OnlineStore.DeviceLibrary; using OnlineStore.DeviceLibrary;
using System.IO.Ports; using System.IO.Ports;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using AcStoreWCF;
namespace OnlineStore.ACSingleStore namespace OnlineStore.ACSingleStore
{ {
......
AcStoreWCF/AcStoreWCF.csproj → source/AcStoreWCF/AcStoreWCF.csproj
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\source\Common\Common.csproj"> <ProjectReference Include="..\Common\Common.csproj">
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project> <Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name> <Name>Common</Name>
</ProjectReference> </ProjectReference>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!