diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index ca121e7d..f93d0496 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -20,7 +20,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
-                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
+                //BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
                 this.InitTreeMenu();//加载树
 
             }
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index 895ad58b..db685eeb 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -613,28 +613,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 {
                     BLL.WeldTaskService.UpdateCanWelderTask(weldTaskId, canWelderId.Substring(0, canWelderId.Length - 1), canWelderCode.Substring(0, canWelderCode.Length - 1));
                 }
-                DateTime? taskTime = null;
-                if (tvControlItem.SelectedNodeID.Contains("|"))
-                {
-                    taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
-                }
-                else
-                {
-                    taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
-                }
-                List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
-                if (taskTime != null)
-                {
-                    GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]), this.rbIsAudit.SelectedValue);
-                }
-                else
-                {
-                    GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
-                }
-                this.BindGrid(GetWeldingTaskList);
+               
+               
                 //GetCanWelderDropDownList(GetWeldingTaskList);
             }
-
+            DateTime? taskTime = null;
+            if (tvControlItem.SelectedNodeID.Contains("|"))
+            {
+                taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
+            }
+            else
+            {
+                taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID);
+            }
+            List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
+            if (taskTime != null)
+            {
+                GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(tvControlItem.SelectedNodeID.Split('|')[1]), this.rbIsAudit.SelectedValue);
+            }
+            else
+            {
+                GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
+            }
+            this.BindGrid(GetWeldingTaskList);
             Alert.ShowInTop("已生成可焊焊工！", MessageBoxIcon.Success);
 
         }