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
katway · Oct 30, 2012 · e602278 · e602278
2 parents 94c3073 + dad6252
commit e602278
Show file tree

Hide file tree

Showing 35 changed files with 6,755 additions and 3,228 deletions.
diff --git a/Application/ClassDiagram5.cd b/Application/ClassDiagram5.cd
diff --git a/Application/Code/CommonClass.cs b/Application/Code/CommonClass.cs
@@ -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; } }

diff --git a/Application/Code/CommonClass.cs.orig b/Application/Code/CommonClass.cs.orig
@@ -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
diff --git a/Application/Code/SqlHelper.cs b/Application/Code/SqlHelper.cs
@@ -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)

diff --git a/Application/Code/SqlHelper.cs.orig b/Application/Code/SqlHelper.cs.orig
diff --git a/Application/WorkStation.csproj b/Application/WorkStation.csproj
@@ -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="app.config">
-    <None Include="ClassDiagram5.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>