巡检信息OK

katway · Oct 24, 2012 · c49349d · c49349d
1 parent c28fa90
commit c49349d
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 21 deletions.
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/frmAddItem.Designer.cs b/Application/frmAddItem.Designer.cs
diff --git a/Application/frmAddItem.resx b/Application/frmAddItem.resx
@@ -120,7 +120,4 @@
   <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
diff --git a/Application/frmAddPoint.Designer.cs b/Application/frmAddPoint.Designer.cs
diff --git a/Application/frmAddPoint.resx b/Application/frmAddPoint.resx
@@ -120,7 +120,4 @@
   <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
diff --git a/Application/frmAddRoutName.Designer.cs b/Application/frmAddRoutName.Designer.cs
diff --git a/Application/frmAddRoutName.cs b/Application/frmAddRoutName.cs
@@ -23,6 +23,7 @@ public frmAddRoutName()
 
         private void frmAddRoutName_Load(object sender, EventArgs e)
         {
+            this.cbo_init();
             if (isEdit)
             {
                 this.btnTrue.Text = "修改";
@@ -38,7 +39,7 @@ private void frmAddRoutName_Load(object sender, EventArgs e)
                 }
                 dr.Dispose();
             }
-            this.cbo_init();
+
         }
 
         private void btnTrue_Click(object sender, EventArgs e)

diff --git a/Application/frmAddRoute.Designer.cs b/Application/frmAddRoute.Designer.cs
diff --git a/Application/frmAddRoute.cs b/Application/frmAddRoute.cs
@@ -119,16 +119,19 @@ private void btnAdd_Click(object sender, EventArgs e)
         private void btnDel_Click(object sender, EventArgs e)
         {
             foreach (TreeNode node in listLogical)
-            {
+            {            
                 if (node.Parent == null)
                 {
                     Object obj_ID = SqlHelper.ExecuteScalar("Select ID From LogicalCheckPoint Where Route_ID=" + labRouteID.Text + " and PhysicalPoint_ID=" + node.Tag);
-                    SqlHelper.ExecuteNonQuery("Delete From LogicalCheckPoint  where ID=" + obj_ID.ToString());
-                    if (node.Nodes.Count > 0)
+                    if (obj_ID != null)
                     {
-                        foreach (TreeNode de in node.Nodes)
+                        SqlHelper.ExecuteNonQuery("Delete From LogicalCheckPoint  where ID=" + obj_ID.ToString());
+                        if (node.Nodes.Count > 0)
                         {
-                            SqlHelper.ExecuteNonQuery("Delete From LogicalPoint_Item Where ID=" + obj_ID.ToString());
+                            foreach (TreeNode de in node.Nodes)
+                            {
+                                SqlHelper.ExecuteNonQuery("Delete From LogicalPoint_Item Where ID=" + obj_ID.ToString());
+                            }
                         }
                     }
                 }
@@ -244,6 +247,8 @@ private void btnSave_Click(object sender, EventArgs e)
         private void 新建路线ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             frmAddRoutName rn = new frmAddRoutName();
+            rn.Left=this.Left+(this.Width-rn.Width)/2;
+            rn.Top=this.Top+(this.Height-rn.Height)/2;
             rn.tView = this.tvRoute;
             rn.Show();
         }
@@ -297,7 +302,6 @@ public static void tvRouteInit(TreeView tvRoute)
                 }
                 tvRoute.Nodes.Add(tnode);
             }
-            //tvRoute.ExpandAll();
             dr.Close();
 
         }
@@ -412,20 +416,28 @@ private void tvPhysicalPoint_NodeMouseDoubleClick(object sender, TreeNodeMouseCl
 
         private void 删除路线ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (tvRoute.SelectedNode.Level != 2)
+            if (labRouteID.Text=="")
             {
                 MessageBox.Show("请选择具体路线");
                 return;
             }
-            string strDel = "Delete From CheckRoute Where ID=" + tvRoute.SelectedNode.Tag;
-            if (SqlHelper.ExecuteNonQuery(strDel) != 1)
+            string[] strsDel=new string[3];
+            strsDel[0]="Delete From LogicalPoint_Item Where ID in (Select ID From LogicalCheckPoint Where Route_ID=" + labRouteID.Text + ")";
+            strsDel[1] = "Delete From LogicalCheckPoint Where Route_ID=" + labRouteID.Text;
+            strsDel[2] = "Delete From CheckRoute Where ID=" + labRouteID.Text;
+
+            try
+            {
+                SqlHelper.ExecuteSqls(strsDel);
+            }
+            catch
             {
-                MessageBox.Show("删除失败");
-                return;
+                MessageBox.Show("删除失败。请稍后再试");
             }
-            else
+            finally
             {
                 tvRouteInit(tvRoute);
+                if (chkRoute.Checked) tvRoute.ExpandAll();
             }
         }
 
@@ -463,6 +475,8 @@ private void tvRoute_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEvent
             if (e.Node.Level == 2)
             {
                 frmAddRoutName fn = new frmAddRoutName();
+                fn.Left=this.Left+(this.Width-fn.Width)/2;
+                fn.Top = this.Top + (this.Height - fn.Height) / 2;
                 fn.tView = tvRoute;
                 fn.isEdit = true;
                 fn.routeID = e.Node.Tag;
@@ -476,6 +490,8 @@ private void toolStripMenuItem1_Click(object sender, EventArgs e)
             {
                 frmAddRoutName fn = new frmAddRoutName();
                 fn.tView = tvRoute;
+                fn.Left=this.Left+(this.Width-fn.Width)/2;
+                fn.Top = this.Top + (this.Height - fn.Height) / 2;
                 fn.isEdit = true;
                 fn.routeID = tvRoute.SelectedNode.Tag;
                 fn.Show();

diff --git a/Application/frmAddRoute.resx b/Application/frmAddRoute.resx
@@ -120,4 +120,7 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
diff --git a/Application/frmain.cs b/Application/frmain.cs
@@ -199,7 +199,9 @@ private void tsmishebeixunjianxiang_Click(object sender, EventArgs e)
         private void tsmixunjianluxian_Click(object sender, EventArgs e)
         {
             frmAddRoute frm = new frmAddRoute();
-            frm.Show();
+            frm.Left = this.Left + (this.Width - frm.Width) / 2;
+            frm.Top = this.Top + (this.Height - frm.Height) / 2;
+            frm.Show() ;
         }
 
     }