diff --git a/DataBase/版本日志/SGGLDB_V2023-10-27.sql b/DataBase/版本日志/SGGLDB_V2023-10-27.sql new file mode 100644 index 00000000..5356b3f7 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-27.sql @@ -0,0 +1,57 @@ + +Alter VIEW [dbo].[View_HJGL_Batch_PointBatchItem] +AS +/*************点口明细表*************/ +SELECT PointBatchItem.PointBatchItemId, +PointBatchItem.PointBatchId, +PointBatch.ProjectId, +PointBatch.UnitId, +PointBatch.DetectionTypeId, +PointBatch.PointBatchCode, +Pipeline.UnitWorkId, +PointBatchItem.WeldJointId, +(CASE PointBatchItem.PointState WHEN '1' THEN '点口' WHEN '2' THEN '扩透' END) AS PointState, +(CASE PointBatchItem.IsBuildTrust WHEN 1 THEN '是' ELSE '' END) AS IsBuildTrust, +(CASE WHEN PointBatchItem.IsAudit=1 THEN '是' + WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '否' + WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NULL THEN '' END) AS PointIsAudit, +PointBatchItem.PointDate,--点口日期 +(CASE PointBatchItem.IsWelderFirst WHEN 1 THEN '是' ELSE '' END) AS IsWelderFirst, +PointBatchItem.RepairDate,--返修日期 +PointBatchItem.RepairRecordId, +PointBatchItem.CutDate,--切除日期 +PointBatchItem.PBackingWelderId,--返修打底焊工 +PointBatchItem.PCoverWelderId,--返修盖面焊工 +UnitWork.UnitWorkCode,--工区号 +WeldJoint.WeldJointCode,--焊口号 +WeldJoint.BackingWelderId AS WelderId, --焊工ID +BackingWelder.WelderCode AS BackingWelderCode, +CoverWelder.WelderCode AS CoverWelderCode, +WeldType.WeldTypeCode, +WeldJoint.JointAttribute, +WeldJoint.JointArea,--焊接区域 +WeldJoint.Size,--实际寸径 +WeldingDaily.WeldingDate,--焊接日期 +WeldJoint.PipelineId, --管线ID +WeldJoint.Material1Id AS Mat, --材质 +WeldJoint.Specification, --规格 +Pipeline.PipelineCode, --管线号 +PipingClass.PipingClassName , --管道等级 +WeldJoint.BackingWelderId, +WeldJoint.CoverWelderId +FROM dbo.HJGL_Batch_PointBatchItem AS PointBatchItem +LEFT JOIN dbo.HJGL_Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId +LEFT JOIN dbo.HJGL_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=PointBatchItem.WeldJointId +LEFT JOIN dbo.HJGL_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId +LEFT JOIN dbo.WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId=Pipeline.UnitWorkId +LEFT JOIN dbo.HJGL_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId +LEFT JOIN dbo.Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId +LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=WeldJoint.BackingWelderId +LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=WeldJoint.CoverWelderId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId +LEFT JOIN HJGL_Hard_TrustItem HardTrustItem ON HardTrustItem.WeldJointId=PointBatchItem.WeldJointId +where (WeldJoint.IsHotProess!=1 or (WeldJoint.IsHotProess=1 and HardTrustItem.IsPass=1)) +and BackingWelder.ProjectId=Pipeline.ProjectId and CoverWelder.ProjectId=Pipeline.ProjectId + +go + diff --git a/DataBase/版本日志/SGGLDB_V2023-10-30.sql b/DataBase/版本日志/SGGLDB_V2023-10-30.sql new file mode 100644 index 00000000..3bd6ab95 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-30.sql @@ -0,0 +1,45 @@ +ALTER TABLE [dbo].[Base_Project] ADD IsCNCECShow BIT NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿչʾ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'IsCNCECShow' +GO +UPDATE Base_Project SET IsCNCECShow= 1 WHERE ProjectState=1 +GO +UPDATE Base_Project SET IsCNCECShow= 0 WHERE IsCNCECShow IS NULL +GO + +ALTER VIEW [dbo].[View_License_LicenseManager] +AS +/*ֳȫ֤*/ +SELECT LicenseManager.LicenseManagerId, + LicenseManager.ProjectId, + LicenseManager.LicenseTypeId, + LicenseManager.LicenseManagerCode, + LicenseManager.LicenseManageName, + LicenseManager.UnitId, + LicenseManager.LicenseManageContents, + LicenseManager.CompileMan, + LicenseManager.CompileDate, + LicenseManager.States, + Project.ProjectCode, + Project.ProjectName, + Project.IsCNCECShow, + LicenseType.LicenseTypeName, + Unit.UnitName, + Users.PersonName, + LicenseManager.WorkAreaId, + --WorkArea.WorkAreaName, + LicenseManager.StartDate, + LicenseManager.EndDate, + LicenseManager.ApplicantMan, + WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork + where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0 + ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',') + FOR XML PATH('')), 1, 1,'') +FROM dbo.License_LicenseManager AS LicenseManager +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId +LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId +LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId +LEFT JOIN dbo.Person_Persons AS Users ON Users.PersonId = LicenseManager.CompileMan +LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId + +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql index c792a835..38fea7e0 100644 --- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql +++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql @@ -170,25 +170,26 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff VALUES ( N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'۸ϵ',30,N'0',N'Menu_PHTGL',0,0,1) GO INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'ֽṹԤƹ',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'չܵװ',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'DZ',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'豸װ',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'ˮ',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'DZ豸ֳװ',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'ůͨ',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'ǰװ',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'ˮůװ',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'ȹ',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'ٽʩ',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'⹤',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B',N'',100,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) GO - INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) VALUES ( N'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'ִͬи',40,N'0',N'Menu_PHTGL',0,0,1) GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index ea01de06..b8bfa829 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -271,6 +271,7 @@ + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index b5f1c295..80b375dc 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3424,9 +3424,9 @@ namespace BLL /// public const string TemQuantityTemplateUrl = "File\\Excel\\DataIn\\工程量清单模板.xlsx"; /// - /// 合同执行跟踪导入模板 + /// 合同价格信息导入模板 /// - public const string TemContractTrackTemplateUrl = "File\\Excel\\DataIn\\合同执行跟踪导入模板.xlsx"; + public const string TemContractTrackTemplateUrl = "File\\Excel\\DataIn\\合同价格信息导入模板.xlsx"; #endregion diff --git a/SGGL/BLL/Common/MultiHeaderTable.cs b/SGGL/BLL/Common/MultiHeaderTable.cs new file mode 100644 index 00000000..1e99cd70 --- /dev/null +++ b/SGGL/BLL/Common/MultiHeaderTable.cs @@ -0,0 +1,142 @@ +using FineUIPro; +using System.Collections.Generic; +using System; +/// +/// 处理多表头的类 +/// +public class MultiHeaderTable +{ + // 包含 rowspan，colspan 的多表头，方便生成 HTML 的 table 标签 + public List> MultiTable = new List>(); + // 最终渲染的列数组 + public List Columns = new List(); + + + public void ResolveMultiHeaderTable(GridColumnCollection columns) + { + List row = new List(); + foreach (GridColumn column in columns) + { + object[] cell = new object[4]; + cell[0] = 1; // rowspan + cell[1] = 1; // colspan + cell[2] = column; + cell[3] = null; + + row.Add(cell); + } + + ResolveMultiTable(row, 0); + + ResolveColumns(row); + } + + private void ResolveColumns(List row) + { + foreach (object[] cell in row) + { + GroupField groupField = cell[2] as GroupField; + if (groupField != null && groupField.Columns.Count > 0) + { + List subrow = new List(); + foreach (GridColumn column in groupField.Columns) + { + subrow.Add(new object[] + { + 1, + 1, + column, + groupField + }); + } + + ResolveColumns(subrow); + } + else + { + Columns.Add(cell[2] as GridColumn); + } + } + + } + + private void ResolveMultiTable(List row, int level) + { + List nextrow = new List(); + + foreach (object[] cell in row) + { + GroupField groupField = cell[2] as GroupField; + if (groupField != null && groupField.Columns.Count > 0) + { + // 如果当前列包含子列，则更改当前列的 colspan，以及增加父列（向上递归）的colspan + cell[1] = Convert.ToInt32(groupField.Columns.Count); + PlusColspan(level - 1, cell[3] as GridColumn, groupField.Columns.Count - 1); + + foreach (GridColumn column in groupField.Columns) + { + nextrow.Add(new object[] + { + 1, + 1, + column, + groupField + }); + } + } + } + + MultiTable.Add(row); + + // 如果当前下一行，则增加上一行（向上递归）中没有子列的列的 rowspan + if (nextrow.Count > 0) + { + PlusRowspan(level); + + ResolveMultiTable(nextrow, level + 1); + } + } + + private void PlusRowspan(int level) + { + if (level < 0) + { + return; + } + + foreach (object[] cells in MultiTable[level]) + { + GroupField groupField = cells[2] as GroupField; + if (groupField != null && groupField.Columns.Count > 0) + { + // ... + } + else + { + cells[0] = Convert.ToInt32(cells[0]) + 1; + } + } + + PlusRowspan(level - 1); + } + + private void PlusColspan(int level, GridColumn parent, int plusCount) + { + if (level < 0) + { + return; + } + + foreach (object[] cells in MultiTable[level]) + { + GridColumn column = cells[2] as GridColumn; + if (column == parent) + { + cells[1] = Convert.ToInt32(cells[1]) + plusCount; + + PlusColspan(level - 1, cells[3] as GridColumn, plusCount); + } + } + } + +} diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs index b391b9d2..c0be47d9 100644 --- a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs +++ b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs @@ -138,8 +138,8 @@ namespace BLL var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId); var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId); var project = BLL.ProjectService.GetProjectByProjectId(pipeline.ProjectId); - var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId); - var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId); + var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId); + var WeldingDaily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(newWeldJoint.WeldingDailyId); var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(pipeline.DetectionType); var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId); @@ -204,7 +204,7 @@ namespace BLL { new SqlParameter("@ProjectId", project.ProjectId), new SqlParameter("@UnitWorkId", pipeline.UnitWorkId), - new SqlParameter("@UnitId", pipeline.UnitId), + new SqlParameter("@UnitId", WeldingDaily.UnitId), new SqlParameter("@DetectionTypeId", pipeline.DetectionType), new SqlParameter("@DetectionRateId", pipeline.DetectionRateId) }; @@ -241,7 +241,7 @@ namespace BLL batch.ProjectId = project.ProjectId; batch.UnitWorkId = pipeline.UnitWorkId; batch.BatchCondition = batchCondition; - batch.UnitId = pipeline.UnitId; + batch.UnitId = WeldingDaily.UnitId; batch.DetectionTypeId = pipeline.DetectionType; batch.DetectionRateId = pipeline.DetectionRateId; if (condition.Contains("5")) diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 10038a26..cfd95d31 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -506,5 +506,17 @@ namespace BLL } return Convert.ToDouble(size) * n; } + + public static string GetWPQCodeByWeldJointId(object WeldJointId) + { + string result = ""; + if (WeldJointId != null) + { + var model = GetViewWeldJointById(WeldJointId.ToString()); + result = model?.WPQCode; + } + + return result; + } } } diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs index 86ea8e24..8949031b 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs @@ -295,6 +295,56 @@ namespace BLL db.SubmitChanges(); } } + /// + /// 日报明细删除 + /// + /// + /// + public static string DeleteWeldingDailyItemByweldJointId(string weldJointId) + { + string errlog = string.Empty; + var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId); + var pipeline = BLL.PipelineService.GetPipelineByPipelineId(newWeldJoint.PipelineId); + + if (newWeldJoint != null && !string.IsNullOrEmpty(newWeldJoint.WeldingDailyId)) + { + var isTrust = from x in Funs.DB.HJGL_Batch_BatchTrustItem + where x.WeldJointId == weldJointId + select x; ; + if (isTrust.Count() == 0) + { + var updateWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId); + if (updateWeldJoint != null) + { + updateWeldJoint.WeldingDailyId = null; + updateWeldJoint.WeldingDailyCode = null; + updateWeldJoint.CoverWelderId = null; + updateWeldJoint.BackingWelderId = null; + BLL.WeldJointService.UpdateWeldJoint(updateWeldJoint); + + var pointBatchItems = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.WeldJointId == weldJointId select x; + string pointBatchId = pointBatchItems.FirstOrDefault().PointBatchId; + + // 删除焊口所在批明细信息 + BLL.PointBatchDetailService.DeleteBatchDetail(weldJointId); + + // 删除批信息 + var batch = from x in Funs.DB.HJGL_Batch_PointBatchItem where x.PointBatchId == pointBatchId select x; + if (pointBatchId != null && batch.Count() == 0) + { + BLL.PointBatchService.DeleteBatch(pointBatchId); + } + } + } + else + { + errlog += "焊口【" + newWeldJoint.WeldJointCode + "】已进委托单了，不能删除。"; + } + } + + return errlog; + } + /// /// 按类型获取焊接日报项 diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs index f377bf23..ec3bd6d2 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; using EmitMapper; +using EmitMapper.MappingConfiguration; using FineUIPro; using MiniExcelLibs; using MiniExcelLibs.Attributes; @@ -166,6 +167,7 @@ namespace BLL PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id); } + public static void UpdatePHTGL_ContractTrack(PHTGL_ContractTrack newtable) @@ -308,59 +310,62 @@ namespace BLL { var responeData = new ResponeData(); List rows; - try + var sheetNames = MiniExcel.GetSheetNames(path); + foreach (var sheet in sheetNames) ////多sheet导入 { - rows = MiniExcel.Query(path).ToList(); - } - catch (Exception e) - { - responeData.code = 0; - responeData.message = "模板错误"; - return responeData; - } - - var mapper = - ObjectMapperManager.DefaultInstance.GetMapper, List>(); - var modeList = mapper.Map(rows); - if (modeList.Count == 0) - { - responeData.code = 0; - responeData.message = "没有数据"; - return responeData; - } - - foreach (var item in modeList) - { - item.ContractId = contractid; - item.ProjectId = projectid; - if (string.IsNullOrEmpty(item.ProjectCode)) continue; - var phtglContractTrack = new PHTGL_ContractTrack + try { - MainItemCode = item.MainItemCode, - ProjectCode = item.ProjectCode, - ContractId = contractid, - ProjectId = projectid, - }; - var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack); - item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum; - if (!string.IsNullOrEmpty(item.ProjectCode) && !item.ProjectCode.Contains("-")) - { - - item.ProjectCode = item.MainItemCode + "-" + item.ProjectCode; + rows = MiniExcel.Query(path, sheetName: sheet).ToList(); } - if (resultModel.Any()) + catch (Exception ex) { - item.Id = resultModel[0].Id; - UpdatePHTGL_ContractTrack(item); + responeData.code = 0; + responeData.message = sheet+"模板错误:" + ex.ToString(); + return responeData; } - else - { - item.Id = SQLHelper.GetNewID(); - AddPHTGL_ContractTrack(item); - } - PhtglContracttrackprogressService.CreateTemplateByContractTrackId(item.Id); - } + var mapper = + ObjectMapperManager.DefaultInstance.GetMapper, List>(); + var modeList = mapper.Map(rows); + if (modeList.Count == 0) + { + responeData.code = 0; + responeData.message = sheet+ "没有数据"; + return responeData; + } + foreach (var item in modeList) + { + item.ContractId = contractid; + item.ProjectId = projectid; + if (string.IsNullOrEmpty(item.ProjectCode)) continue; + var phtglContractTrack = new PHTGL_ContractTrack + { + MainItemCode = item.MainItemCode, + ProjectCode = item.ProjectCode, + ContractId = contractid, + ProjectId = projectid, + }; + var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack); + item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum; + if (!string.IsNullOrEmpty(item.ProjectCode) && !item.ProjectCode.Contains("-")) + { + + item.ProjectCode = item.MainItemCode + "-" + item.ProjectCode; + } + if (resultModel.Any()) + { + item.Id = resultModel[0].Id; + UpdatePHTGL_ContractTrack(item); + } + else + { + item.Id = SQLHelper.GetNewID(); + AddPHTGL_ContractTrack(item); + } + PhtglContracttrackprogressService.CreateTemplateByContractTrackId(item.Id); + } + } + return responeData; } @@ -1265,7 +1270,7 @@ namespace BLL } public class PHTGL_ContractTrackDtoIn - { + { /// /// 序号 /// @@ -1338,5 +1343,34 @@ namespace BLL /// 备注 /// [ExcelColumnIndex("R")] public string Remarks { get; set; } + /// + /// 施工分包商 + /// + [ExcelColumnIndex("S")] public string ConstructionSubcontractor { get; set; } + /// + /// 主材供应方 + /// + [ExcelColumnIndex("T")] public string MaterialSupplier { get; set; } + /// + /// 是否总包合同范围内 + /// + [ExcelColumnIndex("U")] + public string IsWithinGeneralContractScope { get; set; } + /// + /// 概算工程量 + /// + [ExcelColumnIndex("V")] public string EstimatedQuantity { get; set; } + /// + /// 概算金额 + /// + [ExcelColumnIndex("W")] public decimal EstimatedAmount { get; set; } + /// + /// 预算工程量 + /// + [ExcelColumnIndex("X")] public string SettledQuantity { get; set; } + /// + /// 预算金额 + /// + [ExcelColumnIndex("Y")] public decimal SettledAmount { get; set; } } } \ No newline at end of file diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 4e45f8e3..160519a8 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -125,7 +125,7 @@ City = project.City, EnglishRemark = project.EnglishRemark, ProjectRealCode=project.ProjectRealCode, - + IsCNCECShow=project.IsCNCECShow, }; db.Base_Project.InsertOnSubmit(newProject); db.SubmitChanges(); @@ -171,6 +171,7 @@ newProject.City = project.City; newProject.EnglishRemark = project.EnglishRemark; newProject.ProjectRealCode = project.ProjectRealCode; + newProject.IsCNCECShow = project.IsCNCECShow; db.SubmitChanges(); HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject); CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject); @@ -374,6 +375,29 @@ } } + #region + /// + /// 项目表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitCNCECShowProjectDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.Items.Clear(); + dropName.DataValueField = "ProjectId"; + dropName.DataTextField = "ProjectName"; + dropName.DataSource = (from x in Funs.DB.Base_Project + where x.IsCNCECShow == true + orderby x.ProjectCode descending + select x).ToList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #endregion + #region 项目表下拉框 --施工项目 /// /// 项目表下拉框 diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs index d7867994..70c89147 100644 --- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -45,7 +45,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; if (rbType.SelectedValue == "0") { @@ -67,7 +67,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration' LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId - WHERE 1 = 1 "; + WHERE IsCNCECShow=1 "; if (rbType.SelectedValue == "2") { strSql += " AND Record.AccidentDegree ='1'"; diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs index cc2edb01..5ceea304 100644 --- a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow + @" FROM dbo.Supervise_SuperviseCheckReport AS S" + @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId" + @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId" - + @" WHERE 1=1 "; + + @" WHERE IsCNCECShow=1 "; List listStr = new List(); strSql += " AND S.CheckType= @CheckType"; listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue)); @@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow ,CheckTeam= STUFF((SELECT ',' + PersonName FROM dbo.Person_Persons where PATINDEX('%,' + RTRIM(PersonId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'') from Check_ProjectLeaderCheck AS C LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -108,7 +108,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId LEFT JOIN Person_Persons AS U ON C.CheckManId=U.PersonId LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -141,7 +141,7 @@ namespace FineUIPro.Web.DataShow ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'') from Check_CheckSpecial AS C LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs index 875af09f..ed91421c 100644 --- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -38,20 +38,20 @@ namespace FineUIPro.Web.DataShow strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,CompileDate,EQType FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId - ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType + ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType,IsCNCECShow FROM InApproveManager_EquipmentInItem AS Item LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId - ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType + ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType,IsCNCECShow FROM InApproveManager_GeneralEquipmentInItem AS Item LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; //strSql += " AND V.IsUsed = @IsUsed"; //listStr.Add(new SqlParameter("@IsUsed", "1")); diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs index 065d83b0..372634cb 100644 --- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow from EduTrain_TrainRecord AS TrainRecord LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; strSql += " AND TrainType.TrainType =@TrainType"; listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue)); diff --git a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs index 11879047..810102d3 100644 --- a/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow if (!IsPostBack) { Funs.DropDownPageSize(this.ddlPageSize); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); ddlPageSize2.SelectedValue = Grid2.PageSize.ToString(); @@ -97,7 +97,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Unit AS Unit ON Em.UnitId=Unit.UnitId LEFT JOIN Base_Project AS Project ON Em.ProjectId=Project.ProjectId LEFT JOIN Base_EmergencyType AS EmergencyType ON Em.EmergencyTypeId=EmergencyType.EmergencyTypeId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -257,7 +257,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON List.Projectid = Project.ProjectId LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = List.DrillRecordType and DrillRecordType.GroupId='DrillRecordType' - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs index dd1976be..aa77eadd 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow FROM HJGL_Batch_NDEItem AS Item LEFT JOIN HJGL_Batch_NDE AS Checks ON Item.NDEID =Checks.NDEID LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId - WHERE 1=1 "; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs index fd1614c7..1c4cae2c 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs @@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId - WHERE Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL"; + WHERE IsCNCECShow=1 AND Welder.WorkPostId=@WorkPostId AND Welder.ProjectId IS NOT NULL"; List listStr = new List(); listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_Welder)); if (this.drpProject.SelectedValue !=Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs index 713f4bb5..746beaff 100644 --- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs index 0f73c8f6..a40f7d68 100644 --- a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs index 843e85e5..f4c7ad48 100644 --- a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); LargerHazard = (from x in Funs.DB.Solution_LargerHazard join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId where y.ProjectState == Const.ProjectState_1 @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs index e900fb16..8cdf0197 100644 --- a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs @@ -22,8 +22,8 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); - // 绑定表格t + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); + // 绑定表格 BindGrid(); } } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.LicenseTypeId,V.UnitId,V.LicenseManageContents ,V.CompileMan,V.CompileDate,V.States FROM View_License_LicenseManager AS V - WHERE 1=1"; + WHERE IsCNCECShow=1 "; if (this.rbType.SelectedValue=="2") { strSql += " AND V.States = @WorkStates"; diff --git a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs index 04c1f52b..2e31f26c 100644 --- a/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -96,7 +96,7 @@ namespace FineUIPro.Web.DataShow ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson FROM Meeting_SafetyLeaderGroupMeeting AS Meeting LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { @@ -127,15 +127,15 @@ namespace FineUIPro.Web.DataShow { string strSql = @"SELECT ProjectId,ProjectName, ID, MeetingName, MeetingDate,MeetingHours,HostMan,AttentPersonNum,AttentPerson FROM (SELECT Project.ProjectId,Project.ProjectName,Meeting.MonthMeetingId AS ID,Meeting.MonthMeetingName AS MeetingName,Meeting.MonthMeetingDate AS MeetingDate,Meeting.MeetingHours - ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson + ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow FROM Meeting_MonthMeeting AS Meeting LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId union all SELECT Project.ProjectId,Project.ProjectName,Meeting.WeekMeetingId AS ID,Meeting.WeekMeetingName AS MeetingName,Meeting.WeekMeetingDate AS MeetingDate,Meeting.MeetingHours - ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson + ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow FROM Meeting_WeekMeeting AS Meeting LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V - where 1=1 "; + where IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs index 649fbb5d..ffbd7402 100644 --- a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow , ProjectMoney, DATEDIFF(DAY, Project.StartDate, GETDATE()) AS DayCount, ProjectType.ProjectTypeName AS ProjectTypeName FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId = Project.UnitId LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType = ProjectType.ProjectTypeId - WHERE 1 = 1"; + WHERE IsCNCECShow=1 "; List listStr = new List(); if (this.ckState.SelectedValue != "0") diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs index f8c2335c..a4ec9eba 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow ,(SELECT COUNT(*) FROM WBS_ControlItemProject AS D WHERE D.ProjectId =P.ProjectId ) AS count4 ,(SELECT COUNT(*) FROM WBS_ControlItemAndCycle AS E WHERE E.ProjectId =P.ProjectId ) AS count5 FROM Base_Project AS P - WHERE P.ProjectState = 1 "; + WHERE P.IsCNCECShow=1 "; List listStr = new List(); if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs index 7761e5d6..1c455e85 100644 --- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs @@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId - WHERE States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) "; + WHERE IsCNCECShow=1 AND States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) "; List listStr = new List(); if (this.drpProject.SelectedValue !=Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs index a4c47383..d8252e85 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); @@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 "; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs index 20f51822..394449af 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs index 1c7be0de..346f7fb5 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs index d1f3e2a8..43b4d6e2 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow LEFT JOIN Person_Persons AS Persons ON Persons.PersonId=Person.PersonId LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId - LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 "; + LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 AND IsCNCECShow=1 "; if (this.drpProject.SelectedValue != Const._Null) { strSql += " AND Person.ProjectId = @ProjectId"; diff --git a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs index 57565355..0e896ab0 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs index c5fc76c8..f824ce96 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs index bff485ac..a9e9ff8c 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow FROM CostGoods_CostSmallDetail as cost left join Base_Project as p on cost.ProjectId =p.ProjectId left join Base_Unit as Unit on cost.UnitId =Unit.UnitId - WHERE 1=1"; + WHERE IsCNCECShow=1 "; if (this.drpProject.SelectedValue != Const._Null) { diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs index 0ceb7d2c..0e5593b3 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1"; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs index edebf72f..aff7b6da 100644 --- a/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow { Funs.DropDownPageSize(this.ddlPageSize); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); + BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); } @@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow /// private void BindGrid() { - string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1"; + string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 "; List listStr = new List(); string cpara = string.Empty; if (this.drpProject.SelectedValue != Const._Null) diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同价格信息导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同价格信息导入模板.xlsx new file mode 100644 index 00000000..638b3307 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同价格信息导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx deleted file mode 100644 index 43003440..00000000 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx and /dev/null differ diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx index eb2631ee..5292f6b1 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx @@ -60,7 +60,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx index d8098147..72e88f8b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx @@ -24,6 +24,10 @@ + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs index 421a7e01..e12eded6 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs @@ -21,6 +21,7 @@ namespace FineUIPro.Web.HJGL.WPQ if (!IsPostBack) { ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true); // 绑定表格 BindGrid(); } @@ -39,6 +40,12 @@ namespace FineUIPro.Web.HJGL.WPQ strSql += " AND WPQCode LIKE @WPQCode"; listStr.Add(new SqlParameter("@WPQCode", "%" + this.txtWeldingProcedureCode.Text.Trim() + "%")); } + + if (drpUnit.SelectedValue!=Const._Null) + { + strSql += " AND UnitId =@UnitId"; + listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs index 80df370b..d71ea2fb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WPQ { - - - public partial class WPQList { - +namespace FineUIPro.Web.HJGL.WPQ +{ + + + public partial class WPQList + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtWeldingProcedureCode 控件。 /// @@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldingProcedureCode; - + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + /// /// ToolbarFill1 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnNew 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + /// /// btnExport 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnExport; - + /// /// lblNumber 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblNumber; - + /// /// Label1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// Label41 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label41; - + /// /// ToolbarSeparator1 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// Menu1 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuView 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuView; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index d15d72fb..cf566ee8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -18,21 +18,32 @@ + LabelAlign="Left"> + + EnablePostBack="true" OnClick="btnQuery_Click" runat="server" > + + + + + + + + - @@ -63,11 +74,11 @@ - @@ -104,34 +115,39 @@ + TextAlign="Center" Width="50px" > + TextAlign="Center" Width="80px" > + TextAlign="Center" Width="80px" > + HeaderTextAlign="Center" TextAlign="Center" Width="150px" ExpandUnusedSpace="true"> + HeaderTextAlign="Center" TextAlign="Center" Width="140px" ExpandUnusedSpace="true"> + HeaderTextAlign="Center" TextAlign="Center" Width="120px" ExpandUnusedSpace="true"> + FieldType="Double" HeaderTextAlign="Center" TextAlign="Center" Width="80px" > + FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px" > + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index 4c251b90..e34b2dee 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -1,6 +1,7 @@ using Aspose.Words; using BLL; using Model; +using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Data; @@ -119,6 +120,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage //this.SelectedList = new List(); //this.NoSelectedList = new List(); + string strList = Request.Params["strList"]; List list = Funs.GetStrListByStr(strList, '|'); if (list.Count() == 2) @@ -126,6 +128,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.UnitWorkId = list[0]; TaskDate = list[1]; + InitDropList(); Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId); BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位 @@ -207,6 +210,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage && x.PipeArea == PipeArea && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); + if (!string .IsNullOrEmpty( drpFlowingSection.SelectedValue)&& drpFlowingSection.SelectedValue!=Const._Null) + { + pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList(); + } + var joints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); int pageindex = int.Parse(node.CommandName.Split('|')[0]); int pageCount = int.Parse(node.CommandName.Split('|')[1]); @@ -351,6 +359,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage //} //Grid1.SelectedRowIDArray = arr; } + + private void InitDropList() + { + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId + && x.UnitWorkId == this.UnitWorkId + select x.FlowingSection).Distinct().ToList(); + this.drpFlowingSection.DataTextField = "Value"; + this.drpFlowingSection.DataValueField = "Value"; + this.drpFlowingSection.DataSource = pipeline; + this.drpFlowingSection.DataBind(); + Funs.FineUIPleaseSelect(drpFlowingSection); + } + #endregion #region 管线查询 @@ -621,5 +643,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage }; } + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + + if (e.CommandName == "ResetWpq") + { + var weldJointId = e.RowID; + var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId); + if (model != null) + { + model.WPQId = null; + WeldJointService.UpdateWeldJoint(model); + + List wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue); + if (wpqList != null) + { + Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint(); + Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId); + + newJot.WPQId = wps.WPQId; + newJot.WeldJointId = model.WeldJointId; + newJot.WeldingRod = wps.WeldingRod; + newJot.WeldingWire = wps.WeldingWire; + newJot.WeldingMethodId = wps.WeldingMethodId; + newJot.GrooveTypeId = wps.GrooveType; + newJot.PreTemperature = wps.PreTemperature; + newJot.IsHotProess = wps.IsHotProess; + newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode)); + + BLL.WeldJointService.UpdateConWeldJoint(newJot); + } + + BindGrid(); + ShowNotify("焊评已重置！", MessageBoxIcon.Success); + } + } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs index 24315e1a..711c9172 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs @@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Button btnQuery; + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// drpFlowingSection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpFlowingSection; + /// /// tvControlItem 控件。 /// @@ -220,5 +238,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAccept; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index e0c37828..ec9605fb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (flag == "2") { GroupPanel2.Hidden = false; - IsReadOnly(true); + IsReadOnly(false); } else { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx index f9852200..fa5398b0 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx @@ -14,7 +14,7 @@ @@ -27,7 +27,7 @@ - @@ -117,7 +117,7 @@ DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px"> - - - - + + + + + @@ -203,16 +209,25 @@ runat="server" Text="删除"> + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx index f49960ce..652ec252 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx @@ -20,7 +20,7 @@ ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" > - + + AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"> + @@ -54,14 +56,14 @@ - - + FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> <%-- @@ -100,7 +102,10 @@ --%> - + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs index 884c81b8..80eb2975 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.ProjectData private void BindGrid() { string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, " - + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState" + + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工' ELSE '施工中' END) AS ProjectStateName,Project.ProjectState,IsCNCECShow" + @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId" + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId" + @" WHERE 1=1 "; @@ -51,6 +51,10 @@ namespace FineUIPro.Web.ProjectData // strSql += " AND ProjectId = @ProjectId"; // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); //} + if (this.rbIsCNCECShow.Checked) + { + strSql += " AND IsCNCECShow=1 "; + } if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim())) { @@ -344,6 +348,11 @@ namespace FineUIPro.Web.ProjectData { this.BindGrid(); } + + protected void rbIsCNCECShow_CheckedChanged(object sender, CheckedEventArgs e) + { + this.BindGrid(); + } #endregion #region 项目管理人员 @@ -415,6 +424,6 @@ namespace FineUIPro.Web.ProjectData ShowNotify("请选择项目进入！", MessageBoxIcon.Warning); } - } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs index 2eceec4c..0d3d95b1 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData { - - - public partial class ProjectSet { - +namespace FineUIPro.Web.ProjectData +{ + + + public partial class ProjectSet + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// ckState 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList ckState; - + /// /// txtProjectName 控件。 /// @@ -74,7 +76,16 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + + /// + /// rbIsCNCECShow 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox rbIsCNCECShow; + /// /// btnNew 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnOut 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblNumber 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblNumber; - + /// /// ToolbarSeparator1 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnEnter 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnEnter; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 64fd41f1..6e048f5c 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -10,7 +10,7 @@
+ BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="150px"> @@ -24,7 +24,7 @@ ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"> - @@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -104,7 +104,7 @@ > - + @@ -122,7 +122,7 @@ 拾取坐标 - + @@ -132,8 +132,10 @@ > - + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index a2fcda54..b11ca8ac 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -101,6 +101,14 @@ namespace FineUIPro.Web.ProjectData this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; this.txtProjectRealCode.Text = project.ProjectRealCode; + if (project.IsCNCECShow == true) + { + this.rbIsCNCECShow.SelectedValue = "True"; + } + else + { + this.rbIsCNCECShow.SelectedValue = "False"; + } } } else @@ -143,6 +151,7 @@ namespace FineUIPro.Web.ProjectData City = this.txtCity.Text.Trim(), EnglishRemark = this.txtEnglishRemark.Text.Trim(), ProjectRealCode=this.txtProjectRealCode.Text.Trim(), + IsCNCECShow=Convert.ToBoolean( this.rbIsCNCECShow.SelectedValue), }; if (!string.IsNullOrEmpty(txtStartDate.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs index f7aa1fbf..f1eef492 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData { - - - public partial class ProjectSetSave { - +namespace FineUIPro.Web.ProjectData +{ + + + public partial class ProjectSetSave + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtProjectName 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtProjectCode 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectCode; - + /// /// txtShortName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtShortName; - + /// /// drpProjectType 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectType; - + /// /// drpProjectState 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectState; - + /// /// txtStartDate 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStartDate; - + /// /// txtEndDate 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndDate; - + /// /// txtContractNo 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtContractNo; - + /// /// txtDuration 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtDuration; - + /// /// drpUnit 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnit; - + /// /// ckbIsForeign 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsForeign; - + /// /// drpProjectManager 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectManager; - + /// /// drpConstructionManager 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpConstructionManager; - + /// /// drpHSSEManager 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHSSEManager; - + /// /// txtProjectAddress 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectAddress; - + /// /// txtWorkRange 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtWorkRange; - + /// /// txtRemark 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// txtProjectMoney 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtProjectMoney; - + /// /// txtConstructionMoney 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtConstructionMoney; - + /// /// txtTelephone 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTelephone; - + /// /// txtCountry 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCountry; - + /// /// drpProvince 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProvince; - + /// /// txtCity 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCity; - + /// /// txtMapCoordinates 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMapCoordinates; - + /// /// bottomPanel 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel bottomPanel; - + /// /// txtEnglishRemark 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEnglishRemark; - + /// /// txtProjectRealCode 控件。 /// @@ -281,16 +283,16 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectRealCode; - + /// - /// TextBox2 控件。 + /// rbIsCNCECShow 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox2; - + protected global::FineUIPro.RadioButtonList rbIsCNCECShow; + /// /// Toolbar1 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// ckIsUpTotalMonth 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsUpTotalMonth; - + /// /// btnSave 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -326,7 +328,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// hdCompileMan 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx index 8ee93c6f..caa29a7e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx @@ -102,12 +102,12 @@ - - - - + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs index 4be265fb..73981ca5 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs @@ -90,6 +90,14 @@ namespace FineUIPro.Web.ProjectData this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; this.txtProjectRealCode.Text = project.ProjectRealCode; + if (project.IsCNCECShow == true) + { + this.rbIsCNCECShow.SelectedValue = "True"; + } + else + { + this.rbIsCNCECShow.SelectedValue = "False"; + } } } } diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs index 0ad6ae26..155d56bd 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData { - - - public partial class ProjectSetView { - +namespace FineUIPro.Web.ProjectData +{ + + + public partial class ProjectSetView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtProjectName 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtProjectCode 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectCode; - + /// /// txtShortName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtShortName; - + /// /// txtProjectType 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectType; - + /// /// txtProjectState 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectState; - + /// /// txtStartDate 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtStartDate; - + /// /// txtEndDate 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEndDate; - + /// /// txtDuration 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDuration; - + /// /// txtProjectManager 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectManager; - + /// /// txtConstructionManager 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtConstructionManager; - + /// /// txtHSSEManager 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtHSSEManager; - + /// /// txtProjectAddress 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectAddress; - + /// /// txtUnitName 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitName; - + /// /// txtWorkRange 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtWorkRange; - + /// /// txtRemark 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// txtProjectMoney 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectMoney; - + /// /// txtConstructionMoney 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtConstructionMoney; - + /// /// txtTelephone 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTelephone; - + /// /// txtCountry 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCountry; - + /// /// txtProvince 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProvince; - + /// /// txtCity 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCity; - + /// /// ckbIsForeign 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsForeign; - + /// /// txtMapCoordinates 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMapCoordinates; - + /// /// txtEnglishRemark 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEnglishRemark; - + /// /// lb1 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lb1; - + /// /// txtProjectRealCode 控件。 /// @@ -272,16 +274,16 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectRealCode; - + /// - /// TextBox2 控件。 + /// rbIsCNCECShow 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox2; - + protected global::FineUIPro.RadioButtonList rbIsCNCECShow; + /// /// Toolbar1 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnAttachUrl 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// btnClose 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index b532a9bb..bb7a7a34 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -1,9 +1,51 @@  - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,12 +58,15 @@ + + + - - - - - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index c0fc81f0..129ab5fd 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -1,12 +1,14 @@  - - - + + + + + @@ -14,7 +16,10 @@ - + + + + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index 8d4aa005..fd6a0762 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,7 +1,11 @@  - + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index eb672a76..31955789 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -17,19 +17,20 @@ - - - - - - - - - + + + + + + + + + + - + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 03eb9188..9bc36592 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -48,43 +48,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 6fc48bee..b1dc3361 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -23810,6 +23810,8 @@ namespace Model private string _ProjectRealCode; + private System.Nullable _IsCNCECShow; + private EntitySet _Accident_AccidentHandle; private EntitySet _Accident_AccidentPersonRecord; @@ -24228,6 +24230,8 @@ namespace Model partial void OnEnglishRemarkChanged(); partial void OnProjectRealCodeChanging(string value); partial void OnProjectRealCodeChanged(); + partial void OnIsCNCECShowChanging(System.Nullable value); + partial void OnIsCNCECShowChanged(); #endregion public Base_Project() @@ -25001,6 +25005,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCNCECShow", DbType="Bit")] + public System.Nullable IsCNCECShow + { + get + { + return this._IsCNCECShow; + } + set + { + if ((this._IsCNCECShow != value)) + { + this.OnIsCNCECShowChanging(value); + this.SendPropertyChanging(); + this._IsCNCECShow = value; + this.SendPropertyChanged("IsCNCECShow"); + this.OnIsCNCECShowChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentHandle { @@ -39495,10 +39519,10 @@ namespace Model private string _SaveHandleMan; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -39555,10 +39579,10 @@ namespace Model partial void OnProposeUnitIdChanged(); partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public Check_CheckControl() @@ -40037,26 +40061,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -40077,6 +40081,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -100703,10 +100727,10 @@ namespace Model private string _HazardValue; - private string _WorkPackageId; - private string _WorkPackageName; + private string _WorkPackageId; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -100807,10 +100831,10 @@ namespace Model partial void OnRegisterTypes4IdChanged(); partial void OnHazardValueChanging(string value); partial void OnHazardValueChanged(); - partial void OnWorkPackageIdChanging(string value); - partial void OnWorkPackageIdChanged(); partial void OnWorkPackageNameChanging(string value); partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -101748,26 +101772,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] - public string WorkPackageId - { - get - { - return this._WorkPackageId; - } - set - { - if ((this._WorkPackageId != value)) - { - this.OnWorkPackageIdChanging(value); - this.SendPropertyChanging(); - this._WorkPackageId = value; - this.SendPropertyChanged("WorkPackageId"); - this.OnWorkPackageIdChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] public string WorkPackageName { @@ -101788,6 +101792,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -283052,6 +283076,8 @@ namespace Model private string _ProjectName; + private System.Nullable _IsCNCECShow; + private string _LicenseTypeName; private string _UnitName; @@ -283264,6 +283290,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCNCECShow", DbType="Bit")] + public System.Nullable IsCNCECShow + { + get + { + return this._IsCNCECShow; + } + set + { + if ((this._IsCNCECShow != value)) + { + this._IsCNCECShow = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LicenseTypeName", DbType="NVarChar(50)")] public string LicenseTypeName {