diff --git a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
index 1111b577..568b6bdf 100644
--- a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
@@ -326,21 +326,21 @@ namespace BLL
//// 并行执行异步方法
//var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
//var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
- //var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
+ var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
// 等待所有异步方法执行完成
await Task.WhenAll(
- projectHJGLDataListTask
+ projectHJGLDataListTask,
//welderNumTask,
//dineInfoListTask,
- //chCheckItemListTask
+ chCheckItemListTask
);
// 统一获取异步方法的返回值
var projectHJGLDataList = await projectHJGLDataListTask;
//var welderNum = await welderNumTask;
//var dineInfoList = await dineInfoListTask;
- //var chCheckItemList = await chCheckItemListTask;
+ var chCheckItemList = await chCheckItemListTask;
var table = new HJGLData_HJGL
@@ -352,13 +352,13 @@ namespace BLL
WelderNum = projectHJGLDataList.Sum(x => x.WelderNum),
TotalDineNum = projectHJGLDataList.Sum(x => x.TotalDineNum),
CompleteDineNum = projectHJGLDataList.Sum(x => x.CompleteDineNum),
- TotalFilmNum = projectHJGLDataList.Sum(x => x.TotalFilmNum),
- OKFilmNum = projectHJGLDataList.Sum(x => x.OKFilmNum),
+ //TotalFilmNum = projectHJGLDataList.Sum(x => x.TotalFilmNum),
+ //OKFilmNum = projectHJGLDataList.Sum(x => x.OKFilmNum),
//WelderNum = welderNum.Count(),
//TotalDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.Size)),
//CompleteDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.DoneDin)),
- //TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)),
- //OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)),
+ TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)),
+ OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
@@ -530,19 +530,45 @@ namespace BLL
///
public static List GetCHCheckItem()
{
- var result = (from x in Funs.DB.CH_CheckItem
- join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
- where BeUnderConstructionList.Contains(y.ProjectId)
- select new Model.CHCheckItemOutput()
- {
- Id = x.CHT_CheckItemID,
- ProjectId = y.ProjectId,
- UnitId = y.UnitId,
- CHT_TotalFilm = x.CHT_TotalFilm,
- CHT_PassFilm = x.CHT_PassFilm
- //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds),
- }).ToList();
- return result;
+ //var result = (from x in Funs.DB.CH_CheckItem
+ // join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
+ // where BeUnderConstructionList.Contains(y.ProjectId)
+ // select new Model.CHCheckItemOutput()
+ // {
+ // Id = x.CHT_CheckItemID,
+ // ProjectId = y.ProjectId,
+ // UnitId = y.UnitId,
+ // CHT_TotalFilm = x.CHT_TotalFilm,
+ // CHT_PassFilm = x.CHT_PassFilm
+ // //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds),
+ // }).ToList();
+
+ List list =new List();
+ var ndtLists = from x in Funs.DB.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
+ if (ndtLists.Count() > 0)
+ {
+ foreach (var project in BeUnderConstructionList)
+ {
+ var ndt = (from x in ndtLists
+ where x.ProjectId == project
+ orderby x.CreateDate descending
+ select x).FirstOrDefault();
+ if (ndt != null)
+ {
+ if (ndt.TotalQuantity.HasValue)
+ {
+ list.Add(new CHCheckItemOutput {
+ Id = ndt.Id,
+ ProjectId = project,
+ //UnitId = y.UnitId,
+ CHT_TotalFilm = ndt.TotalQuantity,
+ CHT_PassFilm = Convert.ToInt32(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100)
+ });
+ }
+ }
+ }
+ }
+ return list;
}
///
/// 获取焊接检查信息(异步)
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
index b856553a..1ed462bf 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
@@ -86,30 +86,29 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
+ var table = new Project_HJGLData_Defect
+ {
+ Id = newtable.Id,
+ ProjectId = newtable.ProjectId,
+ UnitId = newtable.UnitId,
+ CollCropCode = newtable.CollCropCode,
+ UnitName = newtable.UnitName,
+ ReportDate = newtable.ReportDate,
+ DefectName = newtable.DefectName,
+ DefectNum = newtable.DefectNum
+ };
+ db.Project_HJGLData_Defect.InsertOnSubmit(table);
+ db.SubmitChanges();
}
-
- var table = new Project_HJGLData_Defect
- {
- Id = newtable.Id,
- ProjectId = newtable.ProjectId,
- UnitId = newtable.UnitId,
- CollCropCode = newtable.CollCropCode,
- UnitName = newtable.UnitName,
- ReportDate = newtable.ReportDate,
- DefectName = newtable.DefectName,
- DefectNum = newtable.DefectNum
- };
- db.Project_HJGLData_Defect.InsertOnSubmit(table);
- db.SubmitChanges();
}
public static void AddBulkProject_HJGLData_Defect(List newtables)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
+ db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
+ db.SubmitChanges();
}
- db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
- db.SubmitChanges();
}
public static void UpdateProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
index aa80d6de..04cc5518 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
@@ -384,15 +384,21 @@ namespace BLL
// where y.ProjectId == projectid
// select x.CHT_TotalFilm).ToList().Sum());
- int result = 0;
- var getD2 = (from x in Funs.DB.HJGL_FL_Data
- where x.ProjectId == projectid
- orderby x.CompileDate descending
- select x).FirstOrDefault();
- if (getD2 != null)
- {
- result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
- }
+ //int result = 0;
+ //var getD2 = (from x in Funs.DB.HJGL_FL_Data
+ // where x.ProjectId == projectid
+ // orderby x.CompileDate descending
+ // select x).FirstOrDefault();
+ //if (getD2 != null)
+ //{
+ // result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+ //}
+
+ int result = Convert.ToInt32((from x in Funs.DB.ProcessControl_NondestructiveTest_New
+ where x.ProjectId == projectid && x.ProfessionalName == "工艺管道"
+ orderby x.CreateDate descending
+ select x.TotalQuantity
+ ).FirstOrDefault());
return result;
}
///
@@ -403,16 +409,26 @@ namespace BLL
{
//int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
// join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
- // where y.ProjectId == projectid
+ // where
// select x.CHT_PassFilm).ToList().Sum());
+ //int result = 0;
+ //var getD2 = (from x in Funs.DB.HJGL_FL_Data
+ // where x.ProjectId == projectid
+ // orderby x.CompileDate descending
+ // select x).FirstOrDefault();
+ //if (getD2 != null)
+ //{
+ // result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+ //}
+
int result = 0;
- var getD2 = (from x in Funs.DB.HJGL_FL_Data
- where x.ProjectId == projectid
- orderby x.CompileDate descending
- select x).FirstOrDefault();
- if (getD2 != null)
+ var ndt = (from x in db.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid && x.ProfessionalName == "工艺管道" orderby x.CreateDate descending select x).FirstOrDefault();
+ if (ndt != null)
{
- result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+ if (ndt.TotalQuantity.HasValue)
+ {
+ result = Convert.ToInt32(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
+ }
}
return result;
}
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 4c212aa8..4514566f 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,7 @@
<_PublishTargetUrl>G:\发布\五环WebApi
- True|2025-06-26T15:34:06.4223762Z||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
+ True|2025-06-27T02:31:14.8332810Z||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;
@@ -86,22 +86,22 @@
10/28/2024 14:02:50
- 06/26/2025 23:34:04
+ 06/27/2025 10:31:13
- 06/26/2025 23:34:04
+ 06/27/2025 10:31:13
12/06/2024 20:13:58
- 06/26/2025 22:41:55
+ 06/27/2025 10:31:03
12/26/2024 09:46:52
- 06/26/2025 22:41:55
+ 06/27/2025 10:31:03
12/18/2020 05:32:28
@@ -389,13 +389,13 @@
02/09/2013 00:42:28
- 06/26/2025 23:33:55
+ 06/27/2025 10:31:04
- 06/26/2025 23:33:55
+ 06/27/2025 10:31:04
- 06/26/2025 23:33:55
+ 06/27/2025 10:31:04
01/23/2014 21:57:34
@@ -479,7 +479,7 @@
10/28/2024 14:02:50
- 06/26/2025 23:33:56
+ 06/27/2025 10:31:05
10/28/2024 14:02:50
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 17978b44..1a1a9a6c 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Debug|Any CPU
+ Release|Any CPU
true