feat(clgl): 增加入库申请编辑与明细导入
支持入库申请信息维护、入库明细批量导入及模板下载， 完善材料入库业务流程，减少人工录入和明细维护成本。 增加焊口流转区段信息，并统一相关单位工程列表排序
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE dbo.HJGL_WeldJoint ADD FlowingSection nvarchar(200) NULL;
|
||||
EXEC sys.sp_addextendedproperty 'MS_Description', N'流水段', 'schema', N'dbo', 'table', N'HJGL_WeldJoint', 'column', N'FlowingSection';
|
||||
@@ -0,0 +1,219 @@
|
||||
|
||||
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 --备注
|
||||
, jot.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;
|
||||
@@ -865,19 +865,6 @@
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
<Fakes Include="Fakes\Aspose.Words.fakes" />
|
||||
<None Include="obj\Debug\BLL.csproj.CopyComplete" />
|
||||
<None Include="obj\Debug\BLL.csproj.CoreCompileInputs.cache" />
|
||||
<None Include="obj\Debug\BLL.csprojAssemblyReference.cache" />
|
||||
<None Include="obj\Debug\DesignTimeResolveAssemblyReferences.cache" />
|
||||
<None Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
|
||||
<None Include="obj\Debug\ResolveAssemblyReference.cache" />
|
||||
<None Include="obj\Release\BLL.csproj.CopyComplete" />
|
||||
<None Include="obj\Release\BLL.csproj.CoreCompileInputs.cache" />
|
||||
<None Include="obj\Release\BLL.csprojAssemblyReference.cache" />
|
||||
<None Include="obj\Release\BLL.csprojResolveAssemblyReference.cache" />
|
||||
<None Include="obj\Release\DesignTimeResolveAssemblyReferences.cache" />
|
||||
<None Include="obj\Release\DesignTimeResolveAssemblyReferencesInput.cache" />
|
||||
<None Include="obj\Release\ResolveAssemblyReference.cache" />
|
||||
<None Include="packages.config" />
|
||||
<None Include="Scripts\jquery-3.5.1.min.map" />
|
||||
<None Include="Scripts\jquery-3.5.1.slim.min.map" />
|
||||
@@ -887,16 +874,6 @@
|
||||
<None Include="Service References\OAWebService\OfsTodoDataWebService.wsdl" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="obj\Debug\BLL.csproj.FileListAbsolute.txt" />
|
||||
<Content Include="obj\Debug\BLL.dll" />
|
||||
<Content Include="obj\Debug\BLL.pdb" />
|
||||
<Content Include="obj\Debug\TempPE\Service References.BLLHSSEService.Reference.cs.dll" />
|
||||
<Content Include="obj\Debug\TempPE\Service References.HSSEService.Reference.cs.dll" />
|
||||
<Content Include="obj\Release\BLL.csproj.FileListAbsolute.txt" />
|
||||
<Content Include="obj\Release\BLL.dll" />
|
||||
<Content Include="obj\Release\BLL.pdb" />
|
||||
<Content Include="obj\Release\TempPE\Service References.HSSEService.Reference.cs.dll" />
|
||||
<Content Include="obj\Release\TempPE\Service References.HSSEServiceClient.Reference.cs.dll" />
|
||||
<Content Include="Scripts\jquery-3.5.1.intellisense.js" />
|
||||
<Content Include="Scripts\jquery-3.5.1.js" />
|
||||
<Content Include="Scripts\jquery-3.5.1.min.js" />
|
||||
|
||||
@@ -73,6 +73,7 @@ namespace BLL
|
||||
};
|
||||
public static Dictionary<string, int> CategoryMap = new Dictionary<string, int>
|
||||
{
|
||||
{ "全部" ,(int)Category.全部},
|
||||
{ "管件" ,(int)Category.管件},
|
||||
{ "管段" ,(int)Category.管段},
|
||||
};
|
||||
|
||||
@@ -225,9 +225,10 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static ListItem[] HJGL_JointAttribute()
|
||||
{
|
||||
ListItem[] list = new ListItem[2];
|
||||
ListItem[] list = new ListItem[3];
|
||||
list[0] = new ListItem("预制口", "预制口");
|
||||
list[1] = new ListItem("安装口", "安装口");
|
||||
list[2] = new ListItem("全部", "");
|
||||
return list;
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -119,7 +119,8 @@ namespace BLL
|
||||
TwoJointType = weldJoint.TwoJointType,
|
||||
CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId,
|
||||
BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId,
|
||||
WeldJointPoint = weldJoint.WeldJointPoint
|
||||
WeldJointPoint = weldJoint.WeldJointPoint,
|
||||
FlowingSection = weldJoint.FlowingSection
|
||||
};
|
||||
if (!string.IsNullOrEmpty(weldJoint.WeldJointId))
|
||||
{
|
||||
@@ -191,6 +192,7 @@ namespace BLL
|
||||
newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId;
|
||||
newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId;
|
||||
newWeldJoint.WeldJointPoint = weldJoint.WeldJointPoint;
|
||||
newWeldJoint.FlowingSection= weldJoint.FlowingSection;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
@@ -510,7 +512,7 @@ namespace BLL
|
||||
baseQuery = baseQuery.Where(x => x.IsWeldOK == model.IsWeldOK);
|
||||
|
||||
// 阶段三：排序与分页控制（索引优化关键）
|
||||
var orderedQuery = baseQuery.OrderBy(x => x.PipelineId).ThenBy(x => x.WeldJointCode);
|
||||
var orderedQuery = baseQuery.OrderBy(x => x.PipelineCode).ThenBy(x => x.WeldJointCode);
|
||||
|
||||
// 阶段四：分页执行（数据库层面分页）
|
||||
var pagedData = orderedQuery
|
||||
|
||||
@@ -59,6 +59,7 @@ namespace FineUIPro.Web.CLGL
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
&& (string.IsNullOrEmpty(keyword) || x.UnitWorkName.Contains(keyword) || x.UnitWorkCode.Contains(keyword))
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
foreach (var q in unitWorkList.Where(x => x.ProjectType == "1"))
|
||||
|
||||
@@ -55,6 +55,8 @@
|
||||
LabelWidth="70px" LabelAlign="Right" Width="170px">
|
||||
</f:DropDownList>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnAdd" ToolTip="新增" Icon="Add" runat="server" Text="新增" OnClick="btnAdd_Click" Hidden="true">
|
||||
</f:Button>
|
||||
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnPassMaster" Text="审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" Hidden="true">
|
||||
|
||||
@@ -202,10 +202,18 @@ namespace FineUIPro.Web.CLGL
|
||||
var model = BLL.TwInOutplanmasterService.GetById(ID);
|
||||
if (model != null) ///已上报时不能删除
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterEdit.aspx?Id={0}", ID, "编辑 - ")));
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterApplyEdit.aspx?Id={0}", ID, "编辑 - ")));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 新增入库申请
|
||||
/// </summary>
|
||||
protected void btnAdd_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference("InPlanMasterApplyEdit.aspx?"));
|
||||
}
|
||||
|
||||
protected void btnGenInMaster_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (Grid1.SelectedRowIndexArray.Length == 0)
|
||||
@@ -350,6 +358,7 @@ namespace FineUIPro.Web.CLGL
|
||||
{
|
||||
if (buttonList.Contains(BLL.Const.BtnAdd))
|
||||
{
|
||||
this.btnAdd.Hidden = false;
|
||||
this.btnImport.Hidden = false;
|
||||
}
|
||||
if (buttonList.Contains(BLL.Const.BtnModify))
|
||||
|
||||
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.CLGL
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpStates;
|
||||
|
||||
/// <summary>
|
||||
/// btnAdd 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnAdd;
|
||||
|
||||
/// <summary>
|
||||
/// btnSearch 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InPlanMasterApplyEdit.aspx.cs" Inherits="FineUIPro.Web.CLGL.InPlanMasterApplyEdit" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>入库申请编辑</title>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<div>
|
||||
<f:PageManager runat="server" AutoSizePanelID="SimpleForm1" />
|
||||
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="入库申请详情"
|
||||
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="SystemSave" OnClick="btnSave_Click"
|
||||
EnablePostBack="true" runat="server">
|
||||
</f:Button>
|
||||
<f:Button ID="btnSubmit" Icon="SystemSave" runat="server" ToolTip="提交" Text="提交" ValidateForms="SimpleForm1"
|
||||
OnClick="btnSubmit_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:Panel ID="Panel4" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpWarehouse" runat="server" Label="仓库" ColumnWidth="20%"
|
||||
LabelWidth="70px" LabelAlign="Right" Width="170px" Required="true" ShowRedStar="true">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpTypeInt" runat="server" Label="类型" ColumnWidth="20%" OnSelectedIndexChanged="drpTypeInt_SelectedIndexChanged" AutoPostBack="true"
|
||||
LabelWidth="70px" LabelAlign="Right" Width="170px" Required="true" ShowRedStar="true">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="drpCategory" runat="server" Label="类别" ColumnWidth="30%" OnSelectedIndexChanged="drpTypeInt_SelectedIndexChanged" AutoPostBack="true"
|
||||
LabelWidth="70px" LabelAlign="Right" Width="170px" >
|
||||
</f:DropDownList>
|
||||
<f:TextBox ID="txtCusBillCode" Label="编号" ColumnWidth="30%" runat="server" ShowRedStar="true" Required="true">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Panel ID="PanelOrderIn" Layout="Column" ShowHeader="false" ShowBorder="false" runat="server">
|
||||
<Items>
|
||||
<f:TextBox ID="txtCreateMan" Label="发起人" runat="server" ColumnWidth="20%" Readonly="true"></f:TextBox>
|
||||
<f:TextBox ID="txtCreateDate" Label="发起时间" runat="server" ColumnWidth="20%" Readonly="true"></f:TextBox>
|
||||
<f:DropDownList ID="drpReqUnit" runat="server" Label="申请单位" ColumnWidth="30%"
|
||||
LabelWidth="70px" LabelAlign="Right" Width="170px">
|
||||
</f:DropDownList>
|
||||
<f:TextBox ID="txtRemark" Label="备注" runat="server" ColumnWidth="30%">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Grid ID="Grid2" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="入库明细"
|
||||
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
|
||||
DataIDField="Id" EnableColumnLines="true" OnRowCommand="Grid2_RowCommand"
|
||||
EnableTextSelection="True" PageSize="100" ClicksToEdit="1">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
|
||||
<Items>
|
||||
<f:Button ID="btnAddDetail" Icon="Add" Text="增加" runat="server" ToolTip="增加"
|
||||
OnClick="btnAddDetail_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnImportStock" Icon="PackageIn" Text="导入" runat="server" ToolTip="导入"
|
||||
OnClick="btnImportStock_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:RenderField Width="180px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
|
||||
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
|
||||
<Editor>
|
||||
<f:DropDownList ID="drpMaterialCodeEditor" runat="server" EnableEdit="true">
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
|
||||
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
|
||||
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
|
||||
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
|
||||
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="300px" ColumnID="MaterialDef" DataField="MaterialDef" SortField="MaterialDef"
|
||||
FieldType="String" HeaderText="材料描述" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="PlanNum" DataField="PlanNum" FieldType="Float"
|
||||
HeaderText="计划入库数量">
|
||||
<Editor>
|
||||
<f:NumberBox ID="nbPlanNum" NoDecimal="False" NoNegative="true" DecimalPrecision="2" Increment="0.01" Required="True" runat="server">
|
||||
</f:NumberBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:LinkButtonField Width="60px" TextAlign="Center" ConfirmTarget="Top"
|
||||
CommandName="delete" Icon="Delete" />
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
|
||||
</Listeners>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Form>
|
||||
</div>
|
||||
<f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
|
||||
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true"
|
||||
Title="导入" EnableIFrame="true" Height="650px" OnClose="Window1_Close"
|
||||
Width="900px">
|
||||
</f:Window>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
var grid2ClientID = '<%= Grid2.ClientID %>';
|
||||
var materialInfoMap = <%= MaterialInfoJson %>;
|
||||
|
||||
function onGridAfterEdit(event, value, params) {
|
||||
if (params.columnId !== 'MaterialCode') {
|
||||
return;
|
||||
}
|
||||
|
||||
var grid = F(grid2ClientID);
|
||||
var materialCode = grid.getCellValue(params.rowId, 'MaterialCode');
|
||||
var material = materialInfoMap[materialCode] || {};
|
||||
|
||||
grid.updateCellValue(params.rowId, 'Code', material.Code || '');
|
||||
grid.updateCellValue(params.rowId, 'HeatNo', material.HeatNo || '');
|
||||
grid.updateCellValue(params.rowId, 'BatchNo', material.BatchNo || '');
|
||||
grid.updateCellValue(params.rowId, 'MaterialName', material.MaterialName || '');
|
||||
grid.updateCellValue(params.rowId, 'MaterialDef', material.MaterialDef || '');
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,391 @@
|
||||
using BLL;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CLGL
|
||||
{
|
||||
public partial class InPlanMasterApplyEdit : PageBase
|
||||
{
|
||||
public string Id
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["Id"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["Id"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
protected string MaterialInfoJson
|
||||
{
|
||||
get
|
||||
{
|
||||
var materialMap = GetMaterialList().ToDictionary(x => x.MaterialCode, x => new
|
||||
{
|
||||
x.Code,
|
||||
x.HeatNo,
|
||||
x.BatchNo,
|
||||
x.MaterialName,
|
||||
x.MaterialDef
|
||||
});
|
||||
return JsonConvert.SerializeObject(materialMap);
|
||||
}
|
||||
}
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
InitDrpList();
|
||||
Id = Request.Params["Id"];
|
||||
if (!string.IsNullOrEmpty(Id))
|
||||
{
|
||||
BindMaster();
|
||||
BindGrid(Id);
|
||||
}
|
||||
else
|
||||
{
|
||||
txtCreateMan.Text = this.CurrUser.PersonName;
|
||||
txtCreateDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
drpReqUnit.SelectedValue = this.CurrUser.UnitId;
|
||||
RefreshCusBillCode();
|
||||
BindGrid(string.Empty);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void InitDrpList()
|
||||
{
|
||||
drpWarehouse.DataTextField = "Key";
|
||||
drpWarehouse.DataValueField = "Value";
|
||||
drpWarehouse.DataSource = TwInOutplanmasterService.GetWarehouseCode(this.CurrUser.LoginProjectId);
|
||||
drpWarehouse.DataBind();
|
||||
|
||||
drpTypeInt.DataTextField = "Key";
|
||||
drpTypeInt.DataValueField = "Value";
|
||||
drpTypeInt.DataSource = TwConst.TypeIntMap.Where(x => x.Key.Contains("入库"));
|
||||
drpTypeInt.DataBind();
|
||||
|
||||
drpCategory.DataTextField = "Key";
|
||||
drpCategory.DataValueField = "Value";
|
||||
drpCategory.DataSource = TwConst.CategoryMap;
|
||||
drpCategory.DataBind();
|
||||
|
||||
UnitService.InitUnitDropDownList(drpReqUnit, this.CurrUser.LoginProjectId, true);
|
||||
|
||||
drpMaterialCodeEditor.DataTextField = "MaterialCode";
|
||||
drpMaterialCodeEditor.DataValueField = "MaterialCode";
|
||||
drpMaterialCodeEditor.DataSource = GetMaterialList();
|
||||
drpMaterialCodeEditor.DataBind();
|
||||
Funs.FineUIPleaseSelect(drpMaterialCodeEditor);
|
||||
}
|
||||
|
||||
private void BindMaster()
|
||||
{
|
||||
var queryModel = new Tw_InOutMasterOutput()
|
||||
{
|
||||
Id = Id,
|
||||
};
|
||||
var result = TwInOutplanmasterService.GetListData(queryModel).FirstOrDefault();
|
||||
if (result == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
txtCreateMan.Text = result.CreateManName;
|
||||
txtCreateDate.Text = result.CreateDate.HasValue ? result.CreateDate.Value.ToString("yyyy-MM-dd") : string.Empty;
|
||||
drpReqUnit.SelectedValue = result.ReqUnitId;
|
||||
drpTypeInt.SelectedValue = result.TypeInt.ToString();
|
||||
drpWarehouse.SelectedValue = result.WarehouseId;
|
||||
drpCategory.SelectedValue = result.Category.ToString();
|
||||
txtRemark.Text = result.Remark;
|
||||
txtCusBillCode.Text = result.CusBillCode;
|
||||
}
|
||||
|
||||
private void BindGrid(string inOutPlanMasterId)
|
||||
{
|
||||
if (string.IsNullOrEmpty(inOutPlanMasterId))
|
||||
{
|
||||
Grid2.DataSource = new List<Tw_InOutDetailOutput>();
|
||||
Grid2.DataBind();
|
||||
return;
|
||||
}
|
||||
|
||||
var queryModel = new Tw_InOutDetailOutput()
|
||||
{
|
||||
InOutPlanMasterId = inOutPlanMasterId
|
||||
};
|
||||
var tb = TwInOutplandetailService.GetByModle(queryModel).ToList();
|
||||
Grid2.DataSource = tb;
|
||||
Grid2.DataBind();
|
||||
}
|
||||
|
||||
protected void btnAddDetail_Click(object sender, EventArgs e)
|
||||
{
|
||||
Grid2.DataSource = GetGridDetailList(true);
|
||||
Grid2.DataBind();
|
||||
}
|
||||
|
||||
protected void btnImportStock_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (!Save(Const.BtnSave, false))
|
||||
{
|
||||
return;
|
||||
}
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterDetailImport.aspx?Id={0}", Id, "导入- ")));
|
||||
}
|
||||
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (Save(Const.BtnSave, false))
|
||||
{
|
||||
ShowNotify("保存成功！", MessageBoxIcon.Success);
|
||||
}
|
||||
}
|
||||
|
||||
protected void btnSubmit_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (Save(Const.BtnSubmit, true))
|
||||
{
|
||||
ShowNotify("提交成功！", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
|
||||
}
|
||||
}
|
||||
|
||||
private bool Save(string type, bool validateDetail)
|
||||
{
|
||||
if (!ValidateMaster())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int state = type == Const.BtnSubmit ? (int)TwConst.State.待审核 : (int)TwConst.State.待提交;
|
||||
if (string.IsNullOrEmpty(Id))
|
||||
{
|
||||
Id = Guid.NewGuid().ToString();
|
||||
var model = new Tw_InOutPlanMaster()
|
||||
{
|
||||
Id = Id,
|
||||
ProjectId = this.CurrUser.LoginProjectId,
|
||||
CusBillCode = txtCusBillCode.Text,
|
||||
WarehouseId = drpWarehouse.SelectedValue,
|
||||
WarehouseCode = drpWarehouse.SelectedText,
|
||||
Source = 1,
|
||||
CreateDate = DateTime.Now,
|
||||
CreateMan = this.CurrUser.PersonId,
|
||||
ReqUnitId = drpReqUnit.SelectedValue,
|
||||
TypeInt = int.Parse(drpTypeInt.SelectedValue),
|
||||
Remark = txtRemark.Text,
|
||||
InOutType = (int)TwConst.InOutType.入库,
|
||||
Category = int.Parse(drpCategory.SelectedValue),
|
||||
State = state
|
||||
};
|
||||
TwInOutplanmasterService.Add(model);
|
||||
}
|
||||
else
|
||||
{
|
||||
var model = TwInOutplanmasterService.GetById(Id);
|
||||
if (model == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
model.CusBillCode = txtCusBillCode.Text;
|
||||
model.WarehouseId = drpWarehouse.SelectedValue;
|
||||
model.WarehouseCode = drpWarehouse.SelectedText;
|
||||
model.Source = 1;
|
||||
model.ReqUnitId = drpReqUnit.SelectedValue;
|
||||
model.TypeInt = int.Parse(drpTypeInt.SelectedValue);
|
||||
model.Remark = txtRemark.Text;
|
||||
model.InOutType = (int)TwConst.InOutType.入库;
|
||||
model.Category = int.Parse(drpCategory.SelectedValue);
|
||||
model.State = state;
|
||||
TwInOutplanmasterService.Update(model);
|
||||
}
|
||||
|
||||
return SaveDetail(validateDetail);
|
||||
}
|
||||
|
||||
private bool ValidateMaster()
|
||||
{
|
||||
if (string.IsNullOrEmpty(drpWarehouse.SelectedValue) || drpWarehouse.SelectedValue == Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择仓库！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}
|
||||
if (string.IsNullOrEmpty(drpTypeInt.SelectedValue) || drpTypeInt.SelectedValue == Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择入库类型！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}
|
||||
/*if (string.IsNullOrEmpty(drpCategory.SelectedValue) || drpCategory.SelectedValue == Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择类别！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}*/
|
||||
if (string.IsNullOrEmpty(txtCusBillCode.Text))
|
||||
{
|
||||
Alert.ShowInTop("请输入编号！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool SaveDetail(bool validateDetail)
|
||||
{
|
||||
List<Tw_InOutDetailOutput> details = GetGridDetailList(false);
|
||||
if (validateDetail && details.Count == 0)
|
||||
{
|
||||
Alert.ShowInTop("请添加入库明细！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}
|
||||
|
||||
List<string> keepIds = new List<string>();
|
||||
int sortIndex = 1;
|
||||
foreach (Tw_InOutDetailOutput item in details)
|
||||
{
|
||||
if (IsNullSelectValue(item.MaterialCode))
|
||||
{
|
||||
if (validateDetail)
|
||||
{
|
||||
Alert.ShowInTop("请选择材料主编码！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (!item.PlanNum.HasValue || item.PlanNum <= 0)
|
||||
{
|
||||
if (validateDetail)
|
||||
{
|
||||
Alert.ShowInTop("计划入库数量必须大于0！", MessageBoxIcon.Warning);
|
||||
return false;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
// 明细只保存材料主编码和计划数量，其余材料信息由材料编码库联动显示。
|
||||
var detail = TwInOutplandetailService.GetById(item.Id);
|
||||
if (detail == null)
|
||||
{
|
||||
detail = new Tw_InOutPlanDetail
|
||||
{
|
||||
Id = string.IsNullOrEmpty(item.Id) ? SQLHelper.GetNewID() : item.Id,
|
||||
InOutPlanMasterId = Id,
|
||||
MaterialCode = item.MaterialCode,
|
||||
PlanNum = item.PlanNum,
|
||||
SortIndex = sortIndex++
|
||||
};
|
||||
TwInOutplandetailService.Add(detail);
|
||||
keepIds.Add(detail.Id);
|
||||
}
|
||||
else
|
||||
{
|
||||
detail.MaterialCode = item.MaterialCode;
|
||||
detail.PlanNum = item.PlanNum;
|
||||
detail.SortIndex = sortIndex++;
|
||||
TwInOutplandetailService.Update(detail);
|
||||
keepIds.Add(detail.Id);
|
||||
}
|
||||
}
|
||||
|
||||
var oldDetails = TwInOutplandetailService.GetByModle(new Tw_InOutDetailOutput { InOutPlanMasterId = Id }).ToList();
|
||||
foreach (var oldDetail in oldDetails.Where(x => !keepIds.Contains(x.Id)))
|
||||
{
|
||||
TwInOutplandetailService.DeleteById(oldDetail.Id);
|
||||
}
|
||||
BindGrid(Id);
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool IsNullSelectValue(string value)
|
||||
{
|
||||
return string.IsNullOrEmpty(value) || value == Const._Null;
|
||||
}
|
||||
|
||||
private List<Tw_InOutDetailOutput> GetGridDetailList(bool addEmptyRow)
|
||||
{
|
||||
List<Tw_InOutDetailOutput> list = new List<Tw_InOutDetailOutput>();
|
||||
JArray teamGroupData = Grid2.GetMergedData();
|
||||
foreach (JObject teamGroupRow in teamGroupData)
|
||||
{
|
||||
JObject values = teamGroupRow.Value<JObject>("values");
|
||||
string id = teamGroupRow.Value<string>("id");
|
||||
string materialCode = values.Value<string>("MaterialCode");
|
||||
var material = MaterialCodeLibService.GetMaterialCodeLib(materialCode);
|
||||
list.Add(new Tw_InOutDetailOutput
|
||||
{
|
||||
Id = string.IsNullOrEmpty(id) ? SQLHelper.GetNewID() : id,
|
||||
InOutPlanMasterId = Id,
|
||||
MaterialCode = materialCode,
|
||||
Code = material == null ? values.Value<string>("Code") : material.Code,
|
||||
HeatNo = material == null ? values.Value<string>("HeatNo") : material.HeatNo,
|
||||
BatchNo = material == null ? values.Value<string>("BatchNo") : material.BatchNo,
|
||||
MaterialName = material == null ? values.Value<string>("MaterialName") : material.MaterialName,
|
||||
MaterialDef = material == null ? values.Value<string>("MaterialDef") : material.MaterialDef,
|
||||
PlanNum = values.Value<decimal?>("PlanNum")
|
||||
});
|
||||
}
|
||||
|
||||
if (addEmptyRow)
|
||||
{
|
||||
list.Add(new Tw_InOutDetailOutput
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
InOutPlanMasterId = Id,
|
||||
PlanNum = 0
|
||||
});
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
|
||||
{
|
||||
if (e.CommandName == "delete")
|
||||
{
|
||||
// 删除时保留当前表格中的未保存行，数据库明细在保存或提交时统一同步。
|
||||
List<Tw_InOutDetailOutput> details = GetGridDetailList(false)
|
||||
.Where(x => x.Id != e.RowID)
|
||||
.ToList();
|
||||
Grid2.DataSource = details;
|
||||
Grid2.DataBind();
|
||||
}
|
||||
}
|
||||
|
||||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
BindGrid(Id);
|
||||
}
|
||||
|
||||
protected void drpTypeInt_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (string.IsNullOrEmpty(Id))
|
||||
{
|
||||
RefreshCusBillCode();
|
||||
}
|
||||
}
|
||||
|
||||
private void RefreshCusBillCode()
|
||||
{
|
||||
txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(
|
||||
this.CurrUser.LoginProjectId,
|
||||
UnitService.GetUnitByUnitId(drpReqUnit.SelectedValue)?.UnitCode,
|
||||
drpTypeInt.SelectedText,
|
||||
string.Empty,
|
||||
drpCategory.SelectedText);
|
||||
}
|
||||
|
||||
private List<HJGL_MaterialCodeLib> GetMaterialList()
|
||||
{
|
||||
return MaterialCodeLibService.GetMaterialCodeLibList()
|
||||
.Where(x => string.IsNullOrEmpty(x.ProjectId) || x.ProjectId == this.CurrUser.LoginProjectId)
|
||||
.OrderBy(x => x.MaterialCode)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,215 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CLGL
|
||||
{
|
||||
|
||||
|
||||
public partial class InPlanMasterApplyEdit
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
/// <summary>
|
||||
/// TbCreate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar TbCreate;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// btnSubmit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSubmit;
|
||||
|
||||
/// <summary>
|
||||
/// Panel4 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel4;
|
||||
|
||||
/// <summary>
|
||||
/// drpWarehouse 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWarehouse;
|
||||
|
||||
/// <summary>
|
||||
/// drpTypeInt 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpTypeInt;
|
||||
|
||||
/// <summary>
|
||||
/// drpCategory 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCategory;
|
||||
|
||||
/// <summary>
|
||||
/// txtCusBillCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCusBillCode;
|
||||
|
||||
/// <summary>
|
||||
/// PanelOrderIn 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel PanelOrderIn;
|
||||
|
||||
/// <summary>
|
||||
/// txtCreateMan 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCreateMan;
|
||||
|
||||
/// <summary>
|
||||
/// txtCreateDate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCreateDate;
|
||||
|
||||
/// <summary>
|
||||
/// drpReqUnit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpReqUnit;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtRemark;
|
||||
|
||||
/// <summary>
|
||||
/// Grid2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid2;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// btnAddDetail 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnAddDetail;
|
||||
|
||||
/// <summary>
|
||||
/// btnImportStock 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnImportStock;
|
||||
|
||||
/// <summary>
|
||||
/// drpMaterialCodeEditor 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpMaterialCodeEditor;
|
||||
|
||||
/// <summary>
|
||||
/// nbPlanNum 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox nbPlanNum;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InPlanMasterDetailImport.aspx.cs" Inherits="FineUIPro.Web.CLGL.InPlanMasterDetailImport" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>入库明细导入</title>
|
||||
</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">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:HiddenField ID="hdFileName" runat="server">
|
||||
</f:HiddenField>
|
||||
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click" EnablePostBack="true" EnableAjax="false">
|
||||
</f:Button>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" Text="审核" ValidateForms="SimpleForm1"
|
||||
OnClick="btnAudit_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" Text="导入" ValidateForms="SimpleForm1"
|
||||
OnClick="btnImport_Click">
|
||||
</f:Button>
|
||||
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="提交" Text="提交" ValidateForms="SimpleForm1"
|
||||
OnClick="btnSave_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
|
||||
LabelWidth="150px">
|
||||
</f:FileUpload>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="入库明细"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="MaterialCode" AllowCellEditing="false"
|
||||
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="MaterialCode"
|
||||
AllowPaging="true" PageSize="100" EnableTextSelection="True">
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
|
||||
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
|
||||
<f:RenderField Width="180px" ColumnID="MaterialCode" DataField="MaterialCode"
|
||||
FieldType="String" HeaderText="材料主编码" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="160px" ColumnID="Code" DataField="Code"
|
||||
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo"
|
||||
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo"
|
||||
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName"
|
||||
FieldType="String" HeaderText="材料名称" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="260px" ColumnID="MaterialDef" DataField="MaterialDef"
|
||||
FieldType="String" HeaderText="材料描述" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="PlanNum" DataField="PlanNum"
|
||||
FieldType="Float" HeaderText="计划入库数量" HeaderTextAlign="Center"
|
||||
TextAlign="Right">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<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="50" Value="50" />
|
||||
<f:ListItem Text="100" Value="100" />
|
||||
<f:ListItem Text="200" Value="200" />
|
||||
<f:ListItem Text="所有行" Value="10000" />
|
||||
</f:DropDownList>
|
||||
</PageItems>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,346 @@
|
||||
using BLL;
|
||||
using MiniExcelLibs;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CLGL
|
||||
{
|
||||
public partial class InPlanMasterDetailImport : PageBase
|
||||
{
|
||||
private readonly string initPath = Const.ExcelUrl;
|
||||
|
||||
public static List<InPlanDetailImportItem> ImportDetailList = new List<InPlanDetailImportItem>();
|
||||
|
||||
public static string errorInfos = string.Empty;
|
||||
|
||||
public string Id
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["Id"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["Id"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
hdFileName.Text = string.Empty;
|
||||
Id = Request.QueryString["Id"];
|
||||
ImportDetailList.Clear();
|
||||
errorInfos = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
protected void btnAudit_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (fuAttachUrl.HasFile == false)
|
||||
{
|
||||
ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
string isXls = Path.GetExtension(fuAttachUrl.FileName).Trim().ToLower();
|
||||
if (isXls != ".xlsx")
|
||||
{
|
||||
ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
ImportDetailList.Clear();
|
||||
errorInfos = string.Empty;
|
||||
|
||||
string rootPath = Server.MapPath("~/");
|
||||
string initFullPath = rootPath + initPath;
|
||||
if (!Directory.Exists(initFullPath))
|
||||
{
|
||||
Directory.CreateDirectory(initFullPath);
|
||||
}
|
||||
|
||||
hdFileName.Text = Funs.GetNewFileName() + isXls;
|
||||
string filePath = initFullPath + hdFileName.Text;
|
||||
fuAttachUrl.PostedFile.SaveAs(filePath);
|
||||
ImportXlsToData(filePath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Alert alert = new Alert
|
||||
{
|
||||
Message = "'" + ex.Message + "'",
|
||||
Target = Target.Self
|
||||
};
|
||||
alert.Show();
|
||||
}
|
||||
}
|
||||
|
||||
private void ImportXlsToData(string fileName)
|
||||
{
|
||||
DataTable rows = MiniExcel.QueryAsDataTable(fileName, useHeaderRow: true);
|
||||
ResponeData responeData = AddDataTableToImportList(rows);
|
||||
if (responeData.code == 1)
|
||||
{
|
||||
ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
|
||||
}
|
||||
else
|
||||
{
|
||||
Alert alert = new Alert
|
||||
{
|
||||
Message = responeData.message,
|
||||
Target = Target.Self
|
||||
};
|
||||
alert.Show();
|
||||
}
|
||||
}
|
||||
|
||||
private ResponeData AddDataTableToImportList(DataTable table)
|
||||
{
|
||||
ResponeData responeData = new ResponeData();
|
||||
List<string> result = new List<string>();
|
||||
List<InPlanDetailImportItem> importItems = new List<InPlanDetailImportItem>();
|
||||
|
||||
if (table == null || table.Rows.Count == 0)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "导入数据为空！";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
if (!table.Columns.Contains("计划入库数量"))
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "导入Excel格式错误！模板列必须包含：计划入库数量";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
bool hasMaterialCode = table.Columns.Contains("材料主编码");
|
||||
bool hasCodeInfo = table.Columns.Contains("材料编码") && table.Columns.Contains("炉号") && table.Columns.Contains("批号");
|
||||
if (!hasMaterialCode && !hasCodeInfo)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "导入Excel格式错误！模板列必须包含材料主编码，或同时包含材料编码、炉号、批号";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
Tw_InOutPlanMaster master = TwInOutplanmasterService.GetById(Id);
|
||||
if (master == null)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "请先保存入库申请后再导入明细！";
|
||||
return responeData;
|
||||
}
|
||||
if (master.InOutType != (int)TwConst.InOutType.入库)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = "当前单据不是入库申请，不能导入入库明细！";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
List<HJGL_MaterialCodeLib> materialList = MaterialCodeLibService.GetMaterialCodeLibList();
|
||||
for (int i = 0; i < table.Rows.Count; i++)
|
||||
{
|
||||
string materialCode = hasMaterialCode ? GetCellValue(table.Rows[i], "材料主编码") : string.Empty;
|
||||
string code = table.Columns.Contains("材料编码") ? GetCellValue(table.Rows[i], "材料编码") : string.Empty;
|
||||
string heatNo = table.Columns.Contains("炉号") ? GetCellValue(table.Rows[i], "炉号") : string.Empty;
|
||||
string batchNo = table.Columns.Contains("批号") ? GetCellValue(table.Rows[i], "批号") : string.Empty;
|
||||
string planNumText = GetCellValue(table.Rows[i], "计划入库数量");
|
||||
|
||||
if (string.IsNullOrEmpty(materialCode) && string.IsNullOrEmpty(code) && string.IsNullOrEmpty(heatNo) && string.IsNullOrEmpty(batchNo) && string.IsNullOrEmpty(planNumText))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
HJGL_MaterialCodeLib material = null;
|
||||
if (!string.IsNullOrEmpty(materialCode))
|
||||
{
|
||||
material = materialList.FirstOrDefault(x => x.MaterialCode == materialCode);
|
||||
}
|
||||
else
|
||||
{
|
||||
material = materialList.FirstOrDefault(x => x.Code == code && x.HeatNo == heatNo && x.BatchNo == batchNo);
|
||||
}
|
||||
|
||||
if (material == null)
|
||||
{
|
||||
result.Add("第" + (i + 2).ToString() + "行,材料信息,材料编码库中不存在此材料！");
|
||||
continue;
|
||||
}
|
||||
|
||||
decimal planNum;
|
||||
if (!decimal.TryParse(planNumText, out planNum) || planNum <= 0)
|
||||
{
|
||||
result.Add("第" + (i + 2).ToString() + "行,计划入库数量,请输入大于0的数字！");
|
||||
continue;
|
||||
}
|
||||
|
||||
importItems.Add(new InPlanDetailImportItem
|
||||
{
|
||||
MaterialCode = material.MaterialCode,
|
||||
Code = material.Code,
|
||||
HeatNo = material.HeatNo,
|
||||
BatchNo = material.BatchNo,
|
||||
PlanNum = planNum,
|
||||
MaterialName = material.MaterialName,
|
||||
MaterialDef = material.MaterialDef
|
||||
});
|
||||
}
|
||||
|
||||
if (result.Count > 0)
|
||||
{
|
||||
ImportDetailList.Clear();
|
||||
errorInfos = string.Join("|", result.Distinct());
|
||||
responeData.code = 0;
|
||||
responeData.message = errorInfos;
|
||||
return responeData;
|
||||
}
|
||||
|
||||
ImportDetailList = importItems.GroupBy(x => x.MaterialCode).Select(x =>
|
||||
{
|
||||
InPlanDetailImportItem item = x.First();
|
||||
item.PlanNum = x.Sum(y => y.PlanNum);
|
||||
return item;
|
||||
}).ToList();
|
||||
|
||||
errorInfos = string.Empty;
|
||||
responeData.code = ImportDetailList.Count > 0 ? 1 : 0;
|
||||
responeData.message = ImportDetailList.Count > 0 ? string.Empty : "导入数据为空！";
|
||||
return responeData;
|
||||
}
|
||||
|
||||
protected void btnImport_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(errorInfos))
|
||||
{
|
||||
ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(hdFileName.Text))
|
||||
{
|
||||
ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
Grid1.DataSource = ImportDetailList;
|
||||
Grid1.DataBind();
|
||||
Grid1.RecordCount = ImportDetailList.Count;
|
||||
}
|
||||
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(errorInfos))
|
||||
{
|
||||
ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
SaveDetails();
|
||||
|
||||
string rootPath = Server.MapPath("~/");
|
||||
string filePath = rootPath + initPath + hdFileName.Text;
|
||||
if (!string.IsNullOrEmpty(filePath) && File.Exists(filePath))
|
||||
{
|
||||
File.Delete(filePath);
|
||||
}
|
||||
ShowNotify("导入成功！", MessageBoxIcon.Success);
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
}
|
||||
|
||||
private void SaveDetails()
|
||||
{
|
||||
foreach (InPlanDetailImportItem item in ImportDetailList)
|
||||
{
|
||||
Tw_InOutDetailOutput queryDetail = new Tw_InOutDetailOutput()
|
||||
{
|
||||
InOutPlanMasterId = Id,
|
||||
MaterialCode = item.MaterialCode
|
||||
};
|
||||
Tw_InOutDetailOutput detailOutput = TwInOutplandetailService.GetByModle(queryDetail).FirstOrDefault();
|
||||
if (detailOutput == null)
|
||||
{
|
||||
Tw_InOutPlanDetail newDetail = new Tw_InOutPlanDetail
|
||||
{
|
||||
Id = SQLHelper.GetNewID(),
|
||||
InOutPlanMasterId = Id,
|
||||
MaterialCode = item.MaterialCode,
|
||||
PlanNum = item.PlanNum
|
||||
};
|
||||
TwInOutplandetailService.Add(newDetail);
|
||||
}
|
||||
else
|
||||
{
|
||||
Tw_InOutPlanDetail detail = TwInOutplandetailService.GetById(detailOutput.Id);
|
||||
detail.PlanNum = item.PlanNum;
|
||||
TwInOutplandetailService.Update(detail);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void btnDownLoad_Click(object sender, EventArgs e)
|
||||
{
|
||||
string rootPath = Server.MapPath("~/");
|
||||
string tempDirectory = rootPath + @"File\Excel\Temp\";
|
||||
if (!Directory.Exists(tempDirectory))
|
||||
{
|
||||
Directory.CreateDirectory(tempDirectory);
|
||||
}
|
||||
|
||||
string tempPath = tempDirectory + "入库明细导入模板" + string.Format("{0:yyyyMMddHHmmss}", DateTime.Now) + ".xlsx";
|
||||
DataTable template = new DataTable();
|
||||
template.Columns.Add("材料主编码");
|
||||
template.Columns.Add("计划入库数量");
|
||||
MiniExcel.SaveAs(tempPath, template);
|
||||
|
||||
FileInfo info = new FileInfo(tempPath);
|
||||
long fileSize = info.Length;
|
||||
Response.ClearContent();
|
||||
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("入库明细导入模板.xlsx", System.Text.Encoding.UTF8));
|
||||
Response.ContentType = "excel/plain";
|
||||
Response.ContentEncoding = System.Text.Encoding.UTF8;
|
||||
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
|
||||
Response.TransmitFile(tempPath, 0, fileSize);
|
||||
Response.Flush();
|
||||
Response.Close();
|
||||
File.Delete(tempPath);
|
||||
}
|
||||
|
||||
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
|
||||
Grid1.DataSource = ImportDetailList;
|
||||
Grid1.DataBind();
|
||||
Grid1.RecordCount = ImportDetailList.Count;
|
||||
}
|
||||
|
||||
private string GetCellValue(DataRow row, string columnName)
|
||||
{
|
||||
return Convert.ToString(row[columnName]).Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "").Trim();
|
||||
}
|
||||
|
||||
public class InPlanDetailImportItem
|
||||
{
|
||||
public string MaterialCode { get; set; }
|
||||
|
||||
public string Code { get; set; }
|
||||
|
||||
public string HeatNo { get; set; }
|
||||
|
||||
public string BatchNo { get; set; }
|
||||
|
||||
public decimal PlanNum { get; set; }
|
||||
|
||||
public string MaterialName { get; set; }
|
||||
|
||||
public string MaterialDef { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.CLGL
|
||||
{
|
||||
|
||||
|
||||
public partial class InPlanMasterDetailImport
|
||||
{
|
||||
|
||||
/// <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>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
/// <summary>
|
||||
/// hdFileName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.HiddenField hdFileName;
|
||||
|
||||
/// <summary>
|
||||
/// btnDownLoad 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnDownLoad;
|
||||
|
||||
/// <summary>
|
||||
/// btnAudit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnAudit;
|
||||
|
||||
/// <summary>
|
||||
/// btnImport 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnImport;
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
/// <summary>
|
||||
/// fuAttachUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FileUpload fuAttachUrl;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <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;
|
||||
}
|
||||
}
|
||||
@@ -178,6 +178,7 @@ namespace FineUIPro.Web.CLGL
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -156,6 +156,7 @@ namespace FineUIPro.Web.CLGL
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/25/2026 23:25:00" ReportInfo.Modified="07/07/2026 10:30:48" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/25/2026 23:25:00" ReportInfo.Modified="07/10/2026 18:11:46" ReportInfo.CreatorVersion="2017.1.16.0">
|
||||
<Dictionary>
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaXj7MTwVWd+W15ZHXWbvUTygn/8kT7Dd8PAtwcQdvSWlUEyCU1xPvJPbQKwTsqQwLM+O2fcBJVGvSTxsXNEsa1vy5JNdjQE5XXU2qh41PMt4c4Lp/j2o5C6htb8mS4/JfQOgej7CCf0JujCt3dJ+YxVxIWh8eIZhXk6qeqDkTaXS"/>
|
||||
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaXj7MTwVWd+W15ZHXWbvUTygn/8kT7Dd8PAtwcQdvSWlUEyCU1xPvJPbQKwTsqQwLM+O2fcBJVGvSTxsXNEsa1vy5JNdjQE5XXU2qh41PMt4c4Lp/j2o5C6htb8mS4/JfQOgej7CCf0JujCt3dJ+YxUAMBCvnGnWxEQhHxFzu3Oa"/>
|
||||
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
|
||||
<Column Name="PipelineCode" DataType="System.String"/>
|
||||
<Column Name="SegmentCode" DataType="System.String"/>
|
||||
@@ -48,7 +48,7 @@
|
||||
<TableCell Name="Cell7" Border.Lines="All" Text="管段号/SP NO." HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell8" Border.Lines="All" Text="[Table1.SegmentCode]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell52" Border.Lines="All" Text="焊口号/WJ NO." HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell53" Border.Lines="All" Text="[Table1.WeldJointNo]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell53" Border.Lines="All" Text="S[Table1.WeldJointNo]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell11" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row3" Height="20.01">
|
||||
@@ -62,7 +62,7 @@
|
||||
<TableCell Name="Cell17" Border.Lines="All" Text="规 格/SPE" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell18" Border.Lines="All" Text="[Table1.Spec]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell60" Border.Lines="All" Text="设计温度/DT" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell61" Border.Lines="All" Text="[Table1.DesignTemperature]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell61" Border.Lines="All" Text="[Table1.DesignTemperature]℃" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
<TableCell Name="Cell21" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 7pt, style=Bold"/>
|
||||
</TableRow>
|
||||
<TableRow Name="Row5" Height="20.01">
|
||||
|
||||
@@ -344,17 +344,14 @@
|
||||
<Content Include="BaseInfo\WorkPost.aspx" />
|
||||
<Content Include="BaseInfo\WorkPostCleanupMerge.aspx" />
|
||||
<Content Include="BaseInfo\WorkStage.aspx" />
|
||||
<Content Include="bin\FastReport.dll" />
|
||||
<Content Include="bin\FastReport.Editor.dll" />
|
||||
<Content Include="bin\FastReport.Web.dll" />
|
||||
<Content Include="bin\FineUIPro.Web.dll" />
|
||||
<Content Include="bin\FineUIPro.Web.pdb" />
|
||||
<Content Include="CLGL\ArrivalStatistics.aspx" />
|
||||
<Content Include="CLGL\OutPlanMaster.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterDetailImport.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterHistoryImport.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterEdit.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterOut.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterApplyEdit.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterDetailImport.aspx" />
|
||||
<Content Include="CLGL\InPlanMaster.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterDataIn.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterEdit.aspx" />
|
||||
@@ -645,10 +642,6 @@
|
||||
<Content Include="DigData\ProjectWBSAnalysis.aspx" />
|
||||
<Content Include="DigData\WBSAnalysis.aspx" />
|
||||
<Content Include="DigData\WBSDW.aspx" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.dll" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.xml" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.dll" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.xml" />
|
||||
<Content Include="File\Image\label.png" />
|
||||
<Content Include="File\Image\loc.png" />
|
||||
<Content Include="File\Image\SEDIN_Code.jpg" />
|
||||
@@ -3038,14 +3031,6 @@
|
||||
<Content Include="Notice\NoticeEdit.aspx" />
|
||||
<Content Include="Notice\NoticeView.aspx" />
|
||||
<Content Include="Notice\NoticeView2.aspx" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csproj.FileListAbsolute.txt" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.dll" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.pdb" />
|
||||
<Content Include="obj\Debug\Interop.WIA.dll" />
|
||||
<Content Include="obj\Debug\TempPE\Service References.HSSEService.Reference.cs.dll" />
|
||||
<Content Include="obj\Debug\Web.csproj.FileListAbsolute.txt" />
|
||||
<Content Include="obj\Debug\Web.dll" />
|
||||
<Content Include="obj\Debug\Web.pdb" />
|
||||
<Content Include="OfficeCheck\Check\CheckContentEdit.aspx" />
|
||||
<Content Include="OfficeCheck\Check\CheckInfo.aspx" />
|
||||
<Content Include="OfficeCheck\Check\CheckNotice.aspx" />
|
||||
@@ -3592,7 +3577,6 @@
|
||||
<Content Include="ZHGL\RealName\OnPost.aspx" />
|
||||
<Content Include="ZHGL\RealName\SynchroRecord.aspx" />
|
||||
<Content Include="ZHGL\RealName\SynchroSet.aspx" />
|
||||
<Content Include="AttachFile\officecontrol\2222.docx" />
|
||||
<Content Include="ZHGL\Supervise\ShowFileUpload.aspx" />
|
||||
<Content Include="ZHGL\Supervise\ShowRectifyItem.aspx" />
|
||||
<Content Include="ZHGL\Supervise\SubUnitCheckRectifyEdit.aspx" />
|
||||
@@ -3641,8 +3625,6 @@
|
||||
<Content Include="HSSE\Doc\用户权限怎么设置.doc" />
|
||||
<Content Include="HSSE\Doc\隐患整改单操作说明.doc" />
|
||||
<Content Include="HJGL\WeldingManage\GetWdldingDailyItem.ashx" />
|
||||
<Content Include="File\Word\Person\~%24经理工作任务书.doc" />
|
||||
<Content Include="File\Word\Person\~WRL0001.tmp" />
|
||||
<Content Include="File\Word\Person\安全专业工程师工作任务书.doc" />
|
||||
<Content Include="File\Word\Person\安全经理工作任务书.doc" />
|
||||
<Content Include="File\Word\Person\施工专业工程师工作任务书.doc" />
|
||||
@@ -3669,11 +3651,8 @@
|
||||
<Content Include="File\Word\HSSE\专项检查.doc" />
|
||||
<Content Include="File\Excel\DataIn\WBS定制导入模板.xls" />
|
||||
<Content Include="File\Word\HSSE\安全日志.doc" />
|
||||
<Fakes Include="Fakes\Apache.NMS.fakes" />
|
||||
<Fakes Include="Fakes\ThoughtWorks.QRCode.fakes" />
|
||||
<Content Include="File\Word\PHTGL\合同评审、审批表.docx" />
|
||||
<Content Include="File\Word\PHTGL\招标文件审批表.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\~%249 施工分包商组织机构人员配置表及关键人员名单.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\施工合同标准文本.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\第三部分 专用合同条款.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\第二部分 通用合同条款.docx" />
|
||||
@@ -3701,19 +3680,6 @@
|
||||
<Content Include="File\Word\PHTGL\施工招标评标小组名单审批表.docx" />
|
||||
<Content Include="File\Word\PHTGL\确定分包商审批表（用于经评审的最低投标报价法）.docx" />
|
||||
<Content Include="File\Word\PHTGL\确定分包商审批表（用于综合评估法）.docx" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.fakesconfig" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.messages" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.fakesconfig" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.messages" />
|
||||
<Content Include="obj\Debug\DesignTimeResolveAssemblyReferences.cache" />
|
||||
<Content Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csproj.CopyComplete" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csproj.CoreCompileInputs.cache" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csprojAssemblyReference.cache" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csprojFakesResolveAssemblyReference.cache" />
|
||||
<Content Include="obj\Debug\ResolveAssemblyReference.cache" />
|
||||
<Content Include="obj\Debug\TempPE\vssver.scc" />
|
||||
<Content Include="obj\Debug\Web.csprojResolveAssemblyReference.cache" />
|
||||
<Content Include="File\Word\Person\员工总结模板.doc" />
|
||||
<Fakes Include="Fakes\FastReport.fakes" />
|
||||
<Content Include="libman.json" />
|
||||
@@ -3735,7 +3701,6 @@
|
||||
<Content Include="ReportPrint\ReportTabFile\项目现场职工伤亡事故原因分析报.tab" />
|
||||
<Content Include="ReportPrint\ReportTabFile\职业健康安全危险源辨识与评价.tab" />
|
||||
<Content Include="ReportPrint\ReportTabFile\职业健康安全危险源辨识与评价（重大危险源）.tab" />
|
||||
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
|
||||
<Content Include="Personal\RunLog.aspx" />
|
||||
<Content Include="Personal\PersonalSet.aspx" />
|
||||
<Content Include="Personal\PersonalInfo.aspx" />
|
||||
@@ -8252,6 +8217,20 @@
|
||||
<Compile Include="CLGL\OutPlanMasterOut.aspx.designer.cs">
|
||||
<DependentUpon>OutPlanMasterOut.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterApplyEdit.aspx.cs">
|
||||
<DependentUpon>InPlanMasterApplyEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterApplyEdit.aspx.designer.cs">
|
||||
<DependentUpon>InPlanMasterApplyEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterDetailImport.aspx.cs">
|
||||
<DependentUpon>InPlanMasterDetailImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterDetailImport.aspx.designer.cs">
|
||||
<DependentUpon>InPlanMasterDetailImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMaster.aspx.cs">
|
||||
<DependentUpon>InPlanMaster.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -17190,20 +17169,15 @@
|
||||
<DependentUpon>UnitHazardRegisterRecordEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="App_Themes\Web.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="App_Themes\Default\Images\" />
|
||||
<Folder Include="FakesAssemblies\" />
|
||||
<Folder Include="FileUpload\" />
|
||||
<Folder Include="Images\charts_0\" />
|
||||
<Folder Include="Images\charts_1\" />
|
||||
<Folder Include="Images\charts_2\" />
|
||||
<Folder Include="Images\charts_3\" />
|
||||
<Folder Include="obj\Debug\Fakes\anms\b\zh-Hans\" />
|
||||
<Folder Include="obj\Debug\Fakes\anms\o\" />
|
||||
<Folder Include="obj\Debug\Fakes\twqrc\b\zh-Hans\" />
|
||||
<Folder Include="obj\Debug\Fakes\twqrc\o\" />
|
||||
<Folder Include="Properties\PublishProfiles\" />
|
||||
<Folder Include="res\indexv1\assets\image\sub_index\quality\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -64,6 +64,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -72,6 +72,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -106,6 +106,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -108,6 +108,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -101,6 +101,10 @@
|
||||
<asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
|
||||
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
|
||||
Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
|
||||
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
|
||||
Width="100px">
|
||||
|
||||
@@ -258,6 +258,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
&& x.SuperUnitWork == null
|
||||
&& x.UnitId != null
|
||||
&& x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
// 优化2: 批量获取所有相关管线数据，避免N+1查询问题
|
||||
@@ -913,8 +914,12 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
var jointIds = weldJointList.Select(x => x.WeldJointId).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
|
||||
var pipelineIds = weldJointList.Select(x => x.PipelineId).Where(x => !string.IsNullOrEmpty(x)).Distinct().ToList();
|
||||
var materialRows = (from x in Funs.DB.HJGL_PipeLineMat
|
||||
join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
|
||||
where jointIds.Contains(x.WeldJointId) && pipelineIds.Contains(x.PipelineId)
|
||||
orderby x.WeldJointId, x.Number, x.PipeLineMatId
|
||||
orderby
|
||||
y.MaterialUnit == "米" ? 1 :
|
||||
y.MaterialUnit == "个" ? 2 :
|
||||
y.MaterialUnit == "片" ? 3 : 4
|
||||
select x).ToList();
|
||||
|
||||
var materialCodes = materialRows.Where(x => !string.IsNullOrEmpty(x.MaterialCode)).Select(x => x.MaterialCode).Distinct().ToList();
|
||||
@@ -952,7 +957,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
dr["WeldJointNo"] = weldJointNo;
|
||||
dr["MaterialText"] = string.IsNullOrEmpty(joint.Material1Code) ? joint.Material2Code : joint.Material1Code;
|
||||
dr["Spec"] = joint.Specification;
|
||||
dr["DesignTemperature"] = joint.PreTemperature;
|
||||
dr["DesignTemperature"] = joint.DesignTemperature;
|
||||
dr["MaterialCode1"] = GetMaterialDisplayCode(row1, lib1);
|
||||
dr["HeatNo1"] = lib1 == null ? string.Empty : lib1.HeatNo;
|
||||
dr["BatchNo1"] = lib1 == null ? string.Empty : lib1.BatchNo;
|
||||
|
||||
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -74,6 +74,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -131,6 +131,7 @@ namespace FineUIPro.Web.HJGL.NDT
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -52,6 +52,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -52,6 +52,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
//获取当前项目出库单
|
||||
Model.Tw_InOutMasterOutput querytable = new Model.Tw_InOutMasterOutput();
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
Width="180px" LabelWidth="80px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
|
||||
<f:DropDownList ID="ddlFlowingSection" runat="server" Label="流水段"
|
||||
<f:DropDownList ID="ddlFlowingSection" runat="server" Label="流水段" Hidden="true"
|
||||
Width="180px" LabelWidth="80px" LabelAlign="Right" AutoSelectFirstItem="true">
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="ddlPipeArea" runat="server" Label="管线划分"
|
||||
@@ -132,10 +132,10 @@
|
||||
<asp:Label ID="txt" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
|
||||
<%--<f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
|
||||
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
|
||||
TextAlign="Center" SortField="FlowingSection">
|
||||
</f:RenderField>
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField Width="150px" ColumnID="WarehouseName" DataField="WarehouseName"
|
||||
FieldType="String" HeaderText="仓库" HeaderTextAlign="Center"
|
||||
TextAlign="Center" SortField="WarehouseName">
|
||||
|
||||
@@ -99,6 +99,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -64,6 +64,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -62,6 +62,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
@@ -980,6 +981,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWorks = null;
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaningLists = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -90,6 +90,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -176,6 +176,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -51,6 +51,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -91,6 +91,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
|
||||
if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
|
||||
|
||||
@@ -85,6 +85,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
|
||||
if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
|
||||
|
||||
@@ -88,6 +88,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
|
||||
if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
|
||||
|
||||
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
&& x.SuperUnitWork == null
|
||||
&& x.UnitId != null
|
||||
&& x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
// 按项目类型分组，避免重复查询
|
||||
|
||||
@@ -93,6 +93,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
List<Model.PTP_TestPackage> testPackageLists = new List<Model.PTP_TestPackage>();
|
||||
if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
|
||||
|
||||
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -1026,7 +1026,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
MaterialId = x.MaterialId,
|
||||
PaintId = x.PaintId,
|
||||
Remark = x.Remark,
|
||||
FlowingSection = x.FlowingSection
|
||||
}).DistinctBy(temp => new
|
||||
{
|
||||
temp.PipelineId,
|
||||
@@ -1052,8 +1051,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
temp.PCMedium,
|
||||
temp.MaterialId,
|
||||
temp.PaintId,
|
||||
temp.Remark,
|
||||
temp.FlowingSection
|
||||
temp.Remark
|
||||
}).ToList();
|
||||
for (int i = 0; i < pipelines.Count(); i++)
|
||||
{
|
||||
@@ -1082,7 +1080,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
pipeline.MaterialId = pipelines[i].MaterialId;
|
||||
pipeline.PaintId = pipelines[i].PaintId;
|
||||
pipeline.Remark = pipelines[i].Remark;
|
||||
pipeline.FlowingSection = pipelines[i].FlowingSection;
|
||||
|
||||
var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId);
|
||||
if (isExistPipelineCode != null) // 更新管线
|
||||
@@ -1127,6 +1124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
ProjectId = this.CurrUser.LoginProjectId,
|
||||
IsHotProess = x.IsHotProess,
|
||||
WeldJointPoint = x.WeldJointPoint,
|
||||
FlowingSection=x.FlowingSection
|
||||
}).DistinctBy(temp => new
|
||||
{
|
||||
temp.WeldJointCode,
|
||||
@@ -1143,7 +1141,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
temp.JointAttribute,
|
||||
temp.ProjectId,
|
||||
temp.IsHotProess,
|
||||
temp.WeldJointPoint
|
||||
temp.WeldJointPoint,
|
||||
temp.FlowingSection
|
||||
}).ToList();
|
||||
|
||||
var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList();
|
||||
@@ -1166,12 +1165,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
weldJoint.ProjectId = weldJoints[i].ProjectId;
|
||||
weldJoint.IsHotProess = weldJoints[i].IsHotProess;
|
||||
weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint;
|
||||
weldJoint.FlowingSection = weldJoints[i].FlowingSection;
|
||||
|
||||
var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode);
|
||||
if (isExistJot != null) // 更新焊口
|
||||
{
|
||||
weldJoint.WeldJointId = isExistJot.WeldJointId;
|
||||
BLL.WeldJointService.UpdateWeldJoint(weldJoint);
|
||||
isExistJot.PipelineId = getpipelines.Where(x => x.PipelineCode == weldJoints[i].PipelineCode).FirstOrDefault().PipelineId;
|
||||
isExistJot.WeldJointCode = weldJoints[i].WeldJointCode;
|
||||
isExistJot.PipelineCode = weldJoints[i].PipelineCode;
|
||||
isExistJot.Material1Id = weldJoints[i].Material1Id;
|
||||
isExistJot.Material2Id = weldJoints[i].Material2Id;
|
||||
isExistJot.Dia = weldJoints[i].Dia;
|
||||
isExistJot.DNDia = weldJoints[i].DNDia;
|
||||
isExistJot.Size = weldJoints[i].Size;
|
||||
isExistJot.Thickness = weldJoints[i].Thickness;
|
||||
isExistJot.Specification = weldJoints[i].Specification;
|
||||
isExistJot.WeldTypeId = weldJoints[i].WeldTypeId;
|
||||
isExistJot.DetectionTypeId = weldJoints[i].DetectionTypeId;
|
||||
isExistJot.JointAttribute = weldJoints[i].JointAttribute;
|
||||
isExistJot.ProjectId = weldJoints[i].ProjectId;
|
||||
isExistJot.IsHotProess = weldJoints[i].IsHotProess;
|
||||
isExistJot.WeldJointPoint = weldJoints[i].WeldJointPoint;
|
||||
isExistJot.FlowingSection = weldJoints[i].FlowingSection;
|
||||
BLL.WeldJointService.UpdateWeldJoint(isExistJot);
|
||||
}
|
||||
else // 增加焊口
|
||||
{
|
||||
|
||||
@@ -53,6 +53,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -225,10 +225,6 @@
|
||||
FieldType="String" HeaderText="防腐等级" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
|
||||
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark" SortField="Remark"
|
||||
FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
@@ -263,6 +259,10 @@
|
||||
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
|
||||
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -72,6 +72,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
@@ -329,7 +330,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,WeldJointPoint
|
||||
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint,FlowingSection
|
||||
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter> { };
|
||||
|
||||
|
||||
@@ -140,6 +140,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -59,6 +59,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -108,6 +108,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true"
|
||||
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
|
||||
AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
|
||||
AllowSorting="true" SortField="PipelineCode,WeldJointCodeInt" SortDirection="ASC" OnSort="Grid1_Sort"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableTextSelection="True" EnableRowDoubleClickEvent="true"
|
||||
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
|
||||
@@ -108,6 +108,9 @@
|
||||
Width="60px" HeaderTextAlign="Center" TextAlign="Center" ColumnID="tfNumber" />
|
||||
<f:GroupField HeaderText="设计基础数据" TextAlign="Center">
|
||||
<Columns>
|
||||
<f:renderfield headertext="管线号" columnid="PipelineCode" datafield="PipelineCode" sortfield="PipelineCode" fieldtype="String" headertextalign="Center"
|
||||
textalign="Left" width="160px">
|
||||
</f:renderfield>
|
||||
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="160px">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
@@ -265,7 +266,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,CAST(WeldJointCode as int) as WeldJointCodeInt
|
||||
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter> { };
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
@@ -1,18 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
|
||||
自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。
|
||||
-->
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<WebPublishMethod>FileSystem</WebPublishMethod>
|
||||
<PublishProvider>FileSystem</PublishProvider>
|
||||
<DeleteExistingFiles>false</DeleteExistingFiles>
|
||||
<ExcludeApp_Data>false</ExcludeApp_Data>
|
||||
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
|
||||
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
||||
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
||||
<SiteUrlToLaunchAfterPublish />
|
||||
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
|
||||
<ExcludeApp_Data>True</ExcludeApp_Data>
|
||||
<publishUrl>D:\Package\中国化学</publishUrl>
|
||||
<DeleteExistingFiles>False</DeleteExistingFiles>
|
||||
<PublishProvider>FileSystem</PublishProvider>
|
||||
<PublishUrl>E:\Package\陕化建</PublishUrl>
|
||||
<WebPublishMethod>FileSystem</WebPublishMethod>
|
||||
<_TargetId>Folder</_TargetId>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -65,6 +65,7 @@ namespace FineUIPro.Web.common
|
||||
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
|
||||
orderby x.UnitWorkCode
|
||||
select x).ToList();
|
||||
|
||||
List<Model.WBS_UnitWork> unitWork1 = null;
|
||||
|
||||
+26
-1
@@ -1,4 +1,5 @@
|
||||
#pragma warning disable 1591
|
||||
|
||||
#pragma warning disable 1591
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
@@ -110922,6 +110923,8 @@ namespace Model
|
||||
|
||||
private System.Nullable<decimal> _Misalignment;
|
||||
|
||||
private string _FlowingSection;
|
||||
|
||||
private EntitySet<HJGL_Hard_Report> _HJGL_Hard_Report;
|
||||
|
||||
private EntitySet<HJGL_Hard_TrustItem> _HJGL_Hard_TrustItem;
|
||||
@@ -111080,6 +111083,8 @@ namespace Model
|
||||
partial void OnFitupGapChanged();
|
||||
partial void OnMisalignmentChanging(System.Nullable<decimal> value);
|
||||
partial void OnMisalignmentChanged();
|
||||
partial void OnFlowingSectionChanging(string value);
|
||||
partial void OnFlowingSectionChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_WeldJoint()
|
||||
@@ -112345,6 +112350,26 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")]
|
||||
public string FlowingSection
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._FlowingSection;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._FlowingSection != value))
|
||||
{
|
||||
this.OnFlowingSectionChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._FlowingSection = value;
|
||||
this.SendPropertyChanged("FlowingSection");
|
||||
this.OnFlowingSectionChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Hard_Report_HJGL_WeldJoint", Storage="_HJGL_Hard_Report", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_Hard_Report> HJGL_Hard_Report
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user