shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-05-12 15:56:56 +08:00
parent 190a7a4374
commit 0b31bc3d75
7 changed files with 142 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

51
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
View File

@ -21,47 +21,56 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Label ID="txtQualifiedProjectCode" runat="server" Label="合格项目代号" MaxLength="100" ShowRedStar="true" Required="true" LabelWidth="120px"> <f:Label ID="txtQualifiedProjectCode" runat="server" Label="合格项目代号" LabelWidth="120px">
</f:Label> </f:Label>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList runat="server" Label="可焊焊接方法" ID="drpWeldingMethod" EnableMultiSelect="true" ShowRedStar="true" Required="true" LabelWidth="120px" EnableEdit="false"> <f:DropDownList runat="server" Label="可焊焊接方法" ID="drpWeldingMethod" EnableMultiSelect="true" ShowRedStar="true" Required="true" LabelWidth="120px" EnableCheckBoxSelect="true">
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpMaterialType" runat="server" EnableMultiSelect="true" Label="焊接材质类型范围" MaxLength="50" LabelWidth="120px"> <f:DropDownList ID="drpMaterialType" runat="server" EnableMultiSelect="true" Label="焊接材质类型范围" MaxLength="50" LabelWidth="120px" EnableCheckBoxSelect="true">
</f:DropDownList> <f:ListItem Value="" Text=""/>
<f:ListItem Value="FeⅠ" Text="FeⅠ"/>
</Items> <f:ListItem Value="FeⅡ" Text="FeⅡ"/>
</f:FormRow> <f:ListItem Value="FeⅢ" Text="FeⅢ"/>
<f:FormRow> <f:ListItem Value="FeIV" Text="FeIV"/>
<Items> <f:ListItem Value="其它" Text="其它"/>
<f:DropDownList runat="server" Label="焊接位置范围" ID="drpWeldingLocation" LabelWidth="120px" EnableMultiSelect="true" EnableEdit="false">
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtExamProject" runat="server" Label="考试项目" MaxLength="50" LabelWidth="120px"> <f:DropDownList runat="server" Label="焊接位置范围" ID="drpWeldingLocation" LabelWidth="120px" EnableMultiSelect="true" EnableEdit="false" EnableCheckBoxSelect="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpIsPass" runat="server" Label="是否合格" LabelWidth="120px">
<f:ListItem Value="是" Text="是" Selected="true" />
<f:ListItem Value="否" Text="否" />
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="50" LabelWidth="120px"> <f:NumberBox ID="numThicknessMax" runat="server" Label="壁厚范围(<=)" MaxLength="50" LabelWidth="120px" DecimalPrecision="2">
</f:TextBox> </f:NumberBox>
<f:Label runat="server" Text="0表示不限"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="numSizesMin" runat="server" Label="外径范围(>=)" MaxLength="50" LabelWidth="120px" DecimalPrecision="2">
</f:NumberBox>
<f:Label runat="server" Text="0表示不限"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="可焊焊缝类型" ID="drpWeldType" LabelWidth="120px" EnableMultiSelect="true" EnableEdit="false" EnableCheckBoxSelect="true">
<f:ListItem Value="" Text=""/>
<f:ListItem Value="1" Text="对接"/>
<f:ListItem Value="2" Text="角焊缝"/>
<f:ListItem Value="3" Text="支管连接焊缝"/>
</f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>

102
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
View File

