From a53759ccf3150d9e581769e65c1501132d24b5ff Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 9 Mar 2023 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?2023-03-09=20=E5=A2=9E=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E4=B8=9A=E5=9C=B0=E5=9B=BE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin/v17/.wsuo | Bin 29184 -> 28672 bytes ...HSE_V2023-03-09.sql => SGGLDB_V2023-03-09.sql} | 4 +- SGGL/BLL/BaseInfo/BaseFactoryService.cs | 2 + .../ZHGL/DataSync/SYHSEData_DataService.cs | 1 + .../BaseInfo/BaseFactoryEdit.aspx | 8 ++++ .../BaseInfo/BaseFactoryEdit.aspx.cs | 2 + .../BaseInfo/BaseFactoryEdit.aspx.designer.cs | 18 ++++++++ .../ZHGL/DataSync/SYHSEData_Data.aspx | 2 +- .../ZHGL/DataSync/SYHSEData_DataEdit.aspx | 4 +- SGGL/Model/APIItem/SHHSE/NewSYHSEDataItem.cs | 4 ++ SGGL/Model/Model.cs | 42 ++++++++++++++---- 11 files changed, 74 insertions(+), 13 deletions(-) rename DataBase/版本日志/{SUBQHSE_V2023-03-09.sql => SGGLDB_V2023-03-09.sql} (79%) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8e04b2643a7e420cfad6fbb57e6814e617e7b716..31fa17abf1fda350c2c529463c76369038ce1c5e 100644 GIT binary patch delta 1645 zcmcIkO>7%g5Z<@86USb+iR#*cq)kiR$OZp2{=;rcy`*UrQYUs}r^K|f6FYW9DZwSR zl&UB;KUEH?5b}pWRiy%f0}@C;mJ=5&krNyW5(l_(0KpY0mIw#JJhK~|Lkk=j>GQnz z&6{~Mv-4d2kyU?SAIC)I!C|q_Qr~*)oBZVWY_A{)GOmf&SqKero4tUBuCLNb>^4b< zst=GpLimF?3+a6XiO@%AC-AdexLuQOmEY51*K9VGJFIGxsvV@Ag7CynK<;piNSAtm z@7=Wa5WEC`3(svqbsr*aCVXjc-qSx!YrJoA>3Mee&XnjnON^E-*Kv%SdV0^du<4fdMebiR zAHs}DkJrtqj_aBcznWiWd6cCJOQAu((@NRmW&i7qdnfUQIKU=Rb|j5_EGhqObhSHJ z0u9GqiO-QXmz>6CS9N!eC|g!*{i8#wIwjzd7LHDuuWK+Jn!M(c6*ggC=I(= z)D2_<@IGh9%={oCS8Q0mv;wENXU(l!@7-V+4j;$nfhr3s<%8QgHixpc!lux$CXGBA zmu9*-l=sIaKGOWD?9c@?j#TbnUTflp2gq4cw%lVn3*)2wNJ}tW9k_X~bl#9Hsqn$1`i$)+W@vM4wnLB&&S}-8-YkFG@Z86&D z1?6{dn^+4iv6yl#w8GW{{UZ7gPBfdi%GSdAT6kFEFOU0kX}0hwlznlDKXmP%g42cz zL@Z;=_m!l*P0gcioJ>Z#t>??;hf+49ZyK)8+ix(VAGNr#vLHYPP9`()U{Qhv!?GF}x z?m#|JaL*R=1$Qpw59a*&NMtsG59d;l3-z^JTdgP?d7)hJbt&9FeV5OtfR$nd)uI!p zoZW`z0T|{7nFv;h;*`saI}7L5E{S-j-mMw@&2 Ondf1g{|)lxeSZQ1osQ=K delta 1594 zcmcIk%Wo245a(N#7U^yU!AG@Hq&{kO>q2S8`Y76$8fvT5+9)+HU5ZqoK9)q&m|{%4 z)L3OqJb3HLi&0sRHj>zz2d`>k(u041hjOTi*7;yDtBtRN1H-(&nQwlxvt;H;<|BC; zWQYwmF?IZ>FYgT>4!$ER4M=c}nIJ7tV3x=P6pVG-SDsZ2uyb75@D>qI{QYzcO1LDR!dX|pmk3dRiA;$8*g<~(l zF+V3PZ2=xxcCxLQ3vVs`JoS|M81z~;xK3h-dWJMvj-JtMxLD<4qcs11)qtrOy?5N6 z+f&{PxL2{6^g+RTj3)?XiS8to z)DMcS4_+}ISg>V&Y#Gx0RMxGK5lFiy$p94GA#-`NiWMbD*Y|O>kX2W(LPjHJg3tCN zJfXWx4^S%I=IH0>(mQk+^eUvt23lmEv&9$a_i@e#hV0ud|_jTG^%Om zlJRev)T8D~O=2;mtX0wG<~J`J*&B{x&;vBlSB`_l9k2fh3D=8h1IU!%K~jJxsd{Kj z*29WaJ2WuWGc^QUHGyA;y5VqYFWijpT%KvnHFOZ@@XTiYoiOJRLGkw&=d}heD-Yjv z8jZ)W=zq=8F|N~xf@ql4#b$v~x3)PMwbTE?m~|?}@lKIk?HpM)es!V!fr;%r=o8iH zu4k+o2>mEt;$|FLnH0l>T9=TbF$Rj>M6h}ngXsh2JZ4s{nk@m0Y2#0!l zg5mCXDthur|K;(fQ&EDW7035OK+4QSDj*-7T1*-sk)-BG)72|7{?}COOQjQu0|o<@K?3Vh5$+@{*;syNjDdVC0Cy7toQv&M&yTSL zhLbUT65TMD?1Crp^%Fq`nfRN@xQkFJO53)L_mcl{K*jk%>KIh<_!2K|J6 A>i_@% diff --git a/DataBase/版本日志/SUBQHSE_V2023-03-09.sql b/DataBase/版本日志/SGGLDB_V2023-03-09.sql similarity index 79% rename from DataBase/版本日志/SUBQHSE_V2023-03-09.sql rename to DataBase/版本日志/SGGLDB_V2023-03-09.sql index a511fe18..b9fea3e4 100644 --- a/DataBase/版本日志/SUBQHSE_V2023-03-09.sql +++ b/DataBase/版本日志/SGGLDB_V2023-03-09.sql @@ -1,4 +1,6 @@ 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 +alter table [dbo].[Base_Factory] add MapCoordinates nvarchar(50) null +GO + 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 fd2eaa3c..04f3edc7 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 e6bd10c3..d70decc7 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 e62a266f..3b9bca82 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -15921,6 +15921,8 @@ namespace Model private string _Address; + private string _MapCoordinates; + private EntityRef _Base_Unit; private EntitySet _SYHSEData_Data; @@ -15943,6 +15945,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() @@ -16058,6 +16062,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 { @@ -73854,7 +73878,7 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] public string MaterialCode { get @@ -73958,7 +73982,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")] public string MaterialDef { get @@ -78548,7 +78572,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15)")] public string MaterialCode { get @@ -82896,7 +82920,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] public string CanWelderCode { get @@ -122265,7 +122289,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(50)")] public string MaterialName { get @@ -122285,7 +122309,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")] public string SpecificationAndModel { get @@ -122305,7 +122329,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] public string MaterialCode { get @@ -122325,7 +122349,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(50)")] public string Material { get @@ -235827,7 +235851,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] public string CanWelderCode { get