lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2023-09-12 17:09:43 +08:00
parent c24c1811e2 c5986c938b
commit 2b6b7c5d5e
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/DropListService.cs
+3 -1
View File
@@ -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"
};
}
}
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+6 -6
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+2 -2
View File
@@ -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
{