代码无效引用清理，试压包资料界面看板修改
This commit is contained in:
@@ -1,17 +1,12 @@
|
||||
using System;
|
||||
using EmitMapper;
|
||||
using FineUIPro;
|
||||
using MiniExcelLibs;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using EmitMapper;
|
||||
using EmitMapper.MappingConfiguration;
|
||||
using FineUIPro;
|
||||
using MiniExcelLibs;
|
||||
using MiniExcelLibs.Attributes;
|
||||
using MiniExcelLibs.OpenXml;
|
||||
using Model;
|
||||
using WIA;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -59,7 +54,7 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.SettledQuantity) ||
|
||||
x.SettledQuantity.Contains(table.SettledQuantity)) &&
|
||||
(string.IsNullOrEmpty(table.ContractId) ||
|
||||
table.ContractId.Split(',').Contains(x.ContractId))&&
|
||||
table.ContractId.Split(',').Contains(x.ContractId)) &&
|
||||
(string.IsNullOrEmpty(table.ProjectId) ||
|
||||
x.ProjectId.Contains(table.ProjectId))
|
||||
|
||||
@@ -72,44 +67,44 @@ namespace BLL
|
||||
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))
|
||||
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()
|
||||
;
|
||||
select x).FirstOrDefault()
|
||||
;
|
||||
return q;
|
||||
}
|
||||
|
||||
@@ -264,11 +259,11 @@ namespace BLL
|
||||
var table = Funs.DB.PHTGL_ContractTrack.FirstOrDefault(x => x.Id == id);
|
||||
if (table != null)
|
||||
{
|
||||
|
||||
|
||||
table.EstimatedQuantity = string.Empty;
|
||||
table.EstimatedAmount = 0m;
|
||||
table.SettledQuantity = string.Empty;
|
||||
table.SettledAmount = 0m;
|
||||
table.SettledAmount = 0m;
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
}
|
||||
@@ -350,7 +345,7 @@ namespace BLL
|
||||
Funs.GetNewDecimalOrZero(model.SettledQuantity);
|
||||
}
|
||||
|
||||
return result;
|
||||
return result;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
@@ -364,7 +359,7 @@ namespace BLL
|
||||
var model = GetPHTGL_ContractTrackById(id.ToString());
|
||||
if (model != null)
|
||||
{
|
||||
result =(model.EstimatedAmount??0 )- ( model.SettledAmount??0);
|
||||
result = (model.EstimatedAmount ?? 0) - (model.SettledAmount ?? 0);
|
||||
}
|
||||
|
||||
return result;
|
||||
@@ -373,19 +368,19 @@ namespace BLL
|
||||
{
|
||||
var responeData = new ResponeData();
|
||||
List<PHTGL_ContractTrackDtoIn> rows;
|
||||
List<PHTGL_ContractTrack> thisContractTracks =new List<PHTGL_ContractTrack>();
|
||||
|
||||
List<PHTGL_ContractTrack> thisContractTracks = new List<PHTGL_ContractTrack>();
|
||||
|
||||
var sheetNames = MiniExcel.GetSheetNames(path);
|
||||
foreach (var sheet in sheetNames) ////多sheet导入
|
||||
{
|
||||
try
|
||||
{
|
||||
rows = MiniExcel.Query<PHTGL_ContractTrackDtoIn>(path, sheetName: sheet,startCell:"A2").ToList();
|
||||
rows = MiniExcel.Query<PHTGL_ContractTrackDtoIn>(path, sheetName: sheet, startCell: "A2").ToList();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = sheet+"模板错误:" + ex.ToString();
|
||||
responeData.message = sheet + "模板错误:" + ex.ToString();
|
||||
return responeData;
|
||||
}
|
||||
var mapper =
|
||||
@@ -396,7 +391,7 @@ namespace BLL
|
||||
if (modeList.Count == 0)
|
||||
{
|
||||
responeData.code = 0;
|
||||
responeData.message = sheet+ "没有数据";
|
||||
responeData.message = sheet + "没有数据";
|
||||
return responeData;
|
||||
}
|
||||
foreach (var item in modeList)
|
||||
@@ -418,8 +413,8 @@ namespace BLL
|
||||
|
||||
item.ProjectCode = item.MainItemCode + "-" + item.ProjectCode;
|
||||
}
|
||||
|
||||
if (resultModel!=null)
|
||||
|
||||
if (resultModel != null)
|
||||
{
|
||||
item.Id = resultModel.Id;
|
||||
UpdatePHTGL_ContractTrack(item);
|
||||
@@ -435,9 +430,9 @@ namespace BLL
|
||||
}
|
||||
|
||||
AddBulkPHTGL_ContractTrack(goingAddList);
|
||||
PhtglContracttrackprogressService.CreateTemplateByContractList(goingAddList,projectid);
|
||||
PhtglContracttrackprogressService.CreateTemplateByContractList(goingAddList, projectid);
|
||||
}
|
||||
|
||||
|
||||
return responeData;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user