diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 67687d2..bc38370 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
index e20fad9..4f38110 100644
--- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
+++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx
@@ -21,47 +21,56 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
index 7d8e772..d4ead77 100644
--- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs
@@ -1,9 +1,11 @@
-using System;
+using BLL;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header;
namespace FineUIPro.Web.WelderManage
{
@@ -24,21 +26,6 @@ namespace FineUIPro.Web.WelderManage
ViewState["WelderQualifiedProjectId"] = value;
}
}
-
- ///
- /// 焊工id
- ///
- public string WED_ID
- {
- get
- {
- return (string)ViewState["WED_ID"];
- }
- set
- {
- ViewState["WED_ID"] = value;
- }
- }
#endregion
protected void Page_Load(object sender, EventArgs e)
{
@@ -46,32 +33,103 @@ namespace FineUIPro.Web.WelderManage
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
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))
{
var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId);
if (welderQualifiedProject != null)
{
- this.WED_ID = welderQualifiedProject.WelderId;
+ string wlederId = welderQualifiedProject.WelderId;
this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode;
-
- this.txtExamProject.Text = welderQualifiedProject.ExamProject;
- txtRemark.Text = welderQualifiedProject.Remark;
- drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否";
+
+ if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingMethodId))
+ {
+ drpWeldingMethod.SelectedValueArray = welderQualifiedProject.WeldingMethodId.Split(',');
+ }
+ if (!string.IsNullOrEmpty(welderQualifiedProject.MaterialType))
+ {
+ drpMaterialType.SelectedValueArray = welderQualifiedProject.MaterialType.Split(',');
+ }
+ 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)
+ {
+ this.lbWedlerName.Text = welder.WelderName;
+ this.lbWedlerCode.Text = welder.WelderCode;
+ }
}
}
- Model.Welder_Welder welder = BLL.WelderService.GetWelderById(this.WED_ID);
- if (welder != null)
- {
- this.lbWedlerName.Text = welder.WelderName;
- this.lbWedlerCode.Text = welder.WelderCode;
- }
}
}
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());
}
}
}
\ No newline at end of file
diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs
index 1915e90..ed0ccfc 100644
--- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs
@@ -96,31 +96,31 @@ namespace FineUIPro.Web.WelderManage
protected global::FineUIPro.DropDownList drpWeldingLocation;
///
- /// txtExamProject 控件。
+ /// numThicknessMax 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextBox txtExamProject;
+ protected global::FineUIPro.NumberBox numThicknessMax;
///
- /// drpIsPass 控件。
+ /// numSizesMin 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.DropDownList drpIsPass;
+ protected global::FineUIPro.NumberBox numSizesMin;
///
- /// txtRemark 控件。
+ /// drpWeldType 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextBox txtRemark;
+ protected global::FineUIPro.DropDownList drpWeldType;
///
/// Toolbar1 控件。
diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx
index 1c8d899..1c8c820 100644
--- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx
+++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx
@@ -144,7 +144,7 @@
+ Width="600px" Height="480px">