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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
杨红卫
2023-10-25 15:42:39 +08:00
parent 4e171aa7f9 d1a4134e7b
commit 77b348244b
8 changed files with 119 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+12 -42
View File
@@ -1100,27 +1100,18 @@ namespace BLL
decimal physicalCompletionQuantity = 0, materialConsumption = 0;
if (we.Count() > 0)
{
foreach (var w in we)
{
physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
materialConsumption += w.MaterialConsumption ?? 0;
}
physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
row[9] = physicalCompletionQuantity;
row[10] = materialConsumption;
}
for (int i = 0; i < workPostIds.Count; i++)
{
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0)
{
decimal d = 0;
foreach (var workEfficiency in workEfficiencyList)
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
if (d > 0)
{
row[12 + i * 2] = decimal.Round(d, 2);
@@ -1133,17 +1124,11 @@ namespace BLL
}
for (int i = 0; i < machineIds.Count; i++)
{
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0)
{
decimal d = 0;
foreach (var workEfficiency in workEfficiencyList)
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
if (d > 0)
{
row[52 + i * 2] = decimal.Round(d, 2);
@@ -1188,27 +1173,18 @@ namespace BLL
decimal physicalCompletionQuantity = 0, materialConsumption = 0;
if (we.Count() > 0)
{
foreach (var w in we)
{
physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
materialConsumption += w.MaterialConsumption ?? 0;
}
physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
row[9] = physicalCompletionQuantity;
row[10] = materialConsumption;
}
for (int i = 0; i < workPostIds.Count; i++)
{
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0)
{
decimal d = 0;
foreach (var workEfficiency in workEfficiencyList)
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
if (d > 0)
{
row[12 + i * 2] = decimal.Round(d, 2);
@@ -1221,17 +1197,11 @@ namespace BLL
}
for (int i = 0; i < machineIds.Count; i++)
{
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0)
{
decimal d = 0;
foreach (var workEfficiency in workEfficiencyList)
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
if (d > 0)
{
row[52 + i * 2] = decimal.Round(d, 2);