Permalink
Browse files

Merge remote-tracking branch 'qicb/Develop' into Develop

Conflicts:
	Application/WorkStation.csproj
	Application/WorkStation.csproj.orig
	Application/frmMain.Designer.cs
	Application/frmMain.cs
	Application/frmMain.cs.orig
	Application/frmMain.resx
  • Loading branch information...
katway committed Oct 30, 2012
2 parents 94c3073 + dad6252 commit e6022783bc208e3317f7d474d8319de2d7c90085
Showing with 6,755 additions and 3,228 deletions.
  1. +0 −11 Application/ClassDiagram5.cd
  2. +7 −0 Application/Code/CommonClass.cs
  3. +32 −0 Application/Code/CommonClass.cs.orig
  4. +1 −0 Application/Code/SqlHelper.cs
  5. +2,382 −2,390 Application/Code/SqlHelper.cs.orig
  6. +46 −11 Application/WorkStation.csproj
  7. +280 −1 Application/WorkStation.csproj.orig
  8. +3 −0 Application/frmAddItem.Designer.cs
  9. +184 −0 Application/frmAddPlan.Designer.cs
  10. +318 −0 Application/frmAddPlan.cs
  11. +126 −0 Application/frmAddPlan.resx
  12. +144 −0 Application/frmAddPlanExamine.Designer.cs
  13. +167 −0 Application/frmAddPlanExamine.cs
  14. +126 −0 Application/frmAddPlanExamine.resx
  15. +158 −0 Application/frmAddPlanToTask.Designer.cs
  16. +145 −0 Application/frmAddPlanToTask.cs
  17. +123 −0 Application/frmAddPlanToTask.resx
  18. +307 −0 Application/frmAddPlan_Add.Designer.cs
  19. +143 −0 Application/frmAddPlan_Add.cs
  20. +120 −0 Application/frmAddPlan_Add.resx
  21. +3 −0 Application/frmAddPoint.Designer.cs
  22. +2 −1 Application/frmAddRoutName.Designer.cs
  23. +2 −1 Application/frmAddRoutName.cs
  24. +4 −0 Application/frmAddRoute.Designer.cs
  25. +28 −12 Application/frmAddRoute.cs
  26. +3 −0 Application/frmAddRoute.resx
  27. +259 −180 Application/frmAddTask.Designer.cs
  28. +699 −0 Application/frmAddTask.Designer.cs.orig
  29. +332 −21 Application/frmAddTask.cs
  30. +356 −0 Application/frmAddTask.cs.orig
  31. +122 −119 Application/frmAddTask.resx
  32. +29 −77 Application/frmMain.Designer.cs
  33. +62 −1 Application/frmMain.cs
  34. +0 −361 Application/frmMain.cs.orig
  35. +42 −42 PartolCheck.sln
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
- <Class Name="WorkStation.SiteEditDelete" Collapsed="true">
- <Position X="0.5" Y="0.5" Width="1.5" />
- <TypeIdentifier>
- <HashCode>gQAAgCAABCIAABEAAADAgMACAAA4BBAAAQAAAAIAAQQ=</HashCode>
- <FileName>SiteEditDelete.cs</FileName>
- </TypeIdentifier>
- </Class>
- <Font Name="宋体" Size="9" />
-</ClassDiagram>
@@ -10,6 +10,13 @@ public class CommonClass
}
public class BoxItem
{
+ public BoxItem()
+ { }
+ public BoxItem(string text, string value)
+ {
+ this.Text = text;
+ this.Value = value;
+ }
private string _text = null;
private object _value = null;
public string Text { get { return this._text; } set { this._text = value; } }
@@ -1,3 +1,34 @@
+<<<<<<< HEAD
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WorkStation
+{
+ public class CommonClass
+ {
+ }
+ public class BoxItem
+ {
+ public BoxItem()
+ { }
+ public BoxItem(string text, string value)
+ {
+ this.Text = text;
+ this.Value = value;
+ }
+ private string _text = null;
+ private object _value = null;
+ public string Text { get { return this._text; } set { this._text = value; } }
+ public object Value { get { return this._value; } set { this._value = value; } }
+ public override string ToString()
+ {
+ return this._text;
+ }
+ }
+}
+=======
using System;
using System.Collections.Generic;
using System.Linq;
@@ -20,3 +51,4 @@ namespace WorkStation
}
}
}
+>>>>>>> hefangli/master
@@ -420,6 +420,7 @@ public static int ExecuteSqls(string[] strs)
SqlTransaction tran = conn.BeginTransaction();
SqlCommand command = new SqlCommand();
command.Connection = conn;
+ command.Transaction = tran;
try
{
foreach (string s in strs)

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -64,6 +64,30 @@
<Compile Include="frmAddCompany.Designer.cs">
<DependentUpon>frmAddCompany.cs</DependentUpon>
</Compile>
+ <Compile Include="frmAddPlan.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddPlan.Designer.cs">
+ <DependentUpon>frmAddPlan.cs</DependentUpon>
+ </Compile>
+ <Compile Include="frmAddPlanExamine.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddPlanExamine.Designer.cs">
+ <DependentUpon>frmAddPlanExamine.cs</DependentUpon>
+ </Compile>
+ <Compile Include="frmAddPlanToTask.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddPlanToTask.Designer.cs">
+ <DependentUpon>frmAddPlanToTask.cs</DependentUpon>
+ </Compile>
+ <Compile Include="frmAddPlan_Add.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmAddPlan_Add.Designer.cs">
+ <DependentUpon>frmAddPlan_Add.cs</DependentUpon>
+ </Compile>
<Compile Include="frmAddPoint.cs">
<SubType>Form</SubType>
</Compile>
@@ -100,6 +124,12 @@
<Compile Include="frmAddTask.Designer.cs">
<DependentUpon>frmAddTask.cs</DependentUpon>
</Compile>
+ <Compile Include="frmMain.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="frmMain.Designer.cs">
+ <DependentUpon>frmMain.cs</DependentUpon>
+ </Compile>
<Compile Include="frmAddItem.cs">
<SubType>Form</SubType>
</Compile>
@@ -166,12 +196,6 @@
<Compile Include="frmIssueTask.Designer.cs">
<DependentUpon>frmIssueTask.cs</DependentUpon>
</Compile>
- <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" />
<Compile Include="SiteEditDelete.cs">
@@ -192,6 +216,18 @@
<EmbeddedResource Include="frmAddCompany.resx">
<DependentUpon>frmAddCompany.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmAddPlan.resx">
+ <DependentUpon>frmAddPlan.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="frmAddPlanExamine.resx">
+ <DependentUpon>frmAddPlanExamine.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="frmAddPlanToTask.resx">
+ <DependentUpon>frmAddPlanToTask.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="frmAddPlan_Add.resx">
+ <DependentUpon>frmAddPlan_Add.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmAddPoint.resx">
<DependentUpon>frmAddPoint.cs</DependentUpon>
</EmbeddedResource>
@@ -210,6 +246,9 @@
<EmbeddedResource Include="frmAddTask.resx">
<DependentUpon>frmAddTask.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="frmMain.resx">
+ <DependentUpon>frmMain.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="frmAddItem.resx">
<DependentUpon>frmAddItem.cs</DependentUpon>
</EmbeddedResource>
@@ -243,9 +282,6 @@
<EmbeddedResource Include="frmIssueTask.resx">
<DependentUpon>frmIssueTask.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="frmMain.resx">
- <DependentUpon>frmMain.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -262,8 +298,7 @@
<EmbeddedResource Include="SiteNew.resx">
<DependentUpon>SiteNew.cs</DependentUpon>
</EmbeddedResource>
- <None Include="app.config" />
- <None Include="ClassDiagram5.cd" />
+ <None Include="app.config">
<None Include="Properties\Settings.settings">
<Generator>PublicSettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Oops, something went wrong.

0 comments on commit e602278

Please sign in to comment.