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

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

Browse Source 
支持入库申请信息维护、入库明细批量导入及模板下载，
完善材料入库业务流程，减少人工录入和明细维护成本。
增加焊口流转区段信息，并统一相关单位工程列表排序
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+1 -24
View File
@@ -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" />
@@ -941,4 +918,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
SGGL/BLL/CLGL/TwConst.cs
+1
View File
@@ -73,6 +73,7 @@ namespace BLL
};
public static Dictionary<string, int> CategoryMap = new Dictionary<string, int>
{
{ "全部" ,(int)Category.全部},
{ "管件" ,(int)Category.管件},
{ "管段" ,(int)Category.管段},
};
SGGL/BLL/DropListService.cs
+2 -1
View File
@@ -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
SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
+4 -2
View File
@@ -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