lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改材料编码库导入功能，焊口台账增加焊接日期筛选

Browse Source
This commit is contained in:
李鹏飞
2026-08-31 15:11:03 +08:00
parent ad6ef33ce2
commit ffb9c2a95c
9 changed files with 97 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLib.aspx
+1 -1
View File
@@ -43,7 +43,7 @@
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<Columns>
<f:RenderField Width="200px" ColumnID="Code" DataField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left" SortField="Code">
SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs
+4
View File
@@ -235,6 +235,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
select new HJGL_MaterialCodeLib
{
MaterialCode = x.MaterialCode,
Code = x.MaterialCode,
MaterialDef = x.MaterialDef,
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit,
@@ -244,6 +245,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
}).DistinctBy(temp => new
{
temp.MaterialCode,
temp.Code,
temp.MaterialDef,
temp.MaterialSpec,
temp.MaterialUnit,
@@ -254,6 +256,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
select new HJGL_MaterialCodeLib
{
MaterialCode = x.MaterialCode,
Code = x.MaterialCode,
MaterialDef = x.MaterialDef,
MaterialSpec = x.MaterialSpec,
MaterialUnit = x.MaterialUnit,
@@ -263,6 +266,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
}).DistinctBy(temp => new
{
temp.MaterialCode,
temp.Code,
temp.MaterialDef,
temp.MaterialSpec,
temp.MaterialUnit,