diff --git a/HJGL_DS/BLL/API/APIJointInfoService.cs b/HJGL_DS/BLL/API/APIJointInfoService.cs index bc3678f..7932f76 100644 --- a/HJGL_DS/BLL/API/APIJointInfoService.cs +++ b/HJGL_DS/BLL/API/APIJointInfoService.cs @@ -277,6 +277,10 @@ namespace BLL BLL.HJGL_PW_JointInfoService.UpdateJointInfoByDReport(newJointInfo); //更新焊口号 修改固定焊口号后 +G BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(newJointInfo.JOT_ID, newJointInfo.JOT_JointAttribute, Const.Add); + if (newJointInfo.IS_Proess == "1" && (newJointInfo.ProessTypes.Contains("4") || newJointInfo.ProessTypes.Contains("5"))) + { + BLL.HJGL_HotProessManageEditService.AddHotProessItemByJoint(newJointInfo); + } } } diff --git a/HJGL_DS/BLL/HJGL/HotProessManage/HJGL_HotProessManageEditService.cs b/HJGL_DS/BLL/HJGL/HotProessManage/HJGL_HotProessManageEditService.cs index 90ff122..01ac56f 100644 --- a/HJGL_DS/BLL/HJGL/HotProessManage/HJGL_HotProessManageEditService.cs +++ b/HJGL_DS/BLL/HJGL/HotProessManage/HJGL_HotProessManageEditService.cs @@ -174,7 +174,7 @@ namespace BLL { Model.HJGL_PW_JointInfo info = new Model.HJGL_PW_JointInfo(); info.JOT_ID = item.JOT_ID; - + info.IS_Proess = "0"; UpdateJointInfo(info); } @@ -272,7 +272,7 @@ namespace BLL ////更新焊口信息 Model.HJGL_PW_JointInfo info = new Model.HJGL_PW_JointInfo(); info.JOT_ID = HJGL_HotProessItem.JOT_ID; - + info.IS_Proess = "1"; UpdateJointInfo(info); } @@ -341,5 +341,53 @@ namespace BLL return false; } } + + /// + /// 增加热处理信息明细 + /// + /// 热处理明细实体 + public static void AddHotProessItemByJoint(Model.HJGL_PW_JointInfo joint) + { + if (joint.ProessTypes.Contains("4")) + { + Model.HJGL_HotProessItem hotProessItem = new Model.HJGL_HotProessItem(); + hotProessItem.HotProessItemId = SQLHelper.GetNewID(typeof(Model.HJGL_HotProessItem)); + hotProessItem.JOT_ID = joint.JOT_ID; + var trust = (from x in Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == joint.JOT_ID select x).FirstOrDefault(); + if (trust != null) + { + hotProessItem.HotProessTrustId = trust.HotProessTrustId; + } + hotProessItem.ProessTypes = "4"; + hotProessItem.SortIndex = BLL.HJGL_HotProessManageEditService.GetSortIndex(trust.HotProessTrustId, joint.JOT_ID, "4"); + Model.HJGL_CH_HotProessTrustItem hotProessTrustItem = BLL.HJGL_CH_HotProessTrustService.GetCH_HotProessTrustItemByHotProessTrustIdAndJotId(trust.HotProessTrustId, joint.JOT_ID); + if (hotProessTrustItem != null) + { + BLL.HJGL_HotProessManageEditService.AddHotProessItem(hotProessItem, "", null); + } + //回写焊口热处理委托时间 + BLL.HJGL_PW_JointInfoService.WriteBackHotProessTrustDate(joint.JOT_ID, DateTime.Now); + } + if (joint.ProessTypes.Contains("5")) + { + Model.HJGL_HotProessItem hotProessItem = new Model.HJGL_HotProessItem(); + hotProessItem.HotProessItemId = SQLHelper.GetNewID(typeof(Model.HJGL_HotProessItem)); + hotProessItem.JOT_ID = joint.JOT_ID; + var trust = (from x in Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == joint.JOT_ID select x).FirstOrDefault(); + if (trust != null) + { + hotProessItem.HotProessTrustId = trust.HotProessTrustId; + } + hotProessItem.ProessTypes = "5"; + hotProessItem.SortIndex = BLL.HJGL_HotProessManageEditService.GetSortIndex(trust.HotProessTrustId, joint.JOT_ID, "5"); + Model.HJGL_CH_HotProessTrustItem hotProessTrustItem = BLL.HJGL_CH_HotProessTrustService.GetCH_HotProessTrustItemByHotProessTrustIdAndJotId(trust.HotProessTrustId, joint.JOT_ID); + if (hotProessTrustItem != null) + { + BLL.HJGL_HotProessManageEditService.AddHotProessItem(hotProessItem, "", null); + } + //回写焊口热处理委托时间 + BLL.HJGL_PW_JointInfoService.WriteBackHotProessTrustDate(joint.JOT_ID, DateTime.Now); + } + } } } diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs index c1276ad..f08e410 100644 --- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs +++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs @@ -509,7 +509,10 @@ namespace BLL { addJointInfo.JOT_JointNo += "G"; } - + if (addJointInfo.IsGold == true) //黄金口加H + { + addJointInfo.JOT_JointNo += "H"; + } db.SubmitChanges(); } } diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt index 82d5e61..2ce5f5c 100644 --- a/HJGL_DS/FineUIPro.Web/ErrLog.txt +++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt @@ -30,3 +30,22 @@ IP地址:::1 出错时间:06/26/2025 10:36:58 + +错误信息开始=====> +错误类型:HttpException +错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。 +错误堆栈: + 在 System.Web.HttpResponse.set_ContentType(String value) + 在 (HttpResponse , String ) + 在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq() + 在 (hZzEMoBFowQHNetYNlTaFyfiuHiLc ) + 在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq(Object , EventArgs ) + 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:07/07/2025 10:10:27 +出错文件:http://localhost:64304/HJGL/DataIn/JointIn.aspx +IP地址:::1 +操作人员:管理员 + +出错时间:07/07/2025 10:10:27 + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 8aa7c11..bf54086 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index cf79435..dbe9beb 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -625,6 +625,102 @@ } } } + + #region 自动生成热处理委托信息，按管线号生成 + Model.SGGLDB db = Funs.DB; + var allJoints = from x in db.HJGL_PW_JointInfo + where (from y in db.HJGL_CH_HotProessTrustItem where y.JOT_ID == x.JOT_ID select y).Count() == 0 && x.IS_Proess == "1" + select x; + var allIsoIds = allJoints.Select(x => x.ISO_ID).Distinct(); + var allIsos = from x in db.HJGL_PW_IsoInfo + join y in db.Base_Project on x.ProjectId equals y.ProjectId + where allIsoIds.Contains(x.ISO_ID) + select new { x.ISO_ID, x.ProjectId, x.ISO_IsoNo, x.BSU_ID, y.ProjectName, y.ProjectCode }; + var allProjectUser = from x in db.Project_User + join y in db.Sys_User on x.UserId equals y.UserId + select new { x.UserId, x.ProjectId, y.UnitId }; + string HotProessTrustId = string.Empty; + List trusts = new List(); + List trustItems = new List(); + List hotProessResults = new List(); + foreach (var item in allIsos) + { + Model.HJGL_CH_HotProessTrust newHotProessTrust = new Model.HJGL_CH_HotProessTrust(); + newHotProessTrust.ProjectId = item.ProjectId; + newHotProessTrust.HotProessTrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCode2ByProjectIdNoR", "dbo.HJGL_CH_HotProessTrust", "HotProessTrustCode", item.ProjectId, item.ProjectCode + "-" + string.Format("{0:MMdd}", DateTime.Now) + "-"); + newHotProessTrust.TrustUnitId = item.BSU_ID; + newHotProessTrust.ProjectName = item.ProjectName; + newHotProessTrust.ConstructionNo = item.ProjectCode; + var projectUser = allProjectUser.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.UnitId == item.BSU_ID); + if (projectUser != null) + { + newHotProessTrust.TrstManId = projectUser.UserId; + } + HotProessTrustId = SQLHelper.GetNewID(typeof(Model.HJGL_CH_HotProessTrust)); + newHotProessTrust.HotProessTrustId = HotProessTrustId; + newHotProessTrust.TrustType = "1"; //正常口 + trusts.Add(newHotProessTrust); + var joints = allJoints.Where(x => x.ISO_ID == item.ISO_ID); + foreach (var joint in joints) + { + if (!string.IsNullOrEmpty(joint.ProessTypes)) + { + string[] proessTypes = joint.ProessTypes.Split('|'); + for (int i = 0; i < proessTypes.Length; i++) + { + + Model.HJGL_CH_HotProessTrustItem newItem = new Model.HJGL_CH_HotProessTrustItem(); + newItem.HotProessTrustId = HotProessTrustId; + newItem.JOT_ID = joint.JOT_ID; + newItem.ProessTypes = proessTypes[i]; + //item.TrustDate = Funs.GetNewDateTime(values.Value("TrustDate").ToString()); + newItem.TrustDate = DateTime.Now; + newItem.Remark = string.Empty; + newItem.HotProessTrustItemId = SQLHelper.GetNewID(typeof(Model.HJGL_CH_HotProessTrustItem)); + trustItems.Add(newItem); + //if (newItem.ProessTypes.Contains("4") || newItem.ProessTypes.Contains("5")) //需要进入热处理报告的记录 + //{ + // Model.HJGL_HotProessItem hotProessItem = new Model.HJGL_HotProessItem(); + // hotProessItem.HotProessItemId = SQLHelper.GetNewID(typeof(Model.HJGL_HotProessItem)); + // hotProessItem.JOT_ID = newItem.JOT_ID; + // hotProessItem.HotProessTrustId = HotProessTrustId; + // hotProessItem.ProessTypes = newItem.ProessTypes; + // hotProessItem.SortIndex = BLL.HJGL_HotProessManageEditService.GetSortIndex(HotProessTrustId, newItem.JOT_ID, newItem.ProessTypes); + // Model.HJGL_CH_HotProessTrustItem hotProessTrustItem = BLL.HJGL_CH_HotProessTrustService.GetCH_HotProessTrustItemByHotProessTrustIdAndJotId(HotProessTrustId, newItem.JOT_ID); + // if (hotProessTrustItem != null) + // { + // BLL.HJGL_HotProessManageEditService.AddHotProessItem(hotProessItem, "", null); + // } + // //回写焊口热处理委托时间 + // BLL.HJGL_PW_JointInfoService.WriteBackHotProessTrustDate(newItem.JOT_ID, newItem.TrustDate); + //} + //进入热处理结果反馈 + Model.HJGL_CH_HotProessResult hotProessResult = new Model.HJGL_CH_HotProessResult(); + hotProessResult.JOT_ID = newItem.JOT_ID; + hotProessResult.HotProessTrustId = HotProessTrustId; + hotProessResult.ProessTypes = newItem.ProessTypes; + hotProessResult.HotProessResultId = SQLHelper.GetNewID(typeof(Model.HJGL_CH_HotProessResult)); + hotProessResults.Add(hotProessResult); + } + } + } + } + db.HJGL_CH_HotProessTrust.InsertAllOnSubmit(trusts); + db.SubmitChanges(); + db.HJGL_CH_HotProessTrustItem.InsertAllOnSubmit(trustItems); + db.SubmitChanges(); + db.HJGL_CH_HotProessResult.InsertAllOnSubmit(hotProessResults); + db.SubmitChanges(); + //已焊接口 + var allWeldJoints = from x in db.HJGL_PW_JointInfo + where x.DReportID != null && x.IS_Proess == "1" && (x.ProessTypes.Contains("4") || x.ProessTypes.Contains("5")) + && (from y in db.HJGL_HotProessItem where y.JOT_ID == x.JOT_ID select y).Count() == 0 + select x; + foreach (var item in allWeldJoints) + { + BLL.HJGL_HotProessManageEditService.AddHotProessItemByJoint(item); + } + #endregion } protected void Session_Start(object sender, EventArgs e) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs index a2764fc..6015f74 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs @@ -1162,6 +1162,10 @@ namespace FineUIPro.Web.HJGL.DataIn BLL.HJGL_PW_JointInfoService.UpdateJointInfoByDReport(newJointInfo); //更新焊口号 修改固定焊口号后 +G BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(newJointInfo.JOT_ID, newJointInfo.JOT_JointAttribute, Const.Add); + if (newJointInfo.IS_Proess == "1" && (newJointInfo.ProessTypes.Contains("4") || newJointInfo.ProessTypes.Contains("5"))) + { + BLL.HJGL_HotProessManageEditService.AddHotProessItemByJoint(newJointInfo); + } } else { diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs index 3e39ba2..9c183aa 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs @@ -785,7 +785,7 @@ { } - if (jot.DReportID != null) + if (jot.DReportID != null && this.CurrUser.UserId != BLL.Const.GlyId) { BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add); } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 490fddb..7933242 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -831,6 +831,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage BLL.HJGL_PW_JointInfoService.UpdateJointInfoByDReport(newJointInfo); //更新焊口号 修改固定焊口号后 +G BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(newJointInfo.JOT_ID, newJointInfo.JOT_JointAttribute, Const.Add); + if (newJointInfo.IS_Proess == "1" && (newJointInfo.ProessTypes.Contains("4") || newJointInfo.ProessTypes.Contains("5"))) + { + BLL.HJGL_HotProessManageEditService.AddHotProessItemByJoint(newJointInfo); + } } else { diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx index 38ae4a0..6f8a5d3 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockMoveRecords.aspx @@ -16,7 +16,7 @@ diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true