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

2023-03-24

Browse Source
This commit is contained in:
李鹏飞
2023-03-24 15:57:37 +08:00
parent b1bdd30665
commit 06afe1aca0
22 changed files with 1373 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+3 -3
View File
@@ -112,13 +112,13 @@
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode"
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode" Hidden="true"
DataField="CanWelderCode" SortField="CanWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="300px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
<%--<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
DataField="CanWelderId" FieldType="String" Hidden="true">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+14 -9
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);
@@ -196,17 +196,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
private void BindGrid(List<Model.SpWeldingDailyItem> weldingDailyItem)
{
var aw = this.Grid1.SelectedRowIDArray;
DataTable dt = null;
var task = new List<Model.View_HJGL_WeldingTask>();
var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x;
if (weldingDailyItem != null)
{
var weldJointIds = (from x in list
where ( x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
where (x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId
select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
select x).ToList();
weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
task = weldJointIds;
//foreach (var weldJointId in weldJointIds)
//{
@@ -224,10 +224,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
else
{
var weldJointIds = (from x in list
var weldJointIds = (from x in list
where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date <= Convert.ToDateTime(txtWeldingDate.Text)
&& x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/
select x).GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
select x).ToList();
weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.First()).ToList();
task = weldJointIds;
//foreach (var weldJointId in weldJointIds)
//{
@@ -269,8 +270,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (weldingDailyItem != null)
{
var Dailytask = (from x in Funs.DB.View_HJGL_WeldingTask
where x.WeldingDailyId == this.WeldingDailyId
select x).ToList();
where x.WeldingDailyId == this.WeldingDailyId
select new
{
x.PipelineCode,
x.WeldTaskId
}).Distinct().ToList();
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{
Dailytask = Dailytask.Where(x => x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())).ToList();