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

This commit is contained in:
高飞 2022-12-22 09:31:15 +08:00
parent 8e2bf9ecdf 9ecee60d03
commit d4b99c2f75
24 changed files with 301 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
View File

File diff suppressed because one or more lines are too long

4
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
View File

@ -19,8 +19,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线"
EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线" OnTextChanged="Tree_TextChanged"
EmptyText="输入查询条件" AutoPostBack="true"
Width="280px" LabelWidth="60px">
</f:TextBox>
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>

1
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
View File

@ -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

16
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
View File

@ -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);
}
}

1
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
View File

@ -46,6 +46,7 @@
EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:CheckBox ID="ckIsAudit" runat ="server" Label="未审核" AutoPostBack="true" OnCheckedChanged="ckIsAudit_CheckedChanged"></f:CheckBox>
<f:DropDownList runat="server" ID="DropTwoJointType" Label="二次新增类型" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="新增口" Value="新增口" />
<f:ListItem Text="修改口" Value="修改口" />

8
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
View File

@ -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();
}
}
}

9
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs generated
View File

@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// ckIsAudit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsAudit;
/// <summary>
/// DropTwoJointType 控件。
/// </summary>

8
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListIn.aspx.cs
View File

@ -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);
}
}

16
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
View File

@ -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)

16
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
View File

@ -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 导入

7
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
View File

@ -51,6 +51,13 @@
runat="server" ShowRedStar="true" Required="true" LabelWidth="100px" OnSelectedIndexChanged="drpJointAttribute_SelectedIndexChanged"
Width="180px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpWeldTypeCode" Label="焊缝类型" AutoPostBack="true"
runat="server" ShowRedStar="true" Required="true" LabelWidth="100px" OnSelectedIndexChanged="drpJointAttribute_SelectedIndexChanged"
Width="180px" LabelAlign="Right">
<f:ListItem Text="全部" Value="" Selected="true"/>
<f:ListItem Text="SW" Value="SW" />
<f:ListItem Text="BW" Value="BW" />
</f:DropDownList>
</Items>
</f:Toolbar>
</Toolbars>

1
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
View File

@ -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();
//去除任务表已存在的焊口

9
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs generated
View File

@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// drpWeldTypeCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldTypeCode;
/// <summary>
/// Grid1 控件。
/// </summary>

14
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx
View File

@ -90,14 +90,26 @@
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="200" LabelAlign="Right"
LabelWidth="100px">
</f:TextBox>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" ShowRedStar="true" Required="true" LabelWidth="100px"
Width="180px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList runat="server" ID="DropTwoJointType" Label="二次新增类型" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="新增口" Value="新增口" />
<f:ListItem Text="修改口" Value="修改口" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDNDia" Label="公称直径" runat="server" LabelWidth="100px" LabelAlign="Right">
</f:TextBox>
<f:Label runat="server"></f:Label>
<f:Label runat="server"></f:Label>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</Items>

22
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
View File

@ -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()))
{

18
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs generated
View File

@ -221,6 +221,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// DropTwoJointType 控件。
/// </summary>
@ -230,6 +239,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.DropDownList DropTwoJointType;
/// <summary>
/// txtDNDia 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDNDia;
/// <summary>
/// GroupPanel2 控件。
/// </summary>

8
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
View File

@ -76,9 +76,13 @@
<f:Label ID="txtWeldingDate" Label="焊接日期" runat="server"
LabelWidth="90px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtSumSize" Label="总达因" runat="server"
LabelWidth="90px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtRemark" Label="备注" runat="server"
LabelWidth="90px" LabelAlign="Right">
</f:Label>
</Items>
</f:Toolbar>
</Toolbars>
@ -116,6 +120,10 @@
DataField="Dia" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="Thickness"
DataField="Thickness" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="80px">

5
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
View File

@ -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<SqlParameter> listStr = new List<SqlParameter>();
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<decimal>("Size"));
txtSumSize.Text= SumDia.ToString();
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count;

9
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.designer.cs generated
View File

@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Label txtWeldingDate;
/// <summary>
/// txtSumSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtSumSize;
/// <summary>
/// txtRemark 控件。
/// </summary>

87
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
View File

@ -85,7 +85,7 @@
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true" KeepCurrentSelection="true"
SortField="PipelineCode,WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"
AllowPaging="false" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True">
@ -105,19 +105,40 @@
</f:TemplateField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
TextAlign="Left" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode"
DataField="CanWelderCode" SortField="CanWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="300px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
DataField="CanWelderId" FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
<Editor>
<f:DropDownList ID="drpCoverWelderId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
<Editor>
<f:DropDownList ID="drpBackingWelderId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<%-- <f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
</f:RenderField>
<%--<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
</f:RenderField>--%>
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
@ -161,6 +182,11 @@
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="beforeedit" Handler="onGridBeforeEdit" />
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
@ -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);
}
}
</script>
</body>
</html>

43
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -195,29 +195,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
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);
//}
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<Model.View_HJGL_WeldingTask>();
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<Model.View_HJGL_WeldingTask>();
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 == 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<JObject>("values");
int i = mergedRow.Value<int>("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<string>("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<string>("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<string>("JointAttribute").ToString()))
//{
// newWeldJoint.JointAttribute = values.Value<string>("JointAttribute").ToString();

18
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs generated
View File

@ -202,5 +202,23 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbPipeArea;
/// <summary>
/// drpCoverWelderId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCoverWelderId;
/// <summary>
/// drpBackingWelderId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBackingWelderId;
}
}

4
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx
View File

@ -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" >
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />

17
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx.cs
View File

@ -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);
}
}