From 24ad6364163e4995b607c39ca988789d8e4a1692 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 12 Sep 2023 16:54:08 +0800 Subject: [PATCH 1/2] 2023-09-12 --- SGGL/BLL/DropListService.cs | 4 +++- SGGL/BLL/HJGL/WeldingManage/PipelineService.cs | 12 ++++++------ .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs index dd8cf87a..38724822 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" + }; } } 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 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 { From c5986c938bcf53786570f1a955f9a0269d35b80a Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 12 Sep 2023 17:01:42 +0800 Subject: [PATCH 2/2] 2303-09-12 --- SGGL/BLL/DropListService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs index 38724822..dfd1a25d 100644 --- a/SGGL/BLL/DropListService.cs +++ b/SGGL/BLL/DropListService.cs @@ -461,7 +461,7 @@ namespace BLL ".mp3", ".wav", ".wma", ".ogg", ".ape", ".flac", // 音频文件类型 ".mp4", ".avi", ".flv", ".wmv", ".mov", ".rmvb", // 视频文件类型 ".zip", ".rar", ".7z" // 压缩包文件类型, - ,".RVM" + ,".RVM",".rvm" }; }