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-11-06 16:28:17 +08:00
parent 9600736804 1b7463957c
commit 7975ac71d4
22 changed files with 523 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+54 -11
View File
@@ -8,6 +8,7 @@ using EmitMapper.MappingConfiguration;
using FineUIPro;
using MiniExcelLibs;
using MiniExcelLibs.Attributes;
using MiniExcelLibs.OpenXml;
using Model;
using WIA;
@@ -42,11 +43,6 @@ namespace BLL
(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)) &&
@@ -72,6 +68,51 @@ namespace BLL
return model;
}
public static PHTGL_ContractTrack GetFirstPHTGL_ContractTrackByModle(PHTGL_ContractTrack table)
{
var q = (from x in Funs.DB.PHTGL_ContractTrack
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.ContractNum) || x.ContractNum.Contains(table.ContractNum)) &&
(string.IsNullOrEmpty(table.MainItemCode) || x.MainItemCode.Contains(table.MainItemCode)) &&
(string.IsNullOrEmpty(table.MainItemName) || x.MainItemName.Contains(table.MainItemName)) &&
(string.IsNullOrEmpty(table.MajorName) || x.MajorName.Contains(table.MajorName)) &&
(string.IsNullOrEmpty(table.MajorCode) || x.MajorCode.Contains(table.MajorCode)) &&
(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.CalculationRule) ||
x.CalculationRule.Contains(table.CalculationRule)) &&
(string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) &&
(string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) &&
(string.IsNullOrEmpty(table.ConstructionSubcontractor) ||
x.ConstructionSubcontractor.Contains(table.ConstructionSubcontractor)) &&
(string.IsNullOrEmpty(table.ContractWeight) ||
x.ContractWeight.Contains(table.ContractWeight)) &&
(string.IsNullOrEmpty(table.MaterialSupplier) ||
x.MaterialSupplier.Contains(table.MaterialSupplier)) &&
(string.IsNullOrEmpty(table.EstimatedQuantity) ||
x.EstimatedQuantity.Contains(table.EstimatedQuantity)) &&
(string.IsNullOrEmpty(table.SettledQuantity) ||
x.SettledQuantity.Contains(table.SettledQuantity)) &&
(string.IsNullOrEmpty(table.ContractId) ||
table.ContractId.Split(',').Contains(x.ContractId)) &&
(string.IsNullOrEmpty(table.ProjectId) ||
x.ProjectId.Contains(table.ProjectId))
select x).FirstOrDefault()
;
return q;
}
/// <summary>
/// 获取分页列表
/// </summary>
@@ -115,7 +156,8 @@ namespace BLL
x.EstimatedAmount,
x.SettledQuantity,
x.SettledAmount,
x.ContractId
x.ContractId,
x.SerialNumber
};
}
@@ -287,7 +329,7 @@ namespace BLL
Funs.GetNewDecimalOrZero(model.SettledQuantity);
}
return result;
return result;
}
/// <summary>
@@ -315,7 +357,8 @@ namespace BLL
{
try
{
rows = MiniExcel.Query<PHTGL_ContractTrackDtoIn>(path, sheetName: sheet).ToList();
rows = MiniExcel.Query<PHTGL_ContractTrackDtoIn>(path, sheetName: sheet,startCell:"A2").ToList();
}
catch (Exception ex)
{
@@ -1322,15 +1365,15 @@ namespace BLL
/// <summary>
/// 全费用固定综合单价
/// </summary>
[ExcelColumnIndex("M")] public string TotalCostFixedComprehensiveUnitPrice { get; set; }
[ExcelColumnIndex("M")] public decimal TotalCostFixedComprehensiveUnitPrice { get; set; }
/// <summary>
/// 其中：主材费
/// </summary>
[ExcelColumnIndex("N")] public string MainMaterialCost { get; set; }
[ExcelColumnIndex("N")] public decimal MainMaterialCost { get; set; }
/// <summary>
/// 合价/元
/// </summary>
[ExcelColumnIndex("O")] public string TotalPrice { get; set; }
[ExcelColumnIndex("O")] public decimal TotalPrice { get; set; }
/// <summary>
/// 计算规则
/// </summary>
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackprogressService.cs
+1 -1
View File
@@ -172,7 +172,7 @@ namespace BLL
var modeContractTrack = PhtglContractTrackService.GetPHTGL_ContractTrackById(contractTrackId);
if (modeContractTrack!=null)
{
var totalCostFixedComprehensiveUnitPrice = Funs.GetNewDecimalOrZero(modeContractTrack.TotalCostFixedComprehensiveUnitPrice); //全费用综合单价
var totalCostFixedComprehensiveUnitPrice = modeContractTrack.TotalCostFixedComprehensiveUnitPrice; //全费用综合单价
var settledAmount = modeContractTrack.SettledAmount??0;//预算金额
var contractWeight= Funs.GetNewDecimalOrZero(modeContractTrack.ContractWeight)==0?0: Funs.GetNewDecimalOrZero(modeContractTrack.ContractWeight)/100;//合同权重
var quserytable = new Model.PHTGL_ContractTrackProgress();