From ad92f18feeee280e209ba6ac99986ad904ceab8f Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 10 Oct 2025 15:46:23 +0800 Subject: [PATCH 1/7] 1 --- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 988a2753..ba00e122 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -16840,7 +16840,7 @@ - + From 7a4cd1d6ea42fe59081d7977d97e88886722cb74 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 10 Oct 2025 17:40:09 +0800 Subject: [PATCH 2/7] 1 --- .../SGGLDB_V2025-10-10-001-gaofei.sql | 2 + .../API/HSSE/APISeDinMonthReportService.cs | 8 +- SGGL/BLL/BaseInfo/SpecialEquipmentService.cs | 30 ++ SGGL/BLL/Common/PrinterDocService.cs | 34 +- .../HSSE/Manager/ManagerMonth_SeDinEdit.aspx | 9 +- .../Manager/ManagerMonth_SeDinEdit.aspx.cs | 6 +- .../HSSE/QualityAudit/EquipmentQuality.aspx | 2 +- .../QualityAudit/EquipmentQualityEdit.aspx.cs | 2 +- .../APIItem/HSSE/SeDinMonthReport5Item.cs | 8 + SGGL/Model/Model.cs | 342 ++++++++++-------- 10 files changed, 263 insertions(+), 180 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-10-10-001-gaofei.sql diff --git a/DataBase/版本日志/SGGLDB_V2025-10-10-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-10-10-001-gaofei.sql new file mode 100644 index 00000000..4c6c5017 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-10-10-001-gaofei.sql @@ -0,0 +1,2 @@ +alter table [dbo].[SeDin_MonthReport5] add S02 int null +GO \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs index a17385ba..bfc50880 100644 --- a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs +++ b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs @@ -439,6 +439,7 @@ namespace BLL int D03 = getUAll.Where(x => x.BaseInfoName == "拖板车").Count(); int D04 = getUAll.Where(x => x.BaseInfoName == "桩机").Count(); int S01 = getUAll.Where(x => x.BaseInfoName == "吊篮").Count(); + int S02 = getUAll.Where(x => x.BaseInfoName == "高空作业升降平台").Count(); Model.SeDinMonthReport5Item newItem = new Model.SeDinMonthReport5Item { UnitName = item.UnitName, @@ -453,7 +454,8 @@ namespace BLL D03 = D03, D04 = D04, S01 = S01, - TotalNum = (T01 + T02 + T03 + T04 + T05 + T06 + D01 + D02 + D03 + D04 + S01) + S02 = S02, + TotalNum = (T01 + T02 + T03 + T04 + T05 + T06 + D01 + D02 + D03 + D04 + S01 + S02) }; getLists.Add(newItem); } @@ -1294,8 +1296,9 @@ namespace BLL D03 = x.D03 ?? 0, D04 = x.D04 ?? 0, S01 = x.S01 ?? 0, + S02 = x.S02 ?? 0, TotalNum = (x.T01 + x.T02 + x.T03 + x.T04 + x.T05 + x.T06 - + x.D01 + x.D02 + x.D03 + x.D04 + x.S01) + + x.D01 + x.D02 + x.D03 + x.D04 + x.S01 + x.S02) }).ToList(); } return getInfo; @@ -2115,6 +2118,7 @@ namespace BLL D03 = item.D03, D04 = item.D04, S01 = item.S01, + S02 = item.S02, }; db.SeDin_MonthReport5.InsertOnSubmit(newReport5Item); db.SubmitChanges(); diff --git a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs index c62b6117..53676c66 100644 --- a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs +++ b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs @@ -132,6 +132,36 @@ namespace BLL } } + /// + /// 设备下拉框 + /// + /// 下拉框名字 + /// 项目id + /// 是否显示请选择 + public static void InitSpecialEquipmentDropDownList2(DropDownList dropName, string type, bool isShowPlease) + { + dropName.DataValueField = "SpecialEquipmentId"; + dropName.DataTextField = "SpecialEquipmentName"; + dropName.DataSource = GetSpecialEquipmentList2(type); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取机具设备列表 + /// + /// + public static List GetSpecialEquipmentList2(string type) + { + return (from x in Funs.DB.Base_SpecialEquipment + where x.SpecialEquipmentType == type || x.IsSpecial == true + orderby x.SpecialEquipmentCode + select x).ToList(); + } + /// /// 设备下拉框 /// diff --git a/SGGL/BLL/Common/PrinterDocService.cs b/SGGL/BLL/Common/PrinterDocService.cs index fb910e90..3812e276 100644 --- a/SGGL/BLL/Common/PrinterDocService.cs +++ b/SGGL/BLL/Common/PrinterDocService.cs @@ -1165,29 +1165,30 @@ #region 5、本月大型、特种设备投入情况 sb.Append(""); sb.Append(""); - sb.AppendFormat(" " + sb.AppendFormat(" " , "5、本月大型、特种设备投入情况："); sb.Append(""); sb.Append(""); sb.AppendFormat(" ", "单位名称"); sb.AppendFormat(" ", "特种设备"); sb.AppendFormat(" ", "大型机具设备"); - sb.AppendFormat(" ", "特殊机具设备"); + sb.AppendFormat(" ", "特殊机具设备"); sb.AppendFormat(" ", "合计"); sb.Append(""); sb.Append(""); - sb.AppendFormat(" ", "汽车吊"); - sb.AppendFormat(" ", "履带吊"); - sb.AppendFormat(" ", "塔吊"); - sb.AppendFormat(" ", "门式起重机"); - sb.AppendFormat(" ", "升降机"); - sb.AppendFormat(" ", "叉车"); - sb.AppendFormat(" ", "挖掘机"); - sb.AppendFormat(" ", "装载机"); - sb.AppendFormat(" ", "拖板车"); - sb.AppendFormat(" ", "桩机"); - sb.AppendFormat(" ", "吊篮"); + sb.AppendFormat(" ", "汽车吊"); + sb.AppendFormat(" ", "履带吊"); + sb.AppendFormat(" ", "塔吊"); + sb.AppendFormat(" ", "门式起重机"); + sb.AppendFormat(" ", "升降机"); + sb.AppendFormat(" ", "叉车"); + sb.AppendFormat(" ", "挖掘机"); + sb.AppendFormat(" ", "装载机"); + sb.AppendFormat(" ", "拖板车"); + sb.AppendFormat(" ", "桩机"); + sb.AppendFormat(" ", "吊篮"); + sb.AppendFormat(" ", "高空作业升降平台"); sb.Append(""); var getMonthReport5 = from x in Funs.DB.SeDin_MonthReport5 where x.MonthReportId == monthReportId @@ -1211,9 +1212,10 @@ sb.AppendFormat(" ", item.D03); sb.AppendFormat(" ", item.D04); sb.AppendFormat(" ", item.S01); + sb.AppendFormat(" ", item.S02); sb.AppendFormat(" ", (item.T01 ?? 0) + (item.T02 ?? 0) + (item.T03 ?? 0) + (item.T04 ?? 0) + (item.T05 ?? 0) + (item.T06 ?? 0) - + (item.D01 ?? 0) + (item.D02 ?? 0) + (item.D03 ?? 0) + (item.D04 ?? 0) + (item.S01 ?? 0)); + + (item.D01 ?? 0) + (item.D02 ?? 0) + (item.D03 ?? 0) + (item.D04 ?? 0) + (item.S01 ?? 0) + (item.S02 ?? 0)); sb.Append(""); } @@ -1230,6 +1232,7 @@ int sumd03 = getMonthReport5.Sum(x => x.D03) ?? 0; int sumd04 = getMonthReport5.Sum(x => x.D04) ?? 0; int sums01 = getMonthReport5.Sum(x => x.S01) ?? 0; + int sums02 = getMonthReport5.Sum(x => x.S02) ?? 0; sb.AppendFormat(" ", sumt01); sb.AppendFormat(" ", sumt02); sb.AppendFormat(" ", sumt03); @@ -1241,7 +1244,8 @@ sb.AppendFormat(" ", sumd03); sb.AppendFormat(" ", sumd04); sb.AppendFormat(" ", sums01); - sb.AppendFormat(" ", sumt02 + sumt03 + sumt01 + sumt05 + sumt06 + sumd01 + sumd02 + sumd03 + sumd04 + sums01); + sb.AppendFormat(" ", sums02); + sb.AppendFormat(" ", sumt01 + sumt02 + sumt03 + sumt04+ sumt05 + sumt06 + sumd01 + sumd02 + sumd03 + sumd04 + sums01+ sums02); sb.Append(""); sb.Append("
{0}{0}
{0}{0}{0}{0}{0}{0}
{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}
{0}{0}{0}{0}{0}
{0}{0}{0}{0}{0}{0}{0}{0}{0}
"); diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx index 27de9647..50dc4e60 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx @@ -618,13 +618,20 @@ - + + + + + + x.D03) ?? 0; int sumD04 = getLists.Sum(x => x.D04) ?? 0; int sumS01 = getLists.Sum(x => x.S01) ?? 0; + int sumS02 = getLists.Sum(x => x.S02) ?? 0; if (this.GvSeDinMonthReport4Item.Rows.Count > 0) { JObject summary = new JObject @@ -412,7 +413,8 @@ namespace FineUIPro.Web.HSSE.Manager { "D03", sumD03 }, { "D04", sumD04 }, { "S01", sumS01 }, - { "TotalNum", sumS01+sumT02+sumT03+sumT04+sumT05+sumT06+sumD01+sumD02+sumD03+sumD04+sumS01 } + { "S02", sumS02 }, + { "TotalNum", sumT01+sumT02+sumT03+sumT04+sumT05+sumT06+sumD01+sumD02+sumD03+sumD04+sumS01+sumS02 } }; GvSeDinMonthReport5Item.SummaryData = summary; } @@ -878,6 +880,7 @@ namespace FineUIPro.Web.HSSE.Manager var d03 = values.Value("D03"); var d04 = values.Value("D04"); var s01 = values.Value("S01"); + var s02 = values.Value("S02"); Model.SeDinMonthReport5Item newReport5Item = new Model.SeDinMonthReport5Item(); newReport5Item.UnitName = unitName; newReport5Item.T01 = Funs.GetNewInt(t01); @@ -891,6 +894,7 @@ namespace FineUIPro.Web.HSSE.Manager newReport5Item.D03 = Funs.GetNewInt(d03); newReport5Item.D04 = Funs.GetNewInt(d04); newReport5Item.S01 = Funs.GetNewInt(s01); + newReport5Item.S02 = Funs.GetNewInt(s02); listSeDinMonthReport5Item.Add(newReport5Item); } newItem.SeDinMonthReport5Item = listSeDinMonthReport5Item; diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx index ab7da825..88847691 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQuality.aspx @@ -58,7 +58,7 @@ SortField="UnitName" FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left"> - diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx.cs index 7a510c6d..f2fba2fb 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); ///机具设备下拉框 - SpecialEquipmentService.InitSpecialEquipmentDropDownList(this.drpSpecialEquipmentId, true, true); + SpecialEquipmentService.InitSpecialEquipmentDropDownList2(this.drpSpecialEquipmentId, "3", true); this.EquipmentQualityId = Request.Params["EquipmentQualityId"]; if (!string.IsNullOrEmpty(this.EquipmentQualityId)) { diff --git a/SGGL/Model/APIItem/HSSE/SeDinMonthReport5Item.cs b/SGGL/Model/APIItem/HSSE/SeDinMonthReport5Item.cs index 94127039..0e003027 100644 --- a/SGGL/Model/APIItem/HSSE/SeDinMonthReport5Item.cs +++ b/SGGL/Model/APIItem/HSSE/SeDinMonthReport5Item.cs @@ -117,6 +117,14 @@ get; set; } + /// + /// 特殊机具设备-高空作业升降平台 + /// + public int? S02 + { + get; + set; + } /// /// 合计 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index aa16a05a..13fc220c 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -12259,7 +12259,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] public string ApproveIdea { get @@ -97812,10 +97812,10 @@ namespace Model private string _TrainNumber; - private string _TrainNumberId; - private System.Nullable _TypeInt; + private string _TrainNumberId; + private string _CompileMan; private System.Nullable _CompileDate; @@ -97848,10 +97848,10 @@ namespace Model partial void OnReceiveDateChanged(); partial void OnTrainNumberChanging(string value); partial void OnTrainNumberChanged(); - partial void OnTrainNumberIdChanging(string value); - partial void OnTrainNumberIdChanged(); partial void OnTypeIntChanging(System.Nullable value); partial void OnTypeIntChanged(); + partial void OnTrainNumberIdChanging(string value); + partial void OnTrainNumberIdChanged(); partial void OnCompileManChanging(string value); partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); @@ -98103,26 +98103,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] - public string TrainNumberId - { - get - { - return this._TrainNumberId; - } - set - { - if ((this._TrainNumberId != value)) - { - this.OnTrainNumberIdChanging(value); - this.SendPropertyChanging(); - this._TrainNumberId = value; - this.SendPropertyChanged("TrainNumberId"); - this.OnTrainNumberIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")] public System.Nullable TypeInt { @@ -98143,6 +98123,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] + public string TrainNumberId + { + get + { + return this._TrainNumberId; + } + set + { + if ((this._TrainNumberId != value)) + { + this.OnTrainNumberIdChanging(value); + this.SendPropertyChanging(); + this._TrainNumberId = value; + this.SendPropertyChanged("TrainNumberId"); + this.OnTrainNumberIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] public string CompileMan { @@ -109370,7 +109370,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")] public string Rectification { get @@ -109496,7 +109496,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")] public string Measures { get @@ -162211,7 +162211,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] public string AttentPerson { get @@ -193194,7 +193194,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string ProjectDescription { get @@ -193314,7 +193314,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string CalculationRule { get @@ -193374,7 +193374,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")] public string ConstructionSubcontractor { get @@ -193758,7 +193758,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] public System.Nullable WorkPackageEstimate { get @@ -194063,6 +194063,16 @@ namespace Model private string _ProjectId; + private string _ContractId; + + private string _OrderCode; + + private System.Nullable _OrderInDate; + + private System.Nullable _OrderOutDate; + + private string _MaterialRequisitionUnit; + private System.Nullable _State; private string _InvoiceCode; @@ -194091,16 +194101,6 @@ namespace Model private string _CreateUser; - private string _ContractId; - - private System.Nullable _OrderInDate; - - private string _OrderCode; - - private System.Nullable _OrderOutDate; - - private string _MaterialRequisitionUnit; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -194109,6 +194109,16 @@ namespace Model partial void OnInvoiceIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); + partial void OnContractIdChanging(string value); + partial void OnContractIdChanged(); + partial void OnOrderCodeChanging(string value); + partial void OnOrderCodeChanged(); + partial void OnOrderInDateChanging(System.Nullable value); + partial void OnOrderInDateChanged(); + partial void OnOrderOutDateChanging(System.Nullable value); + partial void OnOrderOutDateChanged(); + partial void OnMaterialRequisitionUnitChanging(string value); + partial void OnMaterialRequisitionUnitChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); partial void OnInvoiceCodeChanging(string value); @@ -194137,16 +194147,6 @@ namespace Model partial void OnCreateDateChanged(); partial void OnCreateUserChanging(string value); partial void OnCreateUserChanged(); - partial void OnContractIdChanging(string value); - partial void OnContractIdChanged(); - partial void OnOrderInDateChanging(System.Nullable value); - partial void OnOrderInDateChanged(); - partial void OnOrderCodeChanging(string value); - partial void OnOrderCodeChanged(); - partial void OnOrderOutDateChanging(System.Nullable value); - partial void OnOrderOutDateChanged(); - partial void OnMaterialRequisitionUnitChanging(string value); - partial void OnMaterialRequisitionUnitChanged(); #endregion public PHTGL_Invoice() @@ -194194,6 +194194,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] + public string ContractId + { + get + { + return this._ContractId; + } + set + { + if ((this._ContractId != value)) + { + this.OnContractIdChanging(value); + this.SendPropertyChanging(); + this._ContractId = value; + this.SendPropertyChanged("ContractId"); + this.OnContractIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] + public string OrderCode + { + get + { + return this._OrderCode; + } + set + { + if ((this._OrderCode != value)) + { + this.OnOrderCodeChanging(value); + this.SendPropertyChanging(); + this._OrderCode = value; + this.SendPropertyChanged("OrderCode"); + this.OnOrderCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] + public System.Nullable OrderInDate + { + get + { + return this._OrderInDate; + } + set + { + if ((this._OrderInDate != value)) + { + this.OnOrderInDateChanging(value); + this.SendPropertyChanging(); + this._OrderInDate = value; + this.SendPropertyChanged("OrderInDate"); + this.OnOrderInDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] + public System.Nullable OrderOutDate + { + get + { + return this._OrderOutDate; + } + set + { + if ((this._OrderOutDate != value)) + { + this.OnOrderOutDateChanging(value); + this.SendPropertyChanging(); + this._OrderOutDate = value; + this.SendPropertyChanged("OrderOutDate"); + this.OnOrderOutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] + public string MaterialRequisitionUnit + { + get + { + return this._MaterialRequisitionUnit; + } + set + { + if ((this._MaterialRequisitionUnit != value)) + { + this.OnMaterialRequisitionUnitChanging(value); + this.SendPropertyChanging(); + this._MaterialRequisitionUnit = value; + this.SendPropertyChanged("MaterialRequisitionUnit"); + this.OnMaterialRequisitionUnitChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] public System.Nullable State { @@ -194474,106 +194574,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] - public string ContractId - { - get - { - return this._ContractId; - } - set - { - if ((this._ContractId != value)) - { - this.OnContractIdChanging(value); - this.SendPropertyChanging(); - this._ContractId = value; - this.SendPropertyChanged("ContractId"); - this.OnContractIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] - public System.Nullable OrderInDate - { - get - { - return this._OrderInDate; - } - set - { - if ((this._OrderInDate != value)) - { - this.OnOrderInDateChanging(value); - this.SendPropertyChanging(); - this._OrderInDate = value; - this.SendPropertyChanged("OrderInDate"); - this.OnOrderInDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] - public string OrderCode - { - get - { - return this._OrderCode; - } - set - { - if ((this._OrderCode != value)) - { - this.OnOrderCodeChanging(value); - this.SendPropertyChanging(); - this._OrderCode = value; - this.SendPropertyChanged("OrderCode"); - this.OnOrderCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] - public System.Nullable OrderOutDate - { - get - { - return this._OrderOutDate; - } - set - { - if ((this._OrderOutDate != value)) - { - this.OnOrderOutDateChanging(value); - this.SendPropertyChanging(); - this._OrderOutDate = value; - this.SendPropertyChanged("OrderOutDate"); - this.OnOrderOutDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] - public string MaterialRequisitionUnit - { - get - { - return this._MaterialRequisitionUnit; - } - set - { - if ((this._MaterialRequisitionUnit != value)) - { - this.OnMaterialRequisitionUnitChanging(value); - this.SendPropertyChanging(); - this._MaterialRequisitionUnit = value; - this.SendPropertyChanged("MaterialRequisitionUnit"); - this.OnMaterialRequisitionUnitChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -232606,6 +232606,8 @@ namespace Model private System.Nullable _S01; + private System.Nullable _S02; + private EntityRef _SeDin_MonthReport; #region 可扩展性方法定义 @@ -232640,6 +232642,8 @@ namespace Model partial void OnD04Changed(); partial void OnS01Changing(System.Nullable value); partial void OnS01Changed(); + partial void OnS02Changing(System.Nullable value); + partial void OnS02Changed(); #endregion public SeDin_MonthReport5() @@ -232932,6 +232936,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_S02", DbType="Int")] + public System.Nullable S02 + { + get + { + return this._S02; + } + set + { + if ((this._S02 != value)) + { + this.OnS02Changing(value); + this.SendPropertyChanging(); + this._S02 = value; + this.SendPropertyChanged("S02"); + this.OnS02Changed(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SeDin_MonthReport5_SeDin_MonthReport5", Storage="_SeDin_MonthReport", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] public SeDin_MonthReport SeDin_MonthReport { @@ -313899,7 +313923,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] public string Name { get @@ -314476,7 +314500,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -314667,7 +314691,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -320006,7 +320030,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -321478,7 +321502,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -331029,7 +331053,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] public string ContractNo { get @@ -331049,7 +331073,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] public string UnitWorks { get From 598e79ee3ad5781f3da0b66f053dae6da78d77cd Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 16 Oct 2025 14:36:02 +0800 Subject: [PATCH 3/7] 1 --- SGGL/BLL/API/HSSE/APITestPlanService.cs | 21 ++++++++++++++++++ .../Controllers/HSSE/TestPlanController.cs | 22 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/SGGL/BLL/API/HSSE/APITestPlanService.cs b/SGGL/BLL/API/HSSE/APITestPlanService.cs index cf824cb3..a53c892b 100644 --- a/SGGL/BLL/API/HSSE/APITestPlanService.cs +++ b/SGGL/BLL/API/HSSE/APITestPlanService.cs @@ -532,5 +532,26 @@ namespace BLL APITrainRecordService.InsertTrainRecord(getTestPlan); } } + + #region 获取考试试题类型列表 + /// + /// 获取考试试题类型列表 + /// + /// + public static List getTestTraining() + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var getDataLists = (from x in db.Training_TestTraining + orderby x.TrainingCode + select new Model.TestPlanTrainingItem + { + TrainingTypeId = x.TrainingId, + TrainingTypeName = x.TrainingName, + }).ToList(); + return getDataLists; + } + } + #endregion } } diff --git a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs index df098471..58c16176 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs @@ -244,5 +244,27 @@ namespace WebAPI.Controllers return responeData; } #endregion + + #region 获取考试试题类型列表 + /// + /// 获取考试试题类型列表 + /// + /// 考试计划ID + /// 试题类型 + public Model.ResponeData getTestTrainingList() + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = APITestPlanService.getTestTraining(); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion } } From 01de4d6f2aa1894d1ec7810bad49b5a3d5be4d7a Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 20 Oct 2025 17:29:33 +0800 Subject: [PATCH 4/7] 1 --- SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs index af400688..bf48229e 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs @@ -793,7 +793,7 @@ namespace FineUIPro.Web.CQMS.WBS /// private void BindGrid() { - string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,case CheckAcceptType when '1' then '关键工序验收' when '2' then '特殊过程验收' when '3' then '隐蔽工程验收' when '4' then '单位工程一次验收' when '5' then '材料进场复验' else '' end as CheckAcceptType " + string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,case CheckAcceptType when '1' then '关键工序验收' when '2' then '特殊过程验收' when '3' then '隐蔽工程验收' when '4' then '单位工程验收' when '5' then '分部工程验收' when '6' then '分项工程验收' else '' end as CheckAcceptType " + @" FROM WBS_ControlItemAndCycle "; List listStr = new List(); strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 "; From b5c375e631c405ea1abbf18595cd1d3d804558ed Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 21 Oct 2025 10:55:34 +0800 Subject: [PATCH 5/7] 1 --- SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs index 60187208..ba2c03b3 100644 --- a/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/UnitWorkEdit.aspx.cs @@ -99,15 +99,15 @@ namespace FineUIPro.Web.ProjectData UnitWork.ProjectId = this.CurrUser.LoginProjectId; UnitWork.UnitWorkCode = this.txtUnitWorkCode.Text.Trim(); UnitWork.UnitWorkName = this.txtUnitWorkName.Text.Trim(); - if (this.drpUnit.SelectedValue != BLL.Const._Null) - { - UnitWork.UnitId = string.Join(",", this.drpUnit.SelectedValueArray); - } - else + if (this.drpUnit.SelectedValue == BLL.Const._Null && this.drpUnit.SelectedValueArray.Length == 1) { Alert.ShowInTop("请选择施工单位！"); return; } + else + { + UnitWork.UnitId = string.Join(",", this.drpUnit.SelectedValueArray); + } if (this.drpSupervisorUnit.SelectedValue != BLL.Const._Null) { UnitWork.SupervisorUnitId = this.drpSupervisorUnit.SelectedValue; From 05a92b528ded916a8dea5031df65ee1973780338 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 23 Oct 2025 16:35:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?20251023=20=E6=8E=92=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_V2025-10-23-001-bwj.sql | 123 ++++++ .../ProductionSchedulingPlanService.cs | 32 +- .../PreDesign/ProductionSchedulingPlan.aspx | 53 ++- .../ProductionSchedulingPlan.aspx.cs | 369 ++++++++++++++++-- .../ProductionSchedulingPlan.aspx.designer.cs | 100 +++-- 5 files changed, 594 insertions(+), 83 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-10-23-001-bwj.sql diff --git a/DataBase/版本日志/SGGLDB_V2025-10-23-001-bwj.sql b/DataBase/版本日志/SGGLDB_V2025-10-23-001-bwj.sql new file mode 100644 index 00000000..35dcfa2d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-10-23-001-bwj.sql @@ -0,0 +1,123 @@ +ALTER PROCEDURE [dbo].[Sp_HJGL_ProductionPlanStatistics] + @projectId nvarchar(50)=null +AS +BEGIN + SET NOCOUNT ON; -- + + -- ʹCTEԤȹ˺;ۺ + WITH PipelineFiltered AS ( + SELECT UnitWorkId, FlowingSection, PipelineId + FROM HJGL_Pipeline + WHERE PipeArea='1' + AND FlowingSection IS NOT NULL + AND FlowingSection != '' + AND (@projectId IS NULL OR UnitWorkId IN ( + SELECT UnitWorkId FROM WBS_UnitWork WHERE ProjectId = @projectId + )) + ), + + -- Ԥܴ + TotalDiaCTE AS ( + SELECT p.UnitWorkId, p.FlowingSection, SUM(wj.Size) as TotalDia + FROM HJGL_WeldJoint wj + INNER JOIN PipelineFiltered p ON p.PipelineId = wj.PipelineId + WHERE wj.JointAttribute='Ԥƿ' + GROUP BY p.UnitWorkId, p.FlowingSection + ), + + -- ɹ + CurrentDayCompletedCTE AS ( + SELECT p.UnitWorkId, p.FlowingSection, SUM(wj.Size) as CurrentDayCompletedDia + FROM HJGL_WeldJoint wj + INNER JOIN PipelineFiltered p ON p.PipelineId = wj.PipelineId + INNER JOIN HJGL_WeldingDaily wd ON wd.WeldingDailyId = wj.WeldingDailyId + WHERE wj.JointAttribute='Ԥƿ' + AND wj.WeldingDailyId IS NOT NULL + AND wd.WeldingDate >= CAST(GETDATE() AS DATE) -- ŻڱȽϣʹڷΧ + AND wd.WeldingDate < DATEADD(DAY, 1, CAST(GETDATE() AS DATE)) + GROUP BY p.UnitWorkId, p.FlowingSection + ), + + -- ۼ + TotalCompletedCTE AS ( + SELECT p.UnitWorkId, p.FlowingSection, SUM(wj.Size) as totalCompletedDia + FROM HJGL_WeldJoint wj + INNER JOIN PipelineFiltered p ON p.PipelineId = wj.PipelineId + WHERE wj.JointAttribute='Ԥƿ' + AND wj.WeldingDailyId IS NOT NULL + GROUP BY p.UnitWorkId, p.FlowingSection + ), + + -- ǰ + WelderCountCTE AS ( + SELECT p.UnitWorkId, p.FlowingSection, + COUNT(DISTINCT pp.PersonId) as WelderCount -- ʹDISTINCTظ + FROM Person_Persons pp + INNER JOIN HJGL_WeldJoint wj ON wj.BackingWelderId = pp.PersonId + INNER JOIN PipelineFiltered p ON p.PipelineId = wj.PipelineId + WHERE wj.JointAttribute='Ԥƿ' + AND wj.WeldingDailyId IS NOT NULL + GROUP BY p.UnitWorkId, p.FlowingSection + )--, + + ---- Ԥ + --WarningWelderCountCTE AS ( + -- SELECT p.UnitWorkId, p.FlowingSection, + -- COUNT(DISTINCT pp.PersonId) as WarningWelderCount + -- FROM Person_Persons pp + -- INNER JOIN HJGL_WeldJoint wj ON wj.BackingWelderId = pp.PersonId + -- INNER JOIN PipelineFiltered p ON p.PipelineId = wj.PipelineId + -- INNER JOIN Welder_WelderQualify wq ON wq.WelderId = pp.PersonId + -- WHERE wj.JointAttribute='Ԥƿ' + -- AND wj.WeldingDailyId IS NOT NULL + -- AND wq.LimitDate < GETDATE() -- ʸԤ + -- GROUP BY p.UnitWorkId, p.FlowingSection + --) + + SELECT DISTINCT + unitWork.UnitWorkId, + unitWork.UnitWorkCode, + unitWork.UnitWorkName, + unitWork.ProjectId, + pipeline.FlowingSection, + isnull(total.TotalDia,0) as TotalDia,--Ԥܴ + p.PlanStartDate,--ƻʼ + p.PlanEndDate,--ƻ + --(DATEDIFF(day, p.PlanStartDate, p.PlanEndDate) +1) as TotalDays,-- + --(case when p.PlanEndDate>= getdate() then (DATEDIFF(day, p.PlanStartDate, p.PlanEndDate)-(DATEDIFF(day,p.PlanStartDate,GETDATE()))) else '' end) as RemainingDays,--ʣ + --(case when DATEDIFF(day, p.PlanStartDate, p.PlanEndDate)>0 then cast(isnull(total.TotalDia,0)/DATEDIFF(day, p.PlanStartDate, p.PlanEndDate) as decimal(18,2)) else 0 end) as AvgDayCompleteDia, --ƽÿӦɹ + ISNULL(currentDay.CurrentDayCompletedDia,0) as CurrentDayCompletedDia, --ɹ + + --cast(case when (case when p.PlanEndDate>= getdate() then (DATEDIFF(day, p.PlanStartDate, p.PlanEndDate)-(DATEDIFF(day,p.PlanStartDate,GETDATE()))) else 0 end)>0 then + --(isnull(total.TotalDia,0)-isnull(totalCompleted.totalCompletedDia,0))/ (case when p.PlanEndDate>= getdate() then (DATEDIFF(day, p.PlanStartDate, p.PlanEndDate)-(DATEDIFF(day,p.PlanStartDate,GETDATE()))) else 0 end) else 0 end as decimal(18,2)) as NextDayComplete, --Ӧ + + isnull(totalCompleted.totalCompletedDia,0) as totalCompletedDia, --ۼ + cast(cast((case when isnull(total.TotalDia,0)>0 then + (isnull(totalCompleted.totalCompletedDia,0) / isnull(total.TotalDia,0)*100) else 0 end) as decimal(18,2)) as varchar(10))+'%' as CompletedRate, --ɰٷֱ + welder.WelderCount, --ǰ + --warningWelder.WarningWelderCount --Ԥ + (case when welder.WelderCount>0 then cast((ISNULL(currentDay.CurrentDayCompletedDia,0)/welder.WelderCount) as decimal(18,2)) else 0 end) as WarningWelderCount--չЧ + FROM WBS_UnitWork AS unitWork + INNER JOIN PipelineFiltered pipeline ON pipeline.UnitWorkId = unitWork.UnitWorkId -- ʹINNER JOINΪpipelineݱ + --LEFT JOIN HJGL_ProductionSchedulingPlan p ON p.PipelineId = unitWork.UnitWorkId AND p.FlowNum = pipeline.FlowingSection + --Ųƻ + left join (select min(PlanStartDate) as PlanStartDate,max(PlanEndDate) as PlanEndDate,PipelineId,FlowNum from HJGL_ProductionSchedulingPlan + group by PipelineId,FlowNum + ) as p on p.PipelineId=unitWork.UnitWorkId and p.FlowNum = pipeline.FlowingSection + + --Ԥܴ + LEFT JOIN TotalDiaCTE total ON total.UnitWorkId = unitWork.UnitWorkId AND total.FlowingSection = pipeline.FlowingSection + --ɹ + LEFT JOIN CurrentDayCompletedCTE currentDay ON currentDay.UnitWorkId = unitWork.UnitWorkId AND currentDay.FlowingSection = pipeline.FlowingSection + --ۼ + LEFT JOIN TotalCompletedCTE totalCompleted ON totalCompleted.UnitWorkId = unitWork.UnitWorkId AND totalCompleted.FlowingSection = pipeline.FlowingSection + --ǰ + LEFT JOIN WelderCountCTE welder ON welder.UnitWorkId = unitWork.UnitWorkId AND welder.FlowingSection = pipeline.FlowingSection + --Ԥ + --LEFT JOIN WarningWelderCountCTE warningWelder ON warningWelder.UnitWorkId = unitWork.UnitWorkId AND warningWelder.FlowingSection = pipeline.FlowingSection + WHERE (@projectId IS NULL OR unitWork.ProjectId = @projectId) + AND pipeline.FlowingSection IS NOT NULL +END +GO + + diff --git a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs index e31fa98a..46eb918f 100644 --- a/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs +++ b/SGGL/BLL/HJGL/PreDesign/ProductionSchedulingPlanService.cs @@ -19,15 +19,41 @@ namespace BLL return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProductionSchedulingPlanId == productionSchedulingPlanId); } - + /// + /// 根据单位工程、流水段、材质、口径获取排产计划 + /// + /// + /// + /// + /// + /// + /// public static Model.HJGL_ProductionSchedulingPlan GetProductionSchedulingPlan(string loginProjectId, string flowingSection, string unitWorkId, string material, string caliber) { return Funs.DB.HJGL_ProductionSchedulingPlan.FirstOrDefault(e => e.ProjectId == loginProjectId && e.FlowNum == flowingSection && e.PipelineId == unitWorkId && e.Material == material && e.Caliber == caliber); } - public static List GetProductionSchedulingPlanByMaterialLists(string loginProjectId, string flowingSection, string unitWorkId, string material) + /// + /// 根据单位工程、流水段获取排产计划信息 + /// + /// + /// + /// + /// + public static List GetProductionSchedulingPlanByFlowingSection(string loginProjectId, string flowingSection, string unitWorkId) { - return (from x in Funs.DB.HJGL_ProductionSchedulingPlan where x.ProjectId == loginProjectId && x.FlowNum == flowingSection && x.PipelineId == unitWorkId && x.Material == material select x).ToList(); + return (from x in Funs.DB.HJGL_ProductionSchedulingPlan where x.ProjectId == loginProjectId && x.FlowNum == flowingSection && x.PipelineId == unitWorkId select x).ToList(); + } + + /// + /// 根据单位工程获取排产计划信息 + /// + /// + /// + /// + public static List GetProductionSchedulingPlanByUnitWorkId(string loginProjectId, string unitWorkId) + { + return (from x in Funs.DB.HJGL_ProductionSchedulingPlan where x.ProjectId == loginProjectId && x.PipelineId == unitWorkId select x).ToList(); } /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx index 06f1bfd1..a26d1829 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx @@ -50,7 +50,7 @@ EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="UnitWorkId,FlowingSection" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="1" DataIDField="" AllowSorting="true" SortField="UnitWorkName,FlowingSection" SortDirection="ASC" - AllowPaging="true" IsDatabasePaging="true" PageSize="15" + AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnSort="Grid2_Sort" OnPageIndexChange="Grid2_PageIndexChange" EnableTextSelection="True" Height="300px" OnRowDataBound="Grid2_RowDataBound"> - - - --%> + + + + + + <%-- - - --%> + + + + + + <%-- - + --%> + + + + + - - + --%> + + + + + @@ -107,8 +127,8 @@ DataField="WelderCount" FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> - @@ -135,8 +155,8 @@ EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="ProductionSchedulingPlanId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="1" DataIDField="ProductionSchedulingPlanId" AllowSorting="true" SortField="FlowNum,Material,Caliber" SortDirection="ASC" OnSort="Grid1_Sort" - AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" - EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound" > + AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" + EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound"> @@ -304,12 +324,12 @@ const daysDifference = timeDifference / (1000 * 60 * 60 * 24); //平均每日应完成量=达因数/天数 const avgDailyWorkload = dain / (daysDifference + 1); - + const currentTime = Math.abs(endDate - Date.now());//获取剩余天数（毫秒） const daysTime = Math.ceil(currentTime / (1000 * 60 * 60 * 24));//将时间差转换为天数 if (daysTime > 0) { - //次日应完成量=剩余工程量(达因数-累计已完成量)/剩余天数（结束时间-当前时间） + //次日应完成量=剩余工程量(达因数-累计已完成量)/剩余天数（结束时间-当前时间） var nextDayCompleteDyne = (dain - completedCount) / daysTime; } @@ -317,9 +337,6 @@ me.updateCellValue(rowId, 'AvgDailyWorkload', avgDailyWorkload.toFixed(2));//平均每天工作量 me.updateCellValue(rowId, 'NextDayCompleteDyne', nextDayCompleteDyne.toFixed(2));//次日应完成量 } - - - } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs index 76ece3d7..a25b86cc 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs @@ -7,6 +7,7 @@ using System.Data; using System.Data.SqlClient; using System.IO; using System.Linq; +using AspNet = System.Web.UI.WebControls; namespace FineUIPro.Web.HJGL.PreDesign { @@ -199,7 +200,6 @@ namespace FineUIPro.Web.HJGL.PreDesign e.Node.Nodes.Clear(); BindNodes(e.Node); } - } #endregion @@ -211,6 +211,153 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { + #region 实时统计生产看板数据 + string projectId = this.CurrUser.LoginProjectId; + string steelType = string.Empty;//材质id + //统计生产看板当日已完成量、次日应完成量、累计已完成量、已完成百分比、已完成百分比汇总 + if (tvControlItem.SelectedNode.CommandName == "流水段")//点击流水段 + { + var planLists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, tvControlItem.SelectedNode.Text, tvControlItem.SelectedNode.ParentNode.NodeID); + if (planLists.Count > 0) + { + foreach (var item in planLists) + { + var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanById(item.ProductionSchedulingPlanId); + if (plan != null) + { + if (plan.Material == "碳钢") + { + steelType = "1"; + } + else if (plan.Material == "不锈钢") + { + steelType = "2"; + } + else if (plan.Material == "铬钼钢") + { + steelType = "3"; + } + else if (plan.Material == "低合金钢") + { + steelType = "4"; + } + else if (plan.Material == "镍合金钢") + { + steelType = "5"; + } + else if (plan.Material == "钛合金钢") + { + steelType = "6"; + } + else if (plan.Material == "其他") + { + steelType = "7"; + } + //当日已完成量 + var currentDay = BLL.WeldJointService.GetCurrentDaySizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber); + if (currentDay != null) + { + plan.OnDayCompleteDyne = currentDay; + } + else + { + plan.OnDayCompleteDyne = 0; + } + plan.CompletedCount = BLL.WeldJointService.GetSizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber, "2");//累计已完成量 + if (plan.Dain > 0) + { + plan.CompletedRate = (plan.CompletedCount / plan.Dain) * 100;//已完成百分比 + } + else + { + plan.CompletedRate = 0; + } + if (plan.PriorityTotalDyne > 0) + { + decimal? completeDinSum = BLL.WeldJointService.GetSizeSumByUnitWorkIdAndFlowingSection(projectId, plan.PipelineId, plan.FlowNum, "2");//完成总达因 + plan.TotalCompletedRate = (completeDinSum / plan.PriorityTotalDyne) * 100;//已完成百分比汇总 + } + else + { + plan.TotalCompletedRate = 0; + } + BLL.ProductionSchedulingPlanService.UpdateProductionSchedulingPlan(plan); + } + } + } + } + else if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)//点击单位工程 + { + var planLists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByUnitWorkId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.NodeID); + if (planLists.Count > 0) + { + foreach (var item in planLists) + { + var plan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanById(item.ProductionSchedulingPlanId); + if (plan != null) + { + if (plan.Material == "碳钢") + { + steelType = "1"; + } + else if (plan.Material == "不锈钢") + { + steelType = "2"; + } + else if (plan.Material == "铬钼钢") + { + steelType = "3"; + } + else if (plan.Material == "低合金钢") + { + steelType = "4"; + } + else if (plan.Material == "镍合金钢") + { + steelType = "5"; + } + else if (plan.Material == "钛合金钢") + { + steelType = "6"; + } + else if (plan.Material == "其他") + { + steelType = "7"; + } + //当日已完成量 + var currentDay = BLL.WeldJointService.GetCurrentDaySizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber); + if (currentDay != null) + { + plan.OnDayCompleteDyne = currentDay; + } + else + { + plan.OnDayCompleteDyne = 0; + } + plan.CompletedCount = BLL.WeldJointService.GetSizeSum(projectId, plan.PipelineId, plan.FlowNum, steelType, plan.Caliber, "2");//累计已完成量 + if (plan.Dain > 0) + { + plan.CompletedRate = (plan.CompletedCount / plan.Dain) * 100;//已完成百分比 + } + else + { + plan.CompletedRate = 0; + } + if (plan.PriorityTotalDyne > 0) + { + decimal? completeDinSum = BLL.WeldJointService.GetSizeSumByUnitWorkIdAndFlowingSection(projectId, plan.PipelineId, plan.FlowNum, "2");//完成总达因 + plan.TotalCompletedRate = (completeDinSum / plan.PriorityTotalDyne) * 100;//已完成百分比汇总 + } + else + { + plan.TotalCompletedRate = 0; + } + BLL.ProductionSchedulingPlanService.UpdateProductionSchedulingPlan(plan); + } + } + } + } + #endregion this.BindGrid(); } @@ -597,34 +744,22 @@ namespace FineUIPro.Web.HJGL.PreDesign var newPlan = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanById(rowId); if (newPlan != null) { - if (!string.IsNullOrEmpty(values.Value("TotalPriority"))) - { - newPlan.TotalPriority = values.Value("TotalPriority"); - } - else + if (!string.IsNullOrEmpty(totalPriority)) { newPlan.TotalPriority = totalPriority; totalPriority = string.Empty; } + else + { + newPlan.TotalPriority = values.Value("TotalPriority"); + totalPriority = newPlan.TotalPriority; + } newPlan.PlanStartDate = Funs.GetNewDateTime(values.Value("PlanStartDate")); newPlan.PlanEndDate = Funs.GetNewDateTime(values.Value("PlanEndDate")); newPlan.Days = Funs.GetNewInt(values.Value("Days")); newPlan.AvgDailyWorkload = Funs.GetNewDecimal(values.Value("AvgDailyWorkload")); newPlan.NextDayCompleteDyne = Funs.GetNewDecimal(values.Value("NextDayCompleteDyne")); BLL.ProductionSchedulingPlanService.UpdateProductionSchedulingPlan(newPlan); - - //更新合并单元格的总达因（按材质）优先级 - if (!string.IsNullOrEmpty(newPlan.TotalPriority)) - { - var pLists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByMaterialLists(this.CurrUser.LoginProjectId, newPlan.FlowNum, newPlan.PipelineId, newPlan.Material); - foreach (var item in pLists) - { - if (string.IsNullOrEmpty(item.TotalPriority)) - { - totalPriority = newPlan.TotalPriority; - } - } - } } } ShowNotify("保存成功！", MessageBoxIcon.Success); @@ -932,16 +1067,24 @@ namespace FineUIPro.Web.HJGL.PreDesign #region 生产看板 protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e) + { + Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue); + this.BindGrid2(); + } + protected void Grid2_Sort(object sender, GridSortEventArgs e) { this.BindGrid2(); } + protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid2(); + } /// /// 绑定数据 /// private void BindGrid2() { - List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); @@ -961,17 +1104,22 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected void Grid2_RowDataBound(object sender, GridRowEventArgs e) { - DataRowView row = e.DataItem as DataRowView; + //DataRowView row = e.DataItem as DataRowView; double avgDailyWorkload = 0; double nextDayCompleteDyne = 0; - if (row["AvgDayCompleteDia"] != null && !string.IsNullOrEmpty(row["AvgDayCompleteDia"].ToString())) - { - avgDailyWorkload = Convert.ToDouble(row["AvgDayCompleteDia"]);//平均每日应完成工作量 - } - if (row["NextDayComplete"] != null && !string.IsNullOrEmpty(row["NextDayComplete"].ToString())) - { - nextDayCompleteDyne = Convert.ToDouble(row["NextDayComplete"]);//次日应完成量 - } + //if (row["AvgDayCompleteDia"] != null && !string.IsNullOrEmpty(row["AvgDayCompleteDia"].ToString())) + //{ + // avgDailyWorkload = Convert.ToDouble(row["AvgDayCompleteDia"]);//平均每日应完成工作量 + //} + //if (row["NextDayComplete"] != null && !string.IsNullOrEmpty(row["NextDayComplete"].ToString())) + //{ + // nextDayCompleteDyne = Convert.ToDouble(row["NextDayComplete"]);//次日应完成量 + //} + + //avgDailyWorkload=(e.RowID["lblAvgDayCompleteDia") as AspNet.Label).Text + + avgDailyWorkload = Convert.ToDouble((e.Row.FindControl("lblAvgDayCompleteDia") as AspNet.Label).Text);//平均每日应完成工作量 + nextDayCompleteDyne = Convert.ToDouble((e.Row.FindControl("lblNextDayComplete") as AspNet.Label).Text); //次日应完成量(平均) if (avgDailyWorkload < nextDayCompleteDyne) { e.RowCssClass = "color1"; @@ -979,5 +1127,168 @@ namespace FineUIPro.Web.HJGL.PreDesign } #endregion + #region 格式化字符串 + /// + /// 获取有效总天数 + /// + /// + /// + /// + /// + public static int getTotalDays(string projectId, string unitWorkId, string flowNum) + { + var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId); + List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>(); + foreach (var item in lists) + { + if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue) + { + var dateRanges = new List<(DateTime, DateTime)> + { + (new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)), + }; + combinedList.AddRange(dateRanges); + } + } + return GetEffectiveDaysLinq(combinedList); + } + + /// + /// 获取剩余天数 + /// + /// + /// + /// + /// + public static int getRemainingDays(string projectId, string unitWorkId, string flowNum) + { + var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId); + List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>(); + foreach (var item in lists) + { + if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue) + { + if (item.PlanEndDate > DateTime.Now) + { + var dateRanges = new List<(DateTime, DateTime)> + { + (new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)), + }; + combinedList.AddRange(dateRanges); + } + } + } + return GetEffectiveDaysLinq(combinedList); + } + + /// + /// 获取平均每日应完成工作量 + /// + /// + /// + /// + /// + public static double getAvgDayCompleteDia(string projectId, string unitWorkId, string flowNum) + { + double AvgDayCompleteDia = 0; + int totalDays = 0; + var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId); + List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>(); + foreach (var item in lists) + { + if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue) + { + var dateRanges = new List<(DateTime, DateTime)> + { + (new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)), + }; + combinedList.AddRange(dateRanges); + } + } + totalDays = GetEffectiveDaysLinq(combinedList); + + ///总达因 + decimal? dia = (from x in Funs.DB.HJGL_WeldJoint + join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId + where x.ProjectId == projectId && y.UnitWorkId == unitWorkId && y.FlowingSection == flowNum + && x.JointAttribute == "预制口" + select x.Size).Sum(); + if (totalDays > 0) + { + //平均每日应完成工作量=总达因/有效总天数 + AvgDayCompleteDia = Math.Round(Convert.ToDouble(dia / totalDays), 2); + } + return AvgDayCompleteDia; + } + + /// + /// 获取次日应完成量（平均） + /// + /// + /// + /// + /// + public static double getNextDayComplete(string projectId, string unitWorkId, string flowNum) + { + double nextDayComplete = 0; + int remainingDays = 0; + var lists = BLL.ProductionSchedulingPlanService.GetProductionSchedulingPlanByFlowingSection(projectId, flowNum, unitWorkId); + List<(DateTime, DateTime)> combinedList = new List<(DateTime, DateTime)>(); + foreach (var item in lists) + { + if (item.PlanStartDate.HasValue && item.PlanEndDate.HasValue) + { + if (item.PlanEndDate > DateTime.Now) + { + var dateRanges = new List<(DateTime, DateTime)> + { + (new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)), + }; + combinedList.AddRange(dateRanges); + } + } + } + remainingDays = GetEffectiveDaysLinq(combinedList); + + ///总达因 + decimal? totalDia = (from x in Funs.DB.HJGL_WeldJoint + join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId + where x.ProjectId == projectId && y.UnitWorkId == unitWorkId && y.FlowingSection == flowNum + && x.JointAttribute == "预制口" + select x.Size).Sum(); + //完成达因 + decimal? completedDia = (from x in Funs.DB.HJGL_WeldJoint + join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId + where x.ProjectId == projectId && y.UnitWorkId == unitWorkId && y.FlowingSection == flowNum + && x.JointAttribute == "预制口" && x.WeldingDailyId != null && x.WeldingDailyId != "" + select x.Size).Sum(); + if (remainingDays > 0) + { + //次日应完成量（平均）=(总达因-完成达因)/剩余天数 + nextDayComplete = Math.Round(Convert.ToDouble((totalDia - completedDia) / remainingDays), 2); + } + return nextDayComplete; + } + + /// + /// 生成所有日期并去重 + /// + /// + /// + public static int GetEffectiveDaysLinq(List<(DateTime start, DateTime end)> dateRanges) + { + if (dateRanges == null || !dateRanges.Any()) + return 0; + + // 生成所有日期并去重 + var allDates = dateRanges + .SelectMany(range => + Enumerable.Range(0, (range.end - range.start).Days + 1) + .Select(offset => range.start.AddDays(offset).Date)) + .Distinct(); + + return allDates.Count(); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.designer.cs index 9747bfd8..4a3e9c68 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.PreDesign -{ - - - public partial class ProductionSchedulingPlan - { - +namespace FineUIPro.Web.HJGL.PreDesign { + + + public partial class ProductionSchedulingPlan { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// txtSize 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSize; - + /// /// btnStatics 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnStatics; - + /// /// hdUnitWorkId 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdUnitWorkId; - + /// /// tvControlItem 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// panelCenterTop 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterTop; - + /// /// Grid2 控件。 /// @@ -112,7 +110,43 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid2; - + + /// + /// lblTotalDay 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblTotalDay; + + /// + /// lblRemainingDays 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblRemainingDays; + + /// + /// lblAvgDayCompleteDia 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblAvgDayCompleteDia; + + /// + /// lblNextDayComplete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNextDayComplete; + /// /// ToolbarSeparator2 控件。 /// @@ -121,7 +155,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2; - + /// /// ToolbarText2 控件。 /// @@ -130,7 +164,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText2; - + /// /// ddlPageSize2 控件。 /// @@ -139,7 +173,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize2; - + /// /// Grid1 控件。 /// @@ -148,7 +182,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar3 控件。 /// @@ -157,7 +191,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// ToolbarFill1 控件。 /// @@ -166,7 +200,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -175,7 +209,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnOut 控件。 /// @@ -184,7 +218,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// txtTotalPriority 控件。 /// @@ -193,7 +227,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTotalPriority; - + /// /// txtPlanStartDate 控件。 /// @@ -202,7 +236,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtPlanStartDate; - + /// /// txtPlanEndDate 控件。 /// @@ -211,7 +245,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtPlanEndDate; - + /// /// ToolbarSeparator1 控件。 /// @@ -220,7 +254,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -229,7 +263,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -238,7 +272,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Menu1 控件。 /// @@ -247,7 +281,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuDelete 控件。 /// From 286db49929fcdc373562d36510c1902a879cb446 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 23 Oct 2025 16:58:25 +0800 Subject: [PATCH 7/7] 1 --- SGGL/BLL/ZHGL/DataSync/BaseDataService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/BLL/ZHGL/DataSync/BaseDataService.cs b/SGGL/BLL/ZHGL/DataSync/BaseDataService.cs index bbdd7b8a..3adef53f 100644 --- a/SGGL/BLL/ZHGL/DataSync/BaseDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/BaseDataService.cs @@ -23,7 +23,7 @@ namespace BLL from projectType in projectTypeJoin.DefaultIfEmpty() join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = project.ProjectState, GroupId = BLL.ConstValue.GroupId_ProjectState } equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin from sysConst in sysConstJoin.DefaultIfEmpty() - where project.ProjectState == "1" && project.MasterSysId != null + where project.ProjectState == "1" && project.MasterSysId != null && project.IsCNCECShow == true select new ProjectOutput { ProjectId = project.ProjectId,