diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index caaef8e7..f62a5cc5 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -170,7 +170,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index 0762f3e5..9e893901 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -19,8 +19,8 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 3aaea41a..af3431ea 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -477,6 +477,7 @@ namespace FineUIPro.Web.HJGL.PreDesign protected void Tree_TextChanged(object sender, EventArgs e) { this.InitTreeMenu(); + tvControlItem.CollapseAllNodes(tvControlItem.Nodes[1].Nodes); this.BindGrid(); } #endregion diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs index 2335491b..fae9458a 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs @@ -112,7 +112,13 @@ namespace FineUIPro.Web.HJGL.PreDesign } catch (Exception ex) { - ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + Alert alert = new Alert + { + Message = "'" + ex.Message + "'", + Target = Target.Self + }; + alert.Show(); + //ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); } } @@ -133,7 +139,13 @@ namespace FineUIPro.Web.HJGL.PreDesign } else { - ShowNotify(responeData.message, MessageBoxIcon.Success); + Alert alert = new Alert + { + Message = responeData.message, + Target = Target.Self + }; + alert.Show(); + //ShowNotify(responeData.message, MessageBoxIcon.Success); } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx index 42827d42..292d9b50 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx @@ -46,6 +46,7 @@ EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="240px" LabelWidth="80px" LabelAlign="Right"> + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index fa9f7b87..1f405b6c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -271,6 +271,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage strSql += " AND TwoJointType = @TwoJointType"; listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue)); } + if (ckIsAudit.Checked==true) + { + strSql += " and AuditDate is null"; + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); @@ -880,5 +884,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage } #endregion + protected void ckIsAudit_CheckedChanged(object sender, CheckedEventArgs e) + { + BindGrid(); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs index 500f8f00..84d7c54d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs @@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.TextBox txtWeldJointCode; + /// + /// ckIsAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckIsAudit; + /// /// DropTwoJointType 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListIn.aspx.cs index dc1629e3..15b1713b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListIn.aspx.cs @@ -97,7 +97,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } catch (Exception ex) { - ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + Alert alert = new Alert + { + Message = "'" + ex.Message + "'", + Target = Target.Self + }; + alert.Show(); + //ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 45a55fad..ba9af812 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -146,7 +146,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } catch (Exception ex) { - ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + Alert alert = new Alert + { + Message = "'" + ex.Message + "'", + Target = Target.Self + }; + alert.Show(); + //ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); } } #region 读Excel提取数据 @@ -195,7 +201,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - ShowNotify(reposedata.message); + Alert alert = new Alert + { + Message = reposedata.message, + Target = Target.Self + }; + alert.Show(); + //ShowNotify(reposedata.message); } } catch (Exception exc) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index da78c97d..9c26b075 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -370,7 +370,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage //验证Excel读取是否有误 if (!string.IsNullOrEmpty(errorInfos)) { - ShowNotify(errorInfos, MessageBoxIcon.Warning); + Alert alert = new Alert + { + Message = errorInfos, + Target = Target.Self + }; + alert.Show(); + //ShowNotify(errorInfos, MessageBoxIcon.Warning); return; } var reposedata= AddDatasetToSQL(ds.Tables[0], 4); @@ -382,7 +388,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - ShowNotify(reposedata.message); + Alert alert = new Alert + { + Message = reposedata.message, + Target = Target.Self + }; + alert.Show(); + //ShowNotify(reposedata.message); } } #region 导入 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index d4c2b6e8..af1bc7ae 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -47,10 +47,17 @@ - - + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index cad78702..c6423aee 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -297,6 +297,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage var toDoMatterList = (from x in Funs.DB.View_HJGL_NoWeldJointFind where x.PipelineId == pipelineId && x.WeldingDailyId == null &&x.JointAttribute==drpJointAttribute.SelectedValue + && (string.IsNullOrEmpty(drpWeldTypeCode.SelectedValue) || x.WeldTypeCode.Contains(drpWeldTypeCode.SelectedValue)) select x).ToList(); //去除任务表已存在的焊口 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs index 4c925058..5a7f2809 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs @@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.DropDownList drpJointAttribute; + /// + /// drpWeldTypeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWeldTypeCode; + /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx index 9e922446..ff527bb8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx @@ -90,14 +90,26 @@ + + + + + + + + + + + - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index 972c65c8..8aececd9 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -40,11 +40,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage BLL.Base_ConsumablesService.InitConsumablesDropDownList(this.drpWeldingWire, true, "1", "请选择");//焊条类型 Funs.FineUIPleaseSelect(DropTwoJointType, "请选择"); - // 焊口属性 - //this.drpJointAttribute.DataTextField = "Text"; - //this.drpJointAttribute.DataValueField = "Value"; - //this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); - //this.drpJointAttribute.DataBind(); + //焊口属性 + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); //BLL.Base_ComponentsService.InitComponentsDropDownList(this.drpComponent1, this.CurrUser.LoginProjectId, true, "请选择");//组件1 //BLL.Base_ComponentsService.InitComponentsDropDownList(this.drpComponent2, this.CurrUser.LoginProjectId, true, "请选择");//组件2 @@ -99,6 +99,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } this.txtSize.Text = Convert.ToString(joint.Size); this.txtDia.Text = Convert.ToString(joint.Dia); + this.txtDNDia.Text = joint.DNDia; this.txtThickness.Text = Convert.ToString(joint.Thickness); if (!string.IsNullOrEmpty(joint.WeldingMethodId)) { @@ -148,10 +149,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.drpDetectionTypeId.SelectedValue = joint.DetectionTypeId; } - //if (!string.IsNullOrEmpty(joint.JointAttribute)) - //{ - // drpJointAttribute.SelectedValue = joint.JointAttribute; - //} + if (!string.IsNullOrEmpty(joint.JointAttribute)) + { + drpJointAttribute.SelectedValue = joint.JointAttribute; + } //if (!string.IsNullOrEmpty(joint.Components1Id)) //{ @@ -353,6 +354,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } joint.Size = Funs.GetNewDecimal(this.txtSize.Text.Trim()); joint.Dia = Funs.GetNewDecimal(this.txtDia.Text.Trim()); + joint.DNDia=txtDNDia.Text.Trim(); joint.Thickness = Funs.GetNewDecimal(this.txtThickness.Text.Trim()); //if (this.drpComponent1.SelectedValue != BLL.Const._Null) //{ @@ -362,7 +364,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage //{ // joint.Components2Id = this.drpComponent2.SelectedValue; //} - //joint.JointAttribute = drpJointAttribute.SelectedValue; + joint.JointAttribute = drpJointAttribute.SelectedValue; if (!string.IsNullOrEmpty(this.hdWeldingMethodId.Text.Trim())) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs index 9c043ff1..6814317a 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs @@ -221,6 +221,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.TextBox txtRemark; + /// + /// drpJointAttribute 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpJointAttribute; + /// /// DropTwoJointType 控件。 /// @@ -230,6 +239,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.DropDownList DropTwoJointType; + /// + /// txtDNDia 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDNDia; + /// /// GroupPanel2 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx index fb1ae192..e14ef9a0 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx @@ -76,9 +76,13 @@ + + + @@ -116,6 +120,10 @@ DataField="Dia" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="80px"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs index bcf35fff..0bbfe7bb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs @@ -187,14 +187,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode, BackingWelderCode,CoverWelderCode,Material1Code,Material2Code, Dia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode, - WeldingRodCode + WeldingRodCode,Size FROM dbo.View_HJGL_WeldJoint WHERE WeldingDailyId=@WeldingDailyId"; List listStr = new List(); listStr.Add(new SqlParameter("@WeldingDailyId", tvControlItem.SelectedNodeID)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - + var SumDia = tb.AsEnumerable().Sum(x => x.Field("Size")); + txtSumSize.Text= SumDia.ToString(); // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); Grid1.RecordCount = tb.Rows.Count; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs index d621d3da..28cb6108 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs @@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Label txtWeldingDate; + /// + /// txtSumSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtSumSize; + /// /// txtRemark 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx index 4cefd040..2a45ce2e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx @@ -85,7 +85,7 @@ @@ -105,20 +105,41 @@ + TextAlign="Left" Width="180px"> - + + + + + + + + + + + + + + + <%-- - - <%-- - --%> + --%> @@ -161,6 +182,11 @@ FieldType="String" Hidden="true"> + + + + + @@ -187,6 +213,55 @@ function reloadGrid() { __doPostBack(null, 'reloadGrid'); } + var gridClientID = '<%= Grid1.ClientID %>'; + var drpCoverWelderIdClientID = '<%= drpCoverWelderId.ClientID %>'; + var drpBackingWelderIdClientID = '<%= drpBackingWelderId.ClientID %>'; + + + function onGridBeforeEdit(event, value, params) { + var grid = F(gridClientID); + var canWelder = grid.getCellValue(params.rowId, 'CanWelderCode'); + var coverWelderCode = grid.getCellValue(params.rowId, 'CoverWelderCode'); + var backingWelderCode = grid.getCellValue(params.rowId, 'BackingWelderCode'); + var canWelderList = canWelder.split(','); + + + + + if (params.columnId === 'CoverWelderCode') { + var drpCoverWelderId = F(drpCoverWelderIdClientID); + if (canWelder != '') { + drpCoverWelderId.enable(); + drpCoverWelderId.setEmptyText(''); + drpCoverWelderId.loadData(canWelderList); + } else { + drpCoverWelderId.setEmptyText('请先生成可焊焊工！'); + drpCoverWelderId.disable(); + } + drpCoverWelderId.value = coverWelderCode; + } + + if (params.columnId === 'BackingWelderCode') { + var drpBackingWelderId = F(drpBackingWelderIdClientID); + if (canWelder != '') { + drpBackingWelderId.enable(); + drpBackingWelderId.setEmptyText(''); + drpBackingWelderId.loadData(canWelderList); + } else { + drpBackingWelderId.setEmptyText('请先生成可焊焊工！'); + drpBackingWelderId.disable(); + } + drpBackingWelderId.value = backingWelderCode; + } + } + + function onGridAfterEdit(event, value, params) { + var me = this, columnId = params.columnId, rowId = params.rowId; + if (columnId === 'BackingWelderCode') { + var backingWelderCode = me.getCellValue(rowId, 'BackingWelderCode'); + me.updateCellValue(rowId, 'CoverWelderCode', backingWelderCode); + } + } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index ca3631b0..9ae50477 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -194,30 +194,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage private void BindGrid(List weldingDailyItem) { - DataTable dt = null; - //if (weldingDailyItem != null) - //{ - // var task = from x in Funs.DB.View_HJGL_WeldingTask - // where (x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date == Convert.ToDateTime(txtWeldingDate.Text) - // && x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null) || x.WeldingDailyId == this.WeldingDailyId - // select x; - // dt = this.LINQToDataTable(task); - //} - //else - //{ - // var task = from x in Funs.DB.View_HJGL_WeldingTask - // where x.UnitWorkId == this.UnitWorkId && x.TaskDate.Value.Date == Convert.ToDateTime(txtWeldingDate.Text) - // && x.WeldingDailyId == null && x.CoverWelderId != null && x.BackingWelderId != null - // select x; - // dt = this.LINQToDataTable(task); - //} + DataTable dt = null; var list = from x in Funs.DB.View_HJGL_WeldingTask where x.ProjectId == this.CurrUser.LoginProjectId select x; if (weldingDailyItem != null) { var task = new 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) || x.WeldingDailyId == this.WeldingDailyId + && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/) || x.WeldingDailyId == this.WeldingDailyId select x.WeldJointId).Distinct().ToList(); foreach (var weldJointId in weldJointIds) @@ -235,11 +219,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage var task = new 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.WeldJointId).Distinct().ToList(); + && x.WeldingDailyId == null /*&& x.CoverWelderId != null && x.BackingWelderId != null*/ + select x.WeldJointId).Distinct().ToList(); foreach (var weldJointId in weldJointIds) { - task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId && x.CoverWelderId != null)); + task.Add(list.FirstOrDefault(x => x.WeldJointId == weldJointId /*&& x.CoverWelderId != null*/)); } if (drpJointAttribute.SelectedValue != Const._Null) { @@ -585,13 +569,34 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage { JObject values = mergedRow.Value("values"); int i = mergedRow.Value("index"); + string rowId = Grid1.Rows[i].RowID; if (this.Grid1.SelectedRowIDArray.Contains(rowId)) { var t = BLL.WeldTaskService.GetWeldTaskById(rowId); var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId); + + if (newWeldJoint != null) { + var coverWelderCode = (from x in Funs.DB.SitePerson_Person + where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value("CoverWelderCode") + select x).FirstOrDefault(); + if (coverWelderCode != null) + { + t.CoverWelderId = coverWelderCode.PersonId; + newWeldJoint.CoverWelderId = coverWelderCode.PersonId; + } + var backingWelderCode = (from x in Funs.DB.SitePerson_Person + where x.ProjectId == CurrUser.LoginProjectId && x.WelderCode == values.Value("BackingWelderCode") + select x).FirstOrDefault(); + if (backingWelderCode != null) + { + t.BackingWelderId = backingWelderCode.PersonId; + newWeldJoint.BackingWelderId = backingWelderCode.PersonId; + } + WeldTaskService.UpdateWeldTask(t); + WeldJointService.UpdateWeldJoint(newWeldJoint); //if (!string.IsNullOrEmpty(values.Value("JointAttribute").ToString())) //{ // newWeldJoint.JointAttribute = values.Value("JointAttribute").ToString(); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs index 0ec925be..1a5f6679 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs @@ -202,5 +202,23 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lbPipeArea; + + /// + /// drpCoverWelderId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCoverWelderId; + + /// + /// drpBackingWelderId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpBackingWelderId; } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx index 75bb1f2e..da58d7b9 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx @@ -48,8 +48,8 @@ EnableCollapse="true" runat="server" BoxFlex="1" AllowCellEditing="true" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" - AllowPaging="true" IsDatabasePaging="true" PageSize="15" - EnableTextSelection="True"> + AllowPaging="true" IsDatabasePaging="false" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" + EnableTextSelection="True" > diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs index ed1379fd..b46bfc13 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs @@ -6,6 +6,7 @@ using System.Data; using System.Data.OleDb; using System.IO; using System.Linq; +using System.Net.Mail; namespace FineUIPro.Web.HJGL.WeldingManage { @@ -125,7 +126,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } catch (Exception ex) { - ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + Alert alert = new Alert + { + Message = "'" + ex.Message + "'", + Target = Target.Self + }; + alert.Show(); + //ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); } } @@ -154,7 +161,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - ShowNotify(responeData.message, MessageBoxIcon.Success); + Alert alert = new Alert + { + Message = responeData.message, + Target = Target.Self + }; + alert.Show(); + // ShowNotify(responeData.message, MessageBoxIcon.Success); } }