1
This commit is contained in:
@@ -35,3 +35,4 @@ SGGL/.svn
|
||||
/SGGL/FineUIPro.Web/ErrLog.txt
|
||||
/SGGL/CLAUDE.md
|
||||
/SGGL/.claude
|
||||
/SGGL/AGENTS.md
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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,
|
||||
@@ -1131,12 +1139,17 @@ 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))
|
||||
{
|
||||
|
||||
@@ -406,6 +406,7 @@
|
||||
<Compile Include="HJGL\BaseInfo\Base_PressureService.cs" />
|
||||
<Compile Include="HJGL\BaseInfo\Base_PurgeMethodService.cs" />
|
||||
<Compile Include="HJGL\BaseInfo\Base_TestMediumService.cs" />
|
||||
<Compile Include="HJGL\BaseInfo\Base_WarehouseService.cs" />
|
||||
<Compile Include="HJGL\BaseInfo\Base_WeldingLocationServie.cs" />
|
||||
<Compile Include="HJGL\BaseInfo\Base_WeldingMethodService.cs" />
|
||||
<Compile Include="HJGL\BaseInfo\Base_WeldTypeService.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
|
||||
|
||||
@@ -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<string, string> 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())
|
||||
|
||||
@@ -2809,6 +2809,11 @@ namespace BLL
|
||||
/// </summary>
|
||||
public const string HJGL_ComponentsMenuId = "8IDKGJE2-09B1-4607-BC6D-865CE48F0009";
|
||||
|
||||
/// <summary>
|
||||
/// 材料仓库
|
||||
/// </summary>
|
||||
public const string HJGL_WarehouseMenuId = "2F027233-22EC-4063-A04F-FB9FE6A91588";
|
||||
|
||||
/// <summary>
|
||||
/// 探伤类型
|
||||
/// </summary>
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
namespace BLL
|
||||
{
|
||||
using Model;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
public static class Base_WarehouseService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据仓库ID获取仓库信息
|
||||
/// </summary>
|
||||
/// <param name="warehouseId">仓库ID</param>
|
||||
/// <returns>仓库实体</returns>
|
||||
public static Model.Base_Warehouse GetWarehouseByWarehouseId(string warehouseId)
|
||||
{
|
||||
return Funs.DB.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouseId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新增仓库信息
|
||||
/// </summary>
|
||||
/// <param name="warehouse">仓库实体</param>
|
||||
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();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 更新仓库信息
|
||||
/// </summary>
|
||||
/// <param name="warehouse">仓库实体</param>
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据仓库ID删除仓库信息
|
||||
/// </summary>
|
||||
/// <param name="warehouseId">仓库ID</param>
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取项目下所有仓库列表
|
||||
/// </summary>
|
||||
/// <param name="projectId">项目ID</param>
|
||||
/// <returns>仓库列表</returns>
|
||||
public static List<Model.Base_Warehouse> GetWarehouseList(string projectId)
|
||||
{
|
||||
var list = (from x in Funs.DB.Base_Warehouse
|
||||
where x.ProjectId == projectId
|
||||
orderby x.WarehouseName
|
||||
select x).ToList();
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化仓库下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框控件</param>
|
||||
/// <param name="projectId">项目ID</param>
|
||||
/// <param name="isShowPlease">是否显示"请选择"</param>
|
||||
/// <param name="itemText">"请选择"项的文本</param>
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
// 绑定表格
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" >
|
||||
<Items>
|
||||
<f:Button ID="btnSave" ToolTip="入库" Text="入库" Icon="SystemSave" OnClick="btnSave_Click"
|
||||
<f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="SystemSave" OnClick="btnSave_Click"
|
||||
EnablePostBack="true" runat="server">
|
||||
</f:Button>
|
||||
<%--<f:Button ID="btnEditProcess" ToolTip="编辑流程" Text="编辑流程" Icon="ApplicationEdit" OnClick="btnEditProcess_Click"
|
||||
|
||||
@@ -42,9 +42,11 @@ namespace FineUIPro.Web.CLGL
|
||||
};
|
||||
var detailList = TwInOutplandetailService.GetByModle(queryModel).ToList();
|
||||
foreach (var item in detailList)
|
||||
{
|
||||
if (!item.ActNum.HasValue)
|
||||
{
|
||||
item.ActNum = item.PlanNum;
|
||||
|
||||
}
|
||||
}
|
||||
Grid1.DataSource = detailList;
|
||||
Grid1.DataBind();
|
||||
@@ -79,6 +81,26 @@ namespace FineUIPro.Web.CLGL
|
||||
}
|
||||
return detailLists;
|
||||
}
|
||||
/// <summary>
|
||||
/// 保存计划明细项的实收数量
|
||||
/// </summary>
|
||||
private void SavePlanDetail(string InOutPlanMasterId)
|
||||
{
|
||||
JArray teamGroupData = Grid1.GetMergedData();
|
||||
foreach (JObject teamGroupRow in teamGroupData)
|
||||
{
|
||||
JObject values = teamGroupRow.Value<JObject>("values");
|
||||
string detailId = teamGroupRow.Value<string>("id");
|
||||
decimal actNum = values.Value<decimal>("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();
|
||||
@@ -88,6 +110,13 @@ namespace FineUIPro.Web.CLGL
|
||||
{
|
||||
var model = TwInOutplanmasterService.GetById(Id);
|
||||
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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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);
|
||||
// 绑定表格
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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() };
|
||||
|
||||
@@ -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";
|
||||
|
||||
Binary file not shown.
@@ -1521,6 +1521,9 @@
|
||||
<Content Include="HJGL\BaseInfo\TestMedium.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\TestMediumEdit.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\TestMediumView.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\Warehouse.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\WarehouseEdit.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\WarehouseView.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\Weld.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\WeldEdit.aspx" />
|
||||
<Content Include="HJGL\BaseInfo\WeldingLocation.aspx" />
|
||||
@@ -10363,6 +10366,27 @@
|
||||
<Compile Include="HJGL\BaseInfo\TestMediumView.aspx.designer.cs">
|
||||
<DependentUpon>TestMediumView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\Warehouse.aspx.cs">
|
||||
<DependentUpon>Warehouse.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\Warehouse.aspx.designer.cs">
|
||||
<DependentUpon>Warehouse.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\WarehouseEdit.aspx.cs">
|
||||
<DependentUpon>WarehouseEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\WarehouseEdit.aspx.designer.cs">
|
||||
<DependentUpon>WarehouseEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\WarehouseView.aspx.cs">
|
||||
<DependentUpon>WarehouseView.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\WarehouseView.aspx.designer.cs">
|
||||
<DependentUpon>WarehouseView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HJGL\BaseInfo\Weld.aspx.cs">
|
||||
<DependentUpon>Weld.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -16982,7 +17006,7 @@
|
||||
</COMReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Warehouse.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.Warehouse" %>
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title>材料仓库</title>
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
|
||||
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
|
||||
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料仓库" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WarehouseId"
|
||||
AllowCellEditing="true" ClicksToEdit="2" DataIDField="WarehouseId" AllowSorting="true"
|
||||
SortField="WarehouseName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
|
||||
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:TextBox ID="txtWarehouseName" runat="server" Label="仓库名称" EmptyText="输入查询条件"
|
||||
Width="300px" LabelWidth="140px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtRemark" runat="server" Label="备注" EmptyText="输入查询条件"
|
||||
Width="300px" LabelWidth="140px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:Button ID="btnQuery" Text="查询" Icon="SystemSearch"
|
||||
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
|
||||
</f:Button>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="true"
|
||||
runat="server" OnClick="btnNew_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"></f:RowNumberField>
|
||||
<f:RenderField Width="250px" ColumnID="WarehouseName" DataField="WarehouseName" FieldType="String"
|
||||
HeaderText="仓库名称" HeaderTextAlign="Center" TextAlign="Left" SortField="WarehouseName">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="350px" ColumnID="Remark" DataField="Remark" FieldType="String"
|
||||
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
</Listeners>
|
||||
<PageItems>
|
||||
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||
</f:ToolbarSeparator>
|
||||
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
|
||||
</f:ToolbarText>
|
||||
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
|
||||
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
|
||||
<f:ListItem Text="10" Value="10" />
|
||||
<f:ListItem Text="15" Value="15" />
|
||||
<f:ListItem Text="20" Value="20" />
|
||||
<f:ListItem Text="25" Value="25" />
|
||||
</f:DropDownList>
|
||||
</PageItems>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||
Width="600px" Height="300px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" EnablePostBack="true"
|
||||
runat="server" Text="编辑">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
|
||||
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
|
||||
Text="删除">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true"
|
||||
runat="server" Text="查看">
|
||||
</f:MenuButton>
|
||||
</f:Menu>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
var menuID = '<%= Menu1.ClientID %>';
|
||||
// 返回false，来阻止浏览器右键菜单
|
||||
function onRowContextMenu(event, rowId) {
|
||||
F(menuID).show(); //showAt(event.pageX, event.pageY);
|
||||
return false;
|
||||
}
|
||||
|
||||
function reloadGrid() {
|
||||
__doPostBack(null, 'reloadGrid');
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -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 加载
|
||||
/// <summary>
|
||||
/// 加载页面
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
// 绑定表格
|
||||
this.BindGrid();
|
||||
}
|
||||
}
|
||||
|
||||
#region 绑定数据
|
||||
/// <summary>
|
||||
/// 绑定数据
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT WarehouseId,WarehouseName,Remark"
|
||||
+ @" FROM dbo.Base_Warehouse WHERE 1=1 ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
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();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 改变索引事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分页下拉选择事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 排序
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 关闭弹出窗口
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Window1_Close(object sender, EventArgs e)
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
#region 增加按钮事件
|
||||
/// <summary>
|
||||
/// 增加按钮事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
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 编辑
|
||||
/// <summary>
|
||||
/// 双击事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
|
||||
{
|
||||
this.EditData();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 右键编辑事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnMenuEdit_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.EditData();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 编辑数据方法
|
||||
/// </summary>
|
||||
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 删除
|
||||
/// <summary>
|
||||
/// 右键删除事件
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
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 判断是否可删除
|
||||
/// <summary>
|
||||
/// 判断是否可以删除
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
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 查询
|
||||
/// <summary>
|
||||
/// 查询
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnQuery_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.BindGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 查看按钮
|
||||
/// <summary>
|
||||
/// 查看按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnView_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseView.aspx?WarehouseId={0}", Grid1.SelectedRowID, "查看 - ")));
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 获取按钮权限
|
||||
/// <summary>
|
||||
/// 获取按钮权限
|
||||
/// </summary>
|
||||
/// <param name="button"></param>
|
||||
/// <returns></returns>
|
||||
private bool GetButtonPower(string button)
|
||||
{
|
||||
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WarehouseMenuId, button);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,179 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.BaseInfo
|
||||
{
|
||||
|
||||
|
||||
public partial class Warehouse
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
/// <summary>
|
||||
/// txtWarehouseName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWarehouseName;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtRemark;
|
||||
|
||||
/// <summary>
|
||||
/// btnQuery 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnQuery;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuDelete;
|
||||
|
||||
/// <summary>
|
||||
/// btnView 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnView;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WarehouseEdit.aspx.cs"
|
||||
Inherits="FineUIPro.Web.HJGL.BaseInfo.WarehouseEdit" %>
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title>编辑材料仓库</title>
|
||||
<base target="_self" />
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
|
||||
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
|
||||
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtWarehouseName" runat="server" Label="仓库名称"
|
||||
Required="true" MaxLength="200" ShowRedStar="true" LabelWidth="150px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="150px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
|
||||
OnClick="btnSave_Click" ToolTip="保存">
|
||||
</f:Button>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭"
|
||||
runat="server" Icon="SystemClose">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,100 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.HJGL.BaseInfo
|
||||
{
|
||||
public partial class WarehouseEdit : PageBase
|
||||
{
|
||||
#region 定义项
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
public string WarehouseId
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["WarehouseId"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["WarehouseId"] = value;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 加载
|
||||
/// <summary>
|
||||
/// 加载页面
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
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 保存
|
||||
/// <summary>
|
||||
/// 保存按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.BaseInfo {
|
||||
|
||||
|
||||
public partial class WarehouseEdit {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
/// <summary>
|
||||
/// txtWarehouseName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWarehouseName;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtRemark;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WarehouseView.aspx.cs"
|
||||
Inherits="FineUIPro.Web.HJGL.BaseInfo.WarehouseView" %>
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<title>查看材料仓库</title>
|
||||
<base target="_self" />
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
|
||||
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
|
||||
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtWarehouseName" runat="server" Label="仓库名称"
|
||||
MaxLength="200" LabelWidth="150px" Enabled="false">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="150px" Enabled="false">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" Text="关闭"
|
||||
runat="server" Icon="SystemClose">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,50 @@
|
||||
using BLL;
|
||||
using System;
|
||||
|
||||
namespace FineUIPro.Web.HJGL.BaseInfo
|
||||
{
|
||||
public partial class WarehouseView : PageBase
|
||||
{
|
||||
#region 定义项
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
public string WarehouseId
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["WarehouseId"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["WarehouseId"] = value;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 加载
|
||||
/// <summary>
|
||||
/// 加载页面
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HJGL.BaseInfo {
|
||||
|
||||
|
||||
public partial class WarehouseView {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
/// <summary>
|
||||
/// txtWarehouseName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWarehouseName;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtRemark;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
}
|
||||
}
|
||||
@@ -62,6 +62,11 @@
|
||||
<Items>
|
||||
<f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率" Hidden="True"></f:Label>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:DropDownList ID="ddlWarehouse" runat="server" Label="仓库" Width="200px" LabelWidth="80px">
|
||||
</f:DropDownList>
|
||||
<f:Button ID="btnSetWarehouse" ToolTip="仓库设置" Text="仓库设置" Icon="ApplicationEdit"
|
||||
EnablePostBack="true" OnClick="btnSetWarehouse_Click" runat="server">
|
||||
</f:Button>
|
||||
<f:Button ID="btnSetShop" ToolTip="工厂预制" Text="工厂预制" Icon="ApplicationEdit"
|
||||
EnablePostBack="true" OnClick="btnSetShop_Click" runat="server">
|
||||
</f:Button>
|
||||
@@ -84,10 +89,12 @@
|
||||
Width="180px" LabelWidth="80px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
|
||||
<f:TextBox ID="txtMaterialCode" runat="server" Label="材质"
|
||||
EmptyText="输入查询条件"
|
||||
<f:DropDownList ID="ddlFlowingSection" runat="server" Label="流水段"
|
||||
Width="180px" LabelWidth="80px" LabelAlign="Right" AutoSelectFirstItem="true">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="ddlPipeArea" runat="server" Label="管线划分"
|
||||
Width="180px" LabelWidth="80px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
</f:DropDownList>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
|
||||
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
|
||||
@@ -125,6 +132,14 @@
|
||||
<asp:Label ID="txt" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
|
||||
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
|
||||
TextAlign="Center" SortField="FlowingSection">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="WarehouseName" DataField="WarehouseName"
|
||||
FieldType="String" HeaderText="仓库" HeaderTextAlign="Center"
|
||||
TextAlign="Center" SortField="WarehouseName">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
|
||||
<%--<PageItems>
|
||||
|
||||
@@ -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
|
||||
/// <param name="e"></param>
|
||||
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();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 仓库设置按钮
|
||||
/// </summary>
|
||||
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 初始化下拉框
|
||||
/// <summary>
|
||||
/// 初始化流水段下拉框
|
||||
/// </summary>
|
||||
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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化管线划分下拉框
|
||||
/// </summary>
|
||||
private void InitPipeAreaDropDownList()
|
||||
{
|
||||
List<System.Web.UI.WebControls.ListItem> pipeAreaList = new List<System.Web.UI.WebControls.ListItem>();
|
||||
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
|
||||
|
||||
/// <summary>
|
||||
/// 获取图纸预制率（工厂预制管线的预制达因/工厂预制管线的总达因）
|
||||
/// </summary>
|
||||
|
||||
@@ -140,6 +140,24 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbSinglePreRate;
|
||||
|
||||
/// <summary>
|
||||
/// ddlWarehouse 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlWarehouse;
|
||||
|
||||
/// <summary>
|
||||
/// btnSetWarehouse 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSetWarehouse;
|
||||
|
||||
/// <summary>
|
||||
/// btnSetShop 控件。
|
||||
/// </summary>
|
||||
@@ -195,13 +213,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
protected global::FineUIPro.TextBox txtSingleName;
|
||||
|
||||
/// <summary>
|
||||
/// txtMaterialCode 控件。
|
||||
/// ddlFlowingSection 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtMaterialCode;
|
||||
protected global::FineUIPro.DropDownList ddlFlowingSection;
|
||||
|
||||
/// <summary>
|
||||
/// ddlPipeArea 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPipeArea;
|
||||
|
||||
/// <summary>
|
||||
/// btnQuery 控件。
|
||||
|
||||
@@ -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) // 更新焊口
|
||||
@@ -1094,35 +1104,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
BLL.WeldJointService.AddBulkWeldJoint(weldJoints_add);
|
||||
}
|
||||
Model.SGGLDB db2 = Funs.DB;
|
||||
List<Model.HJGL_WeldJoint> delJoints = new List<Model.HJGL_WeldJoint>();
|
||||
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<Model.View_HJGL_WeldJoint> PipelineList)
|
||||
|
||||
@@ -294,6 +294,10 @@
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊点坐标" ColumnID="WeldJointPoint" DataField="WeldJointPoint"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
|
||||
Width="90px">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu3" />
|
||||
|
||||
@@ -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<SqlParameter> listStr = new List<SqlParameter> { };
|
||||
|
||||
|
||||
@@ -33,8 +33,9 @@
|
||||
.f-grid-row.green {
|
||||
background-color: green;
|
||||
}
|
||||
|
||||
.f-grid-row {
|
||||
font-size:smaller;
|
||||
font-size: smaller;
|
||||
}
|
||||
</style>
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
@@ -50,6 +51,13 @@
|
||||
IconFont="ArrowCircleLeft">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpWarehouse" runat="server" Label="仓库" AutoSelectFirstItem="true"
|
||||
Width="230px" LabelWidth="65px" OnSelectedIndexChanged="drpWarehouse_SelectedIndexChanged" AutoPostBack="true">
|
||||
</f:DropDownList>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号"
|
||||
EmptyText="输入查询条件" Width="230px" LabelWidth="65px">
|
||||
@@ -57,8 +65,9 @@
|
||||
<f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left" >
|
||||
<Items >
|
||||
|
||||
<f:Toolbar ID="Toolbar6" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
|
||||
<f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
|
||||
runat="server" LabelWidth="80px"
|
||||
@@ -67,7 +76,7 @@
|
||||
</Items>
|
||||
|
||||
</f:Toolbar>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
|
||||
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
|
||||
@@ -132,7 +141,7 @@
|
||||
<f:Label ID="lbNote" runat="server" LabelWidth="100px" Text="绿色为匹配率100%，红色为匹配率小于100%"></f:Label>
|
||||
<f:Button ID="btnGenTask" ToolTip="生成任务单" Icon="ApplicationViewIcons" runat="server" OnClick="btnGenTask_Click" ConfirmText="确定生成任务单吗？">
|
||||
</f:Button>
|
||||
<f:CheckBox ID="cbSelectCom" ShowLabel="false" runat="server" Text="默认勾选匹配100%" Checked="true" >
|
||||
<f:CheckBox ID="cbSelectCom" ShowLabel="false" runat="server" Text="默认勾选匹配100%" Checked="true">
|
||||
</f:CheckBox>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
@@ -141,7 +150,7 @@
|
||||
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="材料匹配" EnableRowClickEvent="true"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" ForceFit="true"
|
||||
EnableColumnLines="true" DataIDField="PipelineId" AllowSorting="true" OnRowClick="Grid2_RowClick"
|
||||
SortField="PipelineId" SortDirection="ASC" EnableCheckBoxSelect="true" >
|
||||
SortField="PipelineId" SortDirection="ASC" EnableCheckBoxSelect="true">
|
||||
<Columns>
|
||||
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
|
||||
FieldType="String" HeaderText="主项" HeaderTextAlign="Center"
|
||||
@@ -167,7 +176,7 @@
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" EnableRowClickEvent="true"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" ForceFit="true"
|
||||
EnableColumnLines="true" DataIDField="Id" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound"
|
||||
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort" >
|
||||
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort">
|
||||
<Columns>
|
||||
<f:RenderField Width="200px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
|
||||
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using BLL;
|
||||
using FineUIPro.Web.DataShow;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
@@ -12,18 +13,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
public partial class WeldMatMatch : PageBase
|
||||
{
|
||||
public int pageSize = PipelineService.pageSize;
|
||||
//public Dictionary<string, string> dicSeclectPipeLine = new Dictionary<string, string>();
|
||||
//public static List<Model.Tw_PipeMatMatchOutput> 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<Model.Tw_PipeMatMatchOutput>();
|
||||
PipeArea = Request.Params["PipeArea"];
|
||||
if (PipeArea == "2")
|
||||
{
|
||||
WarehouseCode = "现场安装";
|
||||
}
|
||||
else
|
||||
{
|
||||
WarehouseCode = "工厂预制";
|
||||
}
|
||||
HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
|
||||
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<Model.MaterialStockItem>();
|
||||
HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
|
||||
dicSeclectPipeLine = new Dictionary<string, string>();
|
||||
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<Dictionary<string, string>>(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<string> pipelineList = new List<string>();
|
||||
@@ -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();//加载树
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,6 +59,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// drpWarehouse 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWarehouse;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
/// <summary>
|
||||
/// txtPipelineCode 控件。
|
||||
/// </summary>
|
||||
@@ -78,13 +96,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
protected global::FineUIPro.HiddenField hdUnitWorkId;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar5 控件。
|
||||
/// Toolbar6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar5;
|
||||
protected global::FineUIPro.Toolbar Toolbar6;
|
||||
|
||||
/// <summary>
|
||||
/// drpFlowingSection 控件。
|
||||
@@ -96,13 +114,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
protected global::FineUIPro.DropDownList drpFlowingSection;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// Toolbar5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
protected global::FineUIPro.Toolbar Toolbar5;
|
||||
|
||||
/// <summary>
|
||||
/// btnTreeFind 控件。
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -629,10 +629,10 @@ namespace FineUIPro.Web.Person
|
||||
/// <param name="e"></param>
|
||||
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
|
||||
{
|
||||
|
||||
@@ -1,9 +1,51 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
|
||||
<TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
|
||||
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
|
||||
<TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
|
||||
<TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
|
||||
</TreeNode>
|
||||
<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
|
||||
<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
|
||||
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
|
||||
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
|
||||
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
|
||||
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
|
||||
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
|
||||
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
|
||||
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
|
||||
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
|
||||
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
|
||||
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
|
||||
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
|
||||
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
|
||||
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
|
||||
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
|
||||
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
|
||||
<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
|
||||
<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
|
||||
<TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
|
||||
<TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
|
||||
<TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
|
||||
@@ -16,12 +58,15 @@
|
||||
<TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
|
||||
<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
|
||||
<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
|
||||
<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
</Tree>
|
||||
@@ -4,6 +4,7 @@
|
||||
<TreeNode id="8IDKGJE2-09B1-1234-VC6D-865CE48F0005" Text="管道等级" NavigateUrl="HJGL/BaseInfo/PipingClass.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="8IDKGJE2-09B1-4607-BC6D-865CE48F0014" Text="管道介质" NavigateUrl="HJGL/BaseInfo/Medium.aspx"></TreeNode>
|
||||
<TreeNode id="2F027233-22EC-4063-A04F-FB9FE6A91588" Text="材料仓库" NavigateUrl="HJGL/BaseInfo/Warehouse.aspx"></TreeNode>
|
||||
<TreeNode id="F6194C00-D256-485D-9056-171FAB75928A" Text="管道颜色标识库" NavigateUrl="HJGL/BaseInfo/MaterialColor.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="B13BFFA5-3112-4209-8562-5329B78B405C" Text="三维模型导入" NavigateUrl="HJGL/DataImport/TDMImport.aspx"></TreeNode>
|
||||
@@ -13,12 +14,12 @@
|
||||
<TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
|
||||
<TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
|
||||
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
|
||||
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
|
||||
<TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
|
||||
<TreeNode id="F18CFC0E-47E0-477A-9AB3-72B88D438299" Text="堆场规划" NavigateUrl="HJGL/PreDesign/YardPlanning.aspx"></TreeNode>
|
||||
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="车次管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
|
||||
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="发货管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
|
||||
<TreeNode id="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
|
||||
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
|
||||
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="发货管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
|
||||
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="9B828E92-733B-4AF9-9DD0-55ECD8B64AB8" Text="材料管理" NavigateUrl=""><TreeNode id="E29C1839-3530-45EC-A752-B26A0027E2CD" Text="入库管理" NavigateUrl=""><TreeNode id="324C72AF-447A-4308-AFB7-ABF788C58240" Text="入库申请" NavigateUrl="CLGL/InPlanMaster.aspx"></TreeNode>
|
||||
<TreeNode id="4A55351A-2440-4A2D-8509-3FFEE5FC8861" Text="入库单管理" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
|
||||
@@ -27,7 +28,7 @@
|
||||
<TreeNode id="BCCA4D81-410C-4746-B1E4-F882BC3A25F4" Text="出库单管理" NavigateUrl="CLGL/OutputMaster.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="9579C717-769E-4CC0-9E54-EE03D87C15A5" Text="库存管理" NavigateUrl=""><TreeNode id="803F9828-52FA-4EF7-99C7-ADA99DADE9FB" Text="库存管理" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
|
||||
<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
|
||||
<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
|
||||
<TreeNode id="C05EF3BE-AB13-4852-B2AA-1095BE4EEB2F" Text="到货分析" NavigateUrl="CLGL/ArrivalStatistics.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
|
||||
<TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
|
||||
<TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
|
||||
</TreeNode>
|
||||
<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
|
||||
<TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
|
||||
<TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
|
||||
<TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Tree>
|
||||
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
|
||||
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
|
||||
<TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
|
||||
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
|
||||
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
|
||||
</Tree>
|
||||
@@ -4,10 +4,10 @@
|
||||
<TreeNode id="2E57E92E-31BE-46B3-89AF-E08DAE8FC8E7" Text="实施计划编制" NavigateUrl="PHTGL/BiddingManagement/ActionPlanFormation.aspx">
|
||||
</TreeNode>
|
||||
<TreeNode id="303B6753-ED3C-438A-A860-F9C5E5489C8F" Text="实施计划审批" NavigateUrl="PHTGL/BiddingManagement/ActionPlanReview.aspx"></TreeNode>
|
||||
<TreeNode id="687991B6-73AC-42FA-9A72-178AF94D1EB4" Text="招标工程量清单定制" NavigateUrl="PHTGL/BillOfQuantities/BidProjectQuantityList.aspx"></TreeNode>
|
||||
<TreeNode id="0BB31BB1-469D-41E8-9039-A53A2B1EEB86" Text="招标文件审批" NavigateUrl="PHTGL/BiddingManagement/BidDocumentsReview.aspx"></TreeNode>
|
||||
<TreeNode id="133C55A1-3744-40F5-9C74-24E85AB1261F" Text="评标小组名单审批" NavigateUrl="PHTGL/BiddingManagement/ApproveUserReview.aspx"></TreeNode>
|
||||
<TreeNode id="11503AD6-742D-406D-96F1-17BA3B9E7580" Text="确定中标人审批" NavigateUrl="PHTGL/BiddingManagement/SetSubReview.aspx"></TreeNode>
|
||||
<TreeNode id="687991B6-73AC-42FA-9A72-178AF94D1EB4" Text="招标工程量清单定制" NavigateUrl="PHTGL/BillOfQuantities/BidProjectQuantityList.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="C041D799-47A0-4ECA-A6A2-C387857165D6" Text="合同管理" NavigateUrl=""><TreeNode id="C609FEA5-0904-4F59-A920-22B6459F1A94" Text="合同编制" NavigateUrl="PHTGL/ContractCompile/ContractFormation.aspx"></TreeNode>
|
||||
<TreeNode id="B32E7F62-5AA3-46B2-A438-E286909A47B4" Text="合同评审" NavigateUrl="PHTGL/ContractCompile/ContractReview_Countersign.aspx"></TreeNode>
|
||||
|
||||
@@ -58,49 +58,7 @@
|
||||
<TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
|
||||
<TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
|
||||
<TreeNode id="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.aspx"></TreeNode>
|
||||
<TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
|
||||
<TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
|
||||
<TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="集团制度" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
|
||||
<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
|
||||
<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
|
||||
<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
|
||||
<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
|
||||
<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
|
||||
<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
|
||||
<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
|
||||
<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
|
||||
<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
|
||||
<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
|
||||
<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
|
||||
<TreeNode id="C4B90ED3-0258-437A-BC0D-4AB43721EE08" Text="看板数据汇总" NavigateUrl="ZHGL/DataSync/DataStatistics.aspx"></TreeNode>
|
||||
<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
|
||||
<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
|
||||
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
|
||||
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
|
||||
|
||||
@@ -86,6 +86,20 @@ namespace Model
|
||||
get; set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 项目代号
|
||||
/// </summary>
|
||||
public string ProjectCode
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 项目名称
|
||||
/// </summary>
|
||||
public string ProjectName
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 单位ID
|
||||
/// </summary>
|
||||
public string UnitId
|
||||
|
||||
@@ -12,9 +12,9 @@ namespace Model
|
||||
public class PersonInOutRecordInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 项目名称
|
||||
/// 项目代号
|
||||
/// </summary>
|
||||
public string ProjectName { get; set; }
|
||||
public string ProjectCode { get; set; }
|
||||
/// <summary>
|
||||
/// 单位名称
|
||||
/// </summary>
|
||||
|
||||
@@ -40,6 +40,10 @@ namespace Model
|
||||
/// </summary>
|
||||
public string ProjectName { get; set; }
|
||||
/// <summary>
|
||||
/// 项目代号
|
||||
/// </summary>
|
||||
public string ProjectCode { get; set; }
|
||||
/// <summary>
|
||||
/// 单位名称
|
||||
/// </summary>
|
||||
public string UnitName { get; set; }
|
||||
|
||||
@@ -42,6 +42,10 @@ namespace Model
|
||||
/// </summary>
|
||||
public string ProjectName { get; set; }
|
||||
/// <summary>
|
||||
/// 项目代号
|
||||
/// </summary>
|
||||
public string ProjectCode { get; set; }
|
||||
/// <summary>
|
||||
/// 单位ID
|
||||
/// </summary>
|
||||
public string UnitId { get; set; }
|
||||
|
||||
+491
-184
@@ -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> Base_Warehouse
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetTable<Base_Warehouse>();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Data.Linq.Table<Base_WeldingLocation> 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<System.DateTime> _CreateTime;
|
||||
|
||||
private string _ModifyUserId;
|
||||
|
||||
private System.Nullable<System.DateTime> _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<System.DateTime> value);
|
||||
partial void OnCreateTimeChanged();
|
||||
partial void OnModifyUserIdChanging(string value);
|
||||
partial void OnModifyUserIdChanged();
|
||||
partial void OnModifyTimeChanging(System.Nullable<System.DateTime> 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<System.DateTime> 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<System.DateTime> 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<int> _TypeInt;
|
||||
|
||||
private string _TrainNumberId;
|
||||
|
||||
private System.Nullable<int> _TypeInt;
|
||||
|
||||
private string _CompileMan;
|
||||
|
||||
private System.Nullable<System.DateTime> _CompileDate;
|
||||
@@ -100392,10 +100633,10 @@ namespace Model
|
||||
partial void OnReceiveDateChanged();
|
||||
partial void OnTrainNumberChanging(string value);
|
||||
partial void OnTrainNumberChanged();
|
||||
partial void OnTypeIntChanging(System.Nullable<int> value);
|
||||
partial void OnTypeIntChanged();
|
||||
partial void OnTrainNumberIdChanging(string value);
|
||||
partial void OnTrainNumberIdChanged();
|
||||
partial void OnTypeIntChanging(System.Nullable<int> value);
|
||||
partial void OnTypeIntChanged();
|
||||
partial void OnCompileManChanging(string value);
|
||||
partial void OnCompileManChanged();
|
||||
partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
|
||||
@@ -100649,26 +100890,6 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
|
||||
public System.Nullable<int> 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<int> 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> _Base_TestMedium;
|
||||
|
||||
private EntitySet<HJGL_Batch_PointBatch> _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> _HJGL_Batch_BatchTrustItem;
|
||||
|
||||
private EntitySet<HJGL_Batch_PointBatchItem> _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> 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<decimal> WorkPackageEstimate
|
||||
{
|
||||
get
|
||||
@@ -197123,16 +197412,6 @@ namespace Model
|
||||
|
||||
private string _ProjectId;
|
||||
|
||||
private string _ContractId;
|
||||
|
||||
private string _OrderCode;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderInDate;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderOutDate;
|
||||
|
||||
private string _MaterialRequisitionUnit;
|
||||
|
||||
private System.Nullable<int> _State;
|
||||
|
||||
private string _InvoiceCode;
|
||||
@@ -197161,6 +197440,16 @@ namespace Model
|
||||
|
||||
private string _CreateUser;
|
||||
|
||||
private string _ContractId;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderInDate;
|
||||
|
||||
private string _OrderCode;
|
||||
|
||||
private System.Nullable<System.DateTime> _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<System.DateTime> value);
|
||||
partial void OnOrderInDateChanged();
|
||||
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnOrderOutDateChanged();
|
||||
partial void OnMaterialRequisitionUnitChanging(string value);
|
||||
partial void OnMaterialRequisitionUnitChanged();
|
||||
partial void OnStateChanging(System.Nullable<int> 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<System.DateTime> value);
|
||||
partial void OnOrderInDateChanged();
|
||||
partial void OnOrderCodeChanging(string value);
|
||||
partial void OnOrderCodeChanged();
|
||||
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> 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<System.DateTime> 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<System.DateTime> 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<int> 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<System.DateTime> 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<System.DateTime> 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<System.DateTime> _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
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using BLL;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Configuration;
|
||||
using System.IO;
|
||||
@@ -102,7 +103,7 @@ namespace WebAPI.Controllers
|
||||
/// <summary>
|
||||
/// 根据条件获取项目人员信息（支持分页和过滤）
|
||||
/// </summary>
|
||||
/// <param name="filter">查询过滤条件（ProjectName为必填参数）</param>
|
||||
/// <param name="filter">查询过滤条件（ProjectCode为必填参数）</param>
|
||||
/// <param name="pagesize">每页条数</param>
|
||||
/// <param name="pageindex">页码（从1开始）</param>
|
||||
/// <param name="returnAll">是否返回全部数据</param>
|
||||
@@ -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 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;
|
||||
|
||||
Reference in New Issue
Block a user