diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs
index dd8cf87a..dfd1a25d 100644
--- a/SGGL/BLL/DropListService.cs
+++ b/SGGL/BLL/DropListService.cs
@@ -460,7 +460,9 @@ namespace BLL
             ".jpg", ".jpeg", ".png", ".bmp", ".gif", // 图片文件类型
             ".mp3", ".wav", ".wma", ".ogg", ".ape", ".flac", // 音频文件类型
             ".mp4", ".avi", ".flv", ".wmv", ".mov", ".rmvb", // 视频文件类型
-            ".zip", ".rar", ".7z" // 压缩包文件类型
+            ".zip", ".rar", ".7z" // 压缩包文件类型,
+            ,".RVM",".rvm"
+
         };
     }
 }
diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
index 8e4e7715..0545d184 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
@@ -195,8 +195,8 @@ namespace BLL
         public static void UpdataDateByWeldJointId(string WeldJointId)
         {
  
-             DateTime ActDateStart_FIELD = new DateTime();
-            DateTime ActDateEnd_FIELD = new DateTime();
+            DateTime ? ActDateStart_FIELD = new DateTime();
+            DateTime ? ActDateEnd_FIELD = new DateTime();
 
             string JointAttribute = "";
 
@@ -218,15 +218,15 @@ namespace BLL
 
                         if (TaskJoints_Field.Count > 0)
                         {
-                            ActDateStart_FIELD = TaskJoints_Field.OrderBy(x => x.TaskDate).First().TaskDate.Value;
+                            model_pipeline.ActStartDate = TaskJoints_Field.OrderBy(x => x.TaskDate).First().TaskDate;
                         }
                         if (joint_Field_count == TaskJoints_Field.Count && joint_Field_count > 0)
                         {
                             model_pipeline.IsFinished = true;
-                            ActDateEnd_FIELD = TaskJoints_Field.OrderByDescending(x => x.TaskDate).First().TaskDate.Value;
+                            model_pipeline.ActEndDate = TaskJoints_Field.OrderByDescending(x => x.TaskDate).First().TaskDate;
                         }
-                        model_pipeline.ActStartDate = ActDateStart_FIELD;
-                        model_pipeline.ActEndDate = ActDateEnd_FIELD;
+                        //model_pipeline.ActStartDate = ActDateStart_FIELD;
+                        //model_pipeline.ActEndDate = ActDateEnd_FIELD;
                         UpdatePipeline(model_pipeline);
 
                         break;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index e83401be..77e15f0d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
                     this.BindGrid(GetWeldingDailyItem);  // 初始化页面
-               }
+                }
                 else
                 {
                     this.BindGrid(null);
@@ -220,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     task = task.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();
                 }
-               // dt = this.LINQToDataTable(task);
+                // dt = this.LINQToDataTable(task);
             }
             else
             {