feat(clgl): 增加入库申请编辑与明细导入

支持入库申请信息维护、入库明细批量导入及模板下载,
完善材料入库业务流程,减少人工录入和明细维护成本。
增加焊口流转区段信息,并统一相关单位工程列表排序
This commit is contained in:
2026-07-13 09:17:00 +08:00
parent 1da7910305
commit 3185461755
73 changed files with 1774 additions and 145 deletions
@@ -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;
@@ -446,4 +447,4 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
}
}
@@ -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();
@@ -278,4 +279,4 @@ namespace FineUIPro.Web.HJGL.PreDesign
#endregion
}
}
}
@@ -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;
@@ -1291,4 +1293,4 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
#endregion
}
}
}
@@ -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;
@@ -364,4 +365,4 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
}
}