From d36cec32ea89f72c4ebaea19357f3a09527f1284 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 23 Mar 2026 17:14:35 +0800 Subject: [PATCH] 1 --- SGGL/BLL/API/HSSE/APICheckSpecialService.cs | 116 +++++++++- SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx | 18 +- .../CQMS/Check/CheckList.aspx.cs | 78 ++++++- .../CQMS/Check/CheckList.aspx.designer.cs | 36 ++- .../HSSE/CheckSpecialController.cs | 56 +++++ .../HSSE/MaterialInAndOutRecordController.cs | 219 ++++++++++++++++++ SGGL/WebAPI/Controllers/PersonController.cs | 7 +- .../PublishProfiles/FolderProfile.pubxml.user | 18 +- SGGL/WebAPI/WebAPI.csproj | 1 + SGGL/WebAPI/WebAPI.csproj.user | 4 +- 10 files changed, 514 insertions(+), 39 deletions(-) create mode 100644 SGGL/WebAPI/Controllers/HSSE/MaterialInAndOutRecordController.cs diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs index f9f3e05e..82bdd480 100644 --- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs +++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs @@ -534,6 +534,120 @@ namespace BLL } } } - #endregion + #endregion + + + #region 新保存Check_CheckSpecial + + /// + /// 新保存Check_CheckSpecial + /// + /// 处罚通知单 + /// + public static string SaveCheckSpecialNew(Model.CheckSpecialItem newItem) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + string message = string.Empty; + Model.Check_CheckSpecial newCheckSpecial = new Model.Check_CheckSpecial + { + CheckSpecialId = newItem.CheckSpecialId, + CheckSpecialCode = newItem.CheckSpecialCode, + CheckType = newItem.CheckType, + ProjectId = newItem.ProjectId, + CheckPerson = newItem.CheckPersonId, + CheckTime = Funs.GetNewDateTime(newItem.CheckTime), + DaySummary = System.Web.HttpUtility.HtmlEncode(newItem.DaySummary), + PartInUnits = newItem.PartInUnitIds, + PartInPersonIds = newItem.PartInPersonIds, + PartInPersons = UserService.getUserNamesUserIds(newItem.PartInPersonIds), + PartInPersonNames = newItem.PartInPersonNames2, + CompileMan = newItem.CompileManId, + States = Const.State_0, + }; + if (newItem.CheckType == "0") + { + newCheckSpecial.CheckItemSetId = newItem.CheckItemSetId; + } + + if (!string.IsNullOrEmpty(newItem.States)) + { + newCheckSpecial.States = newItem.States; + } + if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0) + { + if (newItem.States == Const.State_1) + { + newCheckSpecial.States = Const.State_2; + } + } + var updateCheckSpecial = + db.Check_CheckSpecial.FirstOrDefault(x => x.CheckSpecialId == newItem.CheckSpecialId); + if (updateCheckSpecial == null) + { + newCheckSpecial.CheckSpecialId = SQLHelper.GetNewID(); + newCheckSpecial.CheckSpecialCode = + CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectCheckSpecialMenuId, + newCheckSpecial.ProjectId, string.Empty); + db.Check_CheckSpecial.InsertOnSubmit(newCheckSpecial); + db.SubmitChanges(); + ////增加一条编码记录 + BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectCheckSpecialMenuId, + newCheckSpecial.ProjectId, null, newCheckSpecial.CheckSpecialId, newCheckSpecial.CheckTime); + } + else + { + Check_CheckSpecialService.UpdateCheckSpecial(newCheckSpecial); + } + + ////保存附件 + if (!string.IsNullOrEmpty(newItem.AttachUrl1)) + { + UploadFileService.SaveAttachUrl( + UploadFileService.GetSourceByAttachUrl(newItem.AttachUrl1, 10, null), newItem.AttachUrl1, + Const.ProjectCheckSpecialMenuId, newCheckSpecial.CheckSpecialId); + } + else + { + CommonService.DeleteAttachFileById(Const.ProjectCheckSpecialMenuId, newCheckSpecial.CheckSpecialId); + } + + ///// 新增检查项 + if (newItem.CheckSpecialDetailItems != null && newItem.CheckSpecialDetailItems.Count() > 0) + { + foreach (var item in newItem.CheckSpecialDetailItems) + { + item.CheckSpecialId = newCheckSpecial.CheckSpecialId; + SaveCheckSpecialDetail(item); + } + + //// 单据完成后 系统自动按照单位 整改要求生成隐患整改单 + if (newItem.States == Const.State_1) + { + var getC = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false); + if (getC == null) + { + newCheckSpecial.States = Const.State_2; + Check_CheckSpecialService.UpdateCheckSpecial(newCheckSpecial); + } + else + { + var detailLists = db.Check_CheckSpecialDetail.Where(x => + x.CheckSpecialId == newCheckSpecial.CheckSpecialId && x.CompleteStatus == false); + if (detailLists.Count() > 0) + { + message = Check_CheckSpecialService.IssueRectification(detailLists.ToList(), + newCheckSpecial); + } + } + } + } + + return message; + } + } + + #endregion + } } diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx index db5e37c1..926e4cc8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx @@ -84,9 +84,9 @@ - + - +