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-11 10:19:26 +08:00
parent 9a73b66ee1 78a26e14c1
commit 5a9ebc9ade
21 changed files with 263 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs
+37 -30
View File
@@ -38,7 +38,8 @@ namespace BLL
WorkContent = newtable.WorkContent,
Remarks = newtable.Remarks,
IsTemplate = newtable.IsTemplate,
ParentId = newtable.ParentId
ParentId = newtable.ParentId,
SerialNumber = newtable.SerialNumber
};
Funs.DB.PHTGL_Quantity.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -68,7 +69,8 @@ namespace BLL
WorkContent = newtable.WorkContent,
Remarks = newtable.Remarks,
IsTemplate = false,
ParentId = parentId
ParentId = parentId,
SerialNumber = newtable.SerialNumber
};
Funs.DB.PHTGL_Quantity.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -96,6 +98,7 @@ namespace BLL
table.Remarks = newtable.Remarks;
table.IsTemplate = newtable.IsTemplate;
table.ParentId = newtable.ParentId;
table.SerialNumber = newtable.SerialNumber;
Funs.DB.SubmitChanges();
}
}
@@ -278,34 +281,37 @@ namespace BLL
public static List<PHTGL_Quantity> GetPHTGL_QuantityByModle(PHTGL_Quantity table)
{
var q = from x in Funs.DB.PHTGL_Quantity
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) &&
(string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) &&
(string.IsNullOrEmpty(table.SubItemProject) ||
x.SubItemProject.Contains(table.SubItemProject)) &&
(string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) &&
(string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) &&
(string.IsNullOrEmpty(table.ProjectDescription) ||
x.ProjectDescription.Contains(table.ProjectDescription)) &&
(string.IsNullOrEmpty(table.UnitOfMeasurement) ||
x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) &&
(string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) &&
(string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) ||
x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) &&
(string.IsNullOrEmpty(table.MainMaterialCost) ||
x.MainMaterialCost.Contains(table.MainMaterialCost)) &&
(string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) &&
(string.IsNullOrEmpty(table.CalculationRule) ||
x.CalculationRule.Contains(table.CalculationRule)) &&
(string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) &&
(string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) &&
x.IsTemplate == table.IsTemplate &&
(string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId))
select x
;
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) &&
(string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) &&
(string.IsNullOrEmpty(table.SubItemProject) ||
x.SubItemProject.Contains(table.SubItemProject)) &&
(string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) &&
(string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) &&
(string.IsNullOrEmpty(table.ProjectDescription) ||
x.ProjectDescription.Contains(table.ProjectDescription)) &&
(string.IsNullOrEmpty(table.UnitOfMeasurement) ||
x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) &&
(string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) &&
(string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) ||
x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) &&
(string.IsNullOrEmpty(table.MainMaterialCost) ||
x.MainMaterialCost.Contains(table.MainMaterialCost)) &&
(string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) &&
(string.IsNullOrEmpty(table.CalculationRule) ||
x.CalculationRule.Contains(table.CalculationRule)) &&
(string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) &&
(string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) &&
x.IsTemplate == table.IsTemplate &&
(string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId))
select new { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", ""))
}
return q.ToList();
;
var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx => itemx.x).ToList();
return model;
}
/// 获取分页列表
@@ -324,6 +330,7 @@ namespace BLL
select new
{
x.Id,
x.SerialNumber,
x.Major,
x.SubProject,
x.SubItemProject,
@@ -348,7 +355,7 @@ namespace BLL
public class PHTGL_QuantityDtoIn
{
[ExcelColumnIndex("A")] public string Major { get; set; }
[ExcelColumnIndex("A")] public string SerialNumber { get; set; }
[ExcelColumnIndex("B")] public string SubProject { get; set; }
[ExcelColumnIndex("C")] public string SubItemProject { get; set; }