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] 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