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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
何美荣 2025-11-20 22:21:01 +08:00
commit c1c43bd636
26 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
View File

@ -1276,18 +1276,18 @@ namespace APT.BaseData.Services.Services.FM
//生产部门 //生产部门
switch (depTemp.DEPARTMENT_TYPE) switch (depTemp.DEPARTMENT_TYPE)
{ {
case 0: case 10:
approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("部门")); approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("部门"));
break; break;
case 1: case 15:
//车间级 //车间级
approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("车间")); approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("车间"));
break; break;
case 2: case 20:
//班组级 班长 //班组级 班长
//detail.APPROVE_USER_ID = depTemp.USER_ID; //detail.APPROVE_USER_ID = depTemp.USER_ID;
break; break;
case 3: case 5:
approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("公司")); approvalRole = iEnumApprovalRole.FirstOrDefault(e => e.NAME.Contains("公司"));
break; break;
default: default:
@ -1776,7 +1776,7 @@ namespace APT.BaseData.Services.Services.FM
else else
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(item); var dep = GetEntity<T_FM_DEPARTMENT>(item);
if (dep != null && depDEPARTMENT_TYPE == 15) if (dep != null && dep.DEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1807,7 +1807,7 @@ namespace APT.BaseData.Services.Services.FM
else else
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(item); var dep = GetEntity<T_FM_DEPARTMENT>(item);
if (dep != null && depDEPARTMENT_TYPE == 15) if (dep != null && dep.DEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }
@ -1833,7 +1833,7 @@ namespace APT.BaseData.Services.Services.FM
else else
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(item); var dep = GetEntity<T_FM_DEPARTMENT>(item);
if (dep != null && depDEPARTMENT_TYPE == 15) if (dep != null && dep.DEPARTMENT_TYPE == 15)
{ {
if (dep.USER_ID.HasValue) if (dep.USER_ID.HasValue)
{ approveId = dep.USER_ID.Value; } { approveId = dep.USER_ID.Value; }

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

@ -12922,7 +12922,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 200) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
departIds.Add((Guid)parentId); departIds.Add((Guid)parentId);
@ -13321,7 +13321,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
} }
else if (currentDepart.DEPARTMENT_TYPE == 200) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -13819,7 +13819,7 @@ namespace APT.BaseData.Services.DomainServices
var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList(); var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
departIds.AddRange(classIds); departIds.AddRange(classIds);
} }
else if (currentDepart.DEPARTMENT_TYPE == 200) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -14256,7 +14256,7 @@ namespace APT.BaseData.Services.DomainServices
//DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds); //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
//departIds.Add(currentDepart.ID); //departIds.Add(currentDepart.ID);
} }
else if (currentDepart.DEPARTMENT_TYPE == 200) else if (currentDepart.DEPARTMENT_TYPE == 20)
{ {
var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID; var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
if (parentId != null) if (parentId != null)
@ -15857,7 +15857,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_TYPE == 15) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15)
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null) if (dep != null)
@ -15883,7 +15883,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
if (user.Nav_Department != null && user.Nav_DepartmentDEPARTMENT_TYPE == 15) if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 15)
{ {
var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value); var dep = GetEntity<T_FM_DEPARTMENT>(user.DEPARTMENT_ID.Value);
if (dep != null) if (dep != null)

2
APT.MicroApi/APT.BD.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": true, "nativeDebugging": true,
"applicationUrl": "http://localhost:5101" "applicationUrl": "http://localhost:5101"

6
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
View File

@ -7964,8 +7964,8 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
switch (DEPARTMENT_TYPE) switch (DEPARTMENT_TYPE)
{ {
case 1: case 15:
case 2: case 20:
var approle = ApproveRole.FirstOrDefault(e => e.NAME.Contains("车间")); var approle = ApproveRole.FirstOrDefault(e => e.NAME.Contains("车间"));
if (approle != null) if (approle != null)
{ {
@ -7977,7 +7977,7 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
break; break;
case 3: case 5:
//公司级 给 安环部安全员 //公司级 给 安环部安全员
var approleSafe = ApproveRole.FirstOrDefault(e => e.NAME.Contains("安")); var approleSafe = ApproveRole.FirstOrDefault(e => e.NAME.Contains("安"));
if (approleSafe != null) if (approleSafe != null)

2
APT.MicroApi/APT.BS.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": true, "nativeDebugging": true,
"applicationUrl": "http://localhost:5178" "applicationUrl": "http://localhost:5178"

2
APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
View File

@ -1132,7 +1132,7 @@ namespace APT.BS.WebApi.Controllers.Api
modelDep20.CREATE_TIME = dtNow; modelDep20.CREATE_TIME = dtNow;
if (string.IsNullOrEmpty(modelDep20.CODE)) if (string.IsNullOrEmpty(modelDep20.CODE))
{ {
modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 200).Count() + 1).ToString().PadLeft(2, '0'); modelDep20.CODE = modelDep15.CODE + (listDepAll.FindAll(e => e.DEPARTMENT_TYPE == 20).Count() + 1).ToString().PadLeft(2, '0');
} }
listDepAdd.Add(modelDep20); listDepAdd.Add(modelDep20);

2
APT.MicroApi/APT.FM.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": false, "nativeDebugging": false,
"applicationUrl": "http://localhost:5107" "applicationUrl": "http://localhost:5107"

2
APT.MicroApi/APT.FO.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"applicationUrl": "http://localhost:5119", "applicationUrl": "http://localhost:5119",
"nativeDebugging": false "nativeDebugging": false

2
APT.MicroApi/APT.HM.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": true, "nativeDebugging": true,
"applicationUrl": "http://localhost:5117" "applicationUrl": "http://localhost:5117"

2
APT.MicroApi/APT.LG.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": false, "nativeDebugging": false,
"applicationUrl": "http://localhost:5109" "applicationUrl": "http://localhost:5109"

2
APT.MicroApi/APT.NW.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": false, "nativeDebugging": false,
"applicationUrl": "http://localhost:5111" "applicationUrl": "http://localhost:5111"

2
APT.MicroApi/APT.OP.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": false, "nativeDebugging": false,
"applicationUrl": "http://localhost:5116" "applicationUrl": "http://localhost:5116"

2
APT.MicroApi/APT.PF.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": false, "nativeDebugging": false,
"applicationUrl": "http://localhost:5112" "applicationUrl": "http://localhost:5112"

18
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs
View File

@ -303,7 +303,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.Key.TEAM_ID; completion.DEPARTMENT_ID = item.Key.TEAM_ID;
completion.DEPARTMENT_NAME = item.Key.TeamName; completion.DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -363,7 +363,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.Key.CLASS_TEAM_ID; completion.DEPARTMENT_ID = item.Key.CLASS_TEAM_ID;
completion.DEPARTMENT_NAME = item.Key.TeamName; completion.DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -423,7 +423,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.Key.TEAM_ID; completion.DEPARTMENT_ID = item.Key.TEAM_ID;
completion.DEPARTMENT_NAME = item.Key.TeamName; completion.DEPARTMENT_NAME = item.Key.TeamName;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -937,7 +937,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.departmetId; completion.DEPARTMENT_ID = item.departmetId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -1257,7 +1257,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.departmentId; completion.DEPARTMENT_ID = item.departmentId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -1310,7 +1310,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
completion.DEPARTMENT_ID = item.departmentId; completion.DEPARTMENT_ID = item.departmentId;
completion.DEPARTMENT_NAME = departInfo?.NAME; completion.DEPARTMENT_NAME = departInfo?.NAME;
} }
if (departInfoDEPARTMENT_TYPE == 15) if (departInfo.DEPARTMENT_TYPE == 15)
{ {
completion.DEPARTMENT_ID = departInfo?.PARENT_ID; completion.DEPARTMENT_ID = departInfo?.PARENT_ID;
completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME; completion.DEPARTMENT_NAME = departInfo?.Nav_Parent?.NAME;
@ -1608,7 +1608,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; depNum = 0;
var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
foreach (var itemD in depC) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -1928,7 +1928,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; depNum = 0;
var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
foreach (var itemD in depC) foreach (var itemD in depC)
{ {
depNum++; depNum++;
@ -2485,7 +2485,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
//车间 //车间
depNum = 0; depNum = 0;
NUMS = 0; NUMS = 0;
var depC = listDep.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM); var depC = listDep.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM);
foreach (var itemD in depC) foreach (var itemD in depC)
{ {
depNum++; depNum++;

2
APT.MicroApi/APT.PP.WebApi/Controllers/Api/PRController.cs
View File

@ -860,7 +860,7 @@ namespace APT.PP.WebApi.Controllers.Api
var classDepartIds = departInfos.Where(t => t.PARENT_ID != null && shopDepartIds.Contains((Guid)t.PARENT_ID)).Select(m => m.ID).ToList(); var classDepartIds = departInfos.Where(t => t.PARENT_ID != null && shopDepartIds.Contains((Guid)t.PARENT_ID)).Select(m => m.ID).ToList();
alldepartIds.AddRange(classDepartIds); alldepartIds.AddRange(classDepartIds);
} }
if (item != null && item.Nav_Department != null && item.Nav_DepartmentDEPARTMENT_TYPE == 15) if (item != null && item.Nav_Department != null && item.Nav_Department.DEPARTMENT_TYPE == 15)
{ {
alldepartIds.Add((Guid)item.DEPARTMENT_ID); alldepartIds.Add((Guid)item.DEPARTMENT_ID);
var classDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList(); var classDepartIds = departInfos.Where(t => t.PARENT_ID == item.DEPARTMENT_ID).Select(m => m.ID).ToList();

8
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SCController.cs
View File

@ -322,7 +322,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
switch (listFMUserNotice[k].Nav_Department.DEPARTMENT_TYPE) switch (listFMUserNotice[k].Nav_Department.DEPARTMENT_TYPE)
{ {
case 0: case 10:
if (listFMUserNotice[k].DEPARTMENT_ID.HasValue) if (listFMUserNotice[k].DEPARTMENT_ID.HasValue)
{ {
depTemp = IListPlanSetDep.FirstOrDefault(e => e.DEPARTMENT_ID == listFMUserNotice[k].DEPARTMENT_ID.Value); depTemp = IListPlanSetDep.FirstOrDefault(e => e.DEPARTMENT_ID == listFMUserNotice[k].DEPARTMENT_ID.Value);
@ -330,7 +330,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
isUserContent = true; isUserContent = true;
} }
break; break;
case 1: case 15:
if (listFMUserNotice[k].Nav_Department.PARENT_ID.HasValue) if (listFMUserNotice[k].Nav_Department.PARENT_ID.HasValue)
{ {
depTemp = IListPlanSetDep.FirstOrDefault(e => e.DEPARTMENT_ID == listFMUserNotice[k].Nav_Department.PARENT_ID.Value); depTemp = IListPlanSetDep.FirstOrDefault(e => e.DEPARTMENT_ID == listFMUserNotice[k].Nav_Department.PARENT_ID.Value);
@ -338,7 +338,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
isUserContent = true; isUserContent = true;
} }
break; break;
case 2: case 20:
if (listFMUserNotice[k].Nav_Department.PARENT_ID.HasValue) if (listFMUserNotice[k].Nav_Department.PARENT_ID.HasValue)
{ {
depCheck = listDepAdd.FirstOrDefault(e => e.ID == listFMUserNotice[k].Nav_Department.PARENT_ID.Value); depCheck = listDepAdd.FirstOrDefault(e => e.ID == listFMUserNotice[k].Nav_Department.PARENT_ID.Value);
@ -355,7 +355,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
} }
} }
break; break;
case 3: case 5:
isUserContent = true; isUserContent = true;
break; break;
default: default:

8
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -247,7 +247,7 @@ namespace APT.PP.WebApi.Controllers.Api
} }
if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级) if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.班组级)
{ {
departList = departs.Where(t => t.DEPARTMENT_TYPE == 200 && teamDepartIds.Contains(t.ID)).ToList(); departList = departs.Where(t => t.DEPARTMENT_TYPE == 20 && teamDepartIds.Contains(t.ID)).ToList();
} }
if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.公司级) if (group.Key.CHECK_TYPE == SKDepartmentTypeEnum.公司级)
{ {
@ -1853,7 +1853,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (shopClass.Any()) if (shopClass.Any())
{ {
var tempIds = shopClass.Select(t => t.ID).ToList(); var tempIds = shopClass.Select(t => t.ID).ToList();
var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 200).ToList(); var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList();
if (tempIds.Any()) if (tempIds.Any())
{ {
//每个车间汇总班组和车间 //每个车间汇总班组和车间
@ -3254,7 +3254,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor) if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor)
{ {
//发给班长 //发给班长
var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 200 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
userIds.AddRange(userTempIds); userIds.AddRange(userTempIds);
} }
//if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post) //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)
@ -4816,7 +4816,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (item.FirstOrDefault().PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor) if (item.FirstOrDefault().PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.ClassMonitor)
{ {
//发给班长 //发给班长
var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 200 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList(); var userTempIds = departTemps.Where(m => teamDepartIds.Contains(m.ID) && m.DEPARTMENT_TYPE == 20 && m.USER_ID != null).Select(t => (Guid)t.USER_ID).ToList();
userIds.AddRange(userTempIds); userIds.AddRange(userTempIds);
} }
//if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post) //if (item.PLANCHECKOBJECT == SKPLANCHECKOBJECTEnum.Post)

2
APT.MicroApi/APT.PP.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"applicationUrl": "http://localhost:5118", "applicationUrl": "http://localhost:5118",
"nativeDebugging": false "nativeDebugging": false

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
View File

@ -1317,13 +1317,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{ {
return result; return result;
} }
List<Guid> listDepIDCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量 List<Guid> listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量
DateTime dtNow = DateTime.Now; DateTime dtNow = DateTime.Now;
List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList(); listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();
T_FM_ENUMS enums = null; T_FM_ENUMS enums = null;
@ -1344,7 +1344,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null); listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null);
if (listDep1MineType != null && listDep1MineType.Any()) if (listDep1MineType != null && listDep1MineType.Any())
{ {
listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .ToList(); listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList();
} }
} }
@ -1566,7 +1566,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
listDepCJ = listDep1MineType.Where(e => eDEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList(); listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList(); listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();

12
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
View File

@ -381,22 +381,22 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var type = user.Nav_Department?.DEPARTMENT_TYPE; var type = user.Nav_Department?.DEPARTMENT_TYPE;
switch (type) switch (type)
{ {
case 0: case 10:
item.DEPT_DEPARTMENT_ID = user.DEPARTMENT_ID; item.DEPT_DEPARTMENT_ID = user.DEPARTMENT_ID;
item.SHOP_DEPARTMENT_ID = null; item.SHOP_DEPARTMENT_ID = null;
item.CLASS_DEPARTMENT_ID = null; item.CLASS_DEPARTMENT_ID = null;
break; break;
case 1: case 15:
item.DEPT_DEPARTMENT_ID = department.ID; item.DEPT_DEPARTMENT_ID = department.ID;
item.SHOP_DEPARTMENT_ID = user.DEPARTMENT_ID; item.SHOP_DEPARTMENT_ID = user.DEPARTMENT_ID;
item.CLASS_DEPARTMENT_ID = null; item.CLASS_DEPARTMENT_ID = null;
break; break;
case 2: case 20:
item.DEPT_DEPARTMENT_ID = department.PARENT_ID; item.DEPT_DEPARTMENT_ID = department.PARENT_ID;
item.SHOP_DEPARTMENT_ID = department.ID; item.SHOP_DEPARTMENT_ID = department.ID;
item.CLASS_DEPARTMENT_ID = user.DEPARTMENT_ID; item.CLASS_DEPARTMENT_ID = user.DEPARTMENT_ID;
break; break;
case 3: case 5:
item.DEPT_DEPARTMENT_ID = null; item.DEPT_DEPARTMENT_ID = null;
item.SHOP_DEPARTMENT_ID = null; item.SHOP_DEPARTMENT_ID = null;
item.CLASS_DEPARTMENT_ID = null; item.CLASS_DEPARTMENT_ID = null;
@ -422,7 +422,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
case "1": case "1":
tasks = tasks.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList(); tasks = tasks.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList();
tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.SHOP_DEPARTMENT_ID)?.NAME; }); tasks.ForEach(m => { m.DEPARTMENT_NAME = departments.FirstOrDefault(t => t.ID == m.SHOP_DEPARTMENT_ID)?.NAME; });
departs = departments.Where(t => tDEPARTMENT_TYPE == 15) .OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList(); departs = departments.Where(t => t.DEPARTMENT_TYPE == 15) .OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList();
break; break;
case "2": case "2":
tasks = tasks.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList(); tasks = tasks.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList();
@ -10673,7 +10673,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
express = express.And(t => t.DEPT_DEPARTMENT_ID == departInfo.ID); express = express.And(t => t.DEPT_DEPARTMENT_ID == departInfo.ID);
} }
else if (departInfoDEPARTMENT_TYPE == 15) else if (departInfo.DEPARTMENT_TYPE == 15)
{ {
express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID); express = express.And(t => t.SHOP_DEPARTMENT_ID == departInfo.ID);
} }