@ -1,9 +1,11 @@
using System; using BLL;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
using System.Web.UI; using System.Web.UI;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header;
namespace FineUIPro.Web.WelderManage namespace FineUIPro.Web.WelderManage
{ {
@ -24,21 +26,6 @@ namespace FineUIPro.Web.WelderManage
ViewState["WelderQualifiedProjectId"] = value; ViewState["WelderQualifiedProjectId"] = value;
} }
} }
/// <summary>
/// 焊工id
/// </summary>
public string WED_ID
{
get
{
return (string)ViewState["WED_ID"];
}
set
{
ViewState["WED_ID"] = value;
}
}
#endregion #endregion
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
@ -46,21 +33,54 @@ namespace FineUIPro.Web.WelderManage
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"]; this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"];
this.WED_ID = Request.Params["WED_ID"];
drpWeldingLocation.DataValueField = "WeldingLocationCode";
drpWeldingLocation.DataTextField = "WeldingLocationCode";
drpWeldingLocation.DataSource = (from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x).ToList();
drpWeldingLocation.DataBind();
Funs.FineUIPleaseSelect(drpWeldingLocation, "");
drpWeldingMethod.DataValueField = "WeldingMethodCode";
drpWeldingMethod.DataTextField = "WeldingMethodCode";
drpWeldingMethod.DataSource = (from x in Funs.DB.Base_WeldingMethod orderby x.WeldingMethodCode select x).ToList();
drpWeldingMethod.DataBind();
Funs.FineUIPleaseSelect(drpWeldingMethod, "");
if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId)) if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId))
{ {
var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId); var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId);
if (welderQualifiedProject != null) if (welderQualifiedProject != null)
{ {
this.WED_ID = welderQualifiedProject.WelderId; string wlederId = welderQualifiedProject.WelderId;
this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode; this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode;
this.txtExamProject.Text = welderQualifiedProject.ExamProject; if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingMethodId))
txtRemark.Text = welderQualifiedProject.Remark; {
drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否"; drpWeldingMethod.SelectedValueArray = welderQualifiedProject.WeldingMethodId.Split(',');
} }
if (!string.IsNullOrEmpty(welderQualifiedProject.MaterialType))
{
drpMaterialType.SelectedValueArray = welderQualifiedProject.MaterialType.Split(',');
} }
Model.Welder_Welder welder = BLL.WelderService.GetWelderById(this.WED_ID); if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingLocationId))
{
drpWeldingLocation.SelectedValueArray = welderQualifiedProject.WeldingLocationId.Split(',');
}
if (!string.IsNullOrEmpty(welderQualifiedProject.WeldType))
{
drpWeldType.SelectedValueArray = welderQualifiedProject.WeldType.Split(',');
}
if (welderQualifiedProject.ThicknessMax != null)
{
numThicknessMax.Text = welderQualifiedProject.ThicknessMax.Value.ToString();
}
if (welderQualifiedProject.SizesMin != null)
{
numSizesMin.Text = welderQualifiedProject.SizesMin.Value.ToString();
}
Model.Welder_Welder welder = BLL.WelderService.GetWelderById(wlederId);
if (welder != null) if (welder != null)
{ {
this.lbWedlerName.Text = welder.WelderName; this.lbWedlerName.Text = welder.WelderName;
@ -68,10 +88,48 @@ namespace FineUIPro.Web.WelderManage
} }
} }
} }
}
}
protected void btnSave_Click(object sender, EventArgs e) protected void btnSave_Click(object sender, EventArgs e)
{ {
Model.Welder_WelderQualify updateQue = Funs.DB.Welder_WelderQualify.FirstOrDefault(x => x.WelderQualifiedProjectId == this.WelderQualifiedProjectId);
if (!string.IsNullOrEmpty(drpWeldingMethod.SelectedValue))
{
updateQue.WeldingMethodId = String.Join(",", drpWeldingMethod.SelectedValueArray);
}
if (!string.IsNullOrEmpty(drpMaterialType.SelectedValue))
{
updateQue.MaterialType = String.Join(",", drpMaterialType.SelectedValueArray);
}
if (!string.IsNullOrEmpty(drpWeldingLocation.SelectedValue))
{
updateQue.WeldingLocationId = String.Join(",", drpWeldingLocation.SelectedValueArray);
}
if (!string.IsNullOrEmpty(drpWeldType.SelectedValue))
{
updateQue.WeldType = String.Join(",", drpWeldType.SelectedValueArray);
}
if (!string.IsNullOrEmpty(numSizesMin.Text))
{
updateQue.SizesMin = Convert.ToInt32(numSizesMin.Text);
}
else
{
updateQue.SizesMin = 0;
}
if (!string.IsNullOrEmpty(numThicknessMax.Text))
{
updateQue.ThicknessMax = Convert.ToInt32(numThicknessMax.Text);
}
else
{
updateQue.ThicknessMax = 0;
}
Funs.DB.SubmitChanges();
BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
} }
} }
} }

12
HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs generated
View File

@ -96,31 +96,31 @@ namespace FineUIPro.Web.WelderManage
protected global::FineUIPro.DropDownList drpWeldingLocation; protected global::FineUIPro.DropDownList drpWeldingLocation;
/// <summary> /// <summary>
/// txtExamProject 控件。 /// numThicknessMax 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtExamProject; protected global::FineUIPro.NumberBox numThicknessMax;
/// <summary> /// <summary>
/// drpIsPass 控件。 /// numSizesMin 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpIsPass; protected global::FineUIPro.NumberBox numSizesMin;
/// <summary> /// <summary>
/// txtRemark 控件。 /// drpWeldType 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtRemark; protected global::FineUIPro.DropDownList drpWeldType;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。

2
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx
View File

@ -144,7 +144,7 @@
</f:Window> </f:Window>
<f:Window ID="Window2" Title="手动资质分析" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="手动资质分析" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="600px" Height="420px"> Width="600px" Height="480px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"

24
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs
View File

