From 58b237b0cf8c4fecec0768f69399d9b699f68c31 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 17 Jul 2025 18:17:56 +0800 Subject: [PATCH] =?UTF-8?q?IDP=E8=AE=BE=E8=AE=A1=E5=9B=BE=E7=BA=B8?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql | 2 + .../DesignDrawing/DesignDrawingService.cs | 191 ++++++++++++++++++ SGGL/BLL/IDP/IDPDataService.cs | 28 +-- .../CQMS/DesignDrawing/ArchivesLib.aspx | 20 +- .../CQMS/DesignDrawing/ArchivesLib.aspx.cs | 125 ++++++++---- .../ArchivesLib.aspx.designer.cs | 36 ++++ SGGL/FineUIPro.Web/indexProject.aspx | 3 +- .../Model/IDP/IDPDesignDrawingResponseData.cs | 5 + SGGL/Model/Model.cs | 26 ++- SGGL/WebAPI/Controllers/IDP/IDPController.cs | 7 +- .../PublishProfiles/FolderProfile.pubxml.user | 24 +-- 11 files changed, 391 insertions(+), 76 deletions(-) diff --git a/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql b/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql index de96bc4a..1525ca20 100644 --- a/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql +++ b/DataBase/版本日志/SUBQHSE_V2025-07-16-xiaj（IDP设计图纸管理）.sql @@ -43,6 +43,7 @@ CREATE TABLE [dbo].[IDP_DesignDrawing]( [formatFileName] [nvarchar](200) NULL, [fileVersion] [nvarchar](50) NULL, [majorNo] [nvarchar](50) NULL, + [majorName] [nvarchar](50) NULL, [status] [nvarchar](50) NULL, [designUserName] [nvarchar](50) NULL, [jiaoheUserName] [nvarchar](50) NULL, @@ -80,6 +81,7 @@ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'formatFileName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'fileVersion' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'majorNo' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'majorName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'status' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'designUserName' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'У' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'IDP_DesignDrawing', @level2type=N'COLUMN',@level2name=N'jiaoheUserName' diff --git a/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs b/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs index 7a70b597..4f724174 100644 --- a/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs +++ b/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs @@ -5,6 +5,7 @@ using System.Text; using System.Collections; using System.Web.UI.WebControls; using Model; +using RestSharp.Extensions; namespace BLL { @@ -86,5 +87,195 @@ namespace BLL //} + + /// + /// 装工主名称下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitWbsFullPathDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetWbsFullPathDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 装工主名称下拉框 + /// + /// 项目id + /// + public static List GetWbsFullPathDropDownList(string projectId) + { + var list = (from x in Funs.DB.IDP_DesignDrawing + where x.ProjectId == projectId && x.WbsFullPath != null + select x.WbsFullPath).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// 版次下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitFileVersionDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetFileVersionDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 版次下拉框 + /// + /// 项目id + /// + public static List GetFileVersionDropDownList(string projectId) + { + var list = (from x in Funs.DB.IDP_DesignDrawing + where x.ProjectId == projectId && x.FileVersion != null + select x.FileVersion).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// 专业编码下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitMajorNoDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetMajorNoDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 专业编码下拉框 + /// + /// 项目id + /// + public static List GetMajorNoDropDownList(string projectId) + { + var list = (from x in Funs.DB.IDP_DesignDrawing + where x.ProjectId == projectId && x.MajorNo != null + select x.MajorNo).Distinct().OrderBy(x => x).ToList(); + return list; + } + + /// + /// 专业名称下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitMajorNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetMajorNameDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 专业名称下拉框 + /// + /// 项目id + /// + public static List GetMajorNameDropDownList(string projectId) + { + var list = (from x in Funs.DB.IDP_DesignDrawing + where x.ProjectId == projectId && x.MajorName != null + select x.MajorName).Distinct().OrderBy(x => x).ToList(); + return list; + } + + + /// + /// 发布状态下拉框 + /// + /// 项目id + /// 下拉框名字 + /// 是否显示请选择 + public static void InitStatusNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "string"; + dropName.DataTextField = "string"; + dropName.DataSource = GetStatusDropDownList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 发布状态下拉框 + /// + /// 项目id + /// + public static List GetStatusDropDownList(string projectId) + { + var list = (from x in Funs.DB.IDP_DesignDrawing + where x.ProjectId == projectId && x.Status != null + select x.Status).Distinct().OrderBy(x => x).ToList(); + return list; + } + + ///// + // /// 装工主名称下拉框 + // /// + // /// 项目id + // /// + //public static List GetWbsFullPathDropDownList(string projectId) + //{ + // var list = (from x in Funs.DB.Transfer_PunchlistFrom + // where x.ProjectId == projectId + // select x.Action_By).Distinct().OrderBy(x => x).ToList(); + // return list; + //} + + ///// + ///// 装工主名称下拉框 + ///// + ///// 项目id + ///// 下拉框名字 + ///// 是否显示请选择 + //public static void InitActionByUnitDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + //{ + // dropName.DataValueField = "string"; + // dropName.DataTextField = "string"; + // dropName.DataSource = GetActionByUnitDropDownList(projectId); + // dropName.DataBind(); + // if (isShowPlease) + // { + // Funs.FineUIPleaseSelect(dropName); + // } + //} + } } diff --git a/SGGL/BLL/IDP/IDPDataService.cs b/SGGL/BLL/IDP/IDPDataService.cs index d37c5107..e3d21101 100644 --- a/SGGL/BLL/IDP/IDPDataService.cs +++ b/SGGL/BLL/IDP/IDPDataService.cs @@ -217,6 +217,7 @@ namespace BLL newItem.FormatFileName = item.formatFileName; newItem.FileVersion = item.fileVersion; newItem.MajorNo = item.majorNo; + newItem.MajorName = item.majorName; newItem.Status = item.status; newItem.DesignUserName = item.designUserName; newItem.JiaoheUserName = item.jiaoheUserName; @@ -258,10 +259,6 @@ namespace BLL catch (WebException ex) { - } - finally - { - } } @@ -298,6 +295,7 @@ namespace BLL newItem.FormatFileName = obj.FormatFileName; newItem.FileVersion = obj.FileVersion; newItem.MajorNo = obj.MajorNo; + newItem.MajorName = obj.MajorName; newItem.Status = obj.Status; newItem.DesignUserName = obj.DesignUserName; newItem.JiaoheUserName = obj.JiaoheUserName; @@ -320,18 +318,20 @@ namespace BLL /// 接收保存数据 /// /// - public static string SaveDesignDrawingData(OADesignDrawingData newItems) + public static string SaveDesignDrawingData(List items) { try { string message = string.Empty; + int succ = 0; + int err = 0; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - foreach (var item in newItems.DataItems) + foreach (var item in items) { - if (!string.IsNullOrWhiteSpace(item.RdpId)) + if (!string.IsNullOrWhiteSpace(item.RdpId) && !string.IsNullOrWhiteSpace(item.fileid)) { - IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.StockId == item.RdpId); + IDP_DesignDrawing newItem = db.IDP_DesignDrawing.FirstOrDefault(x => x.StockId == item.RdpId && x.ThirdId == item.fileid); if (newItem != null) { newItem.RdpId = item.RdpId; @@ -345,13 +345,19 @@ namespace BLL newItem.Printtime = item.printtime; newItem.Ifmail = item.ifmail; db.SubmitChanges(); + succ++; + } + else + { + err++; } } else { - + err++; } } + message = $"总数{(succ + err)}条；失败{err}条，成功{succ}条！"; } return message; } @@ -359,10 +365,6 @@ namespace BLL { return ex.Message; } - finally - { - - } } diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx index 4f785273..b2a7c7fd 100644 --- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx +++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx @@ -62,15 +62,14 @@ - <%-- + - + - + + + - - --%> @@ -103,12 +102,15 @@ - - + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs index 8f160439..a492dca5 100644 --- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs @@ -28,7 +28,9 @@ namespace FineUIPro.Web.CQMS.DesignDrawing ViewState["ProjectId"] = value; } } + #region 加载页面 + /// /// 加载页面 /// @@ -39,7 +41,8 @@ namespace FineUIPro.Web.CQMS.DesignDrawing if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - GetButtonPower(); + this.InitDropDownList(); + ////权限按钮方法 //UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); //UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); @@ -60,15 +63,28 @@ namespace FineUIPro.Web.CQMS.DesignDrawing } + /// + /// 下拉加载 + /// + private void InitDropDownList() + { + BLL.DesignDrawingService.InitWbsFullPathDropDownList(this.ddlWbsFullPath, this.CurrUser.LoginProjectId, false); + BLL.DesignDrawingService.InitFileVersionDropDownList(this.ddlFileVersion, this.CurrUser.LoginProjectId, false); + BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false); + //BLL.DesignDrawingService.InitMajorNoDropDownList(this.ddlMajorNo, this.CurrUser.LoginProjectId, false); + BLL.DesignDrawingService.InitStatusNameDropDownList(this.ddlStatus, this.CurrUser.LoginProjectId, false); + } + #endregion - - protected DataTable ChecklistData() + /// + /// 获取数据 + /// + /// + protected DataTable BindData() { - string strSql = $@"SELECT * FROM IDP_DesignDrawing as lib - WHERE lib.ProjectId=@ProjectId - "; + string strSql = $@"SELECT * FROM IDP_DesignDrawing as lib WHERE lib.ProjectId=@ProjectId "; //ORDER BY lib.updatetime DESC List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); @@ -76,43 +92,79 @@ namespace FineUIPro.Web.CQMS.DesignDrawing //listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "")); //listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "")); + if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlWbsFullPath.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR WbsFullPath = @WbsFullPath" + i.ToString(); + listStr.Add(new SqlParameter("@WbsFullPath" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + if (this.ddlFileVersion.SelectedItemArray.Count() > 1 || (this.ddlFileVersion.SelectedValue != BLL.Const._Null && this.ddlFileVersion.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlFileVersion.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR FileVersion = @FileVersion" + i.ToString(); + listStr.Add(new SqlParameter("@FileVersion" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + if (this.ddlMajorName.SelectedItemArray.Count() > 1 || (this.ddlMajorName.SelectedValue != BLL.Const._Null && this.ddlMajorName.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlMajorName.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR MajorName = @MajorName" + i.ToString(); + listStr.Add(new SqlParameter("@MajorName" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + if (this.ddlStatus.SelectedItemArray.Count() > 1 || (this.ddlStatus.SelectedValue != BLL.Const._Null && this.ddlStatus.SelectedItemArray.Count() == 1)) + { + strSql += " AND (1=2 "; + int i = 0; + foreach (var item in this.ddlStatus.SelectedValueArray) + { + if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null) + { + strSql += " OR Status = @Status" + i.ToString(); + listStr.Add(new SqlParameter("@Status" + i.ToString(), item)); + } + i++; + } + strSql += ")"; + } + SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); return tb; } - //public string Convertstatus(Object code) - //{ - // Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString()); - // if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) - // { - // return "未确认"; - // } - // else if (checkControl.State == Const.CheckControl_Complete) - // { //闭环 - // return "已闭环"; - // } - // //else if( checkControl.LimitDate> ) - // else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 - // { - // return "超期未整改"; - - // } - // else //期内未整改 - // { - // return "未整改"; - - // } - //} - - /// /// 绑定数据 /// public void BindGrid() { - DataTable tb = ChecklistData(); + DataTable tb = BindData(); // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); @@ -166,11 +218,10 @@ namespace FineUIPro.Web.CQMS.DesignDrawing var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ArchivesLibMenuId); if (buttonList.Count() > 0) { - //if (buttonList.Contains(BLL.Const.BtnAdd)) - //{ - // this.btnNew.Hidden = false; - - //} + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + //this.btnNew.Hidden = false; + } //if (buttonList.Contains(BLL.Const.BtnModify)) //{ // this.btnMenuModify.Hidden = false; diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs index f0614aeb..32386bb9 100644 --- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs @@ -59,6 +59,42 @@ namespace FineUIPro.Web.CQMS.DesignDrawing /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// ddlWbsFullPath 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlWbsFullPath; + + /// + /// ddlFileVersion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlFileVersion; + + /// + /// ddlMajorName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlMajorName; + + /// + /// ddlStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlStatus; + /// /// btnQuery 控件。 /// diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index a7a89913..b4001e4d 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -235,7 +235,8 @@ } - +<%--
diff --git a/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs b/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs index adc10f9c..8f3fde55 100644 --- a/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs +++ b/SGGL/Model/IDP/IDPDesignDrawingResponseData.cs @@ -135,6 +135,11 @@ namespace Model [JsonProperty("majorNo")] public string majorNo { get; set; } /// + /// 专业名称 + /// + [JsonProperty("majorName")] + public string majorName { get; set; } + /// /// 发布状态 /// [JsonProperty("status")] diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index ae5b2097..e7904f32 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -188187,6 +188187,8 @@ namespace Model private string _MajorNo; + private string _MajorName; + private string _Status; private string _DesignUserName; @@ -188255,6 +188257,8 @@ namespace Model partial void OnFileVersionChanged(); partial void OnMajorNoChanging(string value); partial void OnMajorNoChanged(); + partial void OnMajorNameChanging(string value); + partial void OnMajorNameChanged(); partial void OnStatusChanging(string value); partial void OnStatusChanged(); partial void OnDesignUserNameChanging(string value); @@ -188300,7 +188304,7 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] public string Id { get @@ -188560,6 +188564,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="majorName", Storage="_MajorName", DbType="NVarChar(50)")] + public string MajorName + { + get + { + return this._MajorName; + } + set + { + if ((this._MajorName != value)) + { + this.OnMajorNameChanging(value); + this.SendPropertyChanging(); + this._MajorName = value; + this.SendPropertyChanged("MajorName"); + this.OnMajorNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="NVarChar(50)")] public string Status { diff --git a/SGGL/WebAPI/Controllers/IDP/IDPController.cs b/SGGL/WebAPI/Controllers/IDP/IDPController.cs index 72693e87..a05c82fc 100644 --- a/SGGL/WebAPI/Controllers/IDP/IDPController.cs +++ b/SGGL/WebAPI/Controllers/IDP/IDPController.cs @@ -1,5 +1,7 @@ using BLL; +using Model; using System; +using System.Collections.Generic; using System.Web.Http; namespace WebAPI.Controllers @@ -37,13 +39,12 @@ namespace WebAPI.Controllers /// /// [HttpPost] - public Model.ResponeData SynOADesignDrawingData([FromBody] Model.OADesignDrawingData newItem) + public Model.ResponeData SynOADesignDrawingData([FromBody] List items) { var responeData = new Model.ResponeData(); try { - - responeData.message = IDPDataService.SaveDesignDrawingData(newItem); + responeData.message = IDPDataService.SaveDesignDrawingData(items); } catch (Exception ex) { diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index c1cd3587..b649e286 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>G:\发布\五环WebApi - True|2025-07-11T09:54:03.0298703Z||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; + True|2025-07-17T07:40:11.9126705Z||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 07/11/2025 17:54:01 + 07/17/2025 15:40:10 - 07/11/2025 17:54:01 + 07/17/2025 15:40:10 12/06/2024 20:13:58 - 07/11/2025 17:53:52 + 07/17/2025 15:39:50 12/26/2024 09:46:52 - 07/11/2025 17:53:52 + 07/17/2025 15:39:50 12/18/2020 05:32:28 @@ -128,10 +128,10 @@ 07/25/2012 19:48:56 - 07/11/2025 17:53:46 + 07/17/2025 15:39:43 - 07/11/2025 17:53:46 + 07/17/2025 15:39:43 07/04/2024 14:13:01 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 07/11/2025 17:53:53 + 07/17/2025 15:39:53 - 07/11/2025 17:53:53 + 07/17/2025 15:39:53 - 07/11/2025 17:53:53 + 07/17/2025 15:39:53 01/23/2014 21:57:34 @@ -458,7 +458,7 @@ 10/28/2024 14:02:50 - 10/28/2024 14:02:50 + 07/16/2025 18:09:47 10/28/2024 14:02:50 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 07/11/2025 17:53:54 + 07/17/2025 15:39:54 10/28/2024 14:02:50