wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
何美荣 2026-06-09 16:04:49 +08:00
parent 31941c5f64
commit 8614961dbe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -14801,7 +14801,7 @@ namespace APT.BaseData.Services.DomainServices
if(approveTemp.Nav_ApproveTempDetails.Count() == 0) if(approveTemp.Nav_ApproveTempDetails.Count() == 0)
{ {
result.STATUS = PFStandardStatus.Archived; result.STATUS = PFStandardStatus.Archived;
var resultDetailTemps = resultDetails.Where(t => (t.MARK != SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK == SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.No)).ToList(); var resultDetailTemps = resultDetails.Where(t => (t.MARK == SKMarkEnum.Add && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK != SKMarkEnum.Add)).ToList();
if (user != null && resultDetailTemps != null && resultDetailTemps.Any()) if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
{ {
var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList(); var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList();
@ -15143,7 +15143,7 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> douContentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> douContentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> douContentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>(); //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> douContentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> douContentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> douContentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
var entityDetails = sumDetails.Where(t => (t.MARK != SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK == SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.No)).ToList(); var entityDetails = sumDetails.Where(t => (t.MARK == SKMarkEnum.Add && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK != SKMarkEnum.Add)).ToList();
if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any()) if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any())
{ {
var sumDetailIds = entityDetails.Select(t => t.ID).ToList(); var sumDetailIds = entityDetails.Select(t => t.ID).ToList();