@ -407,24 +407,24 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
reportModel.GetRow(rowIndex).GetCell(5).CellStyle.SetFont(cs_content_Font); reportModel.GetRow(rowIndex).GetCell(5).CellStyle.SetFont(cs_content_Font);
//焊口号 //焊口号
if (reportModel.GetRow(rowIndex).GetCell(9) == null) reportModel.GetRow(rowIndex).CreateCell(9); if (reportModel.GetRow(rowIndex).GetCell(11) == null) reportModel.GetRow(rowIndex).CreateCell(11);
reportModel.GetRow(rowIndex).GetCell(9).SetCellValue(jotNum.Count()); reportModel.GetRow(rowIndex).GetCell(11).SetCellValue(jotNum.Count());
reportModel.GetRow(rowIndex).GetCell(9).CellStyle.SetFont(cs_content_Font); reportModel.GetRow(rowIndex).GetCell(11).CellStyle.SetFont(cs_content_Font);
// 寸径 // 寸径
if (reportModel.GetRow(rowIndex).GetCell(12) == null) reportModel.GetRow(rowIndex).CreateCell(12); if (reportModel.GetRow(rowIndex).GetCell(14) == null) reportModel.GetRow(rowIndex).CreateCell(14);
reportModel.GetRow(rowIndex).GetCell(12).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size))); reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size)));
reportModel.GetRow(rowIndex).GetCell(12).CellStyle.SetFont(cs_content_Font); reportModel.GetRow(rowIndex).GetCell(14).CellStyle.SetFont(cs_content_Font);
//打底焊工号 //打底焊工号
if (reportModel.GetRow(rowIndex).GetCell(21) == null) reportModel.GetRow(rowIndex).CreateCell(21); if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23);
reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(backingWelder.Count().ToString()); reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(backingWelder.Count().ToString());
reportModel.GetRow(rowIndex).GetCell(21).CellStyle.SetFont(cs_content_Font); reportModel.GetRow(rowIndex).GetCell(23).CellStyle.SetFont(cs_content_Font);
//盖面焊工号 //盖面焊工号
if (reportModel.GetRow(rowIndex).GetCell(22) == null) reportModel.GetRow(rowIndex).CreateCell(22); if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24);
reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(coverWelder.Count().ToString()); reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(coverWelder.Count().ToString());
reportModel.GetRow(rowIndex).GetCell(22).CellStyle.SetFont(cs_content_Font); reportModel.GetRow(rowIndex).GetCell(24).CellStyle.SetFont(cs_content_Font);
} }
#endregion #endregion
reportModel.ForceFormulaRecalculation = true; reportModel.ForceFormulaRecalculation = true;

12
HJGL/FineUIPro.Web/common/mainFullViews.aspx
View File

@ -66,10 +66,10 @@
<Items> <Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="ContentPanel1" Margin="0 0 0 0"> <f:ContentPanel ShowHeader="false" runat="server" ID="ContentPanel1" Margin="0 0 0 0">
<div id="divArea1"> <div id="divArea1">
<h4>&nbsp Welders Ranking Report gives you the impression of BSF</h4> <h4>&nbsp Welders Ranking Report gives you the impression of BASF</h4>
<h4>&nbsp welders rank list. (The rank is according to the rejected rates.) </h4> <h4>&nbsp welders rank list. (The rank is according to the rejected rates.) </h4>
<h4>&nbsp Each year for the rank can be easily ranked out.</h4> <h4>&nbsp Each year for the rank can be easily ranked out.</h4>
<h4>&nbsp 焊工排名报表是所有在BSF从事焊接工作的焊工年度排名</h4> <h4>&nbsp 焊工排名报表是所有在BASF从事焊接工作的焊工年度排名</h4>
<h4>&nbsp（排名是根据焊工拍片量及拍片合格率确定的）。</h4> <h4>&nbsp（排名是根据焊工拍片量及拍片合格率确定的）。</h4>
<h4>&nbsp 查询时可选择不同年份查询每年的焊工合格率排名情况。</h4> <h4>&nbsp 查询时可选择不同年份查询每年的焊工合格率排名情况。</h4>
</div> </div>
@ -161,12 +161,12 @@
<f:ContentPanel ShowHeader="false" runat="server" ID="ContentPanel2" Margin="0 0 0 0"> <f:ContentPanel ShowHeader="false" runat="server" ID="ContentPanel2" Margin="0 0 0 0">
<div id="divArea4"> <div id="divArea4">
<h4>&nbsp Weld Contractors Report gives the welding quality information</h4> <h4>&nbsp Weld Contractors Report gives the welding quality information</h4>
<h4>&nbsp of all the contractors of BSF according to choice the </h4> <h4>&nbsp of all the contractors of BASF according to choice the </h4>
<h4>&nbsp different period and different contractor.</h4> <h4>&nbsp different period and different contractor.</h4>
<h4>&nbsp Accumulated rejection rate was calculated from Jan 2006.</h4> <h4>&nbsp Accumulated rejection rate was calculated from Jan 2024.</h4>
<h4>&nbsp 该报告提供了所有在BSF从事焊接工作的承包商在不同时期的焊接质量状况。</h4> <h4>&nbsp 该报告提供了所有在BASF从事焊接工作的承包商在不同时期的焊接质量状况。</h4>
<h4>&nbsp 查询时可通过选择不同日期及不同承包商名称查看相关信息。</h4> <h4>&nbsp 查询时可通过选择不同日期及不同承包商名称查看相关信息。</h4>
<h4>&nbsp 其中，累计焊接返修率是从2006年1月起计算的。</h4> <h4>&nbsp 其中，累计焊接返修率是从2024年1月起计算的。</h4>
</div> </div>
</f:ContentPanel> </f:ContentPanel>
</Items> </Items>