From e6337e01bfdabd34f3ce31da4b3da5ac3be8c342 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 19 Jun 2023 15:46:50 +0800 Subject: [PATCH 1/9] 2023-06-19 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 250368 -> 251904 bytes .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 142 +++++++++++++++--- 2 files changed, 124 insertions(+), 18 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index fb4f7890ff2c711feb74fdc85c297bd04d910f8f..b4dc2591b91c74b833a1c72ca30120004a626d62 100644 GIT binary patch delta 1960 zcmdVaUu;uV90%}w&b`~Z?snZuSJ`a4flD{$I=Z#6fdhv$Ko(?8=^F`1Ck3uU1p$!&82-=|o!VrNauoOC>3zorhcnrE>g`$)wD>0z! z_N}Q+7;J_uuoa$$XJ8v_haIpJcEN7whdAtky)XcS@GR_u=U@n)hZo>QcnO9f0WZTV zupg3g@dq$C2(Q8+cnw~MH{dWFfe}bS8t&ES*t+a5F#jLpOWyRc32E~=Mu8~!?#&gs(l`m>d(MA7ZQS&u@9M9^3Rq%vDr4_yZzY1sU zHX{(#WzKyd^IO<(fj$S5d)2B|J~|zU>BZZoaB0)%$L=W0Z`y}v-J>R_%c3?E1x4D) zZFJbPPWK=x4+QIx=Cns=4H`D0Rb<(hU|x1Nb{W0NTBq2Yk290Ceayk+pB|cZ+qy|c ztKIE1?TyhH9-^dgqiufC6*TSpzA+pc2=@<0mIOQYMmmF$!SJ$RJQRut2jc^gaK}Jr z7kawte~M|es{XUgLT)r@=6l*coMNrjzhGfixZ@S{zrxH|{}!WpolTxmay>Flyh)*h z&EMI0QH+v{`W%YyR($#NVq#T$45~+YP3Zkcqud4^#P+QmpNAjU0A3$TPWi4!aZkytoK#4 zL?&LN8#TRh9o8qewy>y{Ne7c(rIkUM(h_-&+vxP#8nd$d8q4(X%t}t}Yd#@g^huMi zp0WMiM44Cp^O&(dJCUvAE7+SGPHbQwWqLGms!9!rsk7?H#P}_?on@k>CphQgXszm| zsoy>H`KPY8x^+I$t*d9gH1-6SGk*6@LP}HfX8< delta 2927 zcmeI!dstIt9Ki9tXCMO(Y;0`Y+0X@OQ4A-SoQ1U%lN^PWl_dkgE>>1(S=LrocA=6T zi!!rXM0XQc(LD;a>;_m?c0s$@(;xLm5C8N>*!P9uvmUD_`5NE2q#(0Xgp^v5q!lRkM3bpuXyfL+!l|uP`qfF%i3i!VL8DV^ z)wc5y+Uxm^nH}_LFG0``vLP#BTrcXzD@5VfcB; zzh+L@;J0wh_}VNry2(5;ceH!Z5N*qI86O*u$&AT!Nq}4@o%omYZTA-)Iujmz6fVU8SxW&CQWtYAqt(#=A#y;VF7%o!|6B!^;n2A zaTd=lsAK&6Te2*XSBV?WXiD=@W%w9D!<{=%c&Su|O zaWL1ZvexBBCyed1w1o<53`)$HVi4M@!rcb>bjxjQUXd?F$md`FJB*LU&!nT*ez(p) zlIk{175u&I6YVRq<2hakZKP<9Dy#2kx pds, int count) + { + Model.ResponeData responeData = new Model.ResponeData(); + List result = new List(); + + if (count < 4) + { + responeData.code = 0; + responeData.message = "导入Excel格式错误！Excel只有" + count.ToString().Trim() + "列"; + return responeData; + } + if (pds.Count > 0 && pds != null) + { + + for (int i = 0; i < pds.Count; i++) + { + HJGL_PipeLineMat item = new HJGL_PipeLineMat(); + + #region 数据验证和赋值 + + + string unitworkId = string.Empty; + unitworkId = Request.Params["UnitWorkId"]; + string PipeArea = string.Empty;//管线划分 1工厂预制 2现场施工 + + if (pds[i].A != null && !string.IsNullOrEmpty(pds[i].A.ToString())) + { + string pipelineCode = pds[i].A.ToString(); + var pipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == unitworkId && x.PipelineCode == pipelineCode select x; + if (pipeline.Count() > 0) + { + item.PipelineId = pipeline.First().PipelineId; + PipeArea = pipeline.First().PipeArea; + } + else + { + result.Add("不存在此管线号-" + pds[i].A.ToString()); + + } + + } + else + { + result.Add((i + 2) + "Line, [管线号] 不能为空
"); + } + + + if (pds[i].C != null && !string.IsNullOrEmpty(pds[i].C.ToString())) + { + string materialCode = pds[i].C.ToString(); + var lib = from x in Funs.DB.HJGL_MaterialCodeLib where x.MaterialCode == materialCode select x; + if (lib.Count() > 0) + { + item.MaterialCode = pds[i].C.ToString(); + } + else + { + result.Add("不存在此材料编码-" + pds[i].C.ToString()); + + } + + } + else + { + result.Add((i + 2) + "Line, [材料编码] 不能为空
"); + } + + if (pds[i].D != null && !string.IsNullOrEmpty(pds[i].D.ToString())) + { + try + { + var number = Funs.GetNewDecimal(pds[i].D.ToString()); + item.Number = number; + } + catch (Exception) + { + result.Add("第" + (i + 2).ToString() + "行," + "数量格式输入有误
"); + } + + } + else + { + result.Add((i + 2) + "Line, [数量] 不能为空
"); + } + + if (PipeArea == "1") + { + if (pds[i].B != null && !string.IsNullOrEmpty(pds[i].B.ToString())) + { + item.PrefabricatedComponents = pds[i].B.ToString(); + + } + else + { + result.Add((i + 2) + "Line, [预制组件] 不能为空
"); + } + } + var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents); + if (model.Count() == 0) + { + matList.Add(item); + + } + + #endregion + } + + } + else + { + responeData.code = 0; + responeData.message = "导入数据为空！"; + } + + return responeData; } #endregion @@ -344,7 +462,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage return; } string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); - if (IsXls != ".xls" && IsXls != ".xlsx") + if (IsXls != ".xlsx") { ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning); return; @@ -365,26 +483,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage //文件上传服务器后的名称 string fileName = rootPath + initPath + this.hdFileName.Text; //读取Excel - DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true); - - //验证Excel读取是否有误 - if (!string.IsNullOrEmpty(errorInfos)) - { - Alert alert = new Alert - { - Message = errorInfos, - Target = Target.Self - }; - alert.Show(); - //ShowNotify(errorInfos, MessageBoxIcon.Warning); - return; - } - var reposedata= AddDatasetToSQL(ds.Tables[0], 4); + var ds = MiniExcel.Query(fileName).ToList(); + var columns = MiniExcel.GetColumns(fileName); + var cnt = columns.Count; + var reposedata = AddDatasetToSQL(ds, cnt); if (reposedata.code == 1) { State = (int)ButtonState.Import; ShowNotify("审核完成请点击导入"); - } else { @@ -394,7 +500,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage Target = Target.Self }; alert.Show(); - //ShowNotify(reposedata.message); + //ShowNotify(reposedata.message); } } #region 导入 From c4302dfa9df80a17b01fc91df4e1c00d744f1b0e Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 19 Jun 2023 16:23:15 +0800 Subject: [PATCH 2/9] =?UTF-8?q?202306181=E3=80=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=88=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E3=80=81=E7=9B=91=E6=8E=A7=E3=80=81=E7=8E=AF=E5=A2=83=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=EF=BC=89=E9=A1=B5=E9=9D=A22=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87=E8=BD=AF=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=88=E9=97=A8=E7=A6=81=E3=80=81=E7=9B=91=E6=8E=A7=E3=80=81?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B=EF=BC=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?3=E3=80=81=E4=BC=98=E5=8C=96=E8=B4=B9=E7=94=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => 已更新脚本}/SGGLDB_V2023-06-06.sql | 0 .../SGGLDB_V2023-06-06修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2023-06-12.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-06-13.sql | 0 .../SGGLDB_V2023-06-13修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2023-06-14.sql | 0 .../已更新脚本/SGGLDB_V2023-06-16.sql | 196 +++++ .../已更新脚本/SGGLDB_V2023-06-16修改明细.txt | 5 + .../0-6智慧工地（Menu_SmartSite）.sql | 77 +- SGGL/BLL/BLL.csproj | 2 + SGGL/BLL/Common/Const.cs | 35 +- SGGL/BLL/ProjectData/ProjectService.cs | 8 +- SGGL/BLL/ProjectData/ProjectUnitService.cs | 2 +- SGGL/BLL/SmartSite/EquipmentService.cs | 130 +++ SGGL/BLL/SmartSite/EquipmentSoftService.cs | 131 +++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 34 +- .../HSSE/CostGoods/CostSummary.aspx.cs | 2 +- .../HSSE/CostGoods/CostSummaryUnit.aspx.cs | 2 +- .../SmartSite/EquipmentManage.aspx | 103 +++ .../SmartSite/EquipmentManage.aspx.cs | 276 ++++++ .../EquipmentManage.aspx.designer.cs | 152 ++++ .../SmartSite/EquipmentManageEdit.aspx | 67 ++ .../SmartSite/EquipmentManageEdit.aspx.cs | 167 ++++ .../EquipmentManageEdit.aspx.designer.cs | 152 ++++ SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx | 106 +++ .../SmartSite/SoftManage.aspx.cs | 277 ++++++ .../SmartSite/SoftManage.aspx.designer.cs | 152 ++++ .../SmartSite/SoftManageEdit.aspx | 70 ++ .../SmartSite/SoftManageEdit.aspx.cs | 180 ++++ .../SmartSite/SoftManageEdit.aspx.designer.cs | 161 ++++ SGGL/FineUIPro.Web/common/Menu_SmartSite.xml | 11 +- SGGL/Model/Model.cs | 809 ++++++++++++++++++ SGGL/WebAPI/WebAPI.csproj | 2 +- 33 files changed, 3293 insertions(+), 16 deletions(-) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-06.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-06修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-12.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-13.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-13修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-14.sql (100%) create mode 100644 DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16.sql create mode 100644 DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16修改明细.txt create mode 100644 SGGL/BLL/SmartSite/EquipmentService.cs create mode 100644 SGGL/BLL/SmartSite/EquipmentSoftService.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx create mode 100644 SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx create mode 100644 SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx create mode 100644 SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx create mode 100644 SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_V2023-06-06.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-06.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-06.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-06.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-06修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-06修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-06修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-06修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2023-06-12.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-12.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-12.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-12.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-13.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-13.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-13.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-13.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-13修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-13修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-13修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-13修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2023-06-14.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-14.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-14.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-14.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16.sql new file mode 100644 index 00000000..76d39302 --- /dev/null +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16.sql @@ -0,0 +1,196 @@ +UPDATE Sys_Menu SET Url='SmartSite/EquipmentManage.aspx?Type=D' WHERE MenuId='B972AE90-D40C-44E0-9A90-7B47B2A3399B' +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('641B763D-0C0D-4E52-8803-2E5743328A1F','B972AE90-D40C-44E0-9A90-7B47B2A3399B','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('DDE12996-0920-4BE9-A8EB-EB9CB1C7FB2F','B972AE90-D40C-44E0-9A90-7B47B2A3399B','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('8DD3B631-750C-4E0D-AAE0-0B05586C3490','B972AE90-D40C-44E0-9A90-7B47B2A3399B','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('EC0C885F-163C-4D3B-A301-8FF2C291F8D1','B972AE90-D40C-44E0-9A90-7B47B2A3399B','',4) +GO + +UPDATE Sys_Menu SET Url='SmartSite/EquipmentManage.aspx?Type=M' WHERE MenuId='908325CA-A50A-456D-8A7F-E193C629F2F9' +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('26FC28FB-C3F2-44B5-8CF6-8AF2E153F2DF','908325CA-A50A-456D-8A7F-E193C629F2F9','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('D5D95624-334C-489A-AE3B-A746D024C5A5','908325CA-A50A-456D-8A7F-E193C629F2F9','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('9CB845F6-42BA-4297-91BD-1233CDB97112','908325CA-A50A-456D-8A7F-E193C629F2F9','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('37C274EC-A2E2-4517-AB33-EDC4C36AC43D','908325CA-A50A-456D-8A7F-E193C629F2F9','',4) +GO + +UPDATE Sys_Menu SET Url='SmartSite/EquipmentManage.aspx?Type=E' WHERE MenuId='E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E' +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('78439D40-B0DC-4BE2-B361-DF3B77F4D0E8','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('3D0BC556-300A-4558-BFE8-4ABFF2A66473','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('373C9D29-445D-4973-B6F6-19621D5BD4B5','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('A07E64A2-4318-4E26-8F84-5A086D72EE9C','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','',4) +GO + +CREATE TABLE [dbo].[SmartSite_Equipment]( + [EquipmentId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Type] [varchar](2) NULL, + [EquipmentName] [nvarchar](200) NULL, + [EquipmentModel] [nvarchar](200) NULL, + [Number] [int] NULL, + [RunningState] [nvarchar](50) NULL, + [Supplier] [nvarchar](500) NULL, + [SupplierMan] [nvarchar](50) NULL, + [SupplierTel] [nvarchar](50) NULL, + CONSTRAINT [PK_SmartSite_Equipment] PRIMARY KEY CLUSTERED +( + [EquipmentId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[SmartSite_Equipment] WITH CHECK ADD CONSTRAINT [FK_SmartSite_Equipment_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[SmartSite_Equipment] CHECK CONSTRAINT [FK_SmartSite_Equipment_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'EquipmentId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣDŽMƵE⣩' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'Type' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'EquipmentName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'EquipmentModel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'RunningState' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'Supplier' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۺϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'SupplierMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۺϵ绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment', @level2type=N'COLUMN',@level2name=N'SupplierTel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸ǻ۹أ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_Equipment' +GO + + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('C126F42A-09B0-43D1-8DCF-9EA049B800A8','Ž豸','SmartSite/SoftManage.aspx?Type=D',10,'5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','Menu_SmartSite',1,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('C1945F59-AD5E-4301-9538-67511D0EB0EC','C126F42A-09B0-43D1-8DCF-9EA049B800A8','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('68776A89-A250-4188-99B2-9CD1B3FB7E28','C126F42A-09B0-43D1-8DCF-9EA049B800A8','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('79E96D30-B45F-47F5-8F1C-5E3FF009783C','C126F42A-09B0-43D1-8DCF-9EA049B800A8','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('066CA266-027D-4E74-8F7C-8AFB4F4C9602','C126F42A-09B0-43D1-8DCF-9EA049B800A8','',4) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('9F95F836-E10C-4EFD-B436-5C9D1658BAED','豸','SmartSite/SoftManage.aspx?Type=M',20,'5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','Menu_SmartSite',1,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('49057FC3-538A-4142-B192-D305B0CEF4A2','9F95F836-E10C-4EFD-B436-5C9D1658BAED','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('379D1D1F-CDC1-4C6D-AD3A-CE2186888C0A','9F95F836-E10C-4EFD-B436-5C9D1658BAED','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('AE6803C9-6923-481B-9CE5-AE85AC06B345','9F95F836-E10C-4EFD-B436-5C9D1658BAED','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('08F57065-5251-4EF4-B7D5-EA5C04056BB0','9F95F836-E10C-4EFD-B436-5C9D1658BAED','',4) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('834EE5EA-3DDA-49E1-A951-825392893E85','豸','SmartSite/SoftManage.aspx?Type=E',30,'5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','Menu_SmartSite',1,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('23EC254E-F074-426B-B105-3AB919416CE1','834EE5EA-3DDA-49E1-A951-825392893E85','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('6E414A46-C07B-4780-9D83-1B1993A87229','834EE5EA-3DDA-49E1-A951-825392893E85','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('C6A9D2D7-6A56-4508-9A3E-90986F57C125','834EE5EA-3DDA-49E1-A951-825392893E85','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('AC37EA29-3A1B-4272-9994-ED7AC19970B7','834EE5EA-3DDA-49E1-A951-825392893E85','',4) +GO + +CREATE TABLE [dbo].[SmartSite_EquipmentSoft]( + [EquipmentSoftId] [nvarchar](50) NOT NULL, + [EquipmentId] [nvarchar](50) NULL, + [ProjectId] [nvarchar](50) NULL, + [Type] [varchar](2) NULL, + [EquipmentSoftName] [nvarchar](200) NULL, + [EquipmentSoftModel] [nvarchar](200) NULL, + [Number] [int] NULL, + [RunningState] [nvarchar](50) NULL, + [Supplier] [nvarchar](500) NULL, + [SupplierMan] [nvarchar](50) NULL, + [SupplierTel] [nvarchar](50) NULL, + CONSTRAINT [PK_SmartSite_EquipmentSoft] PRIMARY KEY CLUSTERED +( + [EquipmentSoftId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[SmartSite_EquipmentSoft] WITH CHECK ADD CONSTRAINT [FK_SmartSite_EquipmentSoft_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[SmartSite_EquipmentSoft] CHECK CONSTRAINT [FK_SmartSite_EquipmentSoft_Base_Project] +GO + +ALTER TABLE [dbo].[SmartSite_EquipmentSoft] WITH CHECK ADD CONSTRAINT [FK_SmartSite_EquipmentSoft_SmartSite_Equipment] FOREIGN KEY([EquipmentId]) +REFERENCES [dbo].[SmartSite_Equipment] ([EquipmentId]) +GO + +ALTER TABLE [dbo].[SmartSite_EquipmentSoft] CHECK CONSTRAINT [FK_SmartSite_EquipmentSoft_SmartSite_Equipment] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'EquipmentSoftId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'EquipmentId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ1Ž2Ƶ3⣩' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'Type' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'EquipmentSoftName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'汾' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'EquipmentSoftModel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'RunningState' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'Supplier' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۺϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'SupplierMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ۺϵ绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft', @level2type=N'COLUMN',@level2name=N'SupplierTel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸ǻ۹أ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SmartSite_EquipmentSoft' +GO diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16修改明细.txt new file mode 100644 index 00000000..a9946fa5 --- /dev/null +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-16修改明细.txt @@ -0,0 +1,5 @@ +--ADD BY YangHongwei 2023-06-16 +1、新增设备管理（门禁、监控、环境监测）页面 +2、新增设备软件管理（门禁、监控、环境监测）页面 +3、优化费用管理模块。 +--END \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/0-6智慧工地（Menu_SmartSite）.sql b/DataBase/菜单初始化脚本/0-6智慧工地（Menu_SmartSite）.sql index ed68da0f..dd9a247d 100644 --- a/DataBase/菜单初始化脚本/0-6智慧工地（Menu_SmartSite）.sql +++ b/DataBase/菜单初始化脚本/0-6智慧工地（Menu_SmartSite）.sql @@ -14,20 +14,91 @@ GO VALUES('15F04E9B-5893-4401-B864-BCDF7D67D13D','豸','',10,'C2C9C4BD-B10B-46AD-9468-66EF063517CF','Menu_SmartSite',1,0,1) GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('B972AE90-D40C-44E0-9A90-7B47B2A3399B','Ž豸','',10,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) + VALUES('B972AE90-D40C-44E0-9A90-7B47B2A3399B','Ž豸','SmartSite/EquipmentManage.aspx?Type=D',10,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('641B763D-0C0D-4E52-8803-2E5743328A1F','B972AE90-D40C-44E0-9A90-7B47B2A3399B','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('DDE12996-0920-4BE9-A8EB-EB9CB1C7FB2F','B972AE90-D40C-44E0-9A90-7B47B2A3399B','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8DD3B631-750C-4E0D-AAE0-0B05586C3490','B972AE90-D40C-44E0-9A90-7B47B2A3399B','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('EC0C885F-163C-4D3B-A301-8FF2C291F8D1','B972AE90-D40C-44E0-9A90-7B47B2A3399B','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('908325CA-A50A-456D-8A7F-E193C629F2F9','豸','',20,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) + VALUES('908325CA-A50A-456D-8A7F-E193C629F2F9','豸','SmartSite/EquipmentManage.aspx?Type=M',20,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('26FC28FB-C3F2-44B5-8CF6-8AF2E153F2DF','908325CA-A50A-456D-8A7F-E193C629F2F9','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D5D95624-334C-489A-AE3B-A746D024C5A5','908325CA-A50A-456D-8A7F-E193C629F2F9','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('9CB845F6-42BA-4297-91BD-1233CDB97112','908325CA-A50A-456D-8A7F-E193C629F2F9','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('37C274EC-A2E2-4517-AB33-EDC4C36AC43D','908325CA-A50A-456D-8A7F-E193C629F2F9','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','豸','',30,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) + VALUES('E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','豸','SmartSite/EquipmentManage.aspx?Type=E',30,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('78439D40-B0DC-4BE2-B361-DF3B77F4D0E8','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3D0BC556-300A-4558-BFE8-4ABFF2A66473','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('373C9D29-445D-4973-B6F6-19621D5BD4B5','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('A07E64A2-4318-4E26-8F84-5A086D72EE9C','E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('04A361BF-BFC5-4D23-BF3C-3E5472D94A55','Ԥչ','',40,'15F04E9B-5893-4401-B864-BCDF7D67D13D','Menu_SmartSite',1,1,1) GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','','',20,'C2C9C4BD-B10B-46AD-9468-66EF063517CF','Menu_SmartSite',1,0,1) GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('C126F42A-09B0-43D1-8DCF-9EA049B800A8','Ž豸','SmartSite/SoftManage.aspx?Type=D',10,'5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','Menu_SmartSite',1,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C1945F59-AD5E-4301-9538-67511D0EB0EC','C126F42A-09B0-43D1-8DCF-9EA049B800A8','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('68776A89-A250-4188-99B2-9CD1B3FB7E28','C126F42A-09B0-43D1-8DCF-9EA049B800A8','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('79E96D30-B45F-47F5-8F1C-5E3FF009783C','C126F42A-09B0-43D1-8DCF-9EA049B800A8','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('066CA266-027D-4E74-8F7C-8AFB4F4C9602','C126F42A-09B0-43D1-8DCF-9EA049B800A8','',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('9F95F836-E10C-4EFD-B436-5C9D1658BAED','豸','SmartSite/SoftManage.aspx?Type=M',20,'5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','Menu_SmartSite',1,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('49057FC3-538A-4142-B192-D305B0CEF4A2','9F95F836-E10C-4EFD-B436-5C9D1658BAED','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('379D1D1F-CDC1-4C6D-AD3A-CE2186888C0A','9F95F836-E10C-4EFD-B436-5C9D1658BAED','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('AE6803C9-6923-481B-9CE5-AE85AC06B345','9F95F836-E10C-4EFD-B436-5C9D1658BAED','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('08F57065-5251-4EF4-B7D5-EA5C04056BB0','9F95F836-E10C-4EFD-B436-5C9D1658BAED','',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('834EE5EA-3DDA-49E1-A951-825392893E85','豸','SmartSite/SoftManage.aspx?Type=E',30,'5D9BD2EC-8CF4-4579-91B9-786EBB0ADD12','Menu_SmartSite',1,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('23EC254E-F074-426B-B105-3AB919416CE1','834EE5EA-3DDA-49E1-A951-825392893E85','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('6E414A46-C07B-4780-9D83-1B1993A87229','834EE5EA-3DDA-49E1-A951-825392893E85','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C6A9D2D7-6A56-4508-9A3E-90986F57C125','834EE5EA-3DDA-49E1-A951-825392893E85','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('AC37EA29-3A1B-4272-9994-ED7AC19970B7','834EE5EA-3DDA-49E1-A951-825392893E85','',4) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('C724ADE0-F445-40C7-9B33-560809A1DBFE','ݽӿڹ','',30,'C2C9C4BD-B10B-46AD-9468-66EF063517CF','Menu_SmartSite',1,0,1) GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index a2f00b44..8d1969fe 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -629,6 +629,8 @@ Reference.svcmap + + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 43ffea3a..6f9c25b7 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -699,8 +699,6 @@ /// public const string Menu_Notice = "Menu_Notice"; - - /*项目*/ /// /// 项目设置 @@ -3016,6 +3014,39 @@ #endregion #endregion + #region 智慧工地 + /// + /// 门禁设备管理 + /// + public const string EquipmentManageDMenuId = "B972AE90-D40C-44E0-9A90-7B47B2A3399B"; + + /// + /// 监控设备管理 + /// + public const string EquipmentManageMMenuId = "908325CA-A50A-456D-8A7F-E193C629F2F9"; + + /// + /// 环境设备管理 + /// + public const string EquipmentManageEMenuId = "E2C18D81-264E-4BAB-BCFC-DCB0DCFD582E"; + + /// + /// 门禁设备管理 + /// + public const string SoftManageDMenuId = "C126F42A-09B0-43D1-8DCF-9EA049B800A8"; + + /// + /// 监控设备管理 + /// + public const string SoftManageMMenuId = "9F95F836-E10C-4EFD-B436-5C9D1658BAED"; + + /// + /// 环境设备管理 + /// + public const string SoftManageEMenuId = "834EE5EA-3DDA-49E1-A951-825392893E85"; + + #endregion + #endregion #region 项目级菜单 diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 5fc6aadc..a74ab175 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -356,7 +356,7 @@ } } - #region 项目表下拉框 + #region 项目表下拉框 --施工项目 /// /// 项目表下拉框 /// @@ -364,6 +364,7 @@ /// 是否显示请选择 public static void InitProjectDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) { + dropName.Items.Clear(); dropName.DataValueField = "ProjectId"; dropName.DataTextField = "ProjectName"; dropName.DataSource = BLL.ProjectService.GetProjectWorkList(); @@ -381,6 +382,7 @@ /// 是否显示请选择 public static void InitProjectShortNameDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) { + dropName.Items.Clear(); dropName.DataValueField = "ProjectId"; dropName.DataTextField = "ShortName"; dropName.DataSource = BLL.ProjectService.GetProjectWorkList(); @@ -392,7 +394,7 @@ } /// - /// 项目表下拉框 + /// 项目表下拉框 --所有项目 /// /// 下拉框名字 /// 是否显示请选择 @@ -422,6 +424,7 @@ /// public static void InitAllProjectShortNameDropDownList(FineUIPro.DropDownList dropName, string userId, bool isShowPlease) { + dropName.Items.Clear(); dropName.DataValueField = "ProjectId"; dropName.DataTextField = "ShortName"; var projectlist = GetProjectByUserIdDropDownList(userId); @@ -444,6 +447,7 @@ /// 是否显示请选择 public static void InitProjectByProjectTypeDropDownList(FineUIPro.DropDownList dropName, string projectType, bool isShowPlease) { + dropName.Items.Clear(); dropName.DataValueField = "ProjectId"; dropName.DataTextField = "ProjectName"; var projectlist = BLL.ProjectService.GetProjectByProjectTypeDropDownList(projectType); diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs index 23eb78cf..bc03d2d0 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -133,7 +133,7 @@ var pUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(e => e.ProjectId == projectId && e.UnitId == unitId); if (pUnit != null) { - if (pUnit.UnitType == Const.ProjectUnitType_2 || pUnit.UnitType == Const.ProjectUnitType_0) + if (pUnit.UnitType == Const.ProjectUnitType_2 || pUnit.UnitType == Const.ProjectUnitType_6 || pUnit.UnitType == Const.ProjectUnitType_0) { isShow = true; } diff --git a/SGGL/BLL/SmartSite/EquipmentService.cs b/SGGL/BLL/SmartSite/EquipmentService.cs new file mode 100644 index 00000000..374fe59d --- /dev/null +++ b/SGGL/BLL/SmartSite/EquipmentService.cs @@ -0,0 +1,130 @@ +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 设备管理 + /// + public static class EquipmentService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取设备管理 + /// + /// + /// + public static Model.SmartSite_Equipment GetEquipmentByEquipmentId(string EquipmentId) + { + return Funs.DB.SmartSite_Equipment.FirstOrDefault(e => e.EquipmentId == EquipmentId); + } + + /// + /// 获取设备管理名称是否存在 + /// + /// 设备管理id + /// 名称 + /// 是否存在 + public static bool IsExistEquipment(string EquipmentId, string EquipmentName) + { + bool isExist = false; + var role = Funs.DB.SmartSite_Equipment.FirstOrDefault(x => x.EquipmentName == EquipmentName && x.EquipmentId != EquipmentId); + if (role != null) + { + isExist = true; + } + return isExist; + } + + /// + /// 添加设备管理 + /// + /// + public static void AddEquipment(Model.SmartSite_Equipment Equipment) + { + Model.SmartSite_Equipment newEquipment = new Model.SmartSite_Equipment + { + EquipmentId = Equipment.EquipmentId, + ProjectId = Equipment.ProjectId, + Type = Equipment.Type, + EquipmentName = Equipment.EquipmentName, + EquipmentModel = Equipment.EquipmentModel, + Number = Equipment.Number, + RunningState = Equipment.RunningState, + Supplier = Equipment.Supplier, + SupplierMan = Equipment.SupplierMan, + SupplierTel = Equipment.SupplierTel, + }; + Funs.DB.SmartSite_Equipment.InsertOnSubmit(newEquipment); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改设备管理 + /// + /// + public static void UpdateEquipment(Model.SmartSite_Equipment Equipment) + { + Model.SmartSite_Equipment newEquipment = Funs.DB.SmartSite_Equipment.FirstOrDefault(e => e.EquipmentId == Equipment.EquipmentId); + if (newEquipment != null) + { + newEquipment.Type = Equipment.Type; + newEquipment.EquipmentName = Equipment.EquipmentName; + newEquipment.EquipmentModel = Equipment.EquipmentModel; + newEquipment.Number = Equipment.Number; + newEquipment.RunningState = Equipment.RunningState; + newEquipment.Supplier = Equipment.Supplier; + newEquipment.SupplierMan = Equipment.SupplierMan; + newEquipment.SupplierTel = Equipment.SupplierTel; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据主键删除设备管理 + /// + /// + public static void DeleteEquipmentById(string EquipmentId) + { + Model.SmartSite_Equipment Equipment = Funs.DB.SmartSite_Equipment.FirstOrDefault(e => e.EquipmentId == EquipmentId); + if (Equipment != null) + { + Funs.DB.SmartSite_Equipment.DeleteOnSubmit(Equipment); + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据部门Id获取设备管理下拉选择项 + /// + /// + /// + public static List GetEquipmentList(string projectId, string type) + { + return (from x in Funs.DB.SmartSite_Equipment + where x.ProjectId == projectId && x.Type == type + orderby x.EquipmentName + select x).ToList(); + } + + #region 设备管理表下拉框 + /// + /// 设备管理表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitEquipmentDropDownList(FineUIPro.DropDownList dropName, string projectId, string type, bool isShowPlease) + { + dropName.DataValueField = "EquipmentId"; + dropName.DataTextField = "Equipment"; + dropName.DataSource = BLL.EquipmentService.GetEquipmentList(projectId, type); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #endregion + } +} diff --git a/SGGL/BLL/SmartSite/EquipmentSoftService.cs b/SGGL/BLL/SmartSite/EquipmentSoftService.cs new file mode 100644 index 00000000..19084553 --- /dev/null +++ b/SGGL/BLL/SmartSite/EquipmentSoftService.cs @@ -0,0 +1,131 @@ +using System.Collections.Generic; +using System.Linq; + +namespace BLL +{ + /// + /// 软件管理 + /// + public static class EquipmentSoftService + { + public static Model.SGGLDB db = Funs.DB; + + /// + /// 根据主键获取软件管理 + /// + /// + /// + public static Model.SmartSite_EquipmentSoft GetEquipmentSoftByEquipmentSoftId(string EquipmentSoftId) + { + return Funs.DB.SmartSite_EquipmentSoft.FirstOrDefault(e => e.EquipmentSoftId == EquipmentSoftId); + } + + /// + /// 获取软件管理名称是否存在 + /// + /// 软件管理id + /// 名称 + /// 是否存在 + public static bool IsExistEquipmentSoft(string EquipmentSoftId, string EquipmentSoftName) + { + bool isExist = false; + var role = Funs.DB.SmartSite_EquipmentSoft.FirstOrDefault(x => x.EquipmentSoftName == EquipmentSoftName && x.EquipmentSoftId != EquipmentSoftId); + if (role != null) + { + isExist = true; + } + return isExist; + } + + /// + /// 添加软件管理 + /// + /// + public static void AddEquipmentSoft(Model.SmartSite_EquipmentSoft EquipmentSoft) + { + Model.SmartSite_EquipmentSoft newEquipmentSoft = new Model.SmartSite_EquipmentSoft + { + EquipmentSoftId = EquipmentSoft.EquipmentSoftId, + ProjectId = EquipmentSoft.ProjectId, + EquipmentId = EquipmentSoft.EquipmentId, + Type = EquipmentSoft.Type, + EquipmentSoftName = EquipmentSoft.EquipmentSoftName, + EquipmentSoftModel = EquipmentSoft.EquipmentSoftModel, + Number = EquipmentSoft.Number, + RunningState = EquipmentSoft.RunningState, + Supplier = EquipmentSoft.Supplier, + SupplierMan = EquipmentSoft.SupplierMan, + SupplierTel = EquipmentSoft.SupplierTel, + }; + Funs.DB.SmartSite_EquipmentSoft.InsertOnSubmit(newEquipmentSoft); + Funs.DB.SubmitChanges(); + } + + /// + /// 修改软件管理 + /// + /// + public static void UpdateEquipmentSoft(Model.SmartSite_EquipmentSoft EquipmentSoft) + { + Model.SmartSite_EquipmentSoft newEquipmentSoft = Funs.DB.SmartSite_EquipmentSoft.FirstOrDefault(e => e.EquipmentSoftId == EquipmentSoft.EquipmentSoftId); + if (newEquipmentSoft != null) + { + newEquipmentSoft.EquipmentId = EquipmentSoft.EquipmentId; + newEquipmentSoft.EquipmentSoftName = EquipmentSoft.EquipmentSoftName; + newEquipmentSoft.EquipmentSoftModel = EquipmentSoft.EquipmentSoftModel; + newEquipmentSoft.Number = EquipmentSoft.Number; + newEquipmentSoft.RunningState = EquipmentSoft.RunningState; + newEquipmentSoft.Supplier = EquipmentSoft.Supplier; + newEquipmentSoft.SupplierMan = EquipmentSoft.SupplierMan; + newEquipmentSoft.SupplierTel = EquipmentSoft.SupplierTel; + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据主键删除软件管理 + /// + /// + public static void DeleteEquipmentSoftById(string EquipmentSoftId) + { + Model.SmartSite_EquipmentSoft EquipmentSoft = Funs.DB.SmartSite_EquipmentSoft.FirstOrDefault(e => e.EquipmentSoftId == EquipmentSoftId); + if (EquipmentSoft != null) + { + Funs.DB.SmartSite_EquipmentSoft.DeleteOnSubmit(EquipmentSoft); + Funs.DB.SubmitChanges(); + } + } + + /// + /// 根据部门Id获取软件管理下拉选择项 + /// + /// + /// + public static List GetEquipmentSoftList(string projectId, string type) + { + return (from x in Funs.DB.SmartSite_EquipmentSoft + where x.ProjectId == projectId && x.Type == type + orderby x.EquipmentSoftName + select x).ToList(); + } + + #region 软件管理表下拉框 + /// + /// 软件管理表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitEquipmentSoftDropDownList(FineUIPro.DropDownList dropName, string projectId, string type, bool isShowPlease) + { + dropName.DataValueField = "EquipmentSoftId"; + dropName.DataTextField = "EquipmentSoft"; + dropName.DataSource = BLL.EquipmentSoftService.GetEquipmentSoftList(projectId, type); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 44199c5a..274887f7 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1502,6 +1502,10 @@ + + + + @@ -12878,6 +12882,34 @@ SafetyBriefingEdit.aspx + + SoftManage.aspx + ASPXCodeBehind + + + SoftManage.aspx + + + EquipmentManage.aspx + ASPXCodeBehind + + + EquipmentManage.aspx + + + SoftManageEdit.aspx + ASPXCodeBehind + + + SoftManageEdit.aspx + + + EquipmentManageEdit.aspx + ASPXCodeBehind + + + EquipmentManageEdit.aspx + CustomQuery.aspx ASPXCodeBehind @@ -13879,7 +13911,7 @@ True 0 / - http://localhost:8667/ + http://localhost:1773/ False False diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummary.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummary.aspx.cs index 5cb907a0..8d58f331 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummary.aspx.cs @@ -219,7 +219,7 @@ namespace FineUIPro.Web.HSSE.CostGoods var getCostManageItem = from x in Funs.DB.CostGoods_CostManageItem join y in Funs.DB.CostGoods_CostManage on x.CostManageId equals y.CostManageId - where y.ProjectId == this.ProjectId && (unitId == null || y.UnitId == unitId) + where y.ProjectId == this.ProjectId && (unitId == null || y.UnitId == unitId) && y.States==Const.State_2 select new { x.CostManageId, x.CostManageItemId, Year = y.CostManageDate.Value.Year, x.SupCostTypeId, x.CostTypeId, x.PriceMoney }; foreach (var item in getType) diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummaryUnit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummaryUnit.aspx.cs index db38c001..ea8eb445 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummaryUnit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostSummaryUnit.aspx.cs @@ -231,7 +231,7 @@ namespace FineUIPro.Web.HSSE.CostGoods var getCostManageItem = from x in Funs.DB.CostGoods_CostManageItem join y in Funs.DB.CostGoods_CostManage on x.CostManageId equals y.CostManageId - where y.ProjectId == this.ProjectId && (!year.HasValue || y.CostManageDate.Value.Year == year) + where y.ProjectId == this.ProjectId && (!year.HasValue || y.CostManageDate.Value.Year == year) && y.States == Const.State_2 select new { x.CostManageId, x.CostManageItemId, y.UnitId, Year = y.CostManageDate.Value.Year, x.SupCostTypeId, x.CostTypeId, x.PriceMoney }; var getType = (from x in getDetail select new { x.SupSortIndex, x.SortIndex, x.CostType }).Distinct(); diff --git a/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx b/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx new file mode 100644 index 00000000..bf52c97f --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx @@ -0,0 +1,103 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EquipmentManage.aspx.cs" Inherits="FineUIPro.Web.SmartSite.EquipmentManage" %> + + + + + 设备管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.cs b/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.cs new file mode 100644 index 00000000..03622ea7 --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.cs @@ -0,0 +1,276 @@ +namespace FineUIPro.Web.SmartSite +{ + using BLL; + using System; + using System.Collections.Generic; + using System.Data; + using System.Data.SqlClient; + using System.Linq; + + public partial class EquipmentManage : PageBase + { + /// + /// 类型 + /// + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + + /// + /// 菜单id + /// + public string MenuId + { + get + { + return (string)ViewState["MenuId"]; + } + set + { + ViewState["MenuId"] = value; + } + } + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.Type = Request.Params["type"]; + if (this.Type == "D") + { + this.MenuId = Const.EquipmentManageDMenuId; + } + else if (this.Type == "M") + { + this.MenuId = Const.EquipmentManageMMenuId; + } + else + { + this.MenuId = Const.EquipmentManageEMenuId; + } + ////权限按钮方法 + this.GetButtonPower(); + this.btnNew.OnClientClick = Window1.GetShowReference("EquipmentManageEdit.aspx?type="+this.Type) + "return false;"; + Funs.DropDownPageSize(this.ddlPageSize); + // 绑定表格 + this.BindGrid(); + + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT EquipmentId,EQ.ProjectId,P.ProjectName,Type,EquipmentName,EquipmentModel,Number,RunningState + ,Supplier,SupplierMan,SupplierTel + FROM SmartSite_Equipment AS EQ + LEFT JOIN Base_Project AS P ON EQ.ProjectId=P.ProjectId WHERE 1 = 1"; + List listStr = new List(); + strSql += " AND Type = @Type"; + listStr.Add(new SqlParameter("@Type", this.Type)); + if (!string.IsNullOrEmpty(this.txtEquipmentName.Text.Trim())) + { + strSql += " AND EquipmentName LIKE @EquipmentName"; + listStr.Add(new SqlParameter("@EquipmentName", "%" + this.txtEquipmentName.Text.Trim() + "%")); + } + //if (this.drpLicenseType.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND EquipmentManage.LicenseType = @LicenseTypeId"; + // listStr.Add(new SqlParameter("@LicenseTypeId", this.drpLicenseType.SelectedValue)); + //} + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, this.MenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + #region 删除数据 + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + this.DeleteData(); + } + + /// + /// 删除方法 + /// + private void DeleteData() + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (judgementDelete(rowID, false)) + { + var getD = EquipmentService.GetEquipmentByEquipmentId(rowID); + if (getD != null) + { + LogService.AddSys_Log(this.CurrUser, getD.EquipmentName.ToString(), getD.EquipmentId,this.MenuId, BLL.Const.BtnDelete); + BLL.EquipmentService.DeleteEquipmentById(rowID); + } + } + } + BindGrid(); + ShowNotify("删除数据成功!"); + } + } + #endregion + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Funs.GetNewIntOrZero(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string Id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EquipmentManageEdit.aspx?EquipmentId={0}&type={1}", Id, this.Type, "编辑 - "))); + } + + #region 判断是否可删除 + /// + /// 判断是否可以删除 + /// + /// + private bool judgementDelete(string id, bool isShow) + { + string content = string.Empty; + //if (Funs.DB.Project_ProjectEquipmentManage.FirstOrDefault(x => x.EquipmentManageId == id) != null) + //{ + // content = "该用户已在【项目用户】中使用，不能删除！"; + //} + + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content); + } + return false; + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.designer.cs b/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.designer.cs new file mode 100644 index 00000000..a671002b --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/EquipmentManage.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.SmartSite +{ + + + public partial class EquipmentManage + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtEquipmentName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentName; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx b/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx new file mode 100644 index 00000000..5cda3c8f --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx @@ -0,0 +1,67 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EquipmentManageEdit.aspx.cs" Inherits="FineUIPro.Web.SmartSite.EquipmentManageEdit" %> + + + + + 编辑设备管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.cs b/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.cs new file mode 100644 index 00000000..a608d5b0 --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.cs @@ -0,0 +1,167 @@ +using BLL; +using FineUIPro.Web.CQMS.Material; +using System; +using System.Linq; + +namespace FineUIPro.Web.SmartSite +{ + public partial class EquipmentManageEdit : PageBase + { + #region 定义项 + /// + /// 安全措施主键 + /// + public string EquipmentId + { + get + { + return (string)ViewState["EquipmentId"]; + } + set + { + ViewState["EquipmentId"] = value; + } + } + /// + /// 类型 + /// + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + /// + /// 菜单id + /// + public string MenuId + { + get + { + return (string)ViewState["MenuId"]; + } + set + { + ViewState["MenuId"] = value; + } + } + #endregion + + /// + /// 安全措施编辑页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + + this.EquipmentId = Request.Params["EquipmentId"]; + this.Type = Request.Params["type"]; + if (this.Type == "D") + { + this.MenuId = Const.EquipmentManageDMenuId; + } + else if (this.Type == "M") + { + this.MenuId = Const.EquipmentManageMMenuId; + } + else + { + this.MenuId = Const.EquipmentManageEMenuId; + } + ///权限 + this.GetButtonPower(); + + ProjectService.InitProjectDropDownList(this.drpProject, true); + if (!string.IsNullOrEmpty(this.EquipmentId)) + { + var Equipment = BLL.EquipmentService.GetEquipmentByEquipmentId(this.EquipmentId); + if (Equipment != null) + { + ProjectService.InitAllProjectDropDownList(this.drpProject, true); + this.drpProject.SelectedValue = Equipment.ProjectId; + this.Type = Equipment.Type; + this.txtEquipmentName.Text = Equipment.EquipmentName; + this.txtEquipmentModel.Text = Equipment.EquipmentModel; + this.txtNumber.Text = Equipment.Number.ToString(); + this.txtRunningState.Text = Equipment.RunningState; + this.txtSupplier.Text = Equipment.Supplier; + this.txtSupplierMan.Text = Equipment.SupplierMan; + this.txtSupplierTel.Text = Equipment.SupplierTel; + } + } + } + } + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.drpProject.SelectedValue == Const._Null) + { + Alert.ShowInParent("请选择项目！", MessageBoxIcon.Warning); + return; + } + + Model.SmartSite_Equipment newEquipment = new Model.SmartSite_Equipment + { + EquipmentName = this.txtEquipmentName.Text.Trim(), + Type = this.Type, + EquipmentModel = this.txtEquipmentModel.Text.Trim(), + Number = Funs.GetNewIntOrZero(this.txtNumber.Text.Trim()), + RunningState = this.txtRunningState.Text.Trim(), + Supplier = this.txtSupplier.Text.Trim(), + SupplierMan = this.txtSupplierMan.Text.Trim(), + SupplierTel = this.txtSupplierTel.Text.Trim(), + }; + + if (this.drpProject.SelectedValue != Const._Null) + { + newEquipment.ProjectId = this.drpProject.SelectedValue; + } + if (string.IsNullOrEmpty(this.EquipmentId)) + { + newEquipment.EquipmentId = SQLHelper.GetNewID(); + BLL.EquipmentService.AddEquipment(newEquipment); + BLL.LogService.AddSys_Log(this.CurrUser, newEquipment.EquipmentName, newEquipment.EquipmentId, this.MenuId, Const.BtnAdd); + } + else + { + newEquipment.EquipmentId = this.EquipmentId; + BLL.EquipmentService.UpdateEquipment(newEquipment); + BLL.LogService.AddSys_Log(this.CurrUser, newEquipment.EquipmentName, newEquipment.EquipmentId, this.MenuId, Const.BtnModify); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, this.MenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.designer.cs new file mode 100644 index 00000000..9b9363a2 --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/EquipmentManageEdit.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.SmartSite +{ + + + public partial class EquipmentManageEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// txtEquipmentName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentName; + + /// + /// txtEquipmentModel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentModel; + + /// + /// txtNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtNumber; + + /// + /// txtRunningState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRunningState; + + /// + /// txtSupplier 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSupplier; + + /// + /// txtSupplierMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSupplierMan; + + /// + /// txtSupplierTel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSupplierTel; + + /// + /// lb 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lb; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx b/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx new file mode 100644 index 00000000..fdcef636 --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx @@ -0,0 +1,106 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SoftManage.aspx.cs" Inherits="FineUIPro.Web.SmartSite.SoftManage" %> + + + + + 软件管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.cs b/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.cs new file mode 100644 index 00000000..e54ae6cc --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.cs @@ -0,0 +1,277 @@ +namespace FineUIPro.Web.SmartSite +{ + using BLL; + using System; + using System.Collections.Generic; + using System.Data; + using System.Data.SqlClient; + using System.Linq; + + public partial class SoftManage : PageBase + { + /// + /// 类型 + /// + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + + /// + /// 菜单id + /// + public string MenuId + { + get + { + return (string)ViewState["MenuId"]; + } + set + { + ViewState["MenuId"] = value; + } + } + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.Type = Request.Params["type"]; + if (this.Type == "D") + { + this.MenuId = Const.SoftManageDMenuId; + } + else if (this.Type == "M") + { + this.MenuId = Const.SoftManageMMenuId; + } + else + { + this.MenuId = Const.SoftManageEMenuId; + } + ////权限按钮方法 + this.GetButtonPower(); + this.btnNew.OnClientClick = Window1.GetShowReference("SoftManageEdit.aspx?type=" + this.Type) + "return false;"; + Funs.DropDownPageSize(this.ddlPageSize); + // 绑定表格 + this.BindGrid(); + + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT EquipmentSoftId,Soft.ProjectId,P.ProjectName,Soft.Type,Soft.EquipmentSoftName,EQ.EquipmentName,EquipmentModel,Soft.Number,Soft.RunningState + ,Soft.Supplier,Soft.SupplierMan,Soft.SupplierTel + FROM SmartSite_EquipmentSoft AS Soft + LEFT JOIN Base_Project AS P ON Soft.ProjectId=P.ProjectId + LEFT JOIN SmartSite_Equipment AS EQ ON Soft.EquipmentId=EQ.EquipmentId WHERE 1 = 1"; + List listStr = new List(); + strSql += " AND Soft.Type = @Type"; + listStr.Add(new SqlParameter("@Type", this.Type)); + if (!string.IsNullOrEmpty(this.txtEquipmentName.Text.Trim())) + { + strSql += " AND EquipmentName LIKE @EquipmentName"; + listStr.Add(new SqlParameter("@EquipmentName", "%" + this.txtEquipmentName.Text.Trim() + "%")); + } + //if (this.drpLicenseType.SelectedValue != BLL.Const._Null) + //{ + // strSql += " AND EquipmentManage.LicenseType = @LicenseTypeId"; + // listStr.Add(new SqlParameter("@LicenseTypeId", this.drpLicenseType.SelectedValue)); + //} + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, this.MenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + if (buttonList.Contains(Const.BtnDelete)) + { + this.btnMenuDelete.Hidden = false; + } + } + } + #endregion + + #region 删除数据 + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + this.DeleteData(); + } + + /// + /// 删除方法 + /// + private void DeleteData() + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (judgementDelete(rowID, false)) + { + var getD = EquipmentSoftService.GetEquipmentSoftByEquipmentSoftId(rowID); + if (getD != null) + { + LogService.AddSys_Log(this.CurrUser, getD.EquipmentSoftName.ToString(), getD.EquipmentSoftId,this.MenuId, BLL.Const.BtnDelete); + BLL.EquipmentSoftService.DeleteEquipmentSoftById(rowID); + } + } + } + BindGrid(); + ShowNotify("删除数据成功!"); + } + } + #endregion + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Funs.GetNewIntOrZero(this.ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string Id = Grid1.SelectedRowID; + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SoftManageEdit.aspx?EquipmentSoftId={0}&type={1}", Id, this.Type, "编辑 - "))); + } + + #region 判断是否可删除 + /// + /// 判断是否可以删除 + /// + /// + private bool judgementDelete(string id, bool isShow) + { + string content = string.Empty; + //if (Funs.DB.Project_ProjectEquipmentManage.FirstOrDefault(x => x.EquipmentManageId == id) != null) + //{ + // content = "该用户已在【项目用户】中使用，不能删除！"; + //} + + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content); + } + return false; + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.designer.cs b/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.designer.cs new file mode 100644 index 00000000..3aa6924c --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/SoftManage.aspx.designer.cs @@ -0,0 +1,152 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.SmartSite +{ + + + public partial class SoftManage + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtEquipmentName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentName; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx b/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx new file mode 100644 index 00000000..9cd8ae90 --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx @@ -0,0 +1,70 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SoftManageEdit.aspx.cs" Inherits="FineUIPro.Web.SmartSite.SoftManageEdit" %> + + + + + 编辑软件管理 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.cs b/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.cs new file mode 100644 index 00000000..ba50010a --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.cs @@ -0,0 +1,180 @@ +using BLL; +using FineUIPro.Web.CQMS.Material; +using System; +using System.Linq; + +namespace FineUIPro.Web.SmartSite +{ + public partial class SoftManageEdit : PageBase + { + #region 定义项 + /// + /// 安全措施主键 + /// + public string EquipmentSoftId + { + get + { + return (string)ViewState["EquipmentSoftId"]; + } + set + { + ViewState["EquipmentSoftId"] = value; + } + } + /// + /// 类型 + /// + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } + /// + /// 菜单id + /// + public string MenuId + { + get + { + return (string)ViewState["MenuId"]; + } + set + { + ViewState["MenuId"] = value; + } + } + #endregion + + /// + /// 安全措施编辑页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + + this.EquipmentSoftId = Request.Params["EquipmentSoftId"]; + this.Type = Request.Params["type"]; + if (this.Type == "D") + { + this.MenuId = Const.SoftManageDMenuId; + } + else if (this.Type == "M") + { + this.MenuId = Const.SoftManageMMenuId; + } + else + { + this.MenuId = Const.SoftManageEMenuId; + } + ///权限 + this.GetButtonPower(); + + ProjectService.InitProjectDropDownList(this.drpProject, true); + EquipmentService.InitEquipmentDropDownList(this.drpEQ, this.drpProject.SelectedValue, this.Type, true); + if (!string.IsNullOrEmpty(this.EquipmentSoftId)) + { + var Equipment = BLL.EquipmentSoftService.GetEquipmentSoftByEquipmentSoftId(this.EquipmentSoftId); + if (Equipment != null) + { + ProjectService.InitAllProjectDropDownList(this.drpProject, true); + this.drpProject.SelectedValue = Equipment.ProjectId; + EquipmentService.InitEquipmentDropDownList(this.drpEQ, this.drpProject.SelectedValue, this.Type, true); + this.drpEQ.SelectedValue = Equipment.EquipmentId; + this.Type = Equipment.Type; + this.txtEquipmentSoftName.Text = Equipment.EquipmentSoftName; + this.txtEquipmentSoftModel.Text = Equipment.EquipmentSoftModel; + this.txtNumber.Text = Equipment.Number.ToString(); + this.txtRunningState.Text = Equipment.RunningState; + this.txtSupplier.Text = Equipment.Supplier; + this.txtSupplierMan.Text = Equipment.SupplierMan; + this.txtSupplierTel.Text = Equipment.SupplierTel; + } + } + } + } + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (this.drpProject.SelectedValue == Const._Null) + { + Alert.ShowInParent("请选择项目！", MessageBoxIcon.Warning); + return; + } + + Model.SmartSite_EquipmentSoft newEquipment = new Model.SmartSite_EquipmentSoft + { + EquipmentSoftName = this.txtEquipmentSoftName.Text.Trim(), + Type = this.Type, + EquipmentSoftModel = this.txtEquipmentSoftModel.Text.Trim(), + Number = Funs.GetNewIntOrZero(this.txtNumber.Text.Trim()), + RunningState = this.txtRunningState.Text.Trim(), + Supplier = this.txtSupplier.Text.Trim(), + SupplierMan = this.txtSupplierMan.Text.Trim(), + SupplierTel = this.txtSupplierTel.Text.Trim(), + }; + + if (this.drpProject.SelectedValue != Const._Null) + { + newEquipment.ProjectId = this.drpProject.SelectedValue; + } + + if (this.drpEQ.SelectedValue != Const._Null) + { + newEquipment.EquipmentId = this.drpEQ.SelectedValue; + } + if (string.IsNullOrEmpty(this.EquipmentSoftId)) + { + newEquipment.EquipmentSoftId = SQLHelper.GetNewID(); + BLL.EquipmentSoftService.AddEquipmentSoft(newEquipment); + BLL.LogService.AddSys_Log(this.CurrUser, newEquipment.EquipmentSoftName, newEquipment.EquipmentSoftId, this.MenuId, Const.BtnAdd); + } + else + { + newEquipment.EquipmentSoftId = this.EquipmentSoftId; + BLL.EquipmentSoftService.UpdateEquipmentSoft(newEquipment); + BLL.LogService.AddSys_Log(this.CurrUser, newEquipment.EquipmentSoftName, newEquipment.EquipmentSoftId, this.MenuId, Const.BtnModify); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, this.MenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + #endregion + + protected void drpProject_SelectedIndexChanged(object sender, EventArgs e) + { + EquipmentService.InitEquipmentDropDownList(this.drpEQ, this.drpProject.SelectedValue,this.Type, true); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.designer.cs new file mode 100644 index 00000000..06e93975 --- /dev/null +++ b/SGGL/FineUIPro.Web/SmartSite/SoftManageEdit.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.SmartSite +{ + + + public partial class SoftManageEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// drpEQ 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpEQ; + + /// + /// txtEquipmentSoftName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentSoftName; + + /// + /// txtEquipmentSoftModel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentSoftModel; + + /// + /// txtNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtNumber; + + /// + /// txtRunningState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRunningState; + + /// + /// txtSupplier 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSupplier; + + /// + /// txtSupplierMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSupplierMan; + + /// + /// txtSupplierTel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSupplierTel; + + /// + /// lb 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lb; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/common/Menu_SmartSite.xml b/SGGL/FineUIPro.Web/common/Menu_SmartSite.xml index c931acc6..5280a1aa 100644 --- a/SGGL/FineUIPro.Web/common/Menu_SmartSite.xml +++ b/SGGL/FineUIPro.Web/common/Menu_SmartSite.xml @@ -2,12 +2,15 @@ - - - + + + - + + + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 1e49074f..73565949 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1394,6 +1394,12 @@ namespace Model partial void InsertSitePerson_PersonItem(SitePerson_PersonItem instance); partial void UpdateSitePerson_PersonItem(SitePerson_PersonItem instance); partial void DeleteSitePerson_PersonItem(SitePerson_PersonItem instance); + partial void InsertSmartSite_Equipment(SmartSite_Equipment instance); + partial void UpdateSmartSite_Equipment(SmartSite_Equipment instance); + partial void DeleteSmartSite_Equipment(SmartSite_Equipment instance); + partial void InsertSmartSite_EquipmentSoft(SmartSite_EquipmentSoft instance); + partial void UpdateSmartSite_EquipmentSoft(SmartSite_EquipmentSoft instance); + partial void DeleteSmartSite_EquipmentSoft(SmartSite_EquipmentSoft instance); partial void InsertSolution_ConstructSolution(Solution_ConstructSolution instance); partial void UpdateSolution_ConstructSolution(Solution_ConstructSolution instance); partial void DeleteSolution_ConstructSolution(Solution_ConstructSolution instance); @@ -5370,6 +5376,22 @@ namespace Model } } + public System.Data.Linq.Table SmartSite_Equipment + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table SmartSite_EquipmentSoft + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Solution_ConstructSolution { get @@ -23754,6 +23776,10 @@ namespace Model private EntitySet _SitePerson_PersonItem; + private EntitySet _SmartSite_Equipment; + + private EntitySet _SmartSite_EquipmentSoft; + private EntitySet _Solution_ConstructSolution; private EntitySet _Solution_CQMSConstructSolution; @@ -24021,6 +24047,8 @@ namespace Model this._SitePerson_PersonInOut = new EntitySet(new Action(this.attach_SitePerson_PersonInOut), new Action(this.detach_SitePerson_PersonInOut)); this._SitePerson_PersonInOutNumber = new EntitySet(new Action(this.attach_SitePerson_PersonInOutNumber), new Action(this.detach_SitePerson_PersonInOutNumber)); this._SitePerson_PersonItem = new EntitySet(new Action(this.attach_SitePerson_PersonItem), new Action(this.detach_SitePerson_PersonItem)); + this._SmartSite_Equipment = new EntitySet(new Action(this.attach_SmartSite_Equipment), new Action(this.detach_SmartSite_Equipment)); + this._SmartSite_EquipmentSoft = new EntitySet(new Action(this.attach_SmartSite_EquipmentSoft), new Action(this.detach_SmartSite_EquipmentSoft)); this._Solution_ConstructSolution = new EntitySet(new Action(this.attach_Solution_ConstructSolution), new Action(this.detach_Solution_ConstructSolution)); this._Solution_CQMSConstructSolution = new EntitySet(new Action(this.attach_Solution_CQMSConstructSolution), new Action(this.detach_Solution_CQMSConstructSolution)); this._Solution_ExpertArgument = new EntitySet(new Action(this.attach_Solution_ExpertArgument), new Action(this.detach_Solution_ExpertArgument)); @@ -26523,6 +26551,32 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SmartSite_Equipment_Base_Project", Storage="_SmartSite_Equipment", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet SmartSite_Equipment + { + get + { + return this._SmartSite_Equipment; + } + set + { + this._SmartSite_Equipment.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SmartSite_EquipmentSoft_Base_Project", Storage="_SmartSite_EquipmentSoft", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet SmartSite_EquipmentSoft + { + get + { + return this._SmartSite_EquipmentSoft; + } + set + { + this._SmartSite_EquipmentSoft.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_ConstructSolution_Base_Project", Storage="_Solution_ConstructSolution", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Solution_ConstructSolution { @@ -28625,6 +28679,30 @@ namespace Model entity.Base_Project = null; } + private void attach_SmartSite_Equipment(SmartSite_Equipment entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_SmartSite_Equipment(SmartSite_Equipment entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + + private void attach_SmartSite_EquipmentSoft(SmartSite_EquipmentSoft entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_SmartSite_EquipmentSoft(SmartSite_EquipmentSoft entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_Solution_ConstructSolution(Solution_ConstructSolution entity) { this.SendPropertyChanging(); @@ -223472,6 +223550,737 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SmartSite_Equipment")] + public partial class SmartSite_Equipment : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _EquipmentId; + + private string _ProjectId; + + private string _Type; + + private string _EquipmentName; + + private string _EquipmentModel; + + private System.Nullable _Number; + + private string _RunningState; + + private string _Supplier; + + private string _SupplierMan; + + private string _SupplierTel; + + private EntityRef _Base_Project; + + private EntitySet _SmartSite_EquipmentSoft; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnEquipmentIdChanging(string value); + partial void OnEquipmentIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); + partial void OnEquipmentNameChanging(string value); + partial void OnEquipmentNameChanged(); + partial void OnEquipmentModelChanging(string value); + partial void OnEquipmentModelChanged(); + partial void OnNumberChanging(System.Nullable value); + partial void OnNumberChanged(); + partial void OnRunningStateChanging(string value); + partial void OnRunningStateChanged(); + partial void OnSupplierChanging(string value); + partial void OnSupplierChanged(); + partial void OnSupplierManChanging(string value); + partial void OnSupplierManChanged(); + partial void OnSupplierTelChanging(string value); + partial void OnSupplierTelChanged(); + #endregion + + public SmartSite_Equipment() + { + this._Base_Project = default(EntityRef); + this._SmartSite_EquipmentSoft = new EntitySet(new Action(this.attach_SmartSite_EquipmentSoft), new Action(this.detach_SmartSite_EquipmentSoft)); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string EquipmentId + { + get + { + return this._EquipmentId; + } + set + { + if ((this._EquipmentId != value)) + { + this.OnEquipmentIdChanging(value); + this.SendPropertyChanging(); + this._EquipmentId = value; + this.SendPropertyChanged("EquipmentId"); + this.OnEquipmentIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(2)")] + public string Type + { + get + { + return this._Type; + } + set + { + if ((this._Type != value)) + { + this.OnTypeChanging(value); + this.SendPropertyChanging(); + this._Type = value; + this.SendPropertyChanged("Type"); + this.OnTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentName", DbType="NVarChar(200)")] + public string EquipmentName + { + get + { + return this._EquipmentName; + } + set + { + if ((this._EquipmentName != value)) + { + this.OnEquipmentNameChanging(value); + this.SendPropertyChanging(); + this._EquipmentName = value; + this.SendPropertyChanged("EquipmentName"); + this.OnEquipmentNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentModel", DbType="NVarChar(200)")] + public string EquipmentModel + { + get + { + return this._EquipmentModel; + } + set + { + if ((this._EquipmentModel != value)) + { + this.OnEquipmentModelChanging(value); + this.SendPropertyChanging(); + this._EquipmentModel = value; + this.SendPropertyChanged("EquipmentModel"); + this.OnEquipmentModelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Int")] + 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="_RunningState", DbType="NVarChar(50)")] + public string RunningState + { + get + { + return this._RunningState; + } + set + { + if ((this._RunningState != value)) + { + this.OnRunningStateChanging(value); + this.SendPropertyChanging(); + this._RunningState = value; + this.SendPropertyChanged("RunningState"); + this.OnRunningStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supplier", DbType="NVarChar(500)")] + public string Supplier + { + get + { + return this._Supplier; + } + set + { + if ((this._Supplier != value)) + { + this.OnSupplierChanging(value); + this.SendPropertyChanging(); + this._Supplier = value; + this.SendPropertyChanged("Supplier"); + this.OnSupplierChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupplierMan", DbType="NVarChar(50)")] + public string SupplierMan + { + get + { + return this._SupplierMan; + } + set + { + if ((this._SupplierMan != value)) + { + this.OnSupplierManChanging(value); + this.SendPropertyChanging(); + this._SupplierMan = value; + this.SendPropertyChanged("SupplierMan"); + this.OnSupplierManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupplierTel", DbType="NVarChar(50)")] + public string SupplierTel + { + get + { + return this._SupplierTel; + } + set + { + if ((this._SupplierTel != value)) + { + this.OnSupplierTelChanging(value); + this.SendPropertyChanging(); + this._SupplierTel = value; + this.SendPropertyChanged("SupplierTel"); + this.OnSupplierTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SmartSite_Equipment_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.SmartSite_Equipment.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.SmartSite_Equipment.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SmartSite_EquipmentSoft_SmartSite_Equipment", Storage="_SmartSite_EquipmentSoft", ThisKey="EquipmentId", OtherKey="EquipmentId", DeleteRule="NO ACTION")] + public EntitySet SmartSite_EquipmentSoft + { + get + { + return this._SmartSite_EquipmentSoft; + } + set + { + this._SmartSite_EquipmentSoft.Assign(value); + } + } + + 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)); + } + } + + private void attach_SmartSite_EquipmentSoft(SmartSite_EquipmentSoft entity) + { + this.SendPropertyChanging(); + entity.SmartSite_Equipment = this; + } + + private void detach_SmartSite_EquipmentSoft(SmartSite_EquipmentSoft entity) + { + this.SendPropertyChanging(); + entity.SmartSite_Equipment = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SmartSite_EquipmentSoft")] + public partial class SmartSite_EquipmentSoft : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _EquipmentSoftId; + + private string _EquipmentId; + + private string _ProjectId; + + private string _Type; + + private string _EquipmentSoftName; + + private string _EquipmentSoftModel; + + private System.Nullable _Number; + + private string _RunningState; + + private string _Supplier; + + private string _SupplierMan; + + private string _SupplierTel; + + private EntityRef _Base_Project; + + private EntityRef _SmartSite_Equipment; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnEquipmentSoftIdChanging(string value); + partial void OnEquipmentSoftIdChanged(); + partial void OnEquipmentIdChanging(string value); + partial void OnEquipmentIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); + partial void OnEquipmentSoftNameChanging(string value); + partial void OnEquipmentSoftNameChanged(); + partial void OnEquipmentSoftModelChanging(string value); + partial void OnEquipmentSoftModelChanged(); + partial void OnNumberChanging(System.Nullable value); + partial void OnNumberChanged(); + partial void OnRunningStateChanging(string value); + partial void OnRunningStateChanged(); + partial void OnSupplierChanging(string value); + partial void OnSupplierChanged(); + partial void OnSupplierManChanging(string value); + partial void OnSupplierManChanged(); + partial void OnSupplierTelChanging(string value); + partial void OnSupplierTelChanged(); + #endregion + + public SmartSite_EquipmentSoft() + { + this._Base_Project = default(EntityRef); + this._SmartSite_Equipment = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentSoftId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string EquipmentSoftId + { + get + { + return this._EquipmentSoftId; + } + set + { + if ((this._EquipmentSoftId != value)) + { + this.OnEquipmentSoftIdChanging(value); + this.SendPropertyChanging(); + this._EquipmentSoftId = value; + this.SendPropertyChanged("EquipmentSoftId"); + this.OnEquipmentSoftIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentId", DbType="NVarChar(50)")] + public string EquipmentId + { + get + { + return this._EquipmentId; + } + set + { + if ((this._EquipmentId != value)) + { + if (this._SmartSite_Equipment.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnEquipmentIdChanging(value); + this.SendPropertyChanging(); + this._EquipmentId = value; + this.SendPropertyChanged("EquipmentId"); + this.OnEquipmentIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(2)")] + public string Type + { + get + { + return this._Type; + } + set + { + if ((this._Type != value)) + { + this.OnTypeChanging(value); + this.SendPropertyChanging(); + this._Type = value; + this.SendPropertyChanged("Type"); + this.OnTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentSoftName", DbType="NVarChar(200)")] + public string EquipmentSoftName + { + get + { + return this._EquipmentSoftName; + } + set + { + if ((this._EquipmentSoftName != value)) + { + this.OnEquipmentSoftNameChanging(value); + this.SendPropertyChanging(); + this._EquipmentSoftName = value; + this.SendPropertyChanged("EquipmentSoftName"); + this.OnEquipmentSoftNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentSoftModel", DbType="NVarChar(200)")] + public string EquipmentSoftModel + { + get + { + return this._EquipmentSoftModel; + } + set + { + if ((this._EquipmentSoftModel != value)) + { + this.OnEquipmentSoftModelChanging(value); + this.SendPropertyChanging(); + this._EquipmentSoftModel = value; + this.SendPropertyChanged("EquipmentSoftModel"); + this.OnEquipmentSoftModelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Int")] + 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="_RunningState", DbType="NVarChar(50)")] + public string RunningState + { + get + { + return this._RunningState; + } + set + { + if ((this._RunningState != value)) + { + this.OnRunningStateChanging(value); + this.SendPropertyChanging(); + this._RunningState = value; + this.SendPropertyChanged("RunningState"); + this.OnRunningStateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Supplier", DbType="NVarChar(500)")] + public string Supplier + { + get + { + return this._Supplier; + } + set + { + if ((this._Supplier != value)) + { + this.OnSupplierChanging(value); + this.SendPropertyChanging(); + this._Supplier = value; + this.SendPropertyChanged("Supplier"); + this.OnSupplierChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupplierMan", DbType="NVarChar(50)")] + public string SupplierMan + { + get + { + return this._SupplierMan; + } + set + { + if ((this._SupplierMan != value)) + { + this.OnSupplierManChanging(value); + this.SendPropertyChanging(); + this._SupplierMan = value; + this.SendPropertyChanged("SupplierMan"); + this.OnSupplierManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupplierTel", DbType="NVarChar(50)")] + public string SupplierTel + { + get + { + return this._SupplierTel; + } + set + { + if ((this._SupplierTel != value)) + { + this.OnSupplierTelChanging(value); + this.SendPropertyChanging(); + this._SupplierTel = value; + this.SendPropertyChanged("SupplierTel"); + this.OnSupplierTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SmartSite_EquipmentSoft_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.SmartSite_EquipmentSoft.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.SmartSite_EquipmentSoft.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_SmartSite_EquipmentSoft_SmartSite_Equipment", Storage="_SmartSite_Equipment", ThisKey="EquipmentId", OtherKey="EquipmentId", IsForeignKey=true)] + public SmartSite_Equipment SmartSite_Equipment + { + get + { + return this._SmartSite_Equipment.Entity; + } + set + { + SmartSite_Equipment previousValue = this._SmartSite_Equipment.Entity; + if (((previousValue != value) + || (this._SmartSite_Equipment.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._SmartSite_Equipment.Entity = null; + previousValue.SmartSite_EquipmentSoft.Remove(this); + } + this._SmartSite_Equipment.Entity = value; + if ((value != null)) + { + value.SmartSite_EquipmentSoft.Add(this); + this._EquipmentId = value.EquipmentId; + } + else + { + this._EquipmentId = default(string); + } + this.SendPropertyChanged("SmartSite_Equipment"); + } + } + } + + 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.Solution_ConstructSolution")] public partial class Solution_ConstructSolution : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index c819228c..48bf43b9 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -361,7 +361,7 @@ True 0 / - http://localhost:9850/ + http://localhost:3528/ False False From 3aedbf975fafc72600a4946b4fd09b0ae82f823e Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 19 Jun 2023 17:14:28 +0800 Subject: [PATCH 3/9] 2023-06-19 --- .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index f91a1b9b..66b72644 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -342,7 +342,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (pds.Count > 0 && pds != null) { - for (int i = 0; i < pds.Count; i++) + for (int i = 1; i < pds.Count; i++) { HJGL_PipeLineMat item = new HJGL_PipeLineMat(); @@ -435,6 +435,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage #endregion } + if (result.Count > 0) + { + matList.Clear(); + // result = result.Substring(0, result.LastIndexOf("|")); + errorInfos = string.Join("|", result.Distinct()); + //Alert alert = new Alert(); + //alert.Message = result; + //alert.Target = Target.Self; + //alert.Show(); + responeData.code = 0; + responeData.message = errorInfos; + } + else + { + errorInfos = string.Empty; + + + } + } else { @@ -638,7 +657,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var item in matList) { var pipeLineMat = from x in Funs.DB.HJGL_PipeLineMat where x.MaterialCode == item.MaterialCode && x.PipelineId == item.PipelineId &&x.PrefabricatedComponents==item.PrefabricatedComponents select x; - if (pipeLineMat.Count() == 0) + if (pipeLineMat.Count() == 0|| pipeLineMat==null) { item.PipeLineMatId = SQLHelper.GetNewID(typeof(Model.HJGL_PipeLineMat)); BLL.PipelineMatService.AddPipeLineMat(item); From 0ab6fc53b8804cbe0c5b732e2567538e945193b5 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 19 Jun 2023 18:02:04 +0800 Subject: [PATCH 4/9] 2023-06-19 --- .../HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs index 2e091215..5d6167cc 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs @@ -356,11 +356,11 @@ namespace FineUIPro.Web.HJGL.PreDesign { Model.HJGL_Pipeline_ComponentJoint hJGL_Pipeline_ComponentJoint = new Model.HJGL_Pipeline_ComponentJoint(); hJGL_Pipeline_ComponentJoint.Id = SQLHelper.GetNewID(); - ComponetJoint.PipelineComponentCode = item.PipelineComponentCode; - ComponetJoint.PipelineComponentId = item.PipelineComponentId; - ComponetJoint.WeldJointCode = joint.WeldJointCode; - ComponetJoint.WeldJointId=joint.WeldJointId; - HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(ComponetJoint); + hJGL_Pipeline_ComponentJoint.PipelineComponentCode = item.PipelineComponentCode; + hJGL_Pipeline_ComponentJoint.PipelineComponentId = item.PipelineComponentId; + hJGL_Pipeline_ComponentJoint.WeldJointCode = joint.WeldJointCode; + hJGL_Pipeline_ComponentJoint.WeldJointId=joint.WeldJointId; + HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(hJGL_Pipeline_ComponentJoint); } From 4704c912570b9d402fe5df1dfe9fd45f070c9e6e Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Wed, 21 Jun 2023 15:06:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?2023-06-21=20=E7=84=8A=E6=8E=A5=E6=9D=90?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9D=90=E6=96=99=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=92=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin/v17/.wsuo | Bin 251904 -> 252928 bytes .../HJGL/DataImport/MaterialInformation.aspx | 11 +++++--- .../DataImport/MaterialInformation.aspx.cs | 26 ++++++++++++------ .../MaterialInformation.aspx.designer.cs | 9 ++++++ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index b4dc2591b91c74b833a1c72ca30120004a626d62..16e497e03bc12cf115fc2f437dbac85d75330e13 100644 GIT binary patch delta 2959 zcmeI!SzJ_A9Ki9pcR&WbFfhyjqA=_tM1irU8Onr2Y#Hr~4vU#>TBBK6gCJx@C3A|g zy@+TdQ76-Ev#`<@mK4)A%jyZAiU)fT`W=)U^-~{u=)+6*^ZDL$=A1Ls3ola*&2t2V7?TSk+QT#-#YV}{FG^J_n2bBb|LfvaH(O`r_^cxd|L*JPd zNP*!*;UrRjgkqAS(;cJXFl4GxHW_3`j}46@+?OSgPffl-H+6JMzSTdh(Bc(ZJN48+vTIl4uc>Y$?NnC1!;;ad$%FN zt56JOR~n+d3mj3+Tg)~^lPfUwlnP6QCi@zjwCvM2l@__4KSGO@z|l23?H_%bycIFt z-PDyE#Oko3(XOoC6+bqX-wF7#E`ir6@x=DsTxF;8IlLGF*-;a3!w7)wl-N;yPT9 zg;)f;lT#I{QG;46#tm448?h8O;bz=|TX7qfVL5Kc9dKX;R^m>q!dd#eI6eNFYNW`I-|1XKO+6a07L91a{aA+w@E{&SGakkxcogf=0v7}x z!{ca$8yoNhp2Sml8qeTaJcsAyrg(u&8(u^^UP1?6#w&Ogui7dBxtw!nio zu@!G&8@A(Z?7%yC7w_SHe1M&DQ+!C~BXnaIKE@~b6uYqppW$?N)whiXtfE0anU z(QP6^Os~+wsgf~OKEI)$g(Ih#*UBNKWm%*z<%%MPErsI` zah{=+0p(u@A30$;*|B4g>yvqZ(f~|`hCl?th+u@kgix4aK^Vdz7jOz9F%{Dgg=kn2 zgV_IrkCSDnLN#hoiwO@tu4LO8n^-uKdq>}ajv3{0FFW;Y8u<{&V-2&eM+4TP5&v

LWJKw|IhP|7L8P zql%2Ol!lbDZ7F5S{w|SGxK%{iNEs}iSb~f zbQ1AsIB+77vIjVtKw`WoMlnGzo_vLq=|K*n|DkPcQ4ALjZu0BSemlGK_-4Akd5v#I z^T46Z<2Wu6v@}p+4-7eppYJ3}TEOQimlFFp@8k-}p~L)Zg$k8^;-FehG4;r%jYYyGPU@tVnK8}-fO(@XsDyR1V3J2j3IH3m)!x1D2%{W7=>$a9d5uF+=N@;1t0v* z%HxNk}>%!M8E0H)mv#f}a0MXfs)M1&7l())TT2!5I-gt&vLJH=I%^{mlwtb{vl0f`Ao4_VNC+Y_E=p1y>V3LA5fy|0FBCtoYVrrx>2`qQ{ z(LtYGLB}%Mgk1=-4IOES1~cqx!kT9hcA)uEI+}SmKMwmW6bk*yah(v3ea2ZLl^?e1 zLYhM;z&qLU3BR*g&h}{?UDLMH7ST*SDcy?nsM|D{Vpns?h(y+5=x-$T9`%XIG&x(^ zcr2KW;qxZy$>~;P#5|s}Tx2o1E&YSm8e{crJ=yF>v)$ZClmwRqi z!HZ<#-FumS;@K-%F)c29G%>Rxvr%V~jy4xP_2kMs9^Sx7Bl`VB&9N<@jp>EKA!LRFk%3E|Qahmwyjd>8on*R}-m(4sNWrRQvLgdy zD l-!AW(EAJw2pG-FK()}i$P`+h-is$)BTl^grKc$kr_yv;77R~?w diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx index 8f3de89e..f9c5698c 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx @@ -72,7 +72,10 @@ EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="txtWeldJointCode_TextChanged" Width="240px" LabelWidth="80px" LabelAlign="Right"> --%> - + + <%----%> - @@ -158,7 +161,7 @@ protected global::FineUIPro.Toolbar Toolbar3; + ///

+ /// txtMaterialCode2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialCode2; + /// /// ToolbarFill1 控件。 /// From 295cd47c8b7c0282ec2f2787541046968d3b6c0a Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 26 Jun 2023 09:35:56 +0800 Subject: [PATCH 6/9] =?UTF-8?q?20230626=20=E4=BA=BA=E5=91=98=E7=BB=8F?= =?UTF-8?q?=E5=8E=86=E4=BA=8C=E6=AC=A1=E5=85=A5=E5=9C=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SitePerson/SitePerson_PersonService.cs | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index b7822e9e..eb3b4973 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -781,17 +781,25 @@ namespace BLL } else { - var getPersons = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == newPerson.IdentityCard); - if (getPersons != null && (!getPersons.MultiProject.HasValue || getPersons.MultiProject == false)) + var getDatePItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.ProjectId == person.ProjectId && x.IdentityCard == person.IdentityCard && x.OutTime .HasValue && x.OutTime < person.InTime); + if (getDatePItem != null) { - var getdate = newPerson.InTime.HasValue ? newPerson.InTime.Value.AddDays(-1) : DateTime.Now; - var getPersonItems = db.SitePerson_PersonItem.Where(x => x.PersonId == newPerson.PersonId && x.ProjectId != newPerson.ProjectId && !x.OutTime.HasValue); - foreach(var item in getPersonItems) - { - item.OutTime = getdate; - db.SubmitChanges(); - } + setPersonItemInOut = true; } + else + { + var getPersons = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == newPerson.IdentityCard); + if (getPersons != null && (!getPersons.MultiProject.HasValue || getPersons.MultiProject == false)) + { + var getdate = newPerson.InTime.HasValue ? newPerson.InTime.Value.AddDays(-1) : DateTime.Now; + var getPersonItems = db.SitePerson_PersonItem.Where(x => x.PersonId == newPerson.PersonId && x.ProjectId != newPerson.ProjectId && !x.OutTime.HasValue); + foreach (var item in getPersonItems) + { + item.OutTime = getdate; + db.SubmitChanges(); + } + } + } } } if (setPersonItemInOut) From 4782342614ed2c3fa35fd8008fa185f393beddd4 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 26 Jun 2023 14:58:44 +0800 Subject: [PATCH 7/9] =?UTF-8?q?20230626=20=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=91=98=E5=B7=A5=E8=80=83=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Person/PersonEdit.aspx | 64 ++++++++- SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs | 131 ++++++++++++++++++ .../Person/PersonEdit.aspx.designer.cs | 72 ++++++++++ SGGL/FineUIPro.Web/Person/PersonView.aspx | 67 ++++++++- SGGL/FineUIPro.Web/Person/PersonView.aspx.cs | 131 ++++++++++++++++++ .../Person/PersonView.aspx.designer.cs | 72 ++++++++++ 6 files changed, 531 insertions(+), 6 deletions(-) diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx index 45de5e80..277658c8 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx @@ -95,7 +95,7 @@ - + @@ -440,6 +440,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /// + ///
+ private void getInitGridQuarterCheck() + { + Funs.DropDownPageSize(this.ddlPageSizeGridQuarterCheck); + BindGridQuarterCheck(); + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGridQuarterCheck() + { + string strSql = @"select QuarterCheckId, QuarterCheckName, C.UserId, C.ProjectId, + StartTime,EndTime,State,R.RoleName,P.ProjectName,(case when c.State ='1' then '考核结束' else '正在考核' end) as StateName + from [dbo].[Person_QuarterCheck] C + left join Sys_Role R on C.RoleId=R.RoleId + left join Base_Project P on C.ProjectId=P.ProjectId + where 1=1 "; + List listStr = new List(); + if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId) + { + strSql += " AND C.UserId=@UserId "; + listStr.Add(new SqlParameter("@UserId", this.PersonId)); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + GridQuarterCheck.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(GridQuarterCheck, tb); + GridQuarterCheck.DataSource = table; + GridQuarterCheck.DataBind(); + } + #endregion + + #region gv字段转换 + /// + /// + /// + /// + /// + protected string ConvertGrade(object QuarterCheckId) + { + decimal grade = 0; + if (!string.IsNullOrEmpty(QuarterCheckId.ToString())) + { + var list = BLL.Person_QuarterCheckItemService.GetCheckItemListById(QuarterCheckId.ToString()); + foreach (var item in list) + { + if (item.Grade != null) + { + grade += item.Grade.Value * item.StandardGrade.Value / 100; + } + } + + } + return grade.ToString("0.##"); + } + #endregion + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void GridQuarterCheck_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGridQuarterCheck(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSizeGridQuarterCheck_SelectedIndexChanged(object sender, EventArgs e) + { + GridQuarterCheck.PageSize = Convert.ToInt32(ddlPageSizeGridQuarterCheck.SelectedValue); + BindGridQuarterCheck(); + } + + /// + /// 排序 + /// + /// + /// + protected void GridQuarterCheck_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGridQuarterCheck(); + } + #endregion + + /// + /// 双击事件 + /// + /// + /// + protected void GridQuarterCheck_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditDataQuarterCheck(); + } + protected void btnQuarterCheckEdit_Click(object sender, EventArgs e) + { + this.EditDataQuarterCheck(); + } + + /// + /// 编辑数据方法 + /// + private void EditDataQuarterCheck() + { + if (GridQuarterCheck.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DepartPersonCheckingView.aspx?QuarterCheckId={0}", GridQuarterCheck.SelectedRowID, "编辑 - "))); + } + + #endregion + #region 员工责任书 /// /// diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs index a04c2581..9236313a 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs @@ -779,6 +779,60 @@ namespace FineUIPro.Web.Person /// protected global::FineUIPro.DropDownList ddlPageSizeGridTrain; + /// + /// QuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab QuarterCheck; + + /// + /// GridQuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GridQuarterCheck; + + /// + /// lbGrade 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbGrade; + + /// + /// ToolbarSeparator5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator5; + + /// + /// ToolbarText5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText5; + + /// + /// ddlPageSizeGridQuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSizeGridQuarterCheck; + /// /// Duty 控件。 /// @@ -977,6 +1031,24 @@ namespace FineUIPro.Web.Person /// protected global::FineUIPro.MenuButton btnDutyEdit; + /// + /// MenuQuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu MenuQuarterCheck; + + /// + /// btnQuarterCheckEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnQuarterCheckEdit; + /// /// MenuInOut 控件。 /// diff --git a/SGGL/FineUIPro.Web/Person/PersonView.aspx b/SGGL/FineUIPro.Web/Person/PersonView.aspx index fd46bc7b..dd615666 100644 --- a/SGGL/FineUIPro.Web/Person/PersonView.aspx +++ b/SGGL/FineUIPro.Web/Person/PersonView.aspx @@ -259,7 +259,7 @@ SortField="SendDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10" SortDirection="DESC" OnSort="GridCertificate_Sort" AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="GridCertificate_PageIndexChange" EnableTextSelection="True" - EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridCertificate_RowDoubleClick"> + EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridCertificate_RowDoubleClick"> @@ -284,7 +284,7 @@ - @@ -313,7 +313,7 @@ SortField="TrainDate" ForceFit="true" EnableColumnLines="true" BoxFlex="1" PageSize="10" SortDirection="DESC" OnSort="GridTrain_Sort" AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="GridTrain_PageIndexChange" EnableTextSelection="True" - EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridTrain_RowDoubleClick"> + EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridTrain_RowDoubleClick"> @@ -345,6 +345,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EnableRowDoubleClickEvent="true" OnRowDoubleClick="GridInOut_RowDoubleClick"> @@ -449,6 +497,11 @@ runat="server" Text="查看" Icon="Find"> + + + + @@ -473,6 +526,12 @@ F(menuIDTrain).show(); //showAt(event.pageX, event.pageY); return false; } + var menuIDQuarterCheck = '<%= MenuQuarterCheck.ClientID %>'; + // 返回false，来阻止浏览器右键菜单 + function onRowContextMenuQuarterCheck(event, rowId) { + F(menuIDQuarterCheck).show(); //showAt(event.pageX, event.pageY); + return false; + } var menuIDDuty = '<%= MenuDuty.ClientID %>'; // 返回false，来阻止浏览器右键菜单 function onRowContextMenuDuty(event, rowId) { diff --git a/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs index bbd2b8e4..b306a436 100644 --- a/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonView.aspx.cs @@ -1,5 +1,8 @@ using BLL; using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; namespace FineUIPro.Web.Person { @@ -163,6 +166,7 @@ namespace FineUIPro.Web.Person getInitGridTrain(); getInitGridDuty(); getInitGridInOut(); + getInitGridQuarterCheck(); } } #endregion @@ -366,6 +370,133 @@ namespace FineUIPro.Web.Person } #endregion + #region 员工考核 + /// + /// + /// + private void getInitGridQuarterCheck() + { + Funs.DropDownPageSize(this.ddlPageSizeGridQuarterCheck); + BindGridQuarterCheck(); + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGridQuarterCheck() + { + string strSql = @"select QuarterCheckId, QuarterCheckName, C.UserId, C.ProjectId, + StartTime,EndTime,State,R.RoleName,P.ProjectName,(case when c.State ='1' then '考核结束' else '正在考核' end) as StateName + from [dbo].[Person_QuarterCheck] C + left join Sys_Role R on C.RoleId=R.RoleId + left join Base_Project P on C.ProjectId=P.ProjectId + where 1=1 "; + List listStr = new List(); + if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId) + { + strSql += " AND C.UserId=@UserId "; + listStr.Add(new SqlParameter("@UserId", this.PersonId)); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + GridQuarterCheck.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(GridQuarterCheck, tb); + GridQuarterCheck.DataSource = table; + GridQuarterCheck.DataBind(); + } + #endregion + + #region gv字段转换 + /// + /// + /// + /// + /// + protected string ConvertGrade(object QuarterCheckId) + { + decimal grade = 0; + if (!string.IsNullOrEmpty(QuarterCheckId.ToString())) + { + var list = BLL.Person_QuarterCheckItemService.GetCheckItemListById(QuarterCheckId.ToString()); + foreach (var item in list) + { + if (item.Grade != null) + { + grade += item.Grade.Value * item.StandardGrade.Value / 100; + } + } + + } + return grade.ToString("0.##"); + } + #endregion + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void GridQuarterCheck_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGridQuarterCheck(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSizeGridQuarterCheck_SelectedIndexChanged(object sender, EventArgs e) + { + GridQuarterCheck.PageSize = Convert.ToInt32(ddlPageSizeGridQuarterCheck.SelectedValue); + BindGridQuarterCheck(); + } + + /// + /// 排序 + /// + /// + /// + protected void GridQuarterCheck_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGridQuarterCheck(); + } + #endregion + + /// + /// 双击事件 + /// + /// + /// + protected void GridQuarterCheck_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditDataQuarterCheck(); + } + protected void btnQuarterCheckEdit_Click(object sender, EventArgs e) + { + this.EditDataQuarterCheck(); + } + + /// + /// 编辑数据方法 + /// + private void EditDataQuarterCheck() + { + if (GridQuarterCheck.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DepartPersonCheckingView.aspx?QuarterCheckId={0}", GridQuarterCheck.SelectedRowID, "编辑 - "))); + } + + #endregion + #region 员工责任书 /// /// diff --git a/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs index 75490a7b..a0b84560 100644 --- a/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Person/PersonView.aspx.designer.cs @@ -572,6 +572,60 @@ namespace FineUIPro.Web.Person /// protected global::FineUIPro.DropDownList ddlPageSizeGridTrain; + /// + /// QuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tab QuarterCheck; + + /// + /// GridQuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GridQuarterCheck; + + /// + /// lbGrade 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbGrade; + + /// + /// ToolbarSeparator5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator5; + + /// + /// ToolbarText5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText5; + + /// + /// ddlPageSizeGridQuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSizeGridQuarterCheck; + /// /// Duty 控件。 /// @@ -716,6 +770,24 @@ namespace FineUIPro.Web.Person /// protected global::FineUIPro.MenuButton btnTrainEdit; + /// + /// MenuQuarterCheck 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu MenuQuarterCheck; + + /// + /// btnQuarterCheckEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnQuarterCheckEdit; + /// /// MenuDuty 控件。 /// From c35272be844fb6908a733baa1b9c0e90a1afe6fa Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 26 Jun 2023 15:40:51 +0800 Subject: [PATCH 8/9] 2023-06-26 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 252928 -> 253440 bytes .../File/Fastreport/组件打印.frx | 4 ++-- .../HJGL/PreDesign/PrePipeline.aspx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 16e497e03bc12cf115fc2f437dbac85d75330e13..761316d14e3338b74b45e83f52f37acc207838d1 100644 GIT binary patch delta 2543 zcmeH}U2Icj7{|~1p3|+Av#xZ-eRW;;$=DZNH}(Mx2V0+pKis11ew>q$#3s- zp7-NCd!PUFo`%n+htH+I9hg_3C`u++K&MLlrv|!3M6MHAR3P)y0)w9~y8GdzaAA0i z4$4Df6Wx%VW`4elMhnu5#gjCoz9}puw9J-_*#UjFx1vu0>7WdlfdkyZ;y-x@G`8o% z$2J8t_tAVjxIrP{Nk!;O0Z-tTHf#SP6r~(?1*im7pc*Uz9#8|kpcd4DrJx=(fJV>+ zmVxD91!x8<6-6jCZRtL`5l@@IX3!0u0ndUhU@PbW&w*`VJJ);4D3c}#;w0TM%nl>8G zsN`&=QjZ1m`Dpp<6D^UuCosl&OZd5;hiA@PvX9p;gfA6vetAF6@g3TrW&CRrvoMo) z`#*{IC($xZHj75LEnQ+Gt)KsCPU;Ljun_#W#UR! z>1JlTo(IdFG(=&)nGR?9bXGTCFo`u3%krm*2hO964rIR(vA0sIqlQBEF7i1lDQ5Sl zDK;!k6iWPm3}p;QTo;Rib$zw9p1%63rr?ggsyc6NW7Up^rrN5Vb#>lGkH_n+>5KmA za)?Nd&+JToeJBUJCYRRC$>reWB;K9tkH-+pMUWga7w)~#Lr!=Xz{A(~J#Wkzpf9C| zLU{q5o!Lo)I$y?ooZO6>Db;0+T~SvVQ*5o7Py>d4N^Li$FRLBYZOx&UqHx5m(b*E; zseyIE`6F)JpTN(6we%Z$eg!u=SrUlaD&G-#kDA3FnfBaGkZTtN+>e{E7k>{Zoh)2j zcY7#5qkue8vlS{*@MnP|j_(hdn)sU5XhTsuM>U?_NZX6r{$Va7S+-i|uSQPNS_+kY zrStbE9xVsVx(_XmAGC?ZXPcXHqOodSMC{|U;^;EpuZxOdx0-Z38f+6to%Q{IJ}N4| z6LV3|oHO>wTx4@DB3Z3*rOnjG+PEF7o=6j1D9K7SErr8OHy5?*e5bfUA}!HSy3z2F%%Bj5LJ!8pknNQz8?P3K`L7+LcdxDEhq5gxp)Z6Kz7JnHPZpkw74Wt{Z zuBlD3q3Kv)Bp^Pfnl)!AuWfx4G0BlzLY`QojocQJ+?~b7^$Tiv^aCk-gt6^{S}Hu<}V1WS#}<3bVFCV$8YTDM;{=J`FRjY+@X+nLU3%SCy JIoP`@@E4Jj17-jK delta 3377 zcmeI!c~n$Y9Ki9p?~OXbV{v5P5iDdA2o*#OlZbMGbSzsH1hZAk(cHl`OEj5VK3gm` zqcYQUveB|!D{WCKHE>DW{*u2sc#fWv(D#Pukmq#tkBkT>G0i9JIU(maJ0q0T1YdY(3NP&`d(R53*2L<6Z=CgrtYC^_OH1#Cn>{~ zzTXzsVL07ki}CJoM%K9OgXLa(rrT+E2wVGAwJp}YM2$$N{gB^ZcRsSiSA!iLrgutV zG)JBf9b%{*5a%`5tPap@a#mQep#qKd8j;PZrGLMQBsnd7u`8xn?zg8(XH1EoQ1@7U zQ&L7Co3Z@H#fU1t-N1OW_d8PY5>*zhLPz=Lxl%N!MVgyFQfl;^%cVjf}!M(T-_u~OPh%p$8vMN5xF%A`|#CSY} z33wQf;88q=$MFOvViKOjQW2OUyLtG`no2f94pYlsm_OZ_3VFDRYK^+wdij?0}X zZ8^6&FG>ccZ@V&m$9Gtwca1wfT! z8E%|vccu1$FAVs>9{~tNH`vh~K?p_&LZN<{a6}*yQHVwiViAY<{}Wslx1k*4P=QMP zmlB*Sx$ug;?soPs5$au{N-oC>c)CQRfO zUrL3v|1lG)mm!r2<9I>zet{Zrl`l~4=6u7twosFq#am@`(J+tJDq6HH#Wqc5Xofpz zc#~K=&?+-WBzuzmwWDI5qs}4Ln}Io^$egrYFYqkVv>C$8Sf!N%g+na!Ec4MO3y-jBt-7o9sxq2vigF0692C8?&d@Y-dAJ@VPyZewckQ!#1_WyR zI7@qIbq95AkzK2^>pNC7=;zG(lX{A|v{6rxvwM`9f1J<{n;VbmBUP)fnck?6F;kE0 an>?akZ?wuINfYJiqzeB1N7gmy);|H+6F@2e diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 3915cddf..dabc1087 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index 39ae4b60..07f612ac 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -131,8 +131,8 @@ - From 1acdf085555f79cd122c7b5bfa1148693355e483 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 26 Jun 2023 15:42:26 +0800 Subject: [PATCH 9/9] =?UTF-8?q?20230626=20=E8=B0=83=E6=95=B4=E6=9C=AC?= =?UTF-8?q?=E9=83=A8=E6=A3=80=E6=9F=A5=E5=8F=8A=E5=8D=95=E4=BD=8D=E7=B1=BB?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Common/Const.cs | 4 ++ SGGL/BLL/SysManage/UnitService.cs | 50 ++++++------------- .../Check/EditTechnicalContactList.aspx.cs | 2 +- .../CQMS/Check/SpotCheck.aspx.cs | 2 +- .../CQMS/Check/SpotCheckFile.aspx.cs | 2 +- .../CQMS/Check/SpotDataCheck.aspx.cs | 2 +- .../CQMS/Check/TechnicalContactList.aspx.cs | 2 +- .../Check/TechnicalContactListFile.aspx.cs | 2 +- .../CQMS/Check/WorkContactFile.aspx.cs | 2 +- .../CQMS/Material/ConstructionTest.aspx.cs | 2 +- .../Material/ConstructionTestEdit.aspx.cs | 4 +- .../Material/ConstructionTestView.aspx.cs | 4 +- .../CQMS/Material/Equipment.aspx.cs | 2 +- .../CQMS/Material/EquipmentEdit.aspx.cs | 2 +- .../CQMS/Material/EquipmentSearch.aspx.cs | 2 +- .../CQMS/Material/EquipmentView.aspx.cs | 2 +- .../CQMS/Material/Inspection.aspx.cs | 2 +- .../CQMS/Material/InspectionEdit.aspx.cs | 2 +- .../CQMS/Material/InspectionView.aspx.cs | 2 +- .../CQMS/Material/Material.aspx.cs | 2 +- .../CQMS/Material/MaterialEdit.aspx.cs | 2 +- .../CQMS/Material/MaterialSearch.aspx.cs | 2 +- .../CQMS/Material/MaterialTest.aspx.cs | 2 +- .../CQMS/Material/MaterialTestEdit.aspx.cs | 4 +- .../CQMS/Material/MaterialTestView.aspx.cs | 4 +- .../CQMS/Material/MaterialView.aspx.cs | 2 +- .../Material/NoticeAndSupervision.aspx.cs | 2 +- .../Material/NoticeAndSupervisionEdit.aspx.cs | 2 +- .../Material/NoticeAndSupervisionView.aspx.cs | 2 +- .../CQMS/Meeting/MonthMeetingEdit.aspx.cs | 2 +- .../CQMS/Meeting/MonthMeetingView.aspx.cs | 2 +- .../CQMS/Meeting/SpecialMeetingEdit.aspx.cs | 2 +- .../CQMS/Meeting/SpecialMeetingView.aspx.cs | 2 +- .../AddWorkContactFinalFile.aspx.cs | 2 +- .../CQMS/Unqualified/ContactList.aspx.cs | 2 +- .../CQMS/Unqualified/EditWorkContact.aspx.cs | 2 +- .../HJGL/PreDesign/MaterialManageEdit.aspx.cs | 2 +- .../HJGL/PreDesign/MaterialManageView.aspx.cs | 2 +- .../HSSE/Check/CheckSpecialEdit.aspx.cs | 2 +- .../OfficeCheck/Check/CheckNotice.aspx | 4 -- .../OfficeCheck/Check/CheckNoticeEdit.aspx.cs | 2 +- .../OfficeCheck/Check/CheckTeamEdit.aspx | 9 ++-- .../OfficeCheck/Check/CheckTeamEdit.aspx.cs | 2 +- 43 files changed, 68 insertions(+), 85 deletions(-) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 6f9c25b7..cafdf43e 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -194,6 +194,10 @@ /// public const string UnitId_SEDIN = "d72a27c9-4ba9-41c5-ab0b-c010409f20f2"; /// + /// 集团公司单位id + /// + public const string UnitId_CNCEC = "722090d1-b5de-4c3c-a4f7-14f308161a3b"; + /// /// 赛鼎 /// public const string AppID_SEDIN = "wxee9d14366730ae44"; diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index b5cfae88..a4bb89e0 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -473,23 +473,6 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } - - /// - /// 根据单位类型获取单位表下拉框 - /// - /// 下拉框名字 - /// 是否显示请选择 - public static void InitUnitNameByProjectIdUnitTypeDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease) - { - dropName.DataValueField = "UnitName"; - dropName.DataTextField = "UnitName"; - dropName.DataSource = BLL.UnitService.GetUnitByProjectIdUnitTypeList(projectId, unitType); - dropName.DataBind(); - if (isShowPlease) - { - Funs.FineUIPleaseSelect(dropName); - } - } #endregion /// @@ -579,22 +562,6 @@ namespace BLL } } - /// - /// 单位表下拉框 - /// - /// 下拉框名字 - /// 是否显示请选择 - public static void GetUnit(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) - { - dropName.DataValueField = "UnitId"; - dropName.DataTextField = "UnitName"; - dropName.DataSource = GetUnitByProjectIdList(projectId); - dropName.DataBind(); - if (isShowPlease) - { - Funs.FineUIPleaseSelect(dropName); - } - } public static void GetALLUnit(FineUIPro.DropDownList dropName, bool isShowPlease) { dropName.DataValueField = "UnitId"; @@ -657,6 +624,21 @@ namespace BLL } } + public static void InitSeDinAndCNCECUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.Items.Clear(); + dropName.DataValueField = "UnitId"; + dropName.DataTextField = "UnitName"; + dropName.DataSource = (from x in Funs.DB.Base_Unit + where x.UnitId==Const.UnitId_SEDIN || x.UnitId == Const.UnitId_CNCEC + select x).OrderByDescending(x => x.UnitCode).ToList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #region 根据多单位ID得到单位名称字符串 /// /// 根据多单位ID得到单位名称字符串 @@ -712,7 +694,7 @@ namespace BLL /// /// /// - public static void InitUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + public static void InitMainOrSubUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) { dropName.DataValueField = "Value"; dropName.DataTextField = "Text"; diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs index 5977a5ef..44f4d020 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs @@ -69,7 +69,7 @@ namespace FineUIPro.Web.CQMS.Check if (!IsPostBack) { - UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, false); + UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, false); var unitWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId); var unitWorks = from x in unitWork select diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs index 6f1cc559..b9405ee7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); btnNew.OnClientClick = Window1.GetShowReference("EditSpotCheck.aspx") + "return false;"; GetButtonPower(); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs index b5a077d3..ada00ed3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); BindData(); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs index f39f3a33..adf5b3a3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); GetButtonPower(); BindData(); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs index 853e1253..1553fc35 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs @@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true); Funs.FineUIPleaseSelect(this.drpContactListType); Funs.FineUIPleaseSelect(this.drpIsReply); Funs.FineUIPleaseSelect(this.drpState); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs index 5627baab..07c05f33 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs @@ -29,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true); Funs.FineUIPleaseSelect(this.drpContactListType); Funs.FineUIPleaseSelect(this.drpIsReply); UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs index cdd0f662..3a0467fd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true); Funs.FineUIPleaseSelect(this.drpIsReply); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); BindGrid(); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs index 00ceb9fd..464d54b1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); btnNew.OnClientClick = Window1.GetShowReference("ConstructionTestEdit.aspx") + "return false;"; GetButtonPower(); BindGrid(); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs index 19bed248..d4a68c88 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs @@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); - BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); BLL.ConstructionTestTypeService.InitConstructionTestType(this.drpConstructionTestType, true); BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true); ConstructionTestId = Request.Params["ConstructionTestId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs index 7a4aaf3e..3e0b661e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs @@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); - BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); BLL.ConstructionTestTypeService.InitConstructionTestType(this.drpConstructionTestType, true); BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true); ConstructionTestId = Request.Params["ConstructionTestId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs index 2cbf9f10..31819f0a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); btnNew.OnClientClick = Window1.GetShowReference("EquipmentEdit.aspx") + "return false;"; GetButtonPower(); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs index 83c4350b..2a2d661a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string EquipmentId = Request.Params["EquipmentId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs index a58c2797..d4840f86 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Material { this.ProjectId = this.CurrUser.LoginProjectId; list = new List(); - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); if (!string.IsNullOrEmpty(this.CurrUser.UnitId)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs index 9a406811..87597997 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string EquipmentId = Request.Params["EquipmentId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs index 704c59f7..3765d7d2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Material this.ProjectId = this.CurrUser.LoginProjectId; //权限按钮方法 GetButtonPower(); - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); Funs.FineUIPleaseSelect(this.drpState); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); // 绑定表格 diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs index 738e1717..e7701c1b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); InspectionId = Request.Params["InspectionId"]; this.HideOptions.Hidden = true; this.rblIsAgree.Hidden = true; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs index 8272adb5..46806684 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); InspectionId = Request.Params["InspectionId"]; if (!string.IsNullOrEmpty(InspectionId)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs index 3aa8649f..aef8dbd1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); btnNew.OnClientClick = Window1.GetShowReference("MaterialEdit.aspx") + "return false;"; GetButtonPower(); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs index 9ac662f8..63dc5523 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string MaterialId = Request.Params["MaterialId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs index ae8f9d23..33a61df3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Material { this.ProjectId = this.CurrUser.LoginProjectId; list = new List(); - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); if (!string.IsNullOrEmpty(this.CurrUser.UnitId)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs index bcdc9b42..29955203 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); btnNew.OnClientClick = Window1.GetShowReference("MaterialTestEdit.aspx") + "return false;"; GetButtonPower(); BindGrid(); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs index 3224f62d..907f00d1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs @@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); - BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); BLL.MaterialTypeService.InitMaterialType(this.drpMaterialType, true); BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true); MaterialTestId = Request.Params["MaterialTestId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs index 8c0aa513..dca1e1fe 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs @@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); - BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true); BLL.MaterialTypeService.InitMaterialType(this.drpMaterialType, true); BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true); MaterialTestId = Request.Params["MaterialTestId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs index 1591d4c0..1596139f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs @@ -24,7 +24,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string MaterialId = Request.Params["MaterialId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs index ad16a07d..62d06e16 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); btnNew.OnClientClick = Window1.GetShowReference("NoticeAndSupervisionEdit.aspx") + "return false;"; GetButtonPower(); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs index 9e9ee67c..37d5425f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.CurrUser.LoginProjectId, true); BLL.NoticeAndSupervisionTypeService.InitNoticeAndSupervisionType(this.drpNoticeAndSupervisionType, true); NoticeAndSupervisionId = Request.Params["NoticeAndSupervisionId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs index 9d13f8c5..ccff6879 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs @@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material { if (!IsPostBack) { - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.CurrUser.LoginProjectId, true); BLL.NoticeAndSupervisionTypeService.InitNoticeAndSupervisionType(this.drpNoticeAndSupervisionType, true); NoticeAndSupervisionId = Request.Params["NoticeAndSupervisionId"]; diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs index b233634d..084942b0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Meeting MeetingId = Request.Params["MeetingId"]; this.drpHandleType.DataTextField = "Text"; this.drpHandleType.DataValueField = "Value"; - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); this.HideOptions.Hidden = true; this.rblIsAgree.Hidden = true; BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true); diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs index ff854b75..ac93262d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Meeting if (!IsPostBack) { MeetingId = Request.Params["MeetingId"]; - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true); if (!string.IsNullOrEmpty(MeetingId)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs index bb6d42f6..f04dc421 100644 --- a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Meeting MeetingId = Request.Params["MeetingId"]; this.drpHandleType.DataTextField = "Text"; this.drpHandleType.DataValueField = "Value"; - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); this.HideOptions.Hidden = true; this.rblIsAgree.Hidden = true; BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true); diff --git a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs index 33a68a11..b130b235 100644 --- a/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Meeting if (!IsPostBack) { MeetingId = Request.Params["MeetingId"]; - BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true); if (!string.IsNullOrEmpty(MeetingId)) { diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs index 33d6bde3..6b8ce9d3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs @@ -35,7 +35,7 @@ namespace FineUIPro.Web.CQMS.Unqualified { if (!IsPostBack) { - UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, false); + UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, false); //主送单位 gvMainSendUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId); gvMainSendUnit.DataBind(); diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs index 3494df16..7830a0a3 100644 --- a/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs @@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Unqualified { if (!IsPostBack) { - UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true); + UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true); Funs.FineUIPleaseSelect(this.drpIsReply); Funs.FineUIPleaseSelect(this.drpState); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs index f5abf56c..0413cdfe 100644 --- a/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs @@ -53,7 +53,7 @@ namespace FineUIPro.Web.CQMS.Unqualified { if (!IsPostBack) { - UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, false); + UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, false); //主送单位 gvMainSendUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId); gvMainSendUnit.DataBind(); diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs index 778d2855..f806f826 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.HJGL.PreDesign if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string MaterialId = Request.Params["MaterialId"]; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs index 0cbe922c..fcc38030 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs @@ -24,7 +24,7 @@ namespace FineUIPro.Web.HJGL.PreDesign if (!IsPostBack) { this.ProjectId = this.CurrUser.LoginProjectId; - BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true); this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string MaterialId = Request.Params["MaterialId"]; diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs index 79bac991..b9593049 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs @@ -139,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpPartInPersons, this.ProjectId, null, null, true); ConstValue.InitConstNameDropDownList(this.drpHandleStep, ConstValue.Group_HandleStep, true); ///责任单位 - UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.drpWorkUnit, this.ProjectId, Const.ProjectUnitType_2, false); + UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpWorkUnit, this.ProjectId, Const.ProjectUnitType_2, false); ///单位工程 UnitWorkService.InitUnitWorkNameDropDownList(this.drpCheckArea, this.ProjectId, false); } diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx index 9b4bc73c..09f439a3 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx @@ -153,10 +153,6 @@ SortField="CheckPostName" FieldType="String" HeaderText="工作组职务" HeaderTextAlign="Center" TextAlign="Left"> - - diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs index e765a26e..6216aa92 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.OfficeCheck.Check this.GetButtonPower(); BLL.ProjectService.InitAllProjectDropDownList(this.drpSubjectProject, true); - BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitSeDinAndCNCECUnitDropDownList(this.drpUnit, false); this.CheckNoticeId = Request.Params["CheckNoticeId"]; if (!string.IsNullOrEmpty(this.CheckNoticeId)) diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx index 2537aa87..c1566f44 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx @@ -24,7 +24,8 @@ - + @@ -52,10 +53,10 @@ - + - + diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs index 1583e75c..8d16b2e9 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.OfficeCheck.Check this.CheckNoticeId = Request.Params["CheckNoticeId"]; this.CheckTeamId = Request.Params["CheckTeamId"]; - BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitDropDownList(this.drpUnit, null, true); if (!string.IsNullOrEmpty(this.CheckTeamId)) {