diff --git a/.gitignore b/.gitignore index 2c9c729f..e11f354b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ SGGL/.svn /SGGL/FineUIPro.Web/ErrLog.txt /SGGL/CLAUDE.md /SGGL/.claude +/SGGL/AGENTS.md diff --git a/DataBase/版本日志/SGGLDB_V2026-03-02-001.sql b/DataBase/版本日志/SGGLDB_V2026-03-02-001.sql new file mode 100644 index 00000000..695cc2d9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-03-02-001.sql @@ -0,0 +1,222 @@ +alter table dbo.HJGL_WeldJoint + add WeldJointPoint nvarchar(300) +go + +alter view dbo.View_HJGL_WeldJoint as + SELECT jot.[ProjectId] --项目Id + , pipe.[UnitWorkId] --单位工程Id + , uw.UnitWorkName --单位工程 + , pipe.[UnitId] --单位Id + , unit.UnitName --单位 + , jot.[PipelineCode] --管线号 + , pipe.[SingleNumber] --单线图号 + , pipe.[SingleName] --图纸名称 + , pipe.[MediumId] --介质Id + , medium.MediumCode + , medium.MediumName --介质名称 + , pipe.[PipingClassId] --管道等级Id + , pipingClass.PipingClassCode --管道等级 + , pipe.[DetectionRateId] --探伤比例Id + , dr.DetectionRateCode --探伤比例（例如5，10，20） + , pipe.DetectionType --探伤类型Id(可能多个，中间用|分隔) + , STUFF((SELECT ',' + DetectionTypeCode + FROM Base_DetectionType + WHERE CHARINDEX('|' + LTRIM(DetectionTypeId) + '|', '|' + pipe.DetectionType + '|') > 0 + FOR XML PATH('')), 1, 1, '') AS DetectionTypeStr --探伤类型（可能多个，中间用,分隔） + , pipe.DesignTemperature --设计温度℃ + , pipe.DesignPress --设计压力Mpa(g) + , pipe.TestMedium --压力试验介质Id + , tm.MediumName AS TestMediumName --压力试验介质 + , pipe.TestPressure --压力试验压力Mpa(g) + , pipe.PressurePipingClassId --压力管道级别Id + , ppc.PressurePipingClassCode --压力管道级别 + , pipe.PipeLenth --管线长度(m) + , pipe.LeakMedium --泄露性试验介质Id + , tm2.MediumName AS LeakMediumName --泄露性试验介质 + , pipe.LeakPressure --泄露性试验压力Mpa(g) + , pipe.PCMedium --吹洗要求Id + , pm.PurgeMethodCode --吹洗要求 + , pipe.VacuumPressure --真空试验压力Kpa(a) + , pipe.MaterialId --材质Id + , mat.MaterialCode AS PipeMaterialCode --材质 + , pipe.Remark AS PipeRemark --备注 + , pipe.FlowingSection as FlowingSection --流水段 + , jot.[WeldJointId] --焊口Id + , jot.[WeldJointCode] --焊口号 + , jot.[Material1Id] --材质1Id + , mat1.MaterialCode AS Material1Code --材质1 + , jot.[Material2Id] --材质2Id + , mat2.MaterialCode AS Material2Code --材质2 + , jot.[Dia] --外径 + , jot.DNDia --DN公称直径 + , jot.[Size] --达因 + , jot.[Thickness] --壁厚 + , jot.[Specification] --规格 + , jot.[WeldTypeId] --焊缝类型Id + , WeldType.WeldTypeCode --焊缝类型 + , jot.[DetectionTypeId] --检测类型Id + , ndt.DetectionTypeCode --检测类型 + , jot.[Components1Id] --组件1号Id + , com1.ComponentsCode AS ComponentsCode1 --组件1号 + , jot.[Components2Id] --组件2号Id + , com2.ComponentsCode AS ComponentsCode2 --组件2号 + , jot.DesignIsHotProess --是否热处理 + , CASE jot.DesignIsHotProess WHEN 1 THEN '是' ELSE '否' END AS DesignIsHotProessStr --是否热处理 + , jot.[WeldingMethodId] --焊接方法Id + , WeldingMethod.WeldingMethodCode --焊接方法 + , jot.WPQId --WPS的Id + , wps.WPQCode --WPS编号 + , jot.MatchableWPQ --可匹配WPQ + , jot.[GrooveTypeId] --坡口类型Id + , GrooveType.GrooveTypeCode --坡口类型 + , jot.[WeldingRod] --焊条Id + , rod.ConsumablesCode AS WeldingRodCode --焊条 + , jot.[WeldingWire] --焊丝Id + , wire.ConsumablesCode AS WeldingWireCode --焊丝 + , jot.PreTemperature --预热温度 + , jot.[JointAttribute] --焊口属性 + , jot.TwoJointType --二次焊口新增类型 + , pipe.PipeArea --工厂预制/现场安装 + , daily.WeldingDate as WeldingDateD + , CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate --焊接日期 + , BackingWelder.WelderCode AS BackingWelderCode --打底焊工 + , CoverWelder.WelderCode AS CoverWelderCode --盖面焊工 + , CoverWelderTeamGroup.TeamGroupName as CoverWelderTeamGroupName ----盖面焊工班组 + , BackingWelderTeamGroup.TeamGroupName as BackingWelderTeamGroupName --打底焊工班组 + , (CASE (SELECT COUNT(*) + FROM [dbo].[HJGL_HotProess_TrustItem] hpti + WHERE hpti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 ISNULL(ReportNo, '') + FROM [dbo].[HJGL_HotProess_Trust] hpt + LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti + ON hpti.HotProessTrustId = hpt.HotProessTrustId + WHERE hpti.WeldJointId = jot.WeldJointId) END) AS HotProessReportNo --热处理报告编号 + , (CASE (SELECT TOP 1 IsCompleted + FROM [dbo].[HJGL_HotProess_TrustItem] hpti + WHERE hpti.WeldJointId = jot.WeldJointId) + WHEN 1 THEN '完成' + WHEN 0 THEN '未完成' + ELSE '未热处理' END) AS HotProessResult --热处理检测结果 + , (CASE (SELECT COUNT(*) + FROM [dbo].HJGL_Hard_TrustItem hti + WHERE hti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 ISNULL(InspectionNum, '') + FROM [dbo].HJGL_Hard_Trust ht + LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID = ht.HardTrustID + WHERE hti.WeldJointId = jot.WeldJointId) END) AS HardReportNo --硬度报告编号 + , (CASE (SELECT TOP 1 IsPass + FROM [dbo].HJGL_Hard_TrustItem hti + WHERE hti.WeldJointId = jot.WeldJointId) + WHEN 1 THEN '合格' + WHEN 0 THEN '不合格' + ELSE '待检测' END) AS HardResult --硬度检测结果 + , (CASE (SELECT COUNT(*) + FROM [dbo].HJGL_Batch_BatchTrustItem bti + WHERE bti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 TrustBatchCode + FROM [dbo].HJGL_Batch_BatchTrust bt + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId = bt.TrustBatchId + WHERE bti.WeldJointId = jot.WeldJointId) END) AS TrustBatchCode --委托单编号 + , (CASE (SELECT COUNT(*) + FROM [dbo].HJGL_Batch_NDEItem ndei + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId + WHERE bti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 ISNULL(NDECode, '') + FROM [dbo].HJGL_Batch_NDE nde + LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID = nde.NDEID + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti + ON bti.TrustBatchItemId = ndei.TrustBatchItemId + WHERE bti.WeldJointId = jot.WeldJointId) END) AS NDECode --检测单编号 + , (CASE (SELECT TOP 1 CheckResult + FROM [dbo].HJGL_Batch_NDEItem ndei + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId + WHERE bti.WeldJointId = jot.WeldJointId) + WHEN '1' THEN '合格' + WHEN '2' THEN '不合格' + ELSE '' END) AS CheckResult --检测结果 + , jot.PipelineId + , jot.[JointArea] + , jot.[WeldingLocationId] + , jot.[HeartNo1] + , jot.[HeartNo2] + , jot.[IsHotProess] + , jot.[WeldingDailyId] + , jot.[BackingWelderId] + , jot.[CoverWelderId] + , jot.WeldingMode + , jot.Remark + , jot.IsTwoJoint + , jot.SubmitMan + , jot.AuditMan + , jot.AuditMan2 + , jot.AuditDate + , jot.AuditDate2 + , jot.WeldJointPoint + , WeldingLocation.WeldingLocationCode + , CASE WHEN jot.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS IsWelding + , CASE WHEN jot.WeldingDailyId IS NULL THEN '未完成' ELSE '已完成' END AS IsWeldOK + , CASE WHEN jot.IsHotProess = 1 THEN '是' ELSE '否' END AS IsHotProessStr + , BackingWelder.PersonName AS BackingWelderName + , CoverWelder.PersonName AS CoverWelderName + , (CASE + WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL + THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode + ELSE (ISNULL(CoverWelder.WelderCode, '') + ISNULL(BackingWelder.WelderCode, '')) END) AS WelderCode + , --焊工 + (CASE + WHEN mat1.MaterialCode IS NOT NULL AND mat2.MaterialCode IS NOT NULL + THEN mat1.MaterialCode + '/' + mat2.MaterialCode + ELSE (ISNULL(mat1.MaterialCode, '') + ISNULL(mat2.MaterialCode, '')) END) AS MaterialCode + , --材质 + + daily.WeldingDailyCode + , pointItem.PointBatchId + , point.PointBatchCode + , (CASE + WHEN pointItem.PointState = '1' THEN '已点口' + WHEN pointItem.PointState = '2' THEN '已扩透' + ELSE '' END) AS IsPoint + FROM [dbo].[HJGL_WeldJoint] jot + LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId + LEFT JOIN dbo.WBS_UnitWork uw ON uw.UnitWorkId = pipe.UnitWorkId + LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = daily.UnitId + LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId = jot.WeldTypeId + LEFT JOIN dbo.Base_DetectionRate dr ON dr.DetectionRateId = pipe.DetectionRateId + LEFT JOIN Base_TestMedium tm ON tm.TestMediumId = pipe.TestMedium + LEFT JOIN Base_TestMedium tm2 ON tm2.TestMediumId = pipe.LeakMedium + LEFT JOIN Base_PurgeMethod pm ON pm.PurgeMethodId = pipe.PCMedium + LEFT JOIN Base_PressurePipingClass ppc ON ppc.PressurePipingClassId = pipe.PressurePipingClassId + LEFT JOIN Base_Material AS mat ON mat.MaterialId = pipe.MaterialId + LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id + LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id + LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId = jot.WeldingMethodId + LEFT JOIN Base_WeldingLocation AS WeldingLocation + ON WeldingLocation.WeldingLocationId = jot.WeldingLocationId + LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId = jot.WeldingWire + LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId = jot.WeldingRod + LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId = jot.GrooveTypeId + LEFT JOIN Base_Components AS com1 ON com1.ComponentsId = jot.Components1Id + LEFT JOIN Base_Components AS com2 ON com2.ComponentsId = jot.Components2Id + LEFT JOIN SitePerson_Person AS BackingWelder + ON BackingWelder.PersonId = jot.BackingWelderId and BackingWelder.ProjectId = jot.ProjectId + LEFT JOIN SitePerson_Person AS CoverWelder + ON CoverWelder.PersonId = jot.CoverWelderId and CoverWelder.ProjectId = jot.ProjectId + LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = pipe.PipingClassId + LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId + LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId + LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId + LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + LEFT JOIN dbo.ProjectData_TeamGroup AS CoverWelderTeamGroup + on CoverWelderTeamGroup.TeamGroupId = jot.CoverWelderTeamGroupId and + CoverWelderTeamGroup.ProjectId = jot.ProjectId + LEFT JOIN dbo.ProjectData_TeamGroup AS BackingWelderTeamGroup + on BackingWelderTeamGroup.TeamGroupId = jot.BackingWelderTeamGroupId and + BackingWelderTeamGroup.ProjectId = jot.ProjectId +go + diff --git a/DataBase/版本日志/SGGLDB_V2026-03-05-001.sql b/DataBase/版本日志/SGGLDB_V2026-03-05-001.sql new file mode 100644 index 00000000..6a1c92b1 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-03-05-001.sql @@ -0,0 +1,144 @@ +-- ============================================= +-- 材料仓库管理与管线划分优化 - 数据库变更脚本 +-- 生成时间: 2026-03-05 +-- 说明: 请在执行前备份数据库 +-- ============================================= + +-- ============================================= +-- 第一部分: 创建材料仓库表 +-- ============================================= + +-- 检查表是否存在，如果存在则删除（仅用于开发环境） +-- IF OBJECT_ID('dbo.Base_Warehouse', 'U') IS NOT NULL +-- DROP TABLE dbo.Base_Warehouse; +-- GO + +-- 创建材料仓库表 +CREATE TABLE dbo.Base_Warehouse ( + WarehouseId NVARCHAR(50) NOT NULL, + WarehouseName NVARCHAR(200) NOT NULL, + Remark NVARCHAR(500) NULL, + ProjectId NVARCHAR(50) NOT NULL, + CreateUserId NVARCHAR(50) NULL, + CreateTime DATETIME NULL, + ModifyUserId NVARCHAR(50) NULL, + ModifyTime DATETIME NULL, + CONSTRAINT PK_Base_Warehouse PRIMARY KEY CLUSTERED (WarehouseId ASC), + CONSTRAINT FK_Base_Warehouse_Project FOREIGN KEY (ProjectId) + REFERENCES dbo.Project_Project (ProjectId) + ON DELETE NO ACTION +); +GO + +-- 创建索引以提升查询性能 +CREATE NONCLUSTERED INDEX IX_Base_Warehouse_ProjectId + ON dbo.Base_Warehouse(ProjectId); +GO + +CREATE NONCLUSTERED INDEX IX_Base_Warehouse_WarehouseName + ON dbo.Base_Warehouse(WarehouseName); +GO + +-- 添加表说明 +EXEC sys.sp_addextendedproperty + @name=N'MS_Description', + @value=N'材料仓库基础信息表' , + @level0type=N'SCHEMA', + @level0name=N'dbo', + @level1type=N'TABLE', + @level1name=N'Base_Warehouse'; +GO + +-- 添加字段说明 +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'仓库ID（主键）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'WarehouseId'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'仓库名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'WarehouseName'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'Remark'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'ProjectId'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'CreateUserId'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'CreateTime'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'ModifyUserId'; +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Warehouse', @level2type=N'COLUMN',@level2name=N'ModifyTime'; +GO + +PRINT '材料仓库表创建完成'; +GO + +-- ============================================= +-- 第二部分: 为管线表添加仓库字段 +-- ============================================= + +-- 检查字段是否已存在 +IF NOT EXISTS ( + SELECT 1 FROM sys.columns + WHERE object_id = OBJECT_ID('dbo.HJGL_Pipeline') + AND name = 'WarehouseId' +) +BEGIN + -- 添加 WarehouseId 字段（允许NULL以兼容现有数据） + ALTER TABLE dbo.HJGL_Pipeline + ADD WarehouseId NVARCHAR(50) NULL; + GO + + -- 添加字段说明 + EXEC sys.sp_addextendedproperty + @name=N'MS_Description', + @value=N'仓库ID（关联Base_Warehouse表）' , + @level0type=N'SCHEMA', + @level0name=N'dbo', + @level1type=N'TABLE', + @level1name=N'HJGL_Pipeline', + @level2type=N'COLUMN', + @level2name=N'WarehouseId'; + GO + + -- 添加外键约束（可选，根据实际需求决定是否启用） + -- ALTER TABLE dbo.HJGL_Pipeline + -- ADD CONSTRAINT FK_HJGL_Pipeline_Warehouse + -- FOREIGN KEY (WarehouseId) + -- REFERENCES dbo.Base_Warehouse(WarehouseId) + -- ON DELETE SET NULL; + -- GO + + PRINT '管线表WarehouseId字段添加完成'; +END +ELSE +BEGIN + PRINT '管线表WarehouseId字段已存在，跳过添加'; +END +GO + +-- ============================================= +-- 第三部分: 验证脚本 +-- ============================================= + +-- 验证表和字段创建成功 +SELECT + 'Base_Warehouse表' AS 对象类型, + CASE WHEN EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Base_Warehouse') + THEN '已创建 ✓' + ELSE '未创建 ✗' + END AS 状态; + +SELECT + 'HJGL_Pipeline.WarehouseId字段' AS 对象类型, + CASE WHEN EXISTS ( + SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS + WHERE TABLE_NAME = 'HJGL_Pipeline' + AND COLUMN_NAME = 'WarehouseId' + ) + THEN '已添加 ✓' + ELSE '未添加 ✗' + END AS 状态; +GO + +PRINT '========================================'; +PRINT '数据库变更脚本执行完成！'; +PRINT '========================================'; +PRINT ''; +PRINT '重要提示：'; +PRINT '1. 请在生产环境执行前备份数据库'; +PRINT '2. 建议在维护窗口执行ALTER TABLE操作'; +PRINT '3. 现有管线数据的WarehouseId默认为NULL'; +PRINT '4. 可通过批量设置功能逐步完善数据'; +PRINT '========================================'; +GO diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 51e9c7c8..7a24e5dc 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -320,7 +320,11 @@ namespace BLL { query = query.Where(x => x.ProjectName.Contains(filter.ProjectName)); } - + // 项目代号过滤（模糊查询） + if (!string.IsNullOrEmpty(filter.ProjectCode)) + { + query = query.Where(x => x.ProjectCode.Contains(filter.ProjectCode)); + } // 人员ID过滤 if (!string.IsNullOrEmpty(filter.PersonId)) { @@ -384,6 +388,7 @@ namespace BLL IdentityCard = x.IdentityCard, ProjectId = x.ProjectId, ProjectName = x.ProjectName, + ProjectCode= x.ProjectCode, UnitId = x.UnitId, UnitName = x.UnitName, TeamGroupName = x.TeamGroupName, @@ -1112,14 +1117,17 @@ namespace BLL var query = from x in db.SitePerson_PersonInOut join y in db.SitePerson_Person on x.PersonId equals y.PersonId join z in db.Base_Project on x.ProjectId equals z.ProjectId - where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime && z.ProjectName.Contains(filter.ProjectName) + where x.ChangeTime >= filter.StartTime && x.ChangeTime <= filter.EndTime select new Model.PersonInOutItem { PersonId = x.PersonId, PersonName = y.PersonName, ProjectId = x.ProjectId, + ProjectCode=z.ProjectCode, + ProjectName=z.ProjectName, UnitId = y.UnitId, UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName, + IdentityCard=x.IdentityCard, WorkPostId = y.WorkPostId, WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName, IsIn = x.IsIn, @@ -1130,13 +1138,18 @@ namespace BLL // 添加过滤条件 if (filter != null) - { + { + // 单位名称过滤（模糊查询） if (!string.IsNullOrEmpty(filter.UnitName)) { query = query.Where(x => x.UnitName.Contains(filter.UnitName)); } - + // 项目代号过滤（模糊查询） + if (!string.IsNullOrEmpty(filter.ProjectCode)) + { + query = query.Where(x => x.ProjectCode.Contains(filter.ProjectCode)); + } // 人员姓名过滤（模糊查询） if (!string.IsNullOrEmpty(filter.PersonName)) { diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index e18e1ef9..a94b7f11 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -406,6 +406,7 @@ + diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index b3c4aa53..85306403 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -12,12 +12,12 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - string PipeArea = WarehouseCode == "工厂预制" ? "1" : "2"; + string WarehouseId = Base_WarehouseService.GetWarehouseList(projectid).Where(x => x.WarehouseName == WarehouseCode).Select(x => x.WarehouseId).FirstOrDefault(); ///所需材料数量列表 var NeedOutMateriaList = from x in db.HJGL_PipeLineMat join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId - where z.ProjectId == projectid && (string.IsNullOrEmpty(materialCode) || x.MaterialCode.Contains(materialCode)) && z.PipeArea == PipeArea + where z.ProjectId == projectid && (string.IsNullOrEmpty(materialCode) || x.MaterialCode.Contains(materialCode)) && z.WarehouseId == WarehouseId group x by x.MaterialCode into g select new diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index 50a2f7df..39b09813 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -1,5 +1,6 @@ using EmitMapper; using FineUIPro; +using Microsoft.SqlServer.Dts.Runtime; using MiniExcelLibs; using Model; using System; @@ -264,7 +265,7 @@ namespace BLL string errorWarehouseCode = ""; foreach (var item in warehouseCodeList) { - if (!DropListService.HJGL_WarehouseCode().Select(x => x.Value == item).Any()) + if (!Base_WarehouseService.GetWarehouseList(projectid).Select(x => x.WarehouseName == item).Any()) { errorWarehouseCode += item + ","; } @@ -605,7 +606,11 @@ namespace BLL return cusBillCode; } - + public static Dictionary GetWarehouseCode(string projectId) + { + var q = Base_WarehouseService.GetWarehouseList(projectId).Distinct().ToDictionary(x => x.WarehouseName, x => x.WarehouseName); + return q; + } public static string GetDataInCusBillCode(string projectid, string unitcode, string typeString, string unitWorkCode = "", string Category = "") { if (typeString == TwConst.TypeInt.其他入库.ToString()) diff --git a/SGGL/BLL/CLGL/TwInputmasterService.cs b/SGGL/BLL/CLGL/TwInputmasterService.cs index 7f2d06eb..261f6d61 100644 --- a/SGGL/BLL/CLGL/TwInputmasterService.cs +++ b/SGGL/BLL/CLGL/TwInputmasterService.cs @@ -241,7 +241,7 @@ namespace BLL if (plan == null || plan.State != (int)TwConst.State.已审核) { return; - } + } //判断是否已经生成过入库单 var queryIsExitInMaster = new Tw_InOutMasterOutput(); queryIsExitInMaster.InOutPlanMasterId = planId; diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 69c18f9f..70637d27 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2809,6 +2809,11 @@ namespace BLL /// public const string HJGL_ComponentsMenuId = "8IDKGJE2-09B1-4607-BC6D-865CE48F0009"; + /// + /// 材料仓库 + /// + public const string HJGL_WarehouseMenuId = "2F027233-22EC-4063-A04F-FB9FE6A91588"; + /// /// 探伤类型 /// diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_WarehouseService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_WarehouseService.cs new file mode 100644 index 00000000..f3eec28a --- /dev/null +++ b/SGGL/BLL/HJGL/BaseInfo/Base_WarehouseService.cs @@ -0,0 +1,109 @@ +namespace BLL +{ + using Model; + using System.Collections.Generic; + using System.Linq; + + public static class Base_WarehouseService + { + /// + /// 根据仓库ID获取仓库信息 + /// + /// 仓库ID + /// 仓库实体 + public static Model.Base_Warehouse GetWarehouseByWarehouseId(string warehouseId) + { + return Funs.DB.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouseId); + } + + /// + /// 新增仓库信息 + /// + /// 仓库实体 + public static void AddWarehouse(Model.Base_Warehouse warehouse) + { + Model.SGGLDB db = Funs.DB; + Model.Base_Warehouse newWarehouse = new Base_Warehouse + { + WarehouseId = warehouse.WarehouseId, + WarehouseName = warehouse.WarehouseName, + Remark = warehouse.Remark, + ProjectId = warehouse.ProjectId, + CreateUserId = warehouse.CreateUserId, + CreateTime = warehouse.CreateTime, + ModifyUserId = warehouse.ModifyUserId, + ModifyTime = warehouse.ModifyTime, + }; + db.Base_Warehouse.InsertOnSubmit(newWarehouse); + db.SubmitChanges(); + } + + /// + /// 更新仓库信息 + /// + /// 仓库实体 + public static void UpdateWarehouse(Model.Base_Warehouse warehouse) + { + Model.SGGLDB db = Funs.DB; + Model.Base_Warehouse newWarehouse = db.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouse.WarehouseId); + if (newWarehouse != null) + { + newWarehouse.WarehouseName = warehouse.WarehouseName; + newWarehouse.Remark = warehouse.Remark; + newWarehouse.ProjectId = warehouse.ProjectId; + newWarehouse.ModifyUserId = warehouse.ModifyUserId; + newWarehouse.ModifyTime = warehouse.ModifyTime; + db.SubmitChanges(); + } + } + + /// + /// 根据仓库ID删除仓库信息 + /// + /// 仓库ID + public static void DeleteWarehouseByWarehouseId(string warehouseId) + { + Model.SGGLDB db = Funs.DB; + Model.Base_Warehouse delWarehouse = db.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouseId); + if (delWarehouse != null) + { + db.Base_Warehouse.DeleteOnSubmit(delWarehouse); + db.SubmitChanges(); + } + } + + /// + /// 获取项目下所有仓库列表 + /// + /// 项目ID + /// 仓库列表 + public static List GetWarehouseList(string projectId) + { + var list = (from x in Funs.DB.Base_Warehouse + where x.ProjectId == projectId + orderby x.WarehouseName + select x).ToList(); + + return list; + } + + /// + /// 初始化仓库下拉框 + /// + /// 下拉框控件 + /// 项目ID + /// 是否显示"请选择" + /// "请选择"项的文本 + public static void InitWarehouseDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease, string itemText) + { + dropName.DataValueField = "WarehouseId"; + dropName.DataTextField = "WarehouseName"; + dropName.DataSource = GetWarehouseList(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName, itemText); + } + } + } +} diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 3f21f363..5c3ce0dd 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -118,7 +118,8 @@ namespace BLL SubmitMan = weldJoint.SubmitMan, TwoJointType = weldJoint.TwoJointType, CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId, - BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId + BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId, + WeldJointPoint = weldJoint.WeldJointPoint }; if (!string.IsNullOrEmpty(weldJoint.WeldJointId)) { @@ -189,6 +190,7 @@ namespace BLL newWeldJoint.TwoJointType = weldJoint.TwoJointType; newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId; newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId; + newWeldJoint.WeldJointPoint = weldJoint.WeldJointPoint; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs index 72a06a07..8a93f70d 100644 --- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs @@ -20,9 +20,9 @@ namespace FineUIPro.Web.CLGL { if (!IsPostBack) { - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); // 绑定表格 diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs index c05eeae2..a2455755 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs @@ -71,9 +71,9 @@ namespace FineUIPro.Web.CLGL private void InitDrpList() { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); Funs.FineUIPleaseSelect(this.drpWarehouse); drpTypeInt.DataTextField = "Key"; diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx index bde8c373..5959a00d 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx @@ -22,7 +22,7 @@ - <%-- + /// 保存计划明细项的实收数量 + /// + private void SavePlanDetail(string InOutPlanMasterId) + { + JArray teamGroupData = Grid1.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + string detailId = teamGroupRow.Value("id"); + decimal actNum = values.Value("ActNum"); + + var detail = TwInOutplandetailService.GetById(detailId); + if (detail != null) + { + detail.ActNum = actNum; + TwInOutplandetailService.Update(detail); + } + } + } protected void btnEditProcess_Click(object sender, EventArgs e) { throw new NotImplementedException(); @@ -87,7 +109,14 @@ namespace FineUIPro.Web.CLGL protected void btnSave_Click(object sender, EventArgs e) { var model = TwInOutplanmasterService.GetById(Id); - if (model == null) return; + if (model == null) return; + if (model.State == (int)TwConst.State.待审核) + { + SavePlanDetail(Id); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + return; + } model.WarehouseMan = this.CurrUser.PersonId; model.WarehouseDate = DateTime.Now; TwInOutplanmasterService.Update(model); diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs index db704057..030755e4 100644 --- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs @@ -30,9 +30,9 @@ namespace FineUIPro.Web.CLGL private void InitDrpList() { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); Funs.FineUIPleaseSelect(this.drpWarehouse); drpTypeInt.DataTextField = "Key"; diff --git a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs index 0b33b7e8..841f2295 100644 --- a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs @@ -12,9 +12,9 @@ namespace FineUIPro.Web.CLGL if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); Funs.FineUIPleaseSelect(this.drpWarehouse); // 绑定表格 diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs index 1ceb6917..a60ac02c 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs @@ -28,9 +28,9 @@ namespace FineUIPro.Web.CLGL private void InitDrpList() { - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); Funs.FineUIPleaseSelect(this.drpWarehouse); drpTypeInt.DataTextField = "Key"; diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs index 2b3543c6..44ac50eb 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs @@ -85,9 +85,9 @@ namespace FineUIPro.Web.CLGL private void InitDrpList() { - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); string[] typeIntArr = { TwConst.TypeInt.散件出库.ToString(), TwConst.TypeInt.其他出库.ToString() }; diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs index e85d6dfa..0b2a3193 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs @@ -32,9 +32,9 @@ namespace FineUIPro.Web.CLGL private void InitDrpList() { - drpWarehouse.DataTextField = "Text"; + drpWarehouse.DataTextField = "Key"; drpWarehouse.DataValueField = "Value"; - drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); drpWarehouse.DataBind(); Funs.FineUIPleaseSelect(this.drpWarehouse); drpTypeInt.DataTextField = "Key"; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx index d4711140..67cfb9b7 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 78648b9e..d3b307a5 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1521,6 +1521,9 @@ + + + @@ -10363,6 +10366,27 @@ TestMediumView.aspx + + Warehouse.aspx + ASPXCodeBehind + + + Warehouse.aspx + + + WarehouseEdit.aspx + ASPXCodeBehind + + + WarehouseEdit.aspx + + + WarehouseView.aspx + ASPXCodeBehind + + + WarehouseView.aspx + Weld.aspx ASPXCodeBehind @@ -16982,7 +17006,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx new file mode 100644 index 00000000..9a0538c7 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx @@ -0,0 +1,99 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Warehouse.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.Warehouse" %> + + + + + 材料仓库 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.cs new file mode 100644 index 00000000..9f212071 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.cs @@ -0,0 +1,274 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; + +namespace FineUIPro.Web.HJGL.BaseInfo +{ + public partial class Warehouse : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + } + } + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT WarehouseId,WarehouseName,Remark" + + @" FROM dbo.Base_Warehouse WHERE 1=1 "; + List listStr = new List(); + strSql += " AND ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + if (!string.IsNullOrEmpty(this.txtWarehouseName.Text.Trim())) + { + strSql += " AND WarehouseName LIKE @WarehouseName"; + listStr.Add(new SqlParameter("@WarehouseName", "%" + this.txtWarehouseName.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtRemark.Text.Trim())) + { + strSql += " AND Remark LIKE @Remark"; + listStr.Add(new SqlParameter("@Remark", "%" + this.txtRemark.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + #endregion + + #region 增加按钮事件 + /// + /// 增加按钮事件 + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (GetButtonPower(Const.BtnAdd)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseEdit.aspx", "新增 - "))); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 编辑 + /// + /// 双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + this.EditData(); + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + this.EditData(); + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + + // 双击事件 编辑权限有：编辑页面，无：查看页面 + if (GetButtonPower(Const.BtnModify)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseEdit.aspx?WarehouseId={0}", Grid1.SelectedRowID, "编辑 - "))); + } + else if (GetButtonPower(Const.BtnSee)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseView.aspx?WarehouseId={0}", Grid1.SelectedRowID, "查看 - "))); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 删除 + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (GetButtonPower(Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + string strShowNotify = string.Empty; + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var getWarehouse = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(rowID); + if (getWarehouse != null) + { + string cont = judgementDelete(rowID); + if (string.IsNullOrEmpty(cont)) + { + BLL.Base_WarehouseService.DeleteWarehouseByWarehouseId(rowID); + } + else + { + strShowNotify += "材料仓库" + ":" + getWarehouse.WarehouseName + cont; + } + } + } + + BindGrid(); + if (!string.IsNullOrEmpty(strShowNotify)) + { + Alert.ShowInTop(strShowNotify, MessageBoxIcon.Warning); + } + else + { + ShowNotify("删除成功！", MessageBoxIcon.Success); + } + } + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + + #region 判断是否可删除 + /// + /// 判断是否可以删除 + /// + /// + private string judgementDelete(string id) + { + string content = string.Empty; + // 检查是否有关联的管线 + if (Funs.DB.HJGL_Pipeline.FirstOrDefault(x => x.WarehouseId == id) != null) + { + content += "已在【管线信息】中使用，不能删除！"; + } + + return content; + } + #endregion + #endregion + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void btnQuery_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 查看按钮 + /// + /// 查看按钮 + /// + /// + /// + protected void btnView_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseView.aspx?WarehouseId={0}", Grid1.SelectedRowID, "查看 - "))); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private bool GetButtonPower(string button) + { + return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WarehouseMenuId, button); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.designer.cs new file mode 100644 index 00000000..fbe565c7 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.designer.cs @@ -0,0 +1,179 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.BaseInfo +{ + + + public partial class Warehouse + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtWarehouseName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWarehouseName; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + + /// + /// btnView 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnView; + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx new file mode 100644 index 00000000..71263566 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx @@ -0,0 +1,46 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WarehouseEdit.aspx.cs" + Inherits="FineUIPro.Web.HJGL.BaseInfo.WarehouseEdit" %> + + + + + 编辑材料仓库 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.cs new file mode 100644 index 00000000..448e619e --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.cs @@ -0,0 +1,100 @@ +using BLL; +using System; +using System.Linq; + +namespace FineUIPro.Web.HJGL.BaseInfo +{ + public partial class WarehouseEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + public string WarehouseId + { + get + { + return (string)ViewState["WarehouseId"]; + } + set + { + ViewState["WarehouseId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.txtWarehouseName.Focus(); + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.WarehouseId = Request.Params["WarehouseId"]; + if (!string.IsNullOrEmpty(this.WarehouseId)) + { + Model.Base_Warehouse warehouse = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(this.WarehouseId); + if (warehouse != null) + { + this.txtWarehouseName.Text = warehouse.WarehouseName; + this.txtRemark.Text = warehouse.Remark; + } + } + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + // 唯一性检查：仓库名称在项目内不能重复 + var q = Funs.DB.Base_Warehouse.FirstOrDefault(x => x.WarehouseName == this.txtWarehouseName.Text.Trim() + && (x.WarehouseId != this.WarehouseId || (this.WarehouseId == null && x.WarehouseId != null)) + && x.ProjectId == this.CurrUser.LoginProjectId); + if (q != null) + { + Alert.ShowInTop("此仓库名称已存在！", MessageBoxIcon.Warning); + return; + } + + Model.Base_Warehouse newWarehouse = new Model.Base_Warehouse + { + WarehouseName = this.txtWarehouseName.Text.Trim(), + Remark = this.txtRemark.Text.Trim(), + ProjectId = this.CurrUser.LoginProjectId, + ModifyUserId = this.CurrUser.PersonId, + ModifyTime = DateTime.Now + }; + + if (!string.IsNullOrEmpty(this.WarehouseId)) + { + // 更新 + newWarehouse.WarehouseId = this.WarehouseId; + BLL.Base_WarehouseService.UpdateWarehouse(newWarehouse); + } + else + { + // 新增 + this.WarehouseId = SQLHelper.GetNewID(typeof(Model.Base_Warehouse)); + newWarehouse.WarehouseId = this.WarehouseId; + newWarehouse.CreateUserId = this.CurrUser.PersonId; + newWarehouse.CreateTime = DateTime.Now; + BLL.Base_WarehouseService.AddWarehouse(newWarehouse); + } + + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.designer.cs new file mode 100644 index 00000000..22e64deb --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.designer.cs @@ -0,0 +1,87 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.BaseInfo { + + + public partial class WarehouseEdit { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtWarehouseName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWarehouseName; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx new file mode 100644 index 00000000..76eeec8d --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx @@ -0,0 +1,43 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WarehouseView.aspx.cs" + Inherits="FineUIPro.Web.HJGL.BaseInfo.WarehouseView" %> + + + + + 查看材料仓库 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.cs new file mode 100644 index 00000000..be6dd10a --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.cs @@ -0,0 +1,50 @@ +using BLL; +using System; + +namespace FineUIPro.Web.HJGL.BaseInfo +{ + public partial class WarehouseView : PageBase + { + #region 定义项 + /// + /// 主键 + /// + public string WarehouseId + { + get + { + return (string)ViewState["WarehouseId"]; + } + set + { + ViewState["WarehouseId"] = value; + } + } + #endregion + + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.WarehouseId = Request.Params["WarehouseId"]; + if (!string.IsNullOrEmpty(this.WarehouseId)) + { + Model.Base_Warehouse warehouse = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(this.WarehouseId); + if (warehouse != null) + { + this.txtWarehouseName.Text = warehouse.WarehouseName; + this.txtRemark.Text = warehouse.Remark; + } + } + } + } + #endregion + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.designer.cs new file mode 100644 index 00000000..f173e7f4 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.BaseInfo { + + + public partial class WarehouseView { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtWarehouseName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWarehouseName; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx index adbddc4b..ddca91a0 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx @@ -62,6 +62,11 @@ + + + + @@ -83,11 +88,13 @@ EmptyText="输入查询条件" Hidden="true" Width="180px" LabelWidth="80px" LabelAlign="Right"> - - + + - + @@ -125,6 +132,14 @@ + + + + <%-- diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index d73c73fe..b437bdec 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -53,6 +53,15 @@ namespace FineUIPro.Web.HJGL.PreDesign this.InitTreeMenu();//加载树 PipelineComplete = 0; PipelineNOComplete = 0; + + // 初始化仓库下拉框 + Base_WarehouseService.InitWarehouseDropDownList(this.ddlWarehouse, this.CurrUser.LoginProjectId, true, "-请选择-"); + + // 初始化流水段下拉框 + this.InitFlowingSectionDropDownList(); + + // 初始化管线划分下拉框 + this.InitPipeAreaDropDownList(); } } @@ -150,6 +159,7 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { + InitFlowingSectionDropDownList(); this.BindGrid(); // var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP); // if (q.Any()) @@ -190,13 +200,26 @@ namespace FineUIPro.Web.HJGL.PreDesign view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim(); // view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim(); var list = BLL.PipelineService.GetHJGL_PipelineList(view_HJGL_Pipeline); - if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim())) +/* if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim())) { list = (from x in list join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId where y.MaterialCode.Contains(txtMaterialCode.Text.Trim()) select x).Distinct().ToList(); + }*/ + + // 流水段查询 + if ( this.ddlFlowingSection.SelectedValue != Const._Null) + { + list = list.Where(x => x.FlowingSection == this.ddlFlowingSection.SelectedValue).ToList(); } + + // 管线划分查询 + if (this.ddlPipeArea.SelectedValue!=Const._Null) + { + list = list.Where(x => x.PipeArea == this.ddlPipeArea.SelectedValue).ToList(); + } + view_HJGL_Pipelines = list; // 2.获取当前分页数据 Grid1.RecordCount = list.Count(); @@ -205,8 +228,23 @@ namespace FineUIPro.Web.HJGL.PreDesign // 3.绑定到Grid + // 获取仓库名称 + var warehouseList = Base_WarehouseService.GetWarehouseList(this.CurrUser.LoginProjectId); + var listWithWarehouse = (from x in list + join y in warehouseList on x.WarehouseId equals y.WarehouseId into temp + from z in temp.DefaultIfEmpty() + select new + { + x.PipelineId, + x.PipelineCode, + x.FlowingSection, + x.PipeArea, + x.UnitWorkId, + x.ProjectId, + WarehouseName = z != null ? z.WarehouseName : "" + }).ToList(); - var table = this.GetPagedDataTable(Grid1, list); + var table = this.GetPagedDataTable(Grid1, listWithWarehouse); Grid1.DataSource = table; Grid1.DataBind(); //lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID); @@ -364,11 +402,47 @@ namespace FineUIPro.Web.HJGL.PreDesign BindGrid(); } + /// + /// 仓库设置按钮 + /// + protected void btnSetWarehouse_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + + string warehouseId = this.ddlWarehouse.SelectedValue; + if (string.IsNullOrEmpty(warehouseId)) + { + Alert.ShowInTop("请选择仓库！", MessageBoxIcon.Warning); + return; + } + + // 批量更新 + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var pipeline = PipelineService.GetPipelineByPipelineId(rowID); + if (pipeline != null) + { + pipeline.WarehouseId = warehouseId; + PipelineService.UpdatePipeline(pipeline); + } + } + + BindGrid(); + ShowNotify("批量设置仓库成功！", MessageBoxIcon.Success); + } + protected void btnRset_Click(object sender, EventArgs e) { txtPipelineCode.Text = String.Empty; txtSingleName.Text = String.Empty; - txtMaterialCode.Text = String.Empty; + //txtMaterialCode.Text = String.Empty; + ddlFlowingSection.SelectedValue = Const._Null; + ddlPipeArea.SelectedValue = String.Empty; BindGrid(); } @@ -392,6 +466,50 @@ namespace FineUIPro.Web.HJGL.PreDesign } return PipeAreaValue; } + + #region 初始化下拉框 + /// + /// 初始化流水段下拉框 + /// + private void InitFlowingSectionDropDownList() + { + var baseQuery = from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId + select new { + x.FlowingSection , + x.UnitWorkId + }; + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + { + baseQuery = baseQuery.Where(x => x.UnitWorkId == tvControlItem.SelectedNodeID); + } + var flowingSections = baseQuery.Select(x=>x.FlowingSection).Distinct().OrderBy(x => x).ToList(); + this.ddlFlowingSection.DataValueField = "FlowingSection"; + this.ddlFlowingSection.DataTextField = "FlowingSection"; + this.ddlFlowingSection.DataSource = flowingSections.Select(x => new { FlowingSection = x }).ToList(); + this.ddlFlowingSection.DataBind(); + Funs.FineUIPleaseSelect(this.ddlFlowingSection, "-请选择-"); + ddlFlowingSection.SelectedValue = Const._Null; + } + + /// + /// 初始化管线划分下拉框 + /// + private void InitPipeAreaDropDownList() + { + List pipeAreaList = new List(); + pipeAreaList.Add(new System.Web.UI.WebControls.ListItem("工厂预制", PipelineService.PipeArea_SHOP)); + pipeAreaList.Add(new System.Web.UI.WebControls.ListItem("现场施工", PipelineService.PipeArea_FIELD)); + + this.ddlPipeArea.DataValueField = "Value"; + this.ddlPipeArea.DataTextField = "Text"; + this.ddlPipeArea.DataSource = pipeAreaList; + this.ddlPipeArea.DataBind(); + Funs.FineUIPleaseSelect(this.ddlPipeArea, "-请选择-"); + + } + #endregion + /// /// 获取图纸预制率（工厂预制管线的预制达因/工厂预制管线的总达因） /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs index 203e23d1..3a90fb88 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs @@ -140,6 +140,24 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.Label lbSinglePreRate; + /// + /// ddlWarehouse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlWarehouse; + + /// + /// btnSetWarehouse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSetWarehouse; + /// /// btnSetShop 控件。 /// @@ -195,13 +213,22 @@ namespace FineUIPro.Web.HJGL.PreDesign protected global::FineUIPro.TextBox txtSingleName; /// - /// txtMaterialCode 控件。 + /// ddlFlowingSection 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtMaterialCode; + protected global::FineUIPro.DropDownList ddlFlowingSection; + + /// + /// ddlPipeArea 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPipeArea; /// /// btnQuery 控件。 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 7e52491b..1cbd2ad9 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -730,6 +730,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } + // 读取焊点坐标（AE列） + string col29 = Convert.ToString(pds[i].AE); + if (!string.IsNullOrEmpty(col29)) + { + pipeline.WeldJointPoint = col29; + } + if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode)) { pipeline.ProjectId = this.CurrUser.LoginProjectId; @@ -1039,6 +1046,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage JointAttribute = x.JointAttribute, ProjectId = this.CurrUser.LoginProjectId, IsHotProess = x.IsHotProess, + WeldJointPoint = x.WeldJointPoint, }).DistinctBy(temp => new { temp.WeldJointCode, @@ -1054,7 +1062,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage temp.DetectionTypeId, temp.JointAttribute, temp.ProjectId, - temp.IsHotProess + temp.IsHotProess, + temp.WeldJointPoint }).ToList(); var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList(); @@ -1076,6 +1085,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage weldJoint.JointAttribute = weldJoints[i].JointAttribute; weldJoint.ProjectId = weldJoints[i].ProjectId; weldJoint.IsHotProess = weldJoints[i].IsHotProess; + weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint; var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode); if (isExistJot != null) // 更新焊口 @@ -1093,36 +1103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage if (weldJoints_add.Count > 0) { BLL.WeldJointService.AddBulkWeldJoint(weldJoints_add); - } - Model.SGGLDB db2 = Funs.DB; - List delJoints = new List(); - var allWeldJoints2 = from x in db2.HJGL_WeldJoint - join y in db2.HJGL_Pipeline on x.PipelineId equals y.PipelineId - where y.UnitWorkId == Request.Params["UnitWorkId"] - select x; - foreach (var pipelineCode in pipelineCodes) - { - var pipelineWeldJointCodes = weldJoints.Where(x => x.PipelineCode == pipelineCode).Select(x => x.WeldJointCode).ToList(); - var q = allWeldJoints2.Where(x => x.PipelineCode == pipelineCode && !pipelineWeldJointCodes.Contains(x.WeldJointCode)).ToList(); - delJoints.AddRange(q); - } - if (delJoints.Count() > 0) - { - try - { - db2.HJGL_WeldJoint.DeleteAllOnSubmit(delJoints); - db2.SubmitChanges(); - } - catch (Exception) - { - string weldJointCodes = string.Empty; - foreach (var item in delJoints) - { - weldJointCodes += item.WeldJointCode + ","; - } - Alert.ShowInParent(weldJointCodes, MessageBoxIcon.Warning); - } - } + } } //public void AddView_HJGL_WeldJoint(List PipelineList) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx index 7c25b792..a497b446 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx @@ -294,6 +294,10 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 310f02df..7940da7f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -328,7 +328,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode, Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode, WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode, - BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark + BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL "; List listStr = new List { }; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx index be578e6c..08f8d3d3 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx @@ -33,8 +33,9 @@ .f-grid-row.green { background-color: green; } + .f-grid-row { - font-size:smaller; + font-size: smaller; } @@ -50,6 +51,13 @@ IconFont="ArrowCircleLeft"> + + + + + + @@ -57,17 +65,18 @@ - - - + + + + + runat="server" LabelWidth="80px" + Width="180px" LabelAlign="Left"> - + - + @@ -84,14 +93,14 @@ + BodyPadding="10px" AutoScroll="true"> @@ -99,12 +108,12 @@ - + - - + - + @@ -141,7 +150,7 @@ + SortField="PipelineId" SortDirection="ASC" EnableCheckBoxSelect="true"> + SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort"> dicSeclectPipeLine = new Dictionary(); - //public static List tw_PipeMatMatchOutputs ; public static decimal Rate = 0; - public string WarehouseCode + public string WarehouseId { get { - return (string)ViewState["WarehouseCode"]; + return (string)ViewState["WarehouseId"]; } set { - ViewState["WarehouseCode"] = value; + ViewState["WarehouseId"] = value; } } public string PipeArea @@ -79,15 +78,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage { tw_PipeMatMatchOutputs = new List(); PipeArea = Request.Params["PipeArea"]; - if (PipeArea == "2") - { - WarehouseCode = "现场安装"; - } - else - { - WarehouseCode = "工厂预制"; - } - HJGL_MaterialService.materialStockItems_FIELD = new List(); + drpWarehouse.DataTextField = "Key"; + drpWarehouse.DataValueField = "Value"; + drpWarehouse.DataSource = BLL.TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId); + drpWarehouse.DataBind(); + drpWarehouse_SelectedIndexChanged(null, null); +; HJGL_MaterialService.materialStockItems_FIELD = new List(); HJGL_MaterialService.materialStockItems_SHOP = new List(); dicSeclectPipeLine = new Dictionary(); var pipeline = (from x in Funs.DB.HJGL_Pipeline @@ -159,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea && x.WarehouseId == WarehouseId select x).Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -182,7 +178,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count(); + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea && x.WarehouseId == WarehouseId select x).Count(); // var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(q.UnitWorkId); //int a = NowComPipelineCode.Count(); var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId); @@ -221,14 +217,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage //} var CompleteInOutPlanDetail_RelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id - where y.State == (int)TwConst.State.已完成 && y.WarehouseCode == WarehouseCode + where y.State == (int)TwConst.State.已完成 && y.WarehouseCode == drpWarehouse.SelectedValue select x; var pipeline = (from x in Funs.DB.HJGL_Pipeline join y in CompleteInOutPlanDetail_RelationList on x.PipelineId equals y.PipelineId into temp from y in temp.DefaultIfEmpty() where y == null && x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID - && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) + && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) && x.WarehouseId==WarehouseId orderby x.PipelineCode select x).ToList(); if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null) @@ -396,7 +392,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage var model2 = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(model)); string pipeid = model2.First().Value; - var relationModle = TwInoutplandetailRelationService.GetByPipelineId(pipeid, WarehouseCode); + var relationModle = TwInoutplandetailRelationService.GetByPipelineId(pipeid, drpWarehouse.SelectedValue); if (relationModle != null) { Grid3.Rows[i].RowCssClass = "yellow"; @@ -499,7 +495,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); var pipeline = (from x in Funs.DB.HJGL_Pipeline - where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == tvControlItem.SelectedNodeID && x.PipeArea == PipeArea + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == tvControlItem.SelectedNodeID && x.PipeArea == PipeArea && x.WarehouseId == WarehouseId orderby x.PipelineCode select x).ToList(); List pipelineList = new List(); @@ -570,7 +566,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage dicSeclectPipeLine.Add(node.NodeID, node.Text); } } - tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), WarehouseCode); + tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), drpWarehouse.SelectedValue); BindGrid3(); BindGrid2(); @@ -587,7 +583,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage node.Checked = false; } - tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), WarehouseCode); + tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), drpWarehouse.SelectedValue); BindGrid3(); BindGrid2(); @@ -765,8 +761,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage return isCover; } + #endregion - + protected void drpWarehouse_SelectedIndexChanged(object sender, EventArgs e) + { + WarehouseId = Base_WarehouseService.GetWarehouseList(this.CurrUser.LoginProjectId).Where(x => x.WarehouseName == drpWarehouse.SelectedValue).Select(x => x.WarehouseId).FirstOrDefault(); + this.InitTreeMenu();//加载树 + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs index 525a976f..943a5341 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs @@ -59,6 +59,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// drpWarehouse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWarehouse; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + /// /// txtPipelineCode 控件。 /// @@ -78,13 +96,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage protected global::FineUIPro.HiddenField hdUnitWorkId; /// - /// Toolbar5 控件。 + /// Toolbar6 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar5; + protected global::FineUIPro.Toolbar Toolbar6; /// /// drpFlowingSection 控件。 @@ -96,13 +114,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage protected global::FineUIPro.DropDownList drpFlowingSection; /// - /// Toolbar2 控件。 + /// Toolbar5 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar2; + protected global::FineUIPro.Toolbar Toolbar5; /// /// btnTreeFind 控件。 diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs index b7d74af7..9f13d345 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanReviewEdit.aspx.cs @@ -67,8 +67,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(Approval_Construction, null, CurrUser.UnitId, Const.ConstructionLabor, false); DropConstructionManager.Label = "现场执行经理"; - Approval_Construction.Label = "劳务管理组"; - DropProjectManager.Label = "运营管理部"; + Approval_Construction.Label = "主办部门负责人"; + DropProjectManager.Label = "项目经理"; } #endregion diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs index f3f65ca8..237826fc 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs @@ -629,10 +629,10 @@ namespace FineUIPro.Web.Person /// protected void drpRole_SelectedIndexChanged(object sender, EventArgs e) { - if (this.drpRole.SelectedItemArray.Count() > 4) + if (this.drpRole.SelectedItemArray.Count() > 5) { this.drpRole.SelectedValueArray = null; - Alert.ShowInParent("最多可选择4个角色！", MessageBoxIcon.Warning); + Alert.ShowInParent("最多可选择5个角色！", MessageBoxIcon.Warning); } else { 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_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index c6acad79..f99c41df 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -4,6 +4,7 @@ + @@ -13,12 +14,12 @@ + - - - + + @@ -27,7 +28,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 95eeab91..129ab5fd 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -1,8 +1,8 @@  - - - + + + 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 56efca63..53b0bd32 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -4,10 +4,10 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 8398186c..403b874b 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -58,49 +58,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs b/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs index f9f5e72a..32967e74 100644 --- a/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs +++ b/SGGL/Model/APIItem/HSSE/PersonInOutItem.cs @@ -86,6 +86,20 @@ namespace Model get; set; } /// + /// 项目代号 + /// + public string ProjectCode + { + get; set; + } + /// + /// 项目名称 + /// + public string ProjectName + { + get; set; + } + /// /// 单位ID /// public string UnitId diff --git a/SGGL/Model/HSSE/PersonInOutRecordInput.cs b/SGGL/Model/HSSE/PersonInOutRecordInput.cs index 12287848..6fe92770 100644 --- a/SGGL/Model/HSSE/PersonInOutRecordInput.cs +++ b/SGGL/Model/HSSE/PersonInOutRecordInput.cs @@ -10,11 +10,11 @@ namespace Model /// 人员出入记录入参 /// public class PersonInOutRecordInput - { + { /// - /// 项目名称 + /// 项目代号 /// - public string ProjectName { get; set; } + public string ProjectCode { get; set; } /// /// 单位名称 /// diff --git a/SGGL/Model/HSSE/ProjectPersonInput.cs b/SGGL/Model/HSSE/ProjectPersonInput.cs index e594b832..3b9bae68 100644 --- a/SGGL/Model/HSSE/ProjectPersonInput.cs +++ b/SGGL/Model/HSSE/ProjectPersonInput.cs @@ -40,6 +40,10 @@ namespace Model /// public string ProjectName { get; set; } /// + /// 项目代号 + /// + public string ProjectCode { get; set; } + /// /// 单位名称 /// public string UnitName { get; set; } diff --git a/SGGL/Model/HSSE/ProjectPersonOutput.cs b/SGGL/Model/HSSE/ProjectPersonOutput.cs index b0fb4ebd..91142e9a 100644 --- a/SGGL/Model/HSSE/ProjectPersonOutput.cs +++ b/SGGL/Model/HSSE/ProjectPersonOutput.cs @@ -42,6 +42,10 @@ namespace Model /// public string ProjectName { get; set; } /// + /// 项目代号 + /// + public string ProjectCode { get; set; } + /// /// 单位ID /// public string UnitId { get; set; } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 6759edb4..35da2fe6 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -266,6 +266,9 @@ namespace Model partial void InsertBase_UnitType(Base_UnitType instance); partial void UpdateBase_UnitType(Base_UnitType instance); partial void DeleteBase_UnitType(Base_UnitType instance); + partial void InsertBase_Warehouse(Base_Warehouse instance); + partial void UpdateBase_Warehouse(Base_Warehouse instance); + partial void DeleteBase_Warehouse(Base_Warehouse instance); partial void InsertBase_WeldingLocation(Base_WeldingLocation instance); partial void UpdateBase_WeldingLocation(Base_WeldingLocation instance); partial void DeleteBase_WeldingLocation(Base_WeldingLocation instance); @@ -2583,6 +2586,14 @@ namespace Model } } + public System.Data.Linq.Table Base_Warehouse + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Base_WeldingLocation { get @@ -12409,7 +12420,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] public string ApproveIdea { get @@ -22588,6 +22599,8 @@ namespace Model private string _UnitId; + private string _ProjectId; + private string _MaterialId; private string _ColorName; @@ -22598,8 +22611,6 @@ namespace Model private string _Remark; - private string _ProjectId; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22608,6 +22619,8 @@ namespace Model partial void OnMaterialColorIdChanged(); partial void OnUnitIdChanging(string value); partial void OnUnitIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); partial void OnMaterialIdChanging(string value); partial void OnMaterialIdChanged(); partial void OnColorNameChanging(string value); @@ -22618,8 +22631,6 @@ namespace Model partial void OnRGBChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); - partial void OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); #endregion public Base_MaterialColor() @@ -22667,6 +22678,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50)")] public string MaterialId { @@ -22767,26 +22798,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] - public string ProjectId - { - get - { - return this._ProjectId; - } - set - { - if ((this._ProjectId != value)) - { - this.OnProjectIdChanging(value); - this.SendPropertyChanging(); - this._ProjectId = value; - this.SendPropertyChanged("ProjectId"); - this.OnProjectIdChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -38909,6 +38920,236 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Warehouse")] + public partial class Base_Warehouse : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _WarehouseId; + + private string _WarehouseName; + + private string _Remark; + + private string _ProjectId; + + private string _CreateUserId; + + private System.Nullable _CreateTime; + + private string _ModifyUserId; + + private System.Nullable _ModifyTime; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnWarehouseIdChanging(string value); + partial void OnWarehouseIdChanged(); + partial void OnWarehouseNameChanging(string value); + partial void OnWarehouseNameChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnCreateUserIdChanging(string value); + partial void OnCreateUserIdChanged(); + partial void OnCreateTimeChanging(System.Nullable value); + partial void OnCreateTimeChanged(); + partial void OnModifyUserIdChanging(string value); + partial void OnModifyUserIdChanged(); + partial void OnModifyTimeChanging(System.Nullable value); + partial void OnModifyTimeChanged(); + #endregion + + public Base_Warehouse() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string WarehouseId + { + get + { + return this._WarehouseId; + } + set + { + if ((this._WarehouseId != value)) + { + this.OnWarehouseIdChanging(value); + this.SendPropertyChanging(); + this._WarehouseId = value; + this.SendPropertyChanged("WarehouseId"); + this.OnWarehouseIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseName", DbType="NVarChar(200) NOT NULL", CanBeNull=false)] + public string WarehouseName + { + get + { + return this._WarehouseName; + } + set + { + if ((this._WarehouseName != value)) + { + this.OnWarehouseNameChanging(value); + this.SendPropertyChanging(); + this._WarehouseName = value; + this.SendPropertyChanged("WarehouseName"); + this.OnWarehouseNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateUserId", DbType="NVarChar(50)")] + public string CreateUserId + { + get + { + return this._CreateUserId; + } + set + { + if ((this._CreateUserId != value)) + { + this.OnCreateUserIdChanging(value); + this.SendPropertyChanging(); + this._CreateUserId = value; + this.SendPropertyChanged("CreateUserId"); + this.OnCreateUserIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")] + public System.Nullable CreateTime + { + get + { + return this._CreateTime; + } + set + { + if ((this._CreateTime != value)) + { + this.OnCreateTimeChanging(value); + this.SendPropertyChanging(); + this._CreateTime = value; + this.SendPropertyChanged("CreateTime"); + this.OnCreateTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyUserId", DbType="NVarChar(50)")] + public string ModifyUserId + { + get + { + return this._ModifyUserId; + } + set + { + if ((this._ModifyUserId != value)) + { + this.OnModifyUserIdChanging(value); + this.SendPropertyChanging(); + this._ModifyUserId = value; + this.SendPropertyChanged("ModifyUserId"); + this.OnModifyUserIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyTime", DbType="DateTime")] + public System.Nullable ModifyTime + { + get + { + return this._ModifyTime; + } + set + { + if ((this._ModifyTime != value)) + { + this.OnModifyTimeChanging(value); + this.SendPropertyChanging(); + this._ModifyTime = value; + this.SendPropertyChanged("ModifyTime"); + this.OnModifyTimeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_WeldingLocation")] public partial class Base_WeldingLocation : INotifyPropertyChanging, INotifyPropertyChanged { @@ -100354,10 +100595,10 @@ namespace Model private string _TrainNumber; - private System.Nullable _TypeInt; - private string _TrainNumberId; + private System.Nullable _TypeInt; + private string _CompileMan; private System.Nullable _CompileDate; @@ -100392,10 +100633,10 @@ namespace Model partial void OnReceiveDateChanged(); partial void OnTrainNumberChanging(string value); partial void OnTrainNumberChanged(); - partial void OnTypeIntChanging(System.Nullable value); - partial void OnTypeIntChanged(); partial void OnTrainNumberIdChanging(string value); partial void OnTrainNumberIdChanged(); + partial void OnTypeIntChanging(System.Nullable value); + partial void OnTypeIntChanged(); partial void OnCompileManChanging(string value); partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); @@ -100649,26 +100890,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")] - public System.Nullable TypeInt - { - get - { - return this._TypeInt; - } - set - { - if ((this._TypeInt != value)) - { - this.OnTypeIntChanging(value); - this.SendPropertyChanging(); - this._TypeInt = value; - this.SendPropertyChanged("TypeInt"); - this.OnTypeIntChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] public string TrainNumberId { @@ -100689,6 +100910,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")] + public System.Nullable TypeInt + { + get + { + return this._TypeInt; + } + set + { + if ((this._TypeInt != value)) + { + this.OnTypeIntChanging(value); + this.SendPropertyChanging(); + this._TypeInt = value; + this.SendPropertyChanged("TypeInt"); + this.OnTypeIntChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] public string CompileMan { @@ -102492,6 +102733,8 @@ namespace Model private string _FlowingSection; + private string _WarehouseId; + private EntityRef _Base_TestMedium; private EntitySet _HJGL_Batch_PointBatch; @@ -102596,6 +102839,8 @@ namespace Model partial void OnStateChanged(); partial void OnFlowingSectionChanging(string value); partial void OnFlowingSectionChanged(); + partial void OnWarehouseIdChanging(string value); + partial void OnWarehouseIdChanged(); #endregion public HJGL_Pipeline() @@ -103312,6 +103557,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseId", DbType="NVarChar(50)")] + public string WarehouseId + { + get + { + return this._WarehouseId; + } + set + { + if ((this._WarehouseId != value)) + { + this.OnWarehouseIdChanging(value); + this.SendPropertyChanging(); + this._WarehouseId = value; + this.SendPropertyChanged("WarehouseId"); + this.OnWarehouseIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_[HJGL_Pipeline_Base_TestMedium1", Storage="_Base_TestMedium", ThisKey="LeakMedium", OtherKey="TestMediumId", IsForeignKey=true)] public Base_TestMedium Base_TestMedium { @@ -107746,6 +108011,8 @@ namespace Model private string _CoverWelderTeamGroupId; + private string _WeldJointPoint; + private EntitySet _HJGL_Batch_BatchTrustItem; private EntitySet _HJGL_Batch_PointBatchItem; @@ -107892,6 +108159,8 @@ namespace Model partial void OnBackingWelderTeamGroupIdChanged(); partial void OnCoverWelderTeamGroupIdChanging(string value); partial void OnCoverWelderTeamGroupIdChanged(); + partial void OnWeldJointPointChanging(string value); + partial void OnWeldJointPointChanged(); #endregion public HJGL_WeldJoint() @@ -108961,6 +109230,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointPoint", DbType="NVarChar(300)")] + public string WeldJointPoint + { + get + { + return this._WeldJointPoint; + } + set + { + if ((this._WeldJointPoint != value)) + { + this.OnWeldJointPointChanging(value); + this.SendPropertyChanging(); + this._WeldJointPoint = value; + this.SendPropertyChanged("WeldJointPoint"); + this.OnWeldJointPointChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet HJGL_Batch_BatchTrustItem { @@ -111936,7 +112225,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")] public string Rectification { get @@ -112062,7 +112351,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")] public string Measures { get @@ -165247,7 +165536,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] public string AttentPerson { get @@ -196254,7 +196543,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")] public string ProjectDescription { get @@ -196374,7 +196663,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")] public string CalculationRule { get @@ -196434,7 +196723,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")] public string ConstructionSubcontractor { get @@ -196818,7 +197107,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] public System.Nullable WorkPackageEstimate { get @@ -197123,16 +197412,6 @@ namespace Model private string _ProjectId; - private string _ContractId; - - private string _OrderCode; - - private System.Nullable _OrderInDate; - - private System.Nullable _OrderOutDate; - - private string _MaterialRequisitionUnit; - private System.Nullable _State; private string _InvoiceCode; @@ -197161,6 +197440,16 @@ namespace Model private string _CreateUser; + private string _ContractId; + + private System.Nullable _OrderInDate; + + private string _OrderCode; + + private System.Nullable _OrderOutDate; + + private string _MaterialRequisitionUnit; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -197169,16 +197458,6 @@ namespace Model partial void OnInvoiceIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnContractIdChanging(string value); - partial void OnContractIdChanged(); - partial void OnOrderCodeChanging(string value); - partial void OnOrderCodeChanged(); - partial void OnOrderInDateChanging(System.Nullable value); - partial void OnOrderInDateChanged(); - partial void OnOrderOutDateChanging(System.Nullable value); - partial void OnOrderOutDateChanged(); - partial void OnMaterialRequisitionUnitChanging(string value); - partial void OnMaterialRequisitionUnitChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); partial void OnInvoiceCodeChanging(string value); @@ -197207,6 +197486,16 @@ namespace Model partial void OnCreateDateChanged(); partial void OnCreateUserChanging(string value); partial void OnCreateUserChanged(); + partial void OnContractIdChanging(string value); + partial void OnContractIdChanged(); + partial void OnOrderInDateChanging(System.Nullable value); + partial void OnOrderInDateChanged(); + partial void OnOrderCodeChanging(string value); + partial void OnOrderCodeChanged(); + partial void OnOrderOutDateChanging(System.Nullable value); + partial void OnOrderOutDateChanged(); + partial void OnMaterialRequisitionUnitChanging(string value); + partial void OnMaterialRequisitionUnitChanged(); #endregion public PHTGL_Invoice() @@ -197254,106 +197543,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] - public string ContractId - { - get - { - return this._ContractId; - } - set - { - if ((this._ContractId != value)) - { - this.OnContractIdChanging(value); - this.SendPropertyChanging(); - this._ContractId = value; - this.SendPropertyChanged("ContractId"); - this.OnContractIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] - public string OrderCode - { - get - { - return this._OrderCode; - } - set - { - if ((this._OrderCode != value)) - { - this.OnOrderCodeChanging(value); - this.SendPropertyChanging(); - this._OrderCode = value; - this.SendPropertyChanged("OrderCode"); - this.OnOrderCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] - public System.Nullable OrderInDate - { - get - { - return this._OrderInDate; - } - set - { - if ((this._OrderInDate != value)) - { - this.OnOrderInDateChanging(value); - this.SendPropertyChanging(); - this._OrderInDate = value; - this.SendPropertyChanged("OrderInDate"); - this.OnOrderInDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] - public System.Nullable OrderOutDate - { - get - { - return this._OrderOutDate; - } - set - { - if ((this._OrderOutDate != value)) - { - this.OnOrderOutDateChanging(value); - this.SendPropertyChanging(); - this._OrderOutDate = value; - this.SendPropertyChanged("OrderOutDate"); - this.OnOrderOutDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] - public string MaterialRequisitionUnit - { - get - { - return this._MaterialRequisitionUnit; - } - set - { - if ((this._MaterialRequisitionUnit != value)) - { - this.OnMaterialRequisitionUnitChanging(value); - this.SendPropertyChanging(); - this._MaterialRequisitionUnit = value; - this.SendPropertyChanged("MaterialRequisitionUnit"); - this.OnMaterialRequisitionUnitChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] public System.Nullable State { @@ -197634,6 +197823,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] + public string ContractId + { + get + { + return this._ContractId; + } + set + { + if ((this._ContractId != value)) + { + this.OnContractIdChanging(value); + this.SendPropertyChanging(); + this._ContractId = value; + this.SendPropertyChanged("ContractId"); + this.OnContractIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] + public System.Nullable OrderInDate + { + get + { + return this._OrderInDate; + } + set + { + if ((this._OrderInDate != value)) + { + this.OnOrderInDateChanging(value); + this.SendPropertyChanging(); + this._OrderInDate = value; + this.SendPropertyChanged("OrderInDate"); + this.OnOrderInDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] + public string OrderCode + { + get + { + return this._OrderCode; + } + set + { + if ((this._OrderCode != value)) + { + this.OnOrderCodeChanging(value); + this.SendPropertyChanging(); + this._OrderCode = value; + this.SendPropertyChanged("OrderCode"); + this.OnOrderCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] + public System.Nullable OrderOutDate + { + get + { + return this._OrderOutDate; + } + set + { + if ((this._OrderOutDate != value)) + { + this.OnOrderOutDateChanging(value); + this.SendPropertyChanging(); + this._OrderOutDate = value; + this.SendPropertyChanged("OrderOutDate"); + this.OnOrderOutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] + public string MaterialRequisitionUnit + { + get + { + return this._MaterialRequisitionUnit; + } + set + { + if ((this._MaterialRequisitionUnit != value)) + { + this.OnMaterialRequisitionUnitChanging(value); + this.SendPropertyChanging(); + this._MaterialRequisitionUnit = value; + this.SendPropertyChanged("MaterialRequisitionUnit"); + this.OnMaterialRequisitionUnitChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -199012,7 +199301,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(1000)")] public string ReviewResults { get @@ -298661,6 +298950,8 @@ namespace Model private System.Nullable _AuditDate2; + private string _WeldJointPoint; + private string _WeldingLocationCode; private string _IsWelding; @@ -300305,6 +300596,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointPoint", DbType="NVarChar(300)")] + public string WeldJointPoint + { + get + { + return this._WeldJointPoint; + } + set + { + if ((this._WeldJointPoint != value)) + { + this._WeldJointPoint = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingLocationCode", DbType="NVarChar(50)")] public string WeldingLocationCode { @@ -322509,7 +322816,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] public string Name { get @@ -323086,7 +323393,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -323277,7 +323584,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -328616,7 +328923,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -330088,7 +330395,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -339989,7 +340296,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")] public string ContractNo { get @@ -340009,7 +340316,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")] public string UnitWorks { get diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs index c534b96a..f692c6b5 100644 --- a/SGGL/WebAPI/Controllers/PersonController.cs +++ b/SGGL/WebAPI/Controllers/PersonController.cs @@ -1,4 +1,5 @@ using BLL; +using Model; using System; using System.Configuration; using System.IO; @@ -102,7 +103,7 @@ namespace WebAPI.Controllers /// /// 根据条件获取项目人员信息（支持分页和过滤） /// - /// 查询过滤条件（ProjectName为必填参数） + /// 查询过滤条件（ProjectCode为必填参数） /// 每页条数 /// 页码（从1开始） /// 是否返回全部数据 @@ -112,11 +113,11 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - // 验证必填参数 ProjectName - if (filter == null || string.IsNullOrEmpty(filter.ProjectName)) + // 验证必填参数 ProjectCode + if (filter == null || string.IsNullOrEmpty(filter.ProjectCode)) { responeData.code = 0; - responeData.message = "ProjectName为必填参数！"; + responeData.message = "ProjectCode为必填参数！"; return responeData; } @@ -808,15 +809,17 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList(); - var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ; + // var trainingIds = Funs.DB.EduTrain_TrainRecord.Where(x => projectId == projectId).Select(x => x.TrainingId).ToList(); + // var personIds = Funs.DB.EduTrain_TrainRecordDetail.Where(x => trainingIds.Contains(x.TrainingId)).Select(x=>x.PersonId).ToList(); ; responeData.data = (from x in Funs.DB.SitePerson_Person join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId - join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard - where x.ProjectId == projectId && !x.ExchangeTime.HasValue + join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard + join traindetail in Funs.DB.EduTrain_TrainRecordDetail on x.PersonId equals traindetail.PersonId + join train in Funs.DB.EduTrain_TrainRecord on traindetail.TrainingId equals train.TrainingId + where x.ProjectId == projectId && !x.ExchangeTime.HasValue && train.ProjectId == projectId && x.States == Const.ProjectPersonStates_1 && x.CardNo.Length > 5 && persons.PhotoUrl != null - where personIds.Contains(x.PersonId) + // where personIds.Contains(x.PersonId) select new { x.PersonId, @@ -1072,12 +1075,13 @@ namespace WebAPI.Controllers responeData.message = "StartTime不能大于EndTime！"; return responeData; } - if (filter == null || string.IsNullOrEmpty(filter.ProjectName)) - { - responeData.code = 0; - responeData.message = "ProjectName为必填参数！"; - return responeData; - } + //20260228 赛鼎it要求取消projectcode必填验证，改为如果有projectcode则按照projectcode查询，没有则不过滤projectcode查询 + //if (filter == null || string.IsNullOrEmpty(filter.ProjectCode)) + //{ + // responeData.code = 0; + // responeData.message = "ProjectCode为必填参数！"; + // return responeData; + //} // 处理可空参数的默认值 int actualPagesize = pagesize ?? 15;