diff --git a/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql b/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql new file mode 100644 index 00000000..087bc6ba --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-19-gf.sql @@ -0,0 +1,7 @@ +alter table HJGL_MaterialCodeLib add HeatNo nvarchar(50) null +alter table Tw_InOutPlanDetail add HeatNo nvarchar(50) null +GO + +insert into Sys_Menu +values('2F027233-22EC-4063-A04F-FB9FE6A91588','ϲֿ',null,'HJGL/BaseInfo/Warehouse.aspx',30,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1) +GO \ No newline at end of file diff --git a/SGGL/BLL/CLGL/TwInOutplandetailService.cs b/SGGL/BLL/CLGL/TwInOutplandetailService.cs index 51f195bd..077be9c0 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailService.cs @@ -43,6 +43,7 @@ namespace BLL InOutPlanMasterId = x.InOutPlanMasterId, PipelineComponentId = x.PipelineComponentId, MaterialCode = x.MaterialCode, + HeatNo = x.HeatNo, PlanNum = x.PlanNum, ActNum = x.ActNum, PipelineComponentCode = y.PipelineComponentCode, @@ -108,13 +109,27 @@ namespace BLL public static void AddList(IEnumerable list, string inoutPlanMasterId) { int sortIndex = 1; + List details = new List(); foreach (var item in list) { - item.Id = SQLHelper.GetNewID(); - item.SortIndex = sortIndex; - item.InOutPlanMasterId = inoutPlanMasterId; - Add(item); + Model.Tw_InOutPlanDetail table = new Model.Tw_InOutPlanDetail + { + Id = SQLHelper.GetNewID(), + InOutPlanMasterId = inoutPlanMasterId, + PipelineComponentId = item.PipelineComponentId, + MaterialCode = item.MaterialCode, + PlanNum = item.PlanNum, + ActNum = item.ActNum, + SortIndex = sortIndex, + HeatNo = item.HeatNo + }; sortIndex++; + details.Add(table); + } + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + db.Tw_InOutPlanDetail.InsertAllOnSubmit(details); + db.SubmitChanges(); } } public static void Update(Model.Tw_InOutPlanDetail newtable) diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index 94db0e6a..679af536 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -273,12 +273,12 @@ namespace BLL if (!string.IsNullOrEmpty(errorWarehouseCode)) { - if (temeplateDtoIns.Count == 0) - { + //if (temeplateDtoIns.Count == 0) + //{ responeData.code = 0; responeData.message = errorWarehouseCode + "仓库不存在！"; return responeData; - } + //} } var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型 if (typeString.Where(x => string.IsNullOrEmpty(x)).Count() > 0) @@ -295,21 +295,21 @@ namespace BLL } - var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码 - var IsExitMaterialCode = - from x in Funs.DB.HJGL_MaterialCodeLib - where materialCodeList.Contains(x.MaterialCode) - select x.MaterialCode; - if (IsExitMaterialCode.Count() < materialCodeList.Count) - { - var errorMaterialCode = materialCodeList.Except(IsExitMaterialCode.ToList()); - if (errorMaterialCode.Count() > 0) - { - responeData.code = 0; - responeData.message = string.Join(",", errorMaterialCode) + "材料不存在！"; - return responeData; - } - } + //var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码 + //var IsExitMaterialCode = + // from x in Funs.DB.HJGL_MaterialCodeLib + // where materialCodeList.Contains(x.MaterialCode) + // select x.MaterialCode; + //if (IsExitMaterialCode.Count() < materialCodeList.Count) + //{ + // var errorMaterialCode = materialCodeList.Except(IsExitMaterialCode.ToList()); + // if (errorMaterialCode.Count() > 0) + // { + // responeData.code = 0; + // responeData.message = string.Join(",", errorMaterialCode) + "材料不存在！"; + // return responeData; + // } + //} string cusbilcode = GetDataInCusBillCode(projectid, UnitService.GetUnitCodeByUnitId(Person_PersonsService.GetPerson_PersonsById(creatUserId).UnitId), temeplateDtoIns.FirstOrDefault().TypeString); foreach (var item in temeplateDtoIns) { @@ -367,6 +367,7 @@ namespace BLL twInOutPlanMaster.CreateDate = DateTime.Now; twInOutPlanMaster.Remark = OriFileName; Add(twInOutPlanMaster); + MaterialCodeLibService.AddList(temeplateDtoIns); //插入材料编码库 TwInOutplandetailService.AddList(twInOutPlanDetails, twInOutPlanMaster.Id); //插入入库明细 } diff --git a/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs b/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs index affcee68..bc61976a 100644 --- a/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs @@ -29,6 +29,7 @@ Model.HJGL_MaterialCodeLib newCodeLib = new HJGL_MaterialCodeLib { MaterialCode = codeLib.MaterialCode, + HeatNo = codeLib.HeatNo, MaterialName = codeLib.MaterialName, MaterialSpec = codeLib.MaterialSpec, MaterialMade = codeLib.MaterialMade, @@ -56,6 +57,7 @@ Model.HJGL_MaterialCodeLib newCodeLib = db.HJGL_MaterialCodeLib.FirstOrDefault(e => e.MaterialCode == codeLib.MaterialCode); if (newCodeLib != null) { + newCodeLib.HeatNo = codeLib.HeatNo; newCodeLib.MaterialName = codeLib.MaterialName; newCodeLib.MaterialSpec = codeLib.MaterialSpec; newCodeLib.MaterialMade = codeLib.MaterialMade; @@ -80,6 +82,38 @@ db.SubmitChanges(); } } + + /// + /// 批量添加材料库 + /// + /// + /// + public static void AddList(List list) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var materialCodes = from x in db.HJGL_MaterialCodeLib select x.MaterialCode; + var ls = from x in list + where !materialCodes.Contains(x.MaterialCode) + select x; + List details = new List(); + foreach (var item in ls) + { + Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib + { + MaterialCode = item.MaterialCode, + HeatNo = item.HeatNo, + MaterialName = item.MaterialName, + MaterialSpec = item.MaterialSpec, + MaterialUnit = item.MaterialUnit + }; + details.Add(table); + } + + db.HJGL_MaterialCodeLib.InsertAllOnSubmit(details); + db.SubmitChanges(); + } + } } public class MaterialCodeLibDtoIn diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx index 0e4e5728..faac25eb 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx @@ -140,7 +140,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> @@ -161,12 +161,15 @@ + + - - + --%> diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx index f1a41ec3..d8da1ea3 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx index 0aac678a..6fe9ff9b 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx @@ -48,6 +48,10 @@ FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center" TextAlign="Left" SortField="MaterialCode"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx index b75dad06..5582470e 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx @@ -19,6 +19,13 @@ Required="true" MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" LabelWidth="100px"> + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs index 71c299e2..ebb12754 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.cs @@ -25,6 +25,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo { this.txtMaterialCode.Text = materialCode; this.txtMaterialMade.Text = lib.MaterialMade; + this.txtHeatNo.Text = lib.HeatNo; this.txtMaterialName.Text = lib.MaterialName; txtMaterialSpec.Text = lib.MaterialSpec; txtMaterialDef.Text = lib.MaterialDef; @@ -62,6 +63,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo Model.HJGL_MaterialCodeLib newLib = new Model.HJGL_MaterialCodeLib { MaterialCode = this.txtMaterialCode.Text.Trim(), + HeatNo = this.txtHeatNo.Text.Trim(), MaterialName = this.txtMaterialName.Text.Trim(), MaterialSpec = this.txtMaterialSpec.Text.Trim(), MaterialMade = this.txtMaterialMade.Text.Trim(), diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs index 94d44792..18d88801 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx.designer.cs @@ -48,6 +48,15 @@ namespace FineUIPro.Web.HJGL.BaseInfo { /// protected global::FineUIPro.TextBox txtMaterialCode; + /// + /// txtHeatNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHeatNo; + /// /// txtMaterialName 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index c6acad79..562f836f 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -4,6 +4,7 @@ + diff --git a/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs b/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs index ff127295..ee7545c5 100644 --- a/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs +++ b/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs @@ -11,7 +11,11 @@ namespace Model /// /// 预制组件代码 /// - public string PipelineComponentCode { get; set; } + public string PipelineComponentCode { get; set; } + /// + /// 炉批号 + /// + public string HeatNo { get; set; } /// /// 材料名称 /// diff --git a/SGGL/Model/CLGL/Tw_InputDataIn.cs b/SGGL/Model/CLGL/Tw_InputDataIn.cs index 5b5b347f..36dd80e4 100644 --- a/SGGL/Model/CLGL/Tw_InputDataIn.cs +++ b/SGGL/Model/CLGL/Tw_InputDataIn.cs @@ -17,13 +17,29 @@ namespace Model /// [ExcelColumnIndex("B")] public string MaterialCode { get; set; } /// - /// 数量 + /// 炉批号 /// - [ExcelColumnIndex("C")] public string PlanNum { get; set; } + [ExcelColumnIndex("C")] public string HeatNo { get; set; } /// /// 类型 /// - [ExcelColumnIndex("D")] public string TypeString { get; set; } + [ExcelColumnIndex("D")] public string MaterialName { get; set; } + /// + /// 规格 + /// + [ExcelColumnIndex("E")] public string MaterialSpec { get; set; } + /// + /// 单位 + /// + [ExcelColumnIndex("F")] public string MaterialUnit { get; set; } + /// + /// 数量 + /// + [ExcelColumnIndex("G")] public string PlanNum { get; set; } + /// + /// 类型 + /// + [ExcelColumnIndex("H")] public string TypeString { get; set; } } } \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index abcb1d51..118ee396 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1,5 +1,4 @@ - -#pragma warning disable 1591 +#pragma warning disable 1591 //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -174,9 +173,6 @@ namespace Model partial void InsertBase_MaterialType(Base_MaterialType instance); partial void UpdateBase_MaterialType(Base_MaterialType instance); partial void DeleteBase_MaterialType(Base_MaterialType instance); - partial void InsertBase_MaterialUnit(Base_MaterialUnit instance); - partial void UpdateBase_MaterialUnit(Base_MaterialUnit instance); - partial void DeleteBase_MaterialUnit(Base_MaterialUnit instance); partial void InsertBase_Medium(Base_Medium instance); partial void UpdateBase_Medium(Base_Medium instance); partial void DeleteBase_Medium(Base_Medium instance); @@ -1020,9 +1016,6 @@ namespace Model partial void InsertMaterial_NoticeAndSupervision(Material_NoticeAndSupervision instance); partial void UpdateMaterial_NoticeAndSupervision(Material_NoticeAndSupervision instance); partial void DeleteMaterial_NoticeAndSupervision(Material_NoticeAndSupervision instance); - partial void InsertMaterialInAndOutRecord(MaterialInAndOutRecord instance); - partial void UpdateMaterialInAndOutRecord(MaterialInAndOutRecord instance); - partial void DeleteMaterialInAndOutRecord(MaterialInAndOutRecord instance); partial void InsertMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void UpdateMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void DeleteMeeting_AttendMeeting(Meeting_AttendMeeting instance); @@ -2348,14 +2341,6 @@ namespace Model } } - public System.Data.Linq.Table Base_MaterialUnit - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Base_Medium { get @@ -4612,14 +4597,6 @@ namespace Model } } - public System.Data.Linq.Table MaterialInAndOutRecord - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Meeting_AttendMeeting { get @@ -12454,7 +12431,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 @@ -22633,8 +22610,6 @@ namespace Model private string _UnitId; - private string _ProjectId; - private string _MaterialId; private string _ColorName; @@ -22645,6 +22620,8 @@ namespace Model private string _Remark; + private string _ProjectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22653,8 +22630,6 @@ namespace Model partial void OnMaterialColorIdChanged(); partial void OnUnitIdChanging(string value); partial void OnUnitIdChanged(); - partial void OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); partial void OnMaterialIdChanging(string value); partial void OnMaterialIdChanged(); partial void OnColorNameChanging(string value); @@ -22665,6 +22640,8 @@ namespace Model partial void OnRGBChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); #endregion public Base_MaterialColor() @@ -22712,26 +22689,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] - public string ProjectId - { - get - { - return this._ProjectId; - } - set - { - if ((this._ProjectId != value)) - { - this.OnProjectIdChanging(value); - this.SendPropertyChanging(); - this._ProjectId = value; - this.SendPropertyChanged("ProjectId"); - this.OnProjectIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50)")] public string MaterialId { @@ -22832,6 +22789,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -23015,140 +22992,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_MaterialUnit")] - public partial class Base_MaterialUnit : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _MaterialUnitId; - - private string _MaterialUnitName; - - private string _MaterialUnitCode; - - private string _Remark; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnMaterialUnitIdChanging(string value); - partial void OnMaterialUnitIdChanged(); - partial void OnMaterialUnitNameChanging(string value); - partial void OnMaterialUnitNameChanged(); - partial void OnMaterialUnitCodeChanging(string value); - partial void OnMaterialUnitCodeChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - #endregion - - public Base_MaterialUnit() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string MaterialUnitId - { - get - { - return this._MaterialUnitId; - } - set - { - if ((this._MaterialUnitId != value)) - { - this.OnMaterialUnitIdChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitId = value; - this.SendPropertyChanged("MaterialUnitId"); - this.OnMaterialUnitIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitName", DbType="NVarChar(100)")] - public string MaterialUnitName - { - get - { - return this._MaterialUnitName; - } - set - { - if ((this._MaterialUnitName != value)) - { - this.OnMaterialUnitNameChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitName = value; - this.SendPropertyChanged("MaterialUnitName"); - this.OnMaterialUnitNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitCode", DbType="NVarChar(50)")] - public string MaterialUnitCode - { - get - { - return this._MaterialUnitCode; - } - set - { - if ((this._MaterialUnitCode != value)) - { - this.OnMaterialUnitCodeChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitCode = value; - this.SendPropertyChanged("MaterialUnitCode"); - this.OnMaterialUnitCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Medium")] public partial class Base_Medium : INotifyPropertyChanging, INotifyPropertyChanged { @@ -24943,6 +24786,8 @@ namespace Model private EntitySet _Base_ProjectSate; + private EntitySet _Base_Warehouse; + private EntitySet _HJGL_Batch_NDE; private EntitySet _HJGL_Batch_PointBatch; @@ -25227,8 +25072,6 @@ namespace Model private EntitySet _Sys_FlowOperate; - private EntitySet _Sys_Log; - private EntitySet _Sys_RoleItem; private EntitySet _Sys_UserRead; @@ -25375,6 +25218,7 @@ namespace Model this._Base_ProjectType = default(EntityRef); this._Base_Unit = default(EntityRef); this._Base_ProjectSate = new EntitySet(new Action(this.attach_Base_ProjectSate), new Action(this.detach_Base_ProjectSate)); + this._Base_Warehouse = new EntitySet(new Action(this.attach_Base_Warehouse), new Action(this.detach_Base_Warehouse)); this._HJGL_Batch_NDE = new EntitySet(new Action(this.attach_HJGL_Batch_NDE), new Action(this.detach_HJGL_Batch_NDE)); this._HJGL_Batch_PointBatch = new EntitySet(new Action(this.attach_HJGL_Batch_PointBatch), new Action(this.detach_HJGL_Batch_PointBatch)); this._Check_CheckColligation = new EntitySet(new Action(this.attach_Check_CheckColligation), new Action(this.detach_Check_CheckColligation)); @@ -25517,7 +25361,6 @@ namespace Model this._Sys_CodeRecords = new EntitySet(new Action(this.attach_Sys_CodeRecords), new Action(this.detach_Sys_CodeRecords)); this._Sys_CQMS_DataInTemp = new EntitySet(new Action(this.attach_Sys_CQMS_DataInTemp), new Action(this.detach_Sys_CQMS_DataInTemp)); this._Sys_FlowOperate = new EntitySet(new Action(this.attach_Sys_FlowOperate), new Action(this.detach_Sys_FlowOperate)); - this._Sys_Log = new EntitySet(new Action(this.attach_Sys_Log), new Action(this.detach_Sys_Log)); this._Sys_RoleItem = new EntitySet(new Action(this.attach_Sys_RoleItem), new Action(this.detach_Sys_RoleItem)); this._Sys_UserRead = new EntitySet(new Action(this.attach_Sys_UserRead), new Action(this.detach_Sys_UserRead)); this._Technical_TechnicalDisclose = new EntitySet(new Action(this.attach_Technical_TechnicalDisclose), new Action(this.detach_Technical_TechnicalDisclose)); @@ -26562,6 +26405,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Warehouse_Project", Storage="_Base_Warehouse", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Base_Warehouse + { + get + { + return this._Base_Warehouse; + } + set + { + this._Base_Warehouse.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_NDECheck_Base_Project", Storage="_HJGL_Batch_NDE", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet HJGL_Batch_NDE { @@ -28408,19 +28264,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Base_Project", Storage="_Sys_Log", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] - public EntitySet Sys_Log - { - get - { - return this._Sys_Log; - } - set - { - this._Sys_Log.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_RoleItem_Base_Project", Storage="_Sys_RoleItem", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Sys_RoleItem { @@ -28908,6 +28751,18 @@ namespace Model entity.Base_Project = null; } + private void attach_Base_Warehouse(Base_Warehouse entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Base_Warehouse(Base_Warehouse entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_HJGL_Batch_NDE(HJGL_Batch_NDE entity) { this.SendPropertyChanging(); @@ -30612,18 +30467,6 @@ namespace Model entity.Base_Project = null; } - private void attach_Sys_Log(Sys_Log entity) - { - this.SendPropertyChanging(); - entity.Base_Project = this; - } - - private void detach_Sys_Log(Sys_Log entity) - { - this.SendPropertyChanging(); - entity.Base_Project = null; - } - private void attach_Sys_RoleItem(Sys_RoleItem entity) { this.SendPropertyChanging(); @@ -39154,6 +38997,8 @@ namespace Model private System.Nullable _ModifyTime; + private EntityRef _Base_Project; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -39178,6 +39023,7 @@ namespace Model public Base_Warehouse() { + this._Base_Project = default(EntityRef); OnCreated(); } @@ -39252,6 +39098,10 @@ namespace Model { if ((this._ProjectId != value)) { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -39341,6 +39191,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Warehouse_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Base_Warehouse.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Base_Warehouse.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -61414,8 +61298,6 @@ namespace Model private string _SType; - private string _SourceDes; - private string _MeasurementRange; private string _Precision; @@ -61442,6 +61324,8 @@ namespace Model private string _Remark; + private string _SourceDes; + private EntityRef _Base_CNProfessional; private EntityRef _Base_Project; @@ -61496,8 +61380,6 @@ namespace Model partial void OnIsCheckOKChanged(); partial void OnSTypeChanging(string value); partial void OnSTypeChanged(); - partial void OnSourceDesChanging(string value); - partial void OnSourceDesChanged(); partial void OnMeasurementRangeChanging(string value); partial void OnMeasurementRangeChanged(); partial void OnPrecisionChanging(string value); @@ -61524,6 +61406,8 @@ namespace Model partial void OnCalibrationWarningChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnSourceDesChanging(string value); + partial void OnSourceDesChanged(); #endregion public Comprehensive_InspectionMachine() @@ -61986,26 +61870,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SourceDes", DbType="NVarChar(500)")] - public string SourceDes - { - get - { - return this._SourceDes; - } - set - { - if ((this._SourceDes != value)) - { - this.OnSourceDesChanging(value); - this.SendPropertyChanging(); - this._SourceDes = value; - this.SendPropertyChanged("SourceDes"); - this.OnSourceDesChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeasurementRange", DbType="NVarChar(50)")] public string MeasurementRange { @@ -62266,6 +62130,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SourceDes", DbType="NVarChar(500)")] + public string SourceDes + { + get + { + return this._SourceDes; + } + set + { + if ((this._SourceDes != value)) + { + this.OnSourceDesChanging(value); + this.SendPropertyChanging(); + this._SourceDes = value; + this.SendPropertyChanged("SourceDes"); + this.OnSourceDesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_InspectionMachine_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)] public Base_CNProfessional Base_CNProfessional { @@ -100689,6 +100573,8 @@ namespace Model private string _MaterialUnit; + private string _HeatNo; + private EntityRef _Base_Project; private EntitySet _HJGL_PipeLineMat; @@ -100713,6 +100599,8 @@ namespace Model partial void OnPipeGradeChanged(); partial void OnMaterialUnitChanging(string value); partial void OnMaterialUnitChanged(); + partial void OnHeatNoChanging(string value); + partial void OnHeatNoChanged(); #endregion public HJGL_MaterialCodeLib() @@ -100886,6 +100774,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeatNo", DbType="NVarChar(50)")] + public string HeatNo + { + get + { + return this._HeatNo; + } + set + { + if ((this._HeatNo != value)) + { + this.OnHeatNoChanging(value); + this.SendPropertyChanging(); + this._HeatNo = value; + this.SendPropertyChanged("HeatNo"); + this.OnHeatNoChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_MaterialCodeLib_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -101541,10 +101449,10 @@ namespace Model private string _TrainNumber; - private string _TrainNumberId; - private System.Nullable _TypeInt; + private string _TrainNumberId; + private string _CompileMan; private System.Nullable _CompileDate; @@ -101579,10 +101487,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); @@ -101836,26 +101744,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 { @@ -101876,6 +101764,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 { @@ -113171,7 +113079,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 @@ -113297,7 +113205,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 @@ -164335,356 +164243,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.MaterialInAndOutRecord")] - public partial class MaterialInAndOutRecord : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _Id; - - private string _ProjectId; - - private string _GoodsCategoryId; - - private string _GoodsCategoryName; - - private string _MaterialModel; - - private System.Nullable _InOutDate; - - private string _UnitId; - - private string _InOrOut; - - private System.Nullable _Number; - - private string _MaterialUnitId; - - private string _Remark; - - private string _CompileMan; - - private System.Nullable _CompileDate; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(string value); - partial void OnIdChanged(); - partial void OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); - partial void OnGoodsCategoryIdChanging(string value); - partial void OnGoodsCategoryIdChanged(); - partial void OnGoodsCategoryNameChanging(string value); - partial void OnGoodsCategoryNameChanged(); - partial void OnMaterialModelChanging(string value); - partial void OnMaterialModelChanged(); - partial void OnInOutDateChanging(System.Nullable value); - partial void OnInOutDateChanged(); - partial void OnUnitIdChanging(string value); - partial void OnUnitIdChanged(); - partial void OnInOrOutChanging(string value); - partial void OnInOrOutChanged(); - partial void OnNumberChanging(System.Nullable value); - partial void OnNumberChanged(); - partial void OnMaterialUnitIdChanging(string value); - partial void OnMaterialUnitIdChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnCompileManChanging(string value); - partial void OnCompileManChanged(); - partial void OnCompileDateChanging(System.Nullable value); - partial void OnCompileDateChanged(); - #endregion - - public MaterialInAndOutRecord() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] - public string ProjectId - { - get - { - return this._ProjectId; - } - set - { - if ((this._ProjectId != value)) - { - this.OnProjectIdChanging(value); - this.SendPropertyChanging(); - this._ProjectId = value; - this.SendPropertyChanged("ProjectId"); - this.OnProjectIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GoodsCategoryId", DbType="NVarChar(50)")] - public string GoodsCategoryId - { - get - { - return this._GoodsCategoryId; - } - set - { - if ((this._GoodsCategoryId != value)) - { - this.OnGoodsCategoryIdChanging(value); - this.SendPropertyChanging(); - this._GoodsCategoryId = value; - this.SendPropertyChanged("GoodsCategoryId"); - this.OnGoodsCategoryIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GoodsCategoryName", DbType="NVarChar(100)")] - public string GoodsCategoryName - { - get - { - return this._GoodsCategoryName; - } - set - { - if ((this._GoodsCategoryName != value)) - { - this.OnGoodsCategoryNameChanging(value); - this.SendPropertyChanging(); - this._GoodsCategoryName = value; - this.SendPropertyChanged("GoodsCategoryName"); - this.OnGoodsCategoryNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialModel", DbType="NVarChar(100)")] - public string MaterialModel - { - get - { - return this._MaterialModel; - } - set - { - if ((this._MaterialModel != value)) - { - this.OnMaterialModelChanging(value); - this.SendPropertyChanging(); - this._MaterialModel = value; - this.SendPropertyChanged("MaterialModel"); - this.OnMaterialModelChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOutDate", DbType="DateTime")] - public System.Nullable InOutDate - { - get - { - return this._InOutDate; - } - set - { - if ((this._InOutDate != value)) - { - this.OnInOutDateChanging(value); - this.SendPropertyChanging(); - this._InOutDate = value; - this.SendPropertyChanged("InOutDate"); - this.OnInOutDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] - public string UnitId - { - get - { - return this._UnitId; - } - set - { - if ((this._UnitId != value)) - { - this.OnUnitIdChanging(value); - this.SendPropertyChanging(); - this._UnitId = value; - this.SendPropertyChanged("UnitId"); - this.OnUnitIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOrOut", DbType="NVarChar(10)")] - public string InOrOut - { - get - { - return this._InOrOut; - } - set - { - if ((this._InOrOut != value)) - { - this.OnInOrOutChanging(value); - this.SendPropertyChanging(); - this._InOrOut = value; - this.SendPropertyChanged("InOrOut"); - this.OnInOrOutChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(18,2)")] - public System.Nullable Number - { - get - { - return this._Number; - } - set - { - if ((this._Number != value)) - { - this.OnNumberChanging(value); - this.SendPropertyChanging(); - this._Number = value; - this.SendPropertyChanged("Number"); - this.OnNumberChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitId", DbType="NVarChar(50)")] - public string MaterialUnitId - { - get - { - return this._MaterialUnitId; - } - set - { - if ((this._MaterialUnitId != value)) - { - this.OnMaterialUnitIdChanging(value); - this.SendPropertyChanging(); - this._MaterialUnitId = value; - this.SendPropertyChanged("MaterialUnitId"); - this.OnMaterialUnitIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] - public string CompileMan - { - get - { - return this._CompileMan; - } - set - { - if ((this._CompileMan != value)) - { - this.OnCompileManChanging(value); - this.SendPropertyChanging(); - this._CompileMan = value; - this.SendPropertyChanged("CompileMan"); - this.OnCompileManChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] - public System.Nullable CompileDate - { - get - { - return this._CompileDate; - } - set - { - if ((this._CompileDate != value)) - { - this.OnCompileDateChanging(value); - this.SendPropertyChanging(); - this._CompileDate = value; - this.SendPropertyChanged("CompileDate"); - this.OnCompileDateChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Meeting_AttendMeeting")] public partial class Meeting_AttendMeeting : INotifyPropertyChanging, INotifyPropertyChanged { @@ -167024,7 +166582,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 @@ -198031,7 +197589,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 @@ -198151,7 +197709,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 @@ -198211,7 +197769,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 @@ -198595,7 +198153,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 @@ -198900,6 +198458,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; @@ -198928,16 +198496,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); @@ -198946,6 +198504,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); @@ -198974,16 +198542,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() @@ -199031,6 +198589,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 { @@ -199311,106 +198969,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; @@ -200789,7 +200347,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(1000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(50)")] public string ReviewResults { get @@ -259901,8 +259459,6 @@ namespace Model private System.Nullable _LogSource; - private EntityRef _Base_Project; - private EntityRef _Person_Persons; #region 可扩展性方法定义 @@ -259937,7 +259493,6 @@ namespace Model public Sys_Log() { - this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); OnCreated(); } @@ -260077,10 +259632,6 @@ namespace Model { if ((this._ProjectId != value)) { - if (this._Base_Project.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnProjectIdChanging(value); this.SendPropertyChanging(); this._ProjectId = value; @@ -260190,40 +259741,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] - public Base_Project Base_Project - { - get - { - return this._Base_Project.Entity; - } - set - { - Base_Project previousValue = this._Base_Project.Entity; - if (((previousValue != value) - || (this._Base_Project.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_Project.Entity = null; - previousValue.Sys_Log.Remove(this); - } - this._Base_Project.Entity = value; - if ((value != null)) - { - value.Sys_Log.Add(this); - this._ProjectId = value.ProjectId; - } - else - { - this._ProjectId = default(string); - } - this.SendPropertyChanged("Base_Project"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Sys_Log_Person_Persons", Storage="_Person_Persons", ThisKey="UserId", OtherKey="PersonId", IsForeignKey=true)] public Person_Persons Person_Persons { @@ -276080,6 +275597,8 @@ namespace Model private System.Nullable _SortIndex; + private string _HeatNo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -276098,6 +275617,8 @@ namespace Model partial void OnActNumChanged(); partial void OnSortIndexChanging(System.Nullable value); partial void OnSortIndexChanged(); + partial void OnHeatNoChanging(string value); + partial void OnHeatNoChanged(); #endregion public Tw_InOutPlanDetail() @@ -276245,6 +275766,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeatNo", DbType="NVarChar(50)")] + public string HeatNo + { + get + { + return this._HeatNo; + } + set + { + if ((this._HeatNo != value)) + { + this.OnHeatNoChanging(value); + this.SendPropertyChanging(); + this._HeatNo = value; + this.SendPropertyChanged("HeatNo"); + this.OnHeatNoChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -324587,7 +324128,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 @@ -325164,7 +324705,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 @@ -325355,7 +324896,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 @@ -330694,7 +330235,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 @@ -332166,7 +331707,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 @@ -342067,7 +341608,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 @@ -342087,7 +341628,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 diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml index 99fa69e2..4097680b 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml @@ -4,13 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - true - false - true + True + False + True Release Any CPU FileSystem - E:\Package\赛鼎工程有限公司\SGGLAPI + E:\Package\陕化建 FileSystem