16
APT.MicroApi/APT.SC.WebApi/Controllers/Api/MTController/SCMTMeetingController.cs
View File

@ -133,12 +133,12 @@ namespace APT.SC.WebApi.Controllers.Api.SC
//FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3 //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
switch (loginInfo.Nav_Department.DEPARTMENT_TYPE) switch (loginInfo.Nav_Department.DEPARTMENT_TYPE)
{ {
case 0: case 10:
case 1: case 15:
listUsers = FMUserService.GetUserContentNextHead(loginInfo.DEPARTMENT_ID.Value); listUsers = FMUserService.GetUserContentNextHead(loginInfo.DEPARTMENT_ID.Value);
break; break;
case 2: case 20:
case 3: case 5:
//班组 = 2, 公司 = 3 //班组 = 2, 公司 = 3
listUsers = FMUserService.GetDownUser(loginInfo.DEPARTMENT_ID.Value, new string[] { "Nav_Department", "Nav_Person.Nav_Post" }); listUsers = FMUserService.GetDownUser(loginInfo.DEPARTMENT_ID.Value, new string[] { "Nav_Department", "Nav_Person.Nav_Post" });
break; break;
@ -1721,12 +1721,12 @@ namespace APT.SC.WebApi.Controllers.Api.SC
//FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3 //FMDepartmentType 部门 = 0, 车间 = 1, 班组 = 2, 公司 = 3
switch (loginInfo.Nav_Department.DEPARTMENT_TYPE) switch (loginInfo.Nav_Department.DEPARTMENT_TYPE)
{ {
case 0: case 10:
case 1: case 15:
listUsers = FMUserService.GetUserContentNextHead(loginInfo.DEPARTMENT_ID.Value); listUsers = FMUserService.GetUserContentNextHead(loginInfo.DEPARTMENT_ID.Value);
break; break;
case 2: case 20:
case 3: case 5:
//班组 = 2, 公司 = 3 //班组 = 2, 公司 = 3
listUsers = FMUserService.GetDownUser(loginInfo.DEPARTMENT_ID.Value);//, new string[] { "Nav_Department" }, "Nav_Person.Nav_Post" listUsers = FMUserService.GetDownUser(loginInfo.DEPARTMENT_ID.Value);//, new string[] { "Nav_Department" }, "Nav_Person.Nav_Post"
break; break;

8
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SCController/StandardCreateController.cs
View File

@ -218,16 +218,16 @@ namespace APT.SC.WebApi.Controllers.Api.SCController
var type = userInfo.Nav_Department.DEPARTMENT_TYPE; var type = userInfo.Nav_Department.DEPARTMENT_TYPE;
switch (type) switch (type)
{ {
case 0: case 10:
entity.DEPARTMENT_TYPE = SCDepartmentType.公司; entity.DEPARTMENT_TYPE = SCDepartmentType.公司;
break; break;
case 1: case 15:
entity.DEPARTMENT_TYPE = SCDepartmentType.部门; entity.DEPARTMENT_TYPE = SCDepartmentType.部门;
break; break;
case 2: case 20:
entity.DEPARTMENT_TYPE = SCDepartmentType.车间; entity.DEPARTMENT_TYPE = SCDepartmentType.车间;
break; break;
case 3: case 5:
entity.DEPARTMENT_TYPE = SCDepartmentType.公司; entity.DEPARTMENT_TYPE = SCDepartmentType.公司;
break; break;
default: default:

11
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
View File

@ -74,7 +74,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
listUserCheck = GetEntities<T_FM_USER>(e => listCode.Contains(e.CODE), null, null); listUserCheck = GetEntities<T_FM_USER>(e => listCode.Contains(e.CODE), null, null);
} }
int index = 0;
foreach (var item in Nav_NewUserDetail) foreach (var item in Nav_NewUserDetail)
{ {
var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID); var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID);
@ -83,11 +83,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
if (string.IsNullOrEmpty(item.CODE)) if (string.IsNullOrEmpty(item.CODE))
{ {
throw new Exception("请填写" + item.Nav_User.NAME + "的工号!"); throw new Exception("请填写行：" + (index + 1) + "的工号!");
} }
if (item.USER_POST_ID == Guid.Empty || item.USER_POST_ID == null) if (item.USER_POST_ID == Guid.Empty || item.USER_POST_ID == null)
{ {
throw new Exception("请填写" + item.Nav_User.NAME + "的岗位!"); throw new Exception("请填写行：" + (index + 1) + "的岗位!");
} }
} }
if (listUserCheck != null && listUserCheck.Count() > 0 && !string.IsNullOrEmpty(item.CODE) && item.USER_ID.HasValue) if (listUserCheck != null && listUserCheck.Count() > 0 && !string.IsNullOrEmpty(item.CODE) && item.USER_ID.HasValue)
@ -98,6 +98,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
throw new Exception("工号不能重复【" + item.CODE + "】!"); throw new Exception("工号不能重复【" + item.CODE + "】!");
} }
} }
index++;
} }
if (entity.TRAIN_STATUS == SEThreeLevelSafeTrainType.公司级) if (entity.TRAIN_STATUS == SEThreeLevelSafeTrainType.公司级)
{ {
@ -114,7 +115,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID; item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID;
} }
else if (dep.DEPARTMENT_TYPE == 200) else if (dep.DEPARTMENT_TYPE == 20)
{ {
item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID; item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID;
} }
@ -891,7 +892,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
switch (departInfo.DEPARTMENT_TYPE)//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3 switch (departInfo.DEPARTMENT_TYPE)//FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
{ {
case 2: case 20:
sendUser = userApprol.FirstOrDefault(e => e.Nav_ApproveRole.NAME.Contains("负责人")); sendUser = userApprol.FirstOrDefault(e => e.Nav_ApproveRole.NAME.Contains("负责人"));
break; break;
default: default:

2
APT.MicroApi/APT.SC.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": true, "nativeDebugging": true,
"applicationUrl": "http://localhost:5179" "applicationUrl": "http://localhost:5179"

2
APT.MicroApi/APT.SK.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"applicationUrl": "http://localhost:5180", "applicationUrl": "http://localhost:5180",
"nativeDebugging": false "nativeDebugging": false

2
APT.MicroApi/APT.UT.WebApi/Properties/launchSettings.json
View File

@ -5,7 +5,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Test" "ASPNETCORE_ENVIRONMENT": "Pdev"
}, },
"nativeDebugging": false, "nativeDebugging": false,
"applicationUrl": "http://localhost:5177" "applicationUrl": "http://localhost:5177"