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

焊接修改

Browse Source
This commit is contained in:
李鹏飞
2025-09-24 17:31:28 +08:00
parent cb92dcb730
commit 0f70405339
64 changed files with 2492 additions and 2040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwOutputdetailService..cs
+4 -1
View File
@@ -37,11 +37,14 @@ namespace BLL
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.OutputMasterId) || x.OutputMasterId.Contains(table.OutputMasterId)) &&
(string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))
(string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))&&
(table.TypeInt ==null || master.TypeInt==table.TypeInt)
select new Model.Tw_InOutDetailOutput
{
Id = x.Id,
OutputMasterId = x.OutputMasterId,
CusBillCode=master.CusBillCode,
TypeInt=master.TypeInt,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
PlanNum = x.PlanNum,
SGGL/BLL/CLGL/TwOutputmasterService.cs
+3 -1
View File
@@ -122,6 +122,7 @@ namespace BLL
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
WeldTaskId = x.WeldTaskId,
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == DateTime.ParseExact(x.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date)?.TaskCode : "" : "",
UnitWorkId= x.WeldTaskId != null? x.WeldTaskId.Split('|')[0].ToString():null,
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,
@@ -141,7 +142,7 @@ namespace BLL
Count = q.Count();
if (Count == 0)
{
return null;
return new List<Tw_InOutMasterOutput>();
}
var result = q.ToList();
return (from x in result
@@ -166,6 +167,7 @@ namespace BLL
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
WeldTaskId = x.WeldTaskId,
WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == DateTime.ParseExact(x.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date)?.TaskCode : "" : "",
UnitWorkId = x.WeldTaskId != null ? x.WeldTaskId.Split('|')[0].ToString() : null,
AuditMan = x.AuditMan,
AuditManName = x.AuditManName,
AuditDate = x.AuditDate,