修改实业

DataBase/版本日志/SGGLDB_WH_2023-03-08_子公司实业脚本.sql

@@ -211,4 +211,7 @@ GO
 alter table [dbo].[HSSEData_HSSE] alter column [TotalEnergyConsumption] decimal(18,4) null
 alter table [dbo].[HSSEData_HSSE] alter column [IncomeComprehensiveEnergyConsumption] decimal(18,4) null
 alter table [dbo].[HSSEData_HSSE] alter column [NewWaterConsumption] decimal(18,4) null
-go
+go
+
+alter table [dbo].[Base_Factory] add MapCoordinates nvarchar(50) null
+GO

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();
             }
 

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;

SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx

@@ -33,6 +33,14 @@
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtMapCoordinates" runat="server" Label="坐标" MaxLength="50"></f:TextBox>
+                        <f:ContentPanel ID="bottomPanel" RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
+                            <a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">拾取坐标</a>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
 
             </Rows>
             <Toolbars>

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));

SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.designer.cs

@@ -68,6 +68,24 @@ namespace FineUIPro.Web.BaseInfo
         /// </remarks>
         protected global::FineUIPro.TextBox txtAddress;
 
+        /// <summary>
+        /// txtMapCoordinates 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMapCoordinates;
+
+        /// <summary>
+        /// bottomPanel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel bottomPanel;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_Data.aspx

@@ -103,7 +103,7 @@
         </f:Panel>
         <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
             IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-            Title="编辑SYHSEData_Data" EnableIFrame="true" Height="650px"
+            Title="编辑" EnableIFrame="true" Height="650px"
             Width="1200px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">

SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_DataEdit.aspx

@@ -205,7 +205,7 @@
                                     </Items>
                                 </f:GroupPanel>
 
-                                <f:GroupPanel Title="风险管控" BodyPadding="10" ID="GroupPanel4" EnableCollapse="true" runat="server">
+                                <f:GroupPanel Title="环保数据" BodyPadding="10" ID="GroupPanel4" EnableCollapse="true" runat="server">
                                     <Items>
                                         <f:Form ID="Form4" ShowBorder="false" ShowHeader="false" runat="server">
                                             <Rows>
@@ -227,7 +227,7 @@
                                                             <Columns>
                                                                 <f:RowNumberField HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" Width="60px"></f:RowNumberField>
                                                                 <f:RenderField Width="150px" ColumnID="RiskControlName" DataField="RiskControlName" SortField="RiskControlName"
-                                                                    FieldType="String" HeaderText="风险管控名称" TextAlign="Left" HeaderTextAlign="Center" >
+                                                                    FieldType="String" HeaderText="环保数据" TextAlign="Left" HeaderTextAlign="Center" >
                                                                     <Editor>
                                                                         <f:TextBox ID="txtRiskControlName" runat="server" LabelWidth="160">
                                                                         </f:TextBox>

SGGL/Model/APIItem/SHHSE/NewSYHSEDataItem.cs

@@ -91,6 +91,10 @@ namespace Model
             get;
             set;
         }
+        /// <summary>
+        /// 坐标
+        /// </summary>
+        public string MapCoordinates {   get; set; }
 
         /// <summary>
         /// 安全人工时

SGGL/Model/Model.cs

@@ -19467,6 +19467,8 @@ namespace Model
 		
 		private string _Address;
 		
+		private string _MapCoordinates;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntitySet<SYHSEData_Data> _SYHSEData_Data;
@@ -19489,6 +19491,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()
@@ -19604,6 +19608,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
 		{