diff --git a/CreateModel2017.bat b/CreateModel2017.bat index 6799f93..7afc265 100644 --- a/CreateModel2017.bat +++ b/CreateModel2017.bat @@ -27,7 +27,7 @@ REM -------------- @echo. @call "%VS150%" -SqlMetal /views /server:.\sql2019 /user:sa /password:1111 /database:HJGLDB_DS /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\MSSQLSERVER01 /user:sa /password:1111 /database:HJGLDB_DS /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO pause diff --git a/DataBase/版本日志/HJGLDB_DS_2025-06-12_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-06-12_gf.sql new file mode 100644 index 0000000..4e31367 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-06-12_gf.sql @@ -0,0 +1,2 @@ +alter table OAM_User add IsUsed bit null +GO \ No newline at end of file diff --git a/DataBase/版本日志/HJGLDB_DS_2025-06-13_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-06-13_gf.sql new file mode 100644 index 0000000..44819da --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-06-13_gf.sql @@ -0,0 +1,2 @@ +alter table OAM_UesrQualified add IsDelete bit null +GO \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index 1efbfab..da9ad4f 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -71,7 +71,7 @@ foreach (var q in welders) { - var s = from x in Funs.DB.HJGL_BS_Welder where x.WED_Code == q.MID_Code select x; + var s = from x in Funs.DB.HJGL_BS_Welder where x.IdentityCard == q.MID_IdentityCard select x; var u = BLL.Base_UnitService.GetUnit2(q.MID_Unit); if (u != null) { @@ -103,6 +103,19 @@ BLL.HJGL_WelderQualifiedProjectService.UpdateOAWelder(identityCard, isSync); } } + //更新单位变更情况 + var allWelders = from x in Funs.DB.OAM_User select x; + foreach (var q in allWelders) + { + var u = BLL.Base_UnitService.GetUnit2(q.MID_Unit); + var w = BLL.HJGL_PersonManageService.GetWelderByIdentityCard(q.MID_IdentityCard); + if (u != null && w != null) + { + w.WED_Unit = u.UnitId; + w.WED_IfOnGuard = q.IsUsed; + BLL.HJGL_PersonManageService.UpdateBSWelder(w); + } + } foreach (var q in quas) { @@ -166,6 +179,39 @@ } } } + //更新资质删除情况 + var allDeleteQuas = from x in Funs.DB.OAM_UesrQualified where x.IsDelete == true select x; + var allWelders2 = from x in Funs.DB.HJGL_BS_Welder select x; + foreach (var q in allDeleteQuas) + { + var s = allWelders2.FirstOrDefault(x => x.WED_Code == q.MIDWelder_Code); + if (s != null) + { + if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode)) + { + if (q.MIDWelder_QualifiedProjectCode.Contains("+")) + { + string[] codes = q.MIDWelder_QualifiedProjectCode.Split('+'); + foreach (string c in codes) + { + var oldCode = (from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.WED_ID && x.QualifiedProjectCode == c && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x).FirstOrDefault(); + if (oldCode!=null) + { + BLL.HJGL_WelderQualifiedProjectService.DeleteWelderQualifiedProjectByWelderQualifiedProjectId(oldCode.WelderQualifiedProjectId); + } + } + } + else + { + var oldCode = (from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.WED_ID && x.QualifiedProjectCode == q.MIDWelder_QualifiedProjectCode && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x).FirstOrDefault(); + if (oldCode != null) + { + BLL.HJGL_WelderQualifiedProjectService.DeleteWelderQualifiedProjectByWelderQualifiedProjectId(oldCode.WelderQualifiedProjectId); + } + } + } + } + } var que = from x in Funs.DB.HJGL_BS_WelderQualifiedProject select x; if (que.Count() > 0) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs index 5800e24..ebe161c 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointReportUpdate.aspx.cs @@ -58,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage txtWeldingDate.Text = dayly.JOT_WeldDate.ToString(); } } - + } } @@ -76,7 +76,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage { string jotId = Request.Params["JOT_ID"]; Model.HJGL_PW_JointInfo jot = Funs.DB.HJGL_PW_JointInfo.FirstOrDefault(x => x.JOT_ID == jotId); - if (this.drpFloorWelder.SelectedValue != BLL.Const._Null) { jot.JOT_FloorWelder = drpFloorWelder.SelectedValue; @@ -107,12 +106,324 @@ namespace FineUIPro.Web.HJGL.WeldingManage return; } - jot.Jot_WeldingDate = Convert.ToDateTime(txtWeldingDate.Text.Trim()); - Funs.DB.SubmitChanges(); - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "更新日报信息！"); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - Alert.ShowInTop("日报信息更新成功！", MessageBoxIcon.Success); + #region 验证焊工资质 + bool isAllD = true; //不合格口是否全为D类口（即焊口号包含D的焊口） + bool canSave = false; + var joty = BLL.HJGL_WeldService.GetJointTypeByID(jot.JOTY_ID); + string weldType = joty.JOTY_Group; + string floorWelder = drpFloorWelder.SelectedValue; + string cellWelder = drpCellWelder.SelectedValue; + decimal? dia = jot.JOT_Dia; + decimal? sch = Funs.GetNewDecimal(jot.JOT_Sch); + string wme = jot.WME_ID; + string wmeCode = string.Empty; + var wm = BLL.HJGL_WeldingMethodService.GetWeldMethodByWMEID(jot.WME_ID); + if (wm != null) + { + wmeCode = wm.WME_Code; + } + + string[] wmeCodes = wmeCode.Split('+'); + string location = jot.JOT_Location; + string ste = jot.STE_ID; + + List floorWelderQualifys = (from x in Funs.DB.HJGL_BS_WelderQualifiedProject + where x.WED_ID == floorWelder && (x.IsSteelStru == false || x.IsSteelStru == null) + && x.WeldingMethodId != null && x.LimitDate >= DateTime.Now + && x.WeldingLocationId != null && x.MaterialType != null + && x.WeldType != null && x.ThicknessMax != null && x.SizesMin != null + select x).ToList(); + + List cellWelderQualifys = (from x in Funs.DB.HJGL_BS_WelderQualifiedProject + where x.WED_ID == cellWelder && (x.IsSteelStru == false || x.IsSteelStru == null) + && x.WeldingMethodId != null && x.LimitDate >= DateTime.Now + && x.WeldingLocationId != null && x.MaterialType != null + && x.WeldType != null && x.ThicknessMax != null && x.SizesMin != null + select x).ToList(); + // 打底和盖面同一焊工 + if (floorWelder == cellWelder) + { + if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0) + { + if (wmeCodes.Count() <= 1) // 一种焊接方法 + { + canSave = IsOK(floorWelderQualifys, wmeCode, location, weldType, ste, dia, sch); + } + else // 大于一种焊接方法，如氩电联焊 + { + //bool isok1 = IsOK(floorWelderQualifys, wmeCodes[0], location, ste, dia, sch); + //bool isok2 = IsOK(floorWelderQualifys, wmeCodes[1], location, ste, dia, sch); + //if (isok1 && isok2) + //{ + // canSave = true; + //} + canSave = TwoWmeIsOK(floorWelderQualifys, cellWelderQualifys, wmeCodes[0], wmeCodes[1], location, weldType, ste, dia, sch); + } + } + } + // 打底和盖面焊工不同 + else + { + bool isok1 = false; + bool isok2 = false; + + if (wmeCodes.Count() <= 1) // 一种焊接方法 + { + if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0) + { + isok1 = IsOK(floorWelderQualifys, wmeCode, location, weldType, ste, dia, sch); + } + if (cellWelderQualifys != null && cellWelderQualifys.Count() > 0) + { + isok2 = IsOK(cellWelderQualifys, wmeCode, location, weldType, ste, dia, sch); + } + if (isok1 && isok2) + { + canSave = true; + } + } + else + { + //// wmeCodes[0]对应GTAW 对应打底焊工 + //if (floorWelderQualifys != null && floorWelderQualifys.Count() > 0) + //{ + // isok1 = IsOK(floorWelderQualifys, wmeCodes[0], location, ste, dia, sch); + //} + //// wmeCodes[1]对应SMAW 对应盖面焊工 + //if (cellWelderQualifys != null && cellWelderQualifys.Count() > 0) + //{ + // isok2 = IsOK(cellWelderQualifys, wmeCodes[1], location, ste, dia, sch); + //} + //if (isok1 && isok2) + //{ + // canSave = true; + //} + canSave = TwoWmeIsOK(floorWelderQualifys, cellWelderQualifys, wmeCodes[0], wmeCodes[1], location, weldType, ste, dia, sch); + } + } + + if (canSave == false) + { + if (!jot.JOT_JointNo.Contains("D")) + { + isAllD = false; + } + else + { + canSave = true; + } + } + #endregion + if (canSave) + { + jot.Jot_WeldingDate = Convert.ToDateTime(txtWeldingDate.Text.Trim()); + Funs.DB.SubmitChanges(); + BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "更新日报信息！"); + + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + Alert.ShowInTop("日报信息更新成功！", MessageBoxIcon.Success); + } + else + { + ShowNotify("焊口的焊工资质不符合,无法更新焊工信息！", MessageBoxIcon.Warning); + return; + } } + + private bool IsOK(List welderQualifys, string wmeCode, string location, string weldType, string ste, decimal? dia, decimal? sch) + { + bool isok = false; + foreach (var welderQualify in welderQualifys) + { + int okNum = 0; + + if (!string.IsNullOrEmpty(wmeCode)) //焊接方法 + { + if (wmeCode.Contains(welderQualify.WeldingMethodId)) + { + okNum++; + } + } + else + { + okNum++; + } + + if (welderQualify.WeldingLocationId == "ALL") //焊接位置 + { + okNum++; + } + else + { + if (!string.IsNullOrEmpty(location)) + { + if (welderQualify.WeldingLocationId.Contains(location)) + { + okNum++; + } + } + else + { + okNum++; + } + } + + if (!string.IsNullOrEmpty(weldType)) + { + if (welderQualify.WeldType.Contains(weldType)) + { + okNum++; + } + } + else + { + okNum++; + } + + var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); + if (steel != null) //钢材类型 + { + if (welderQualify.MaterialType.Contains(steel.STE_SteelType ?? "")) + { + okNum++; + } + } + else + { + okNum++; + } + + + if (weldType != "2") + { + if (welderQualify.SizesMin == 0) // 0表示不限 + { + okNum++; + } + else //最小寸径 + { + if (dia != null) + { + if (dia >= welderQualify.SizesMin) + { + okNum++; + } + } + else + { + okNum++; + } + } + + if (welderQualify.ThicknessMax == 0) // 0表示不限 + { + okNum++; + } + else + { + if (sch != null) //最大壁厚 + { + if (sch <= welderQualify.ThicknessMax) + { + okNum++; + } + } + else + { + okNum++; + } + } + } + else // 2表示角焊缝，当为角焊缝时，管径和壁厚不限制 + { + okNum++; + okNum++; + } + + + if (okNum == 6) //全部条件符合 + { + isok = true; + break; + } + } + + return isok; + } + + /// + /// 两种焊接方法的资质判断 + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + private bool TwoWmeIsOK(List floorWelderQualifys, List cellWelderQualifys, string wmeCode1, string wmeCode2, string location, string weldType, string ste, decimal? dia, decimal? sch) + { + bool isok = false; + + decimal? fThicknessMax = 0; + decimal? cThicknessMax = 0; + + var steel = BLL.HJGL_MaterialService.GetSteelBySteID(ste); + var floorQ = from x in floorWelderQualifys + where wmeCode1.Contains(x.WeldingMethodId) + && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) + && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) + && x.WeldType.Contains(weldType) + // && (dia == null || x.SizesMin<=dia) + select x; + var cellQ = from x in cellWelderQualifys + where wmeCode2.Contains(x.WeldingMethodId) + && (x.WeldingLocationId == "ALL" || (location == null || location == "" || x.WeldingLocationId.Contains(location))) + && (steel == null || x.MaterialType.Contains(steel.STE_SteelType ?? "")) + && x.WeldType.Contains(weldType) + // && (dia == null || x.SizesMin <= dia) + select x; + if (floorQ.Count() > 0 && cellQ.Count() > 0) + { + if (weldType != "2") // 2表示角焊缝，当为角焊缝时，管径和壁厚不限制 + { + var floorDiaQ = floorQ.Where(x => x.SizesMin <= dia); + var cellDiaQ = cellQ.Where(x => x.SizesMin <= dia); + + if (floorDiaQ.Count() > 0 && cellDiaQ.Count() > 0) + { + var fThick = floorDiaQ.Where(x => x.ThicknessMax == 0); + var cThick = cellDiaQ.Where(x => x.ThicknessMax == 0); + + // 只要有一个不限（为0）就通过 + if (fThick.Count() > 0 || cThick.Count() > 0) + { + isok = true; + } + + else + { + fThicknessMax = floorQ.Max(x => x.ThicknessMax); + cThicknessMax = cellQ.Max(x => x.ThicknessMax); + + if ((fThicknessMax + cThicknessMax) >= sch) + { + isok = true; + } + } + } + } + else + { + isok = true; + } + } + + return isok; + } + } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs index cc1e723..09a28e7 100644 --- a/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/Welder/WelderManage.aspx.cs @@ -172,7 +172,7 @@ namespace FineUIPro.Web.Welder int l = 0; foreach (var q in welders) { - var s = from x in Funs.DB.HJGL_BS_Welder where x.WED_Code == q.MID_Code select x; + var s = from x in Funs.DB.HJGL_BS_Welder where x.IdentityCard == q.MID_IdentityCard select x; var u = BLL.Base_UnitService.GetUnit2(q.MID_Unit); if (u != null) { @@ -206,6 +206,19 @@ namespace FineUIPro.Web.Welder BLL.HJGL_WelderQualifiedProjectService.UpdateOAWelder(identityCard, isSync); } } + //更新单位变更情况 + var allWelders = from x in Funs.DB.OAM_User select x; + foreach (var q in allWelders) + { + var u = BLL.Base_UnitService.GetUnit2(q.MID_Unit); + var w = BLL.HJGL_PersonManageService.GetWelderByIdentityCard(q.MID_IdentityCard); + if (u != null && w != null) + { + w.WED_Unit = u.UnitId; + w.WED_IfOnGuard = q.IsUsed; + BLL.HJGL_PersonManageService.UpdateBSWelder(w); + } + } foreach (var q in quas) { @@ -289,7 +302,39 @@ namespace FineUIPro.Web.Welder } } } - + //更新资质删除情况 + var allDeleteQuas = from x in Funs.DB.OAM_UesrQualified where x.IsDelete == true select x; + var allWelders2 = from x in Funs.DB.HJGL_BS_Welder select x; + foreach (var q in allDeleteQuas) + { + var s = allWelders2.FirstOrDefault(x => x.WED_Code == q.MIDWelder_Code); + if (s != null) + { + if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode)) + { + if (q.MIDWelder_QualifiedProjectCode.Contains("+")) + { + string[] codes = q.MIDWelder_QualifiedProjectCode.Split('+'); + foreach (string c in codes) + { + var oldCode = (from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.WED_ID && x.QualifiedProjectCode == c && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x).FirstOrDefault(); + if (oldCode != null) + { + BLL.HJGL_WelderQualifiedProjectService.DeleteWelderQualifiedProjectByWelderQualifiedProjectId(oldCode.WelderQualifiedProjectId); + } + } + } + else + { + var oldCode = (from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.WED_ID && x.QualifiedProjectCode == q.MIDWelder_QualifiedProjectCode && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x).FirstOrDefault(); + if (oldCode != null) + { + BLL.HJGL_WelderQualifiedProjectService.DeleteWelderQualifiedProjectByWelderQualifiedProjectId(oldCode.WelderQualifiedProjectId); + } + } + } + } + } int d = m + n; int f = k + l; BLL.Sys_LogService.AddLog(Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "同步焊工及其合格项目信息"); diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 9cc0689..27f6421 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -1076,6 +1076,14 @@ namespace Model } } + public System.Data.Linq.Table HJGL_CH_HardTestReportPrintItem + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table HJGL_CH_HardTestResult { get @@ -29240,6 +29248,267 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_CH_HardTestReportPrintItem")] + public partial class HJGL_CH_HardTestReportPrintItem + { + + private string _HardTestReportId; + + private System.Nullable _Number; + + private string _JOT_JointNoStr1; + + private string _NewJOT_JointNoStr1; + + private string _TestPart1; + + private string _HardNessValue1; + + private string _JOT_JointNoStr2; + + private string _NewJOT_JointNoStr2; + + private string _TestPart2; + + private string _HardNessValue2; + + private string _JOT_JointNoStr3; + + private string _NewJOT_JointNoStr3; + + private string _TestPart3; + + private string _HardNessValue3; + + public HJGL_CH_HardTestReportPrintItem() + { + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HardTestReportId", DbType="NVarChar(50)")] + public string HardTestReportId + { + get + { + return this._HardTestReportId; + } + set + { + if ((this._HardTestReportId != value)) + { + this._HardTestReportId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Int")] + public System.Nullable Number + { + get + { + return this._Number; + } + set + { + if ((this._Number != value)) + { + this._Number = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointNoStr1", DbType="VarChar(50)")] + public string JOT_JointNoStr1 + { + get + { + return this._JOT_JointNoStr1; + } + set + { + if ((this._JOT_JointNoStr1 != value)) + { + this._JOT_JointNoStr1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewJOT_JointNoStr1", DbType="VarChar(50)")] + public string NewJOT_JointNoStr1 + { + get + { + return this._NewJOT_JointNoStr1; + } + set + { + if ((this._NewJOT_JointNoStr1 != value)) + { + this._NewJOT_JointNoStr1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPart1", DbType="VarChar(20)")] + public string TestPart1 + { + get + { + return this._TestPart1; + } + set + { + if ((this._TestPart1 != value)) + { + this._TestPart1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HardNessValue1", DbType="VarChar(100)")] + public string HardNessValue1 + { + get + { + return this._HardNessValue1; + } + set + { + if ((this._HardNessValue1 != value)) + { + this._HardNessValue1 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointNoStr2", DbType="VarChar(50)")] + public string JOT_JointNoStr2 + { + get + { + return this._JOT_JointNoStr2; + } + set + { + if ((this._JOT_JointNoStr2 != value)) + { + this._JOT_JointNoStr2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewJOT_JointNoStr2", DbType="VarChar(50)")] + public string NewJOT_JointNoStr2 + { + get + { + return this._NewJOT_JointNoStr2; + } + set + { + if ((this._NewJOT_JointNoStr2 != value)) + { + this._NewJOT_JointNoStr2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPart2", DbType="VarChar(20)")] + public string TestPart2 + { + get + { + return this._TestPart2; + } + set + { + if ((this._TestPart2 != value)) + { + this._TestPart2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HardNessValue2", DbType="VarChar(100)")] + public string HardNessValue2 + { + get + { + return this._HardNessValue2; + } + set + { + if ((this._HardNessValue2 != value)) + { + this._HardNessValue2 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointNoStr3", DbType="VarChar(50)")] + public string JOT_JointNoStr3 + { + get + { + return this._JOT_JointNoStr3; + } + set + { + if ((this._JOT_JointNoStr3 != value)) + { + this._JOT_JointNoStr3 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewJOT_JointNoStr3", DbType="VarChar(50)")] + public string NewJOT_JointNoStr3 + { + get + { + return this._NewJOT_JointNoStr3; + } + set + { + if ((this._NewJOT_JointNoStr3 != value)) + { + this._NewJOT_JointNoStr3 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPart3", DbType="VarChar(20)")] + public string TestPart3 + { + get + { + return this._TestPart3; + } + set + { + if ((this._TestPart3 != value)) + { + this._TestPart3 = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HardNessValue3", DbType="VarChar(100)")] + public string HardNessValue3 + { + get + { + return this._HardNessValue3; + } + set + { + if ((this._HardNessValue3 != value)) + { + this._HardNessValue3 = value; + } + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_CH_HardTestResult")] public partial class HJGL_CH_HardTestResult : INotifyPropertyChanging, INotifyPropertyChanged { @@ -78733,6 +79002,8 @@ namespace Model private System.Nullable _MIDWelder_jjsybl; + private System.Nullable _IsDelete; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -78757,6 +79028,8 @@ namespace Model partial void OnMIDWelder_sfxgjgblChanged(); partial void OnMIDWelder_jjsyblChanging(System.Nullable value); partial void OnMIDWelder_jjsyblChanged(); + partial void OnIsDeleteChanging(System.Nullable value); + partial void OnIsDeleteChanged(); #endregion public OAM_UesrQualified() @@ -78964,6 +79237,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDelete", DbType="Bit")] + public System.Nullable IsDelete + { + get + { + return this._IsDelete; + } + set + { + if ((this._IsDelete != value)) + { + this.OnIsDeleteChanging(value); + this.SendPropertyChanging(); + this._IsDelete = value; + this.SendPropertyChanged("IsDelete"); + this.OnIsDeleteChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -79149,6 +79442,8 @@ namespace Model private System.Nullable _MID_HanTiao; + private System.Nullable _IsUsed; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -79177,6 +79472,8 @@ namespace Model partial void OnMID_WeldingWireChanged(); partial void OnMID_HanTiaoChanging(System.Nullable value); partial void OnMID_HanTiaoChanged(); + partial void OnIsUsedChanging(System.Nullable value); + partial void OnIsUsedChanged(); #endregion public OAM_User() @@ -79424,6 +79721,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsed", DbType="Bit")] + public System.Nullable IsUsed + { + get + { + return this._IsUsed; + } + set + { + if ((this._IsUsed != value)) + { + this.OnIsUsedChanging(value); + this.SendPropertyChanging(); + this._IsUsed = value; + this.SendPropertyChanged("IsUsed"); + this.OnIsUsedChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;