diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 00000000..75b31f26 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\SGGL.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/SGGL/BLL/BaseInfo/BaseFactoryService.cs b/SGGL/BLL/BaseInfo/BaseFactoryService.cs index e490be6d..eaf7fe17 100644 --- a/SGGL/BLL/BaseInfo/BaseFactoryService.cs +++ b/SGGL/BLL/BaseInfo/BaseFactoryService.cs @@ -104,6 +104,7 @@ namespace BLL FactoryCode = newtable.FactoryCode, FactoryName = newtable.FactoryName, Address = newtable.Address, + MapCoordinates= newtable.MapCoordinates, }; db.Base_Factory.InsertOnSubmit(table); db.SubmitChanges(); @@ -128,6 +129,7 @@ namespace BLL table.FactoryCode = newtable.FactoryCode; table.FactoryName = newtable.FactoryName; table.Address = newtable.Address; + table.MapCoordinates = newtable.MapCoordinates; db.SubmitChanges(); } diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs index d26fa414..a6035ce3 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs @@ -154,6 +154,7 @@ namespace BLL Item.FactoryCode = BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).FactoryCode; Item.FactoryName = BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).FactoryName; Item.Address = BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).Address; + Item.MapCoordinates= BLL.Base_FactoryService.GetBase_FactoryById(data.FactoryId).MapCoordinates; Item.SafetyMnaHours = data.SafetyMnaHours.HasValue ? data.SafetyMnaHours.Value : 0; Item.GeneralRiskNum = data.GeneralRiskNum.HasValue ? data.GeneralRiskNum.Value : 0; Item.LowRiskNum = data.LowRiskNum.HasValue ? data.LowRiskNum.Value : 0; diff --git a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx index 4e4b03e2..db5aff90 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx @@ -33,6 +33,14 @@ + + + + + 拾取坐标 + + + diff --git a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs index d64f9d66..b848bdcd 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs @@ -44,6 +44,7 @@ namespace FineUIPro.Web.BaseInfo this.txtFactoryCode.Text = model.FactoryCode; this.txtFactoryName.Text = model.FactoryName; this.txtAddress.Text = model.Address; + this.txtMapCoordinates.Text = model.MapCoordinates; } } @@ -67,6 +68,7 @@ namespace FineUIPro.Web.BaseInfo table.FactoryCode = this.txtFactoryCode.Text; table.FactoryName = this.txtFactoryName.Text; table.Address = this.txtAddress.Text; + table.MapCoordinates=this.txtMapCoordinates.Text; if (string.IsNullOrEmpty(this.FactoryId)) { table.FactoryId = SQLHelper.GetNewID(typeof(Model.Base_Factory)); diff --git a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.designer.cs index 8671a426..49a796c2 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.designer.cs @@ -68,6 +68,24 @@ namespace FineUIPro.Web.BaseInfo /// protected global::FineUIPro.TextBox txtAddress; + /// + /// txtMapCoordinates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMapCoordinates; + + /// + /// bottomPanel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel bottomPanel; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx index ada86ceb..f23ca492 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx @@ -103,7 +103,7 @@ diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_DataEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_DataEdit.aspx index 0a57ab67..89f84fca 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_DataEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_DataEdit.aspx @@ -205,7 +205,7 @@ - + @@ -227,7 +227,7 @@ + FieldType="String" HeaderText="环保数据" TextAlign="Left" HeaderTextAlign="Center" > diff --git a/SGGL/Model/APIItem/SHHSE/NewSYHSEDataItem.cs b/SGGL/Model/APIItem/SHHSE/NewSYHSEDataItem.cs index e106f37f..13118770 100644 --- a/SGGL/Model/APIItem/SHHSE/NewSYHSEDataItem.cs +++ b/SGGL/Model/APIItem/SHHSE/NewSYHSEDataItem.cs @@ -91,6 +91,10 @@ namespace Model get; set; } + /// + /// 坐标 + /// + public string MapCoordinates { get; set; } /// /// 安全人工时 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index dfcf5951..9fd578f9 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -20070,6 +20070,8 @@ namespace Model private string _Address; + private string _MapCoordinates; + private EntityRef _Base_Unit; private EntitySet _SYHSEData_Data; @@ -20092,6 +20094,8 @@ namespace Model partial void OnFactoryNameChanged(); partial void OnAddressChanging(string value); partial void OnAddressChanged(); + partial void OnMapCoordinatesChanging(string value); + partial void OnMapCoordinatesChanged(); #endregion public Base_Factory() @@ -20207,6 +20211,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MapCoordinates", DbType="NVarChar(50)")] + public string MapCoordinates + { + get + { + return this._MapCoordinates; + } + set + { + if ((this._MapCoordinates != value)) + { + this.OnMapCoordinatesChanging(value); + this.SendPropertyChanging(); + this._MapCoordinates = value; + this.SendPropertyChanged("MapCoordinates"); + this.OnMapCoordinatesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Factory_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit {