feat(hjgl): 优化焊口查询并同步更新相关数据模型
为支持焊口查询页面和静态页的新展示与交互能力， 同步调整了材料匹配统计逻辑、数据模型映射及前端构建产物。 同时补充实名制服务和数据库脚本，保证接口、页面与数据结构保持一致。
This commit is contained in:
@@ -0,0 +1,220 @@
|
|||||||
|
-- dbo.View_HJGL_WeldJoint source
|
||||||
|
|
||||||
|
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
|
||||||
|
, task.TaskCode
|
||||||
|
, 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.HJGL_WeldTask task ON task.WeldJointId = jot.WeldJointId
|
||||||
|
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;
|
||||||
+2
-1
@@ -837,6 +837,7 @@
|
|||||||
<Compile Include="ZHGL\RealName\OnPostService.cs" />
|
<Compile Include="ZHGL\RealName\OnPostService.cs" />
|
||||||
<Compile Include="ZHGL\RealName\RealNameMonitorService.cs" />
|
<Compile Include="ZHGL\RealName\RealNameMonitorService.cs" />
|
||||||
<Compile Include="ZHGL\RealName\RealName_ProjectService.cs" />
|
<Compile Include="ZHGL\RealName\RealName_ProjectService.cs" />
|
||||||
|
<Compile Include="ZHGL\RealName\SedinRealName.Service.cs" />
|
||||||
<Compile Include="ZHGL\RealName\SynchroSetService.cs" />
|
<Compile Include="ZHGL\RealName\SynchroSetService.cs" />
|
||||||
<Compile Include="ZHGL\Supervise\SubUnitCheckRectifyItemService.cs" />
|
<Compile Include="ZHGL\Supervise\SubUnitCheckRectifyItemService.cs" />
|
||||||
<Compile Include="ZHGL\Supervise\SubUnitCheckRectifyService.cs" />
|
<Compile Include="ZHGL\Supervise\SubUnitCheckRectifyService.cs" />
|
||||||
@@ -935,4 +936,4 @@
|
|||||||
<Target Name="AfterBuild">
|
<Target Name="AfterBuild">
|
||||||
</Target>
|
</Target>
|
||||||
-->
|
-->
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -27,42 +27,54 @@ namespace BLL
|
|||||||
NeedNum = g.Sum(x => x.Number) ?? 0,
|
NeedNum = g.Sum(x => x.Number) ?? 0,
|
||||||
};
|
};
|
||||||
///实际材料入库数量列表
|
///实际材料入库数量列表
|
||||||
var RealInMateriaList = from x in db.Tw_InputDetail
|
var RealInMateriaList = (from x in db.Tw_InputDetail
|
||||||
join master in db.Tw_InputMaster on x.InputMasterId equals master.Id
|
join master in db.Tw_InputMaster on x.InputMasterId equals master.Id
|
||||||
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
|
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
|
||||||
where master.ProjectId == projectid && master.WarehouseCode == WarehouseCode
|
where master.ProjectId == projectid && master.WarehouseCode == WarehouseCode
|
||||||
group x by x.MaterialCode
|
group x by x.MaterialCode
|
||||||
into g
|
into g
|
||||||
where (string.IsNullOrEmpty(materialCode) || g.Key.Contains(materialCode))
|
where (string.IsNullOrEmpty(materialCode) || g.Key.Contains(materialCode))
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
g.Key,
|
g.Key,
|
||||||
RealNum = g.Sum(x => x.ActNum) ?? 0,
|
RealNum = g.Sum(x => x.ActNum) ?? 0,
|
||||||
};
|
}).ToList();
|
||||||
//库存数量
|
//库存数量
|
||||||
var tw_MaterialStock = from x in db.Tw_MaterialStock
|
var tw_MaterialStock = (from x in db.Tw_MaterialStock
|
||||||
where x.WarehouseCode == WarehouseCode && x.ProjectId == projectid
|
where x.WarehouseCode == WarehouseCode && x.ProjectId == projectid
|
||||||
select x;
|
select x).ToList();
|
||||||
|
|
||||||
|
var needMateriaList = NeedOutMateriaList.ToList();
|
||||||
|
var materialCodeList = needMateriaList.Select(x => x.Key)
|
||||||
|
.Union(RealInMateriaList.Select(x => x.Key))
|
||||||
|
.Distinct()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
var StatisticsList = (from x in NeedOutMateriaList
|
var materialInfoList = (from x in db.HJGL_MaterialCodeLib
|
||||||
join y in RealInMateriaList on x.Key equals y.Key into gg
|
where materialCodeList.Contains(x.MaterialCode)
|
||||||
from y in gg.DefaultIfEmpty()
|
select x).ToList();
|
||||||
join z in db.HJGL_MaterialCodeLib on x.Key equals z.MaterialCode into zz
|
|
||||||
from z in zz.DefaultIfEmpty()
|
var StatisticsList = (from code in materialCodeList
|
||||||
join m in tw_MaterialStock on x.Key equals m.PipeLineMatCode into mm
|
join x in needMateriaList on code equals x.Key into needGroup
|
||||||
from m in mm.DefaultIfEmpty()
|
from x in needGroup.DefaultIfEmpty()
|
||||||
|
join y in RealInMateriaList on code equals y.Key into realGroup
|
||||||
|
from y in realGroup.DefaultIfEmpty()
|
||||||
|
join z in materialInfoList on code equals z.MaterialCode into infoGroup
|
||||||
|
from z in infoGroup.DefaultIfEmpty()
|
||||||
|
join m in tw_MaterialStock on code equals m.PipeLineMatCode into stockGroup
|
||||||
|
from m in stockGroup.DefaultIfEmpty()
|
||||||
|
orderby code
|
||||||
select new Tw_ArrivalStatisticsOutPut
|
select new Tw_ArrivalStatisticsOutPut
|
||||||
{
|
{
|
||||||
MaterialCode = x.Key,
|
MaterialCode = code,
|
||||||
StockNum = m == null ? 0 : (decimal)m.StockNum,
|
StockNum = m == null ? 0 : (decimal)m.StockNum,
|
||||||
NeedNum = x.NeedNum,
|
NeedNum = x == null ? 0 : x.NeedNum,
|
||||||
RealNum = y == null ? 0 : y.RealNum,
|
RealNum = y == null ? 0 : y.RealNum,
|
||||||
MaterialName = z.MaterialName,
|
MaterialName = z == null ? null : z.MaterialName,
|
||||||
MaterialSpec = z.MaterialSpec,
|
MaterialSpec = z == null ? null : z.MaterialSpec,
|
||||||
MaterialUnit = z.MaterialUnit,
|
MaterialUnit = z == null ? null : z.MaterialUnit,
|
||||||
MaterialDef = z.MaterialDef,
|
MaterialDef = z == null ? null : z.MaterialDef,
|
||||||
MatchRate = (x.NeedNum == 0 ? 0 : Math.Round((y == null ? 0 : y.RealNum) / x.NeedNum, 4, MidpointRounding.ToEven)),
|
MatchRate = (x == null || x.NeedNum == 0 ? 0 : Math.Round((y == null ? 0 : y.RealNum) / x.NeedNum, 4, MidpointRounding.ToEven)),
|
||||||
}).ToList();
|
}).ToList();
|
||||||
foreach (var item in StatisticsList)
|
foreach (var item in StatisticsList)
|
||||||
{
|
{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -125,8 +125,10 @@
|
|||||||
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
|
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
|
||||||
Width="150px">
|
Width="150px">
|
||||||
</f:RenderField>--%>
|
</f:RenderField>--%>
|
||||||
|
|
||||||
|
|
||||||
|
<f:RenderField HeaderText="任务单编号" ColumnID="TaskCode" DataField="TaskCode"
|
||||||
|
SortField="TaskCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
|
||||||
|
</f:RenderField>
|
||||||
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
|
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
|
||||||
TextAlign="Left" Width="90px">
|
TextAlign="Left" Width="90px">
|
||||||
</f:RenderField>
|
</f:RenderField>
|
||||||
|
|||||||
@@ -597,6 +597,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
|||||||
完成状态 = x.IsWeldOK,
|
完成状态 = x.IsWeldOK,
|
||||||
单位名称 = x.UnitName,
|
单位名称 = x.UnitName,
|
||||||
流水段 = x.FlowingSection,
|
流水段 = x.FlowingSection,
|
||||||
|
任务单编号 = x.TaskCode,
|
||||||
材质1 = x.Material1Code,
|
材质1 = x.Material1Code,
|
||||||
材质2 = x.Material2Code,
|
材质2 = x.Material2Code,
|
||||||
达因 = x.Size,
|
达因 = x.Size,
|
||||||
@@ -678,6 +679,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
|||||||
完成状态 = x.IsWeldOK,
|
完成状态 = x.IsWeldOK,
|
||||||
单位名称 = x.UnitName,
|
单位名称 = x.UnitName,
|
||||||
流水段 = x.FlowingSection,
|
流水段 = x.FlowingSection,
|
||||||
|
任务单编号 = x.TaskCode,
|
||||||
材质1 = x.Material1Code,
|
材质1 = x.Material1Code,
|
||||||
材质2 = x.Material2Code,
|
材质2 = x.Material2Code,
|
||||||
达因 = x.Size,
|
达因 = x.Size,
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
|||||||
|
.wrap[data-v-27b9583d]{padding-bottom:1.875rem}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
.wrap[data-v-099af148]{padding-bottom:1.875rem}
|
||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
|||||||
|
.wrap[data-v-f24308e9]{padding-bottom:1.875rem}
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
|||||||
|
import{h as e,s as l,a,_ as t,r as o,o as r,b as u,c as i,d as n,w as s,e as d,f as m,i as v,g as f,j as c}from"./index-BCk3NlG9.js";const p={baseURL:"https://sggl.sedin.com.cn/sgglapi/api/",validateStatus:e=>e>=200&&e<300};e.setConfig((e=>p)),e.interceptors.request.use((e=>(e.data=e.data||{},l(),e.header.token="AF17168B-87BD-4GLY-1111-F0A0A1158F9B",e)),(e=>Promise.reject(e))),e.interceptors.response.use((e=>{a();return e.data||{}}),(e=>Promise.reject(e)));const g=t({__name:"index",setup(l){const a=o({form:{}});return r((l=>{var t;console.log(l),t=null==l?void 0:l.id,e.get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${t}`).then((e=>{console.log(e),a.form=e.data,a.form.CoverWelderName&&(a.form.welderName=a.form.CoverWelderName),a.form.BackingWelderName&&(a.form.welderName+="/"+a.form.BackingWelderName)}))})),(e,l)=>{const t=u(i("up-cell"),d),o=u(i("up-cell-group"),m),r=v;return f(),n(r,{class:"wrap"},{default:s((()=>[c(o,null,{default:s((()=>[c(t,{title:"管线",value:a.form.PipelineCode},null,8,["value"]),c(t,{title:"焊口",value:a.form.WeldJointCode},null,8,["value"]),c(t,{title:"焊接日期",value:a.form.WeldingDate},null,8,["value"]),c(t,{title:"材质一",value:a.form.Material1Code},null,8,["value"]),c(t,{title:"材质二",value:a.form.Material2Code},null,8,["value"]),c(t,{title:"达因",value:a.form.Size},null,8,["value"]),c(t,{title:"外径",value:a.form.Dia},null,8,["value"]),c(t,{title:"DN公称直径",value:a.form.DNDia},null,8,["value"]),c(t,{title:"壁厚",value:a.form.Thickness},null,8,["value"]),c(t,{title:"规格",value:a.form.Specification},null,8,["value"]),c(t,{title:"焊缝类型",value:a.form.WeldTypeCode},null,8,["value"]),c(t,{title:"焊接位置",value:a.form.WeldingLocationCode},null,8,["value"]),c(t,{title:"打底焊工",value:a.form.BackingWelderName},null,8,["value"]),c(t,{title:"盖面焊工",value:a.form.CoverWelderName},null,8,["value"])])),_:1})])),_:1})}}},[["__scopeId","data-v-099af148"]]);export{g as default};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
import{h as e,s as l,a,_ as t,r as o,o as r,b as u,c as i,d as n,w as s,e as d,f as m,i as v,g as f,j as c}from"./index-Bvn6qVoR.js";const p={baseURL:"https://sggl.sedin.com.cn/sgglapi/api/",validateStatus:e=>e>=200&&e<300};e.setConfig((e=>p)),e.interceptors.request.use((e=>(e.data=e.data||{},l(),e.header.token="AF17168B-87BD-4GLY-1111-F0A0A1158F9B",e)),(e=>Promise.reject(e))),e.interceptors.response.use((e=>{a();return e.data||{}}),(e=>Promise.reject(e)));const g=t({__name:"index",setup(l){const a=o({form:{}});return r((l=>{var t;console.log(l),t=null==l?void 0:l.id,e.get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${t}`).then((e=>{console.log(e),a.form=e.data,a.form.CoverWelderName&&(a.form.welderName=a.form.CoverWelderName),a.form.BackingWelderName&&(a.form.welderName+="/"+a.form.BackingWelderName)}))})),(e,l)=>{const t=u(i("up-cell"),d),o=u(i("up-cell-group"),m),r=v;return f(),n(r,{class:"wrap"},{default:s((()=>[c(o,null,{default:s((()=>[c(t,{title:"管线",value:a.form.PipelineCode},null,8,["value"]),c(t,{title:"焊口",value:a.form.WeldJointCode},null,8,["value"]),c(t,{title:"材质一",value:a.form.Material1Code},null,8,["value"]),c(t,{title:"材质二",value:a.form.Material2Code},null,8,["value"]),c(t,{title:"达因",value:a.form.Size},null,8,["value"]),c(t,{title:"外径",value:a.form.Dia},null,8,["value"]),c(t,{title:"DN公称直径",value:a.form.DNDia},null,8,["value"]),c(t,{title:"壁厚",value:a.form.Thickness},null,8,["value"]),c(t,{title:"规格",value:a.form.Specification},null,8,["value"]),c(t,{title:"焊缝类型",value:a.form.WeldTypeCode},null,8,["value"]),c(t,{title:"焊接位置",value:a.form.WeldingLocationCode},null,8,["value"]),c(t,{title:"打底焊工",value:a.form.BackingWelderName},null,8,["value"]),c(t,{title:"盖面焊工",value:a.form.CoverWelderName},null,8,["value"])])),_:1})])),_:1})}}},[["__scopeId","data-v-27b9583d"]]);export{g as default};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
import{h as e,s as l,a,_ as t,r as o,o as u,b as r,c as i,d as n,w as s,e as d,f as m,i as v,g as f,j as c}from"./index-RspKKAD8.js";const p={baseURL:"https://sggl.sedin.com.cn/sgglapi/api/",validateStatus:e=>e>=200&&e<300};e.setConfig((e=>p)),e.interceptors.request.use((e=>(e.data=e.data||{},l(),e.header.token="AF17168B-87BD-4GLY-1111-F0A0A1158F9B",e)),(e=>Promise.reject(e))),e.interceptors.response.use((e=>{a();return e.data||{}}),(e=>Promise.reject(e)));const g=t({__name:"index",setup(l){const a=o({form:{}});return u((l=>{var t;console.log(l),t=null==l?void 0:l.id,e.get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${t}`).then((e=>{console.log(e),a.form=e.data,a.form.CoverWelderName&&(a.form.welderName=a.form.CoverWelderName),a.form.BackingWelderName&&(a.form.welderName+="/"+a.form.BackingWelderName)}))})),(e,l)=>{const t=r(i("up-cell"),d),o=r(i("up-cell-group"),m),u=v;return f(),n(u,{class:"wrap"},{default:s((()=>[c(o,null,{default:s((()=>[c(t,{title:"管线",value:a.form.PipelineCode},null,8,["value"]),c(t,{title:"焊口",value:a.form.WeldJointCode},null,8,["value"]),c(t,{title:"焊接日期",value:a.form.WeldingDate},null,8,["value"]),c(t,{title:"焊工",value:a.form.welderName},null,8,["value"]),c(t,{title:"材质一",value:a.form.Material1Code},null,8,["value"]),c(t,{title:"材质二",value:a.form.Material2Code},null,8,["value"]),c(t,{title:"达因",value:a.form.Size},null,8,["value"]),c(t,{title:"外径",value:a.form.Dia},null,8,["value"]),c(t,{title:"DN公称直径",value:a.form.DNDia},null,8,["value"]),c(t,{title:"壁厚",value:a.form.Thickness},null,8,["value"]),c(t,{title:"规格",value:a.form.Specification},null,8,["value"]),c(t,{title:"焊接方法",value:a.form.WeldingMethodCode},null,8,["value"]),c(t,{title:"焊缝类型",value:a.form.WeldTypeCode},null,8,["value"]),c(t,{title:"焊接位置",value:a.form.WeldingLocationCode},null,8,["value"]),c(t,{title:"打底焊工",value:a.form.BackingWelderName},null,8,["value"]),c(t,{title:"盖面焊工",value:a.form.CoverWelderName},null,8,["value"])])),_:1})])),_:1})}}},[["__scopeId","data-v-f24308e9"]]);export{g as default};
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,7 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" href="/StaticPage/HJGL/assets/uni.b8bf2949.css">
|
<link rel="stylesheet" href="/StaticPage/HJGL/assets/uni.115a2c5d.css">
|
||||||
|
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<script>
|
<script>
|
||||||
@@ -14,8 +14,8 @@
|
|||||||
<title>WebH5</title>
|
<title>WebH5</title>
|
||||||
<!--preload-links-->
|
<!--preload-links-->
|
||||||
<!--app-context-->
|
<!--app-context-->
|
||||||
<script type="module" crossorigin src="/StaticPage/HJGL/assets/index-D_s_mHWI.js"></script>
|
<script type="module" crossorigin src="/StaticPage/HJGL/assets/index-BCk3NlG9.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/StaticPage/HJGL/assets/index-Dz4tKtNa.css">
|
<link rel="stylesheet" crossorigin href="/StaticPage/HJGL/assets/index-th1baVH-.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"><!--app-html--></div>
|
<div id="app"><!--app-html--></div>
|
||||||
|
|||||||
+734
-278
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user