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

提交代码

Browse Source
This commit is contained in:
高飞
2024-12-25 15:43:38 +08:00
parent 0a2f9ea3a7
commit c0b489aaf4
79 changed files with 8536 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
+40 -11
View File
@@ -114,7 +114,7 @@ namespace BLL
}
public static void AddProject_HJGLData_HJGL(Model.Project_HJGLData_HJGL newtable)
{
using (var db = new SGGLDB(Funs.ConnString))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL
{
@@ -133,11 +133,10 @@ namespace BLL
db.Project_HJGLData_HJGL.InsertOnSubmit(table);
db.SubmitChanges();
}
}
public static void UpdateProject_HJGLData_HJGL(Model.Project_HJGLData_HJGL newtable)
{
using (var db = new SGGLDB(Funs.ConnString))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Project_HJGLData_HJGL table = db.Project_HJGLData_HJGL.FirstOrDefault(x => x.Id == newtable.Id);
if (table != null)
@@ -156,11 +155,10 @@ namespace BLL
db.SubmitChanges();
}
}
}
public static void DeleteProject_HJGLData_HJGLById(string Id)
{
using (var db = new SGGLDB(Funs.ConnString))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Project_HJGLData_HJGL table = db.Project_HJGLData_HJGL.FirstOrDefault(x => x.Id == Id);
if (table != null)
@@ -169,8 +167,6 @@ namespace BLL
db.SubmitChanges();
}
}
}
/// <summary>
/// 判断该项目的该日期是否统计数据
@@ -223,7 +219,7 @@ namespace BLL
/// </summary>
public static void StatisticalAllProjectData()
{
var projectlist = ProjectService.GetCNCECShowProjectList();
var projectlist = ProjectService.GetProjectWorkList();
foreach (var item in projectlist)
{
StatisticalData(item.ProjectId, HJGLDateType.All);
@@ -311,7 +307,7 @@ namespace BLL
{
int result = Convert.ToInt32((from x in Funs.DB.HJGL_WeldJoint
where x.ProjectId == projectid
select x.Size).ToList().Sum(x=>x.Value));
select x.Size).ToList().Sum(x => x.Value));
return result;
}
/// <summary>
@@ -333,7 +329,7 @@ namespace BLL
{
int result = (from x in Funs.DB.HJGL_Batch_NDEItem
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
where y.ProjectId == projectid
where y.ProjectId == projectid
select x.TotalFilm).ToList().Sum(x => x.Value);
return result;
}
@@ -345,10 +341,43 @@ namespace BLL
{
int result = (from x in Funs.DB.HJGL_Batch_NDEItem
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
where y.ProjectId == projectid
where y.ProjectId == projectid
select x.PassFilm).ToList().Sum(x => x.Value);
return result;
}
#region 推送项目焊接数据
/// <summary>
/// 推送项目焊接数据
/// </summary>
/// <returns></returns>
public static ReturnData PushProjectHJGLData()
{
var items = (from x in db.Project_HJGLData_HJGL
where x.ReportDate == DateTime.Now.Date
select x).ToList();
var defectItems = (from x in db.Project_HJGLData_Defect
where x.ReportDate == DateTime.Now.Date
select x).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0 || defectItems.Count() > 0)
{
var thisUnit = CommonService.GetIsThisUnit();
var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items, DefectItems = defectItems };
var str = JsonConvert.SerializeObject(newItem);
var baseurl = "/api/HJGLData/SaveProjectHJGLData";
responeData = ServerService.PushCNCEC(str, baseurl);
}
else
{
responeData.code = 0;
responeData.message = "当前没有项目焊接数据";
}
return responeData;
}
#endregion
}
}