From fd3b00ed44332997223999e9222b87d0e93ef8d8 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 11 Jul 2025 18:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql | 38 ++++++ .../SUBQHSE_V2025-07-11-xiaj（IDP）.sql | 10 ++ SGGL/BLL/EnvironmentalCheckService.cs | 2 +- SGGL/BLL/WebService/CNCECHSSEWebService.cs | 4 + .../BLL/ZHGL/DataSync/HSSEData_HSSEService.cs | 6 +- .../Information/ActionWorkLedgerService.cs | 3 + .../Comprehensive/MajorPlanApprovalEdit.aspx | 4 +- .../HSSE/Solution/LargerHazardEdit.aspx | 4 +- .../PZHGL/GJSX/GJSXListEdit.aspx.cs | 7 + .../ZHGL/Information/ActionWorkLedger.aspx | 16 ++- .../ZHGL/Information/ActionWorkLedger.aspx.cs | 15 +++ .../ActionWorkLedger.aspx.designer.cs | 36 +++++ .../ZHGL/Information/ActionWorkLedgerAdd.aspx | 9 ++ .../Information/ActionWorkLedgerAdd.aspx.cs | 27 ++++ .../ActionWorkLedgerAdd.aspx.designer.cs | 27 ++++ .../MillionsMonthlyReportSave.aspx.cs | 102 +++++++++++++- SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 2 +- SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 7 +- SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs | 18 +++ SGGL/Model/Model.cs | 126 ++++++++++++++++++ .../PublishProfiles/FolderProfile.pubxml.user | 22 +-- 21 files changed, 456 insertions(+), 29 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql create mode 100644 DataBase/版本日志/SUBQHSE_V2025-07-11-xiaj（IDP）.sql diff --git a/DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql b/DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql new file mode 100644 index 00000000..817f0c9c --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql @@ -0,0 +1,38 @@ +alter table Information_ActionWorkLedger add KeyWorkNum int null +alter table Information_ActionWorkLedger add KeyWorkOKNum int null +alter table Information_ActionWorkLedger add KeyWorkOKRate nvarchar(20) null +GO + + + +ALTER VIEW [dbo].[View_Information_ActionWorkLedger] AS +SELECT + Report.ActionWorkLedgerId, + Report.UnitId, + Report.ReportDate, + Report.YearId, + Report.Quarter, + Report.UpState, + Report.HandleState, + Report.KeyWorkNum, + Report.KeyWorkOKNum, + Report.KeyWorkOKRate, + (ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0011.ConstText,'-')) AS Quarters, + u.UnitName, + Report.HandleMan, + US.UserName +FROM dbo.Information_ActionWorkLedger AS Report +LEFT JOIN Sys_Const AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.YearId +LEFT JOIN Sys_Const AS Group_0011 ON Group_0011.GroupId='0011' AND Group_0011.ConstValue =Report.Quarter +Left join Base_Unit as u on u.UnitId=Report.UnitId +LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan + + + + + + + +GO + + diff --git a/DataBase/版本日志/SUBQHSE_V2025-07-11-xiaj（IDP）.sql b/DataBase/版本日志/SUBQHSE_V2025-07-11-xiaj（IDP）.sql new file mode 100644 index 00000000..6a2ebf6a --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-07-11-xiaj（IDP）.sql @@ -0,0 +1,10 @@ + + + +--IDPӿڵַ +IF NOT EXISTS (SELECT 1 FROM Sys_Set WHERE SetName = 'IDPӿڵַ') +BEGIN + insert into Sys_Set(SetId,SetName,SetValue) + select 6,'IDPӿڵַ','https://idp.cwcec.com/' +END +GO diff --git a/SGGL/BLL/EnvironmentalCheckService.cs b/SGGL/BLL/EnvironmentalCheckService.cs index 41acc295..eb966c03 100644 --- a/SGGL/BLL/EnvironmentalCheckService.cs +++ b/SGGL/BLL/EnvironmentalCheckService.cs @@ -21,7 +21,7 @@ namespace BLL public static ReturnData PushEnvironmentalCheckData() { var db = Funs.DB; - var items = (from x in db.EnvironmentalCheck where x.IsPushed == false select x).ToList(); + var items = (from x in db.EnvironmentalCheck where x.IsPushed == null || x.IsPushed == false orderby x.CreateTime descending select x).ToList(); Model.ReturnData responeData = new Model.ReturnData(); if (items.Count() > 0) { diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs index 28f662f9..cad704ed 100644 --- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs @@ -3355,6 +3355,9 @@ Quarter = x.Quarter, YearId = x.YearId, CompileMan = x.CompileMan, + KeyWorkNum = x.KeyWorkNum, + KeyWorkOKNum = x.KeyWorkOKNum, + KeyWorkOKRate = x.KeyWorkOKRate, }; var upReportItem = from x in db.Information_ActionWorkLedgerItem @@ -3407,6 +3410,7 @@ return code; } } + /// /// DrillConductedQuarterlyReportApi调用 /// diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs index 6c631021..227bfe00 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs @@ -3987,13 +3987,15 @@ namespace BLL ProjectId = gg.Key.ProjectId, ProjectName = gg.Key.ProjectName, ProjectCode = gg.Key.ProjectCode, - CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false), + OperativesNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.OperativesNum) ?? 0, TrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.TrainPersonNum) ?? 0, + CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false), ConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == false), FinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == false), ArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == false), - SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true), + SuperOperativesNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.OperativesNum) ?? 0, SuperTrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.TrainPersonNum) ?? 0, + SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true), SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true), SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true), SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true), diff --git a/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs b/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs index 603f472f..ed3eb2c9 100644 --- a/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs +++ b/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs @@ -81,6 +81,9 @@ namespace BLL newActionWorkLedger.UpState = ActionWorkLedger.UpState; newActionWorkLedger.HandleState = ActionWorkLedger.HandleState; newActionWorkLedger.HandleMan = ActionWorkLedger.HandleMan; + newActionWorkLedger.KeyWorkNum = ActionWorkLedger.KeyWorkNum; + newActionWorkLedger.KeyWorkOKNum = ActionWorkLedger.KeyWorkOKNum; + newActionWorkLedger.KeyWorkOKRate = ActionWorkLedger.KeyWorkOKRate; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx index 291c146b..053f1def 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx @@ -71,7 +71,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx index de8e9f5f..0a990789 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx @@ -44,7 +44,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs index f44507c5..7c3440e3 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs @@ -741,6 +741,13 @@ namespace FineUIPro.Web.PZHGL.GJSX return; } + ////勾选邮件即时通知责任人，先判断责任人是否已维护邮箱 + //if (this.Date_CompleteDate.Text == "") + //{ + // Alert.ShowInParent("请选择要求完成日期！", MessageBoxIcon.Warning); + // return; + //} + string EditType = Request.Params["EditType"]; string ID = Request.Params["ID"]; diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx index 6e2464f6..a2d16bc6 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx @@ -80,14 +80,26 @@ - + - + + + + + + + + + + + + protected global::FineUIPro.Label lbHandleMan; + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtKeyWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtKeyWorkNum; + + /// + /// txtKeyWorkOKNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtKeyWorkOKNum; + + /// + /// txtKeyWorkOKRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtKeyWorkOKRate; + /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx index 2e0c1ddb..40f63ba3 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx @@ -27,6 +27,15 @@ + + + + + + + + + 0) + { + rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%"; + } + this.txtKeyWorkOKRate.Text = rate; + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs index ffe225da..97c972e7 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs @@ -75,6 +75,33 @@ namespace FineUIPro.Web.ZHGL.Information { /// protected global::FineUIPro.DatePicker dpkCompileDate; + /// + /// txtKeyWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtKeyWorkNum; + + /// + /// txtKeyWorkOKNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtKeyWorkOKNum; + + /// + /// txtKeyWorkOKRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtKeyWorkOKRate; + /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs index 442c5a4a..469bba05 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs @@ -82,7 +82,7 @@ namespace FineUIPro.Web.ZHGL.Information if (report.UpState == BLL.Const.UpState_3) { this.btnSave.Hidden = true; - this.btnUpdata.Hidden = true; + //this.btnUpdata.Hidden = true; } drpMonth.SelectedValue = report.Month.ToString(); drpYear.SelectedValue = report.Year.ToString(); @@ -329,6 +329,7 @@ namespace FineUIPro.Web.ZHGL.Information string code = CNCECHSSEWebService.UpMillionsMonthlyReport(report.MillionsMonthlyReportId, this.CurrUser); if (code == "1") { + //WorkflowTodoitemsService.DoneWorkflow_TodoItems(report.MillionsMonthlyReportId, this.CurrUser.UserId);//完成当前人待办 ShowNotify("同步成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); return; @@ -348,21 +349,100 @@ namespace FineUIPro.Web.ZHGL.Information { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=MillionsMonthlyReport&Id={0}", report.MillionsMonthlyReportId, "编辑 - "))); } + else if (type == "add") + { + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + return; + } } protected void btnSave_Click(object sender, EventArgs e) { - Save("add"); + string err = AuditData(); + if (string.IsNullOrEmpty(err)) + { + Save("add"); + } + else + { + ShowNotify(err, MessageBoxIcon.Warning); + } } protected void btnUpdata_Click(object sender, EventArgs e) { - Save("updata"); + string err = AuditData(); + if (string.IsNullOrEmpty(err)) + { + Save("updata"); + } + else + { + ShowNotify(err, MessageBoxIcon.Warning); + } } protected void btnSubmit_Click(object sender, EventArgs e) { - Save("submit"); + string err = AuditData(); + if (string.IsNullOrEmpty(err)) + { + Save("submit"); + } + else + { + ShowNotify(err, MessageBoxIcon.Warning); + } + } + + private string AuditData() + { + string err = string.Empty; + Model.SGGLDB db = Funs.DB; + var reports = from x in db.Information_MillionsMonthlyReport + where x.FillingDate < DateTime.Now + orderby x.FillingDate descending + select x; + if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId)) + { + reports = from x in reports + where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId + orderby x.FillingDate descending + select x; + } + var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList(); + //var items = from x in db.Information_MillionsMonthlyReportItem + // where reportIds.Contains(x.MillionsMonthlyReportId) + // select new { x.Name, x.TotalWorkNum }; + var items = from x in db.Information_MillionsMonthlyReportItem + where reportIds.Contains(x.MillionsMonthlyReportId) + select new { x.Name, x.TotalWorkNum }; + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString())) + { + string name = values.Value("Name"); + decimal d = values.Value("TotalWorkNum"); + var list = items.Where(x => x.Name == name); + decimal a = 0; + if (list.Count() > 0) + { + foreach (var item in list) + { + a += item.TotalWorkNum ?? 0; + } + } + decimal b = a / list.Count(); + if (d > b * 5) + { + err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！"; + break; + } + } + } + return err; } #endregion @@ -813,10 +893,10 @@ namespace FineUIPro.Web.ZHGL.Information }; items.Add(item2); var projects = (from x in Funs.DB.Base_Project - where projectIds.Contains(x.ProjectId) + where projectIds.Contains(x.ProjectId) && (x.IsDelete == null || x.IsDelete == false) select x).ToList(); - if (this.CurrUser.UnitId == BLL.Const.UnitId_CWCEC) + if (this.CurrUser.UnitId == CommonService.GetThisUnitId()) { projects = BLL.ProjectService.GetProjectWorkList(); } @@ -924,6 +1004,16 @@ namespace FineUIPro.Web.ZHGL.Information Grid1.DataSource = items; Grid1.DataBind(); } + + protected void drpDate_SelectedIndexChanged(object sender, EventArgs e) + { + items.Clear(); + GetNewItems(drpYear.SelectedValue, drpMonth.SelectedValue); + Grid1.DataSource = items; + Grid1.DataBind(); + } + + #endregion #region 获取按钮权限 diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index 9eb6fa64..77942d9e 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -73,7 +73,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 6d7b5edc..43873dc2 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -20,7 +20,7 @@ - + @@ -29,8 +29,11 @@ - + + + + diff --git a/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs b/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs index d54abd04..7501f62c 100644 --- a/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs +++ b/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs @@ -40,5 +40,23 @@ namespace Model get; set; } + + public int? KeyWorkNum + { + get; + set; + } + + public int? KeyWorkOKNum + { + get; + set; + } + + public string KeyWorkOKRate + { + get; + set; + } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index c321bba4..57a56462 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -194205,6 +194205,12 @@ namespace Model private string _HandleMan; + private System.Nullable _KeyWorkNum; + + private System.Nullable _KeyWorkOKNum; + + private string _KeyWorkOKRate; + private EntityRef _Base_Unit; private EntitySet _Information_ActionWorkLedgerItem; @@ -194231,6 +194237,12 @@ namespace Model partial void OnHandleStateChanged(); partial void OnHandleManChanging(string value); partial void OnHandleManChanged(); + partial void OnKeyWorkNumChanging(System.Nullable value); + partial void OnKeyWorkNumChanged(); + partial void OnKeyWorkOKNumChanging(System.Nullable value); + partial void OnKeyWorkOKNumChanged(); + partial void OnKeyWorkOKRateChanging(string value); + partial void OnKeyWorkOKRateChanged(); #endregion public Information_ActionWorkLedger() @@ -194424,6 +194436,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")] + public System.Nullable KeyWorkNum + { + get + { + return this._KeyWorkNum; + } + set + { + if ((this._KeyWorkNum != value)) + { + this.OnKeyWorkNumChanging(value); + this.SendPropertyChanging(); + this._KeyWorkNum = value; + this.SendPropertyChanged("KeyWorkNum"); + this.OnKeyWorkNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")] + public System.Nullable KeyWorkOKNum + { + get + { + return this._KeyWorkOKNum; + } + set + { + if ((this._KeyWorkOKNum != value)) + { + this.OnKeyWorkOKNumChanging(value); + this.SendPropertyChanging(); + this._KeyWorkOKNum = value; + this.SendPropertyChanged("KeyWorkOKNum"); + this.OnKeyWorkOKNumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")] + public string KeyWorkOKRate + { + get + { + return this._KeyWorkOKRate; + } + set + { + if ((this._KeyWorkOKRate != value)) + { + this.OnKeyWorkOKRateChanging(value); + this.SendPropertyChanging(); + this._KeyWorkOKRate = value; + this.SendPropertyChanged("KeyWorkOKRate"); + this.OnKeyWorkOKRateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedger_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -437238,6 +437310,12 @@ namespace Model private string _HandleState; + private System.Nullable _KeyWorkNum; + + private System.Nullable _KeyWorkOKNum; + + private string _KeyWorkOKRate; + private string _Quarters; private string _UnitName; @@ -437362,6 +437440,54 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")] + public System.Nullable KeyWorkNum + { + get + { + return this._KeyWorkNum; + } + set + { + if ((this._KeyWorkNum != value)) + { + this._KeyWorkNum = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")] + public System.Nullable KeyWorkOKNum + { + get + { + return this._KeyWorkOKNum; + } + set + { + if ((this._KeyWorkOKNum != value)) + { + this._KeyWorkOKNum = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")] + public string KeyWorkOKRate + { + get + { + return this._KeyWorkOKRate; + } + set + { + if ((this._KeyWorkOKRate != value)) + { + this._KeyWorkOKRate = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarters", DbType="NVarChar(200) NOT NULL", CanBeNull=false)] public string Quarters { diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index aeecd72c..c1cd3587 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-02T06:39:27.0436873Z||;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-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||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 07/09/2025 15:26:57 + 07/11/2025 17:54:01 - 07/09/2025 15:26:57 + 07/11/2025 17:54:01 12/06/2024 20:13:58 - 07/09/2025 15:26:37 + 07/11/2025 17:53:52 12/26/2024 09:46:52 - 07/09/2025 15:26:37 + 07/11/2025 17:53:52 12/18/2020 05:32:28 @@ -128,10 +128,10 @@ 07/25/2012 19:48:56 - 07/02/2025 14:39:00 + 07/11/2025 17:53:46 - 07/02/2025 14:39:00 + 07/11/2025 17:53:46 07/04/2024 14:13:01 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 07/09/2025 15:26:40 + 07/11/2025 17:53:53 - 07/09/2025 15:26:40 + 07/11/2025 17:53:53 - 07/09/2025 15:26:40 + 07/11/2025 17:53:53 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 07/09/2025 15:26:42 + 07/11/2025 17:53:54 10/28/2024 14:02:50