xiaoguo75131
/
CVDEMCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改设备类型 做的修改

Browse Source
main
xiaoguo 1 year ago
parent 1c1eed70ed
commit ba6dc48858
4 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File

24
CVDEMCS/Common/Constant/Constant.cs
Unescape Escape View File

@ -1,7 +1,7 @@
namespace PVDEMCS.Common.Constant namespace PVDEMCS.Common.Constant
{ {
/// <summary> /// <summary>
/// 点位所属动作 /// 点位所属动作
/// </summary> /// </summary>
@ -24,19 +24,19 @@
public sealed class EquipmentType public sealed class EquipmentType
{ {
/// <summary> /// <summary>
/// Ionbond /// 国产炉
/// </summary> /// </summary>
public const String Ionbond = "Ionbond"; public const String Homegrown = "国产炉";
/// <summary> /// <summary>
/// Balzers /// 进口炉
/// </summary> /// </summary>
public const String Balzers = "Balzers"; public const String Import = "进口炉";
/// <summary> /// <summary>
/// Cemecon /// Cemecon
/// </summary> /// </summary>
public const String CemeCon = "CemeCon"; // public const String CemeCon = "CemeCon";
} }
/// <summary> /// <summary>
@ -45,19 +45,19 @@
public sealed class EquipmentTypeOffset public sealed class EquipmentTypeOffset
{ {
/// <summary> /// <summary>
/// Ionbond补偿时间 /// 国产炉补偿时间
/// </summary> /// </summary>
public const String IonbondOffset = "IonbondOffset"; public const String HomegrownOffset = "HomegrownOffset";
/// <summary> /// <summary>
/// Balzers补偿时间 /// 进口炉补偿时间
/// </summary> /// </summary>
public const String BalzersOffset = "BalzersOffset"; public const String ImportOffset = "ImportOffset";
/// <summary> /// <summary>
/// Cemecon补偿时间 /// Cemecon补偿时间
/// </summary> /// </summary>
public const String CemeConOffset = "CemeConOffset"; // public const String CemeConOffset = "CemeConOffset";
} }
@ -81,7 +81,7 @@
public static readonly string[] States = new string[] { Run, Stop, Alarm }; public static readonly string[] States = new string[] { Run, Stop, Alarm };
public static bool HaveState(string state) public static bool HaveState(string state)
{ {
return States.Contains(state); return States.Contains(state);
} }

6
CVDEMCS/Controllers/EquipmentRecordController.cs
Unescape Escape View File

@ -204,7 +204,7 @@ namespace PVDEMCS.Controllers
/// <param name="endDate">结束时间</param> /// <param name="endDate">结束时间</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public Result<EquipmentOEETotal> GetEquipmentOEEMonthTotal(string equipmentId, DateTime begDate, DateTime endDate) public Result<EquipmentOEETotal> GetEquipmentOEEMonthTotal(string equipmentId, DateTime begDate, DateTime endDate)
{ {
var result = _equipmentRecordService.GetEquipmentOEEMonthTotal(equipmentId, begDate, endDate); var result = _equipmentRecordService.GetEquipmentOEEMonthTotal(equipmentId, begDate, endDate);
if (result.IsSuccess && !result.Content.IsNullOrEmpty()) if (result.IsSuccess && !result.Content.IsNullOrEmpty())
@ -256,7 +256,7 @@ namespace PVDEMCS.Controllers
State = f.Key.State, State = f.Key.State,
count = f.Count() count = f.Count()
}).ToList(); }).ToList();
var equimentTypes = new string[] { EquipmentType.Balzers, EquipmentType.CemeCon, EquipmentType.Ionbond }; var equimentTypes = new string[] { EquipmentType.Homegrown, EquipmentType.Import };
foreach (var type in equimentTypes) foreach (var type in equimentTypes)
{ {
equipmentStateView = new EquipmentStateView(); equipmentStateView = new EquipmentStateView();
@ -333,7 +333,7 @@ namespace PVDEMCS.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public Result<List<EquipmentOEEMonthTotal>> GetEquipmentRecordOEEMonthTotal() public Result<List<EquipmentOEEMonthTotal>> GetEquipmentRecordOEEMonthTotal()
{ {
var result = _equipmentRecordService.GetEquipmentRecordOEEMonthTotal(); var result = _equipmentRecordService.GetEquipmentRecordOEEMonthTotal();
return result; return result;

22
CVDEMCS/Properties/launchSettings.json
Unescape Escape View File

@ -1,24 +1,24 @@
{ {
"profiles": { "profiles": {
"WSL": { "IIS Express": {
"commandName": "WSL2", "commandName": "IISExpress",
"distributionName": "" "launchBrowser": true,
},
"cvdemcs": {
"commandName": "Project",
"launchUrl": "swagger", "launchUrl": "swagger",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:34771" "dotnetRunMessages": true,
"applicationUrl": "http://127.0.0.1:34771"
}, },
"IIS Express": { "CVDEMCS": {
"commandName": "IISExpress", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"launchUrl": "swagger", "launchUrl": "swagger",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} },
"dotnetRunMessages": true,
"applicationUrl": "http://localhost:34771"
} }
}, },
"$schema": "https://json.schemastore.org/launchsettings.json", "$schema": "https://json.schemastore.org/launchsettings.json",
@ -26,7 +26,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://127.0.0.1:34771", "applicationUrl": "http://localhost:34771",
"sslPort": 0 "sslPort": 0
} }
} }

142
CVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
Unescape Escape View File

@ -137,7 +137,7 @@ namespace PVDEMCS.Services.Repositories.Impl
var endDateTime = dateTime.AddDays(-3); var endDateTime = dateTime.AddDays(-3);
var entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId && f.StartTime <= endDateTime).OrderByDescending(f => f.StartTime).FirstOrDefault(); var entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId && f.StartTime <= endDateTime).OrderByDescending(f => f.StartTime).FirstOrDefault();
//如果3天内没有找到 //如果3天内没有找到
if (entity == null) if (entity == null)
{ {
entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId).OrderByDescending(f => f.StartTime).FirstOrDefault(); entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId).OrderByDescending(f => f.StartTime).FirstOrDefault();
} }
@ -237,9 +237,9 @@ namespace PVDEMCS.Services.Repositories.Impl
var result = new Result(); var result = new Result();
using (var context = new EFContext()) using (var context = new EFContext())
{ {
var query = context.EquipmentRecords.Where(f => (f.StartTime >= begDate && f.StartTime <= endDate)).ToList(); var query = context.EquipmentRecords.Where(f => (f.StartTime >= begDate && f.StartTime <= endDate)).ToList();
//过滤跨天的数据部分 //过滤跨天的数据部分
//获取状态统计时间 //获取状态统计时间
var total = query.GroupBy(f => new { f.EquipmentId, f.State }) var total = query.GroupBy(f => new { f.EquipmentId, f.State })
.Select(f => new TotalRecord .Select(f => new TotalRecord
@ -269,24 +269,24 @@ namespace PVDEMCS.Services.Repositories.Impl
//获取配置的设备的阈值 //获取配置的设备的阈值
var balzersConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentType.Balzers).Content; var homegrownConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentType.Homegrown).Content;
var cemeconConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentType.CemeCon).Content; var importConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentType.Import).Content;
var ionbondConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentType.Ionbond).Content; //var ionbondConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentType.Ionbond).Content;
var balzers = 200; var homegrown = 200;
var cemecon = 300; var import = 300;
var ionbond = 200; //var ionbond = 200;
if (balzersConfig != null && !balzersConfig.ConfigValue.IsNullOrEmpty()) if (homegrownConfig != null && !homegrownConfig.ConfigValue.IsNullOrEmpty())
{
int.TryParse(balzersConfig.ConfigValue, out balzers);
}
if (cemeconConfig != null && !cemeconConfig.ConfigValue.IsNullOrEmpty())
{ {
int.TryParse(cemeconConfig.ConfigValue, out cemecon); int.TryParse(homegrownConfig.ConfigValue, out homegrown);
} }
if (ionbondConfig != null && !ionbondConfig.ConfigValue.IsNullOrEmpty()) if (importConfig != null && !importConfig.ConfigValue.IsNullOrEmpty())
{ {
int.TryParse(ionbondConfig.ConfigValue, out ionbond); int.TryParse(importConfig.ConfigValue, out import);
} }
//if (ionbondConfig != null && !ionbondConfig.ConfigValue.IsNullOrEmpty())
//{
// int.TryParse(ionbondConfig.ConfigValue, out ionbond);
//}
var dayTotals = context.EquipmentRecordDayTotals.Where(f => f.TotalDay >= begDate && f.TotalDay <= endDate).ToList(); var dayTotals = context.EquipmentRecordDayTotals.Where(f => f.TotalDay >= begDate && f.TotalDay <= endDate).ToList();
@ -334,24 +334,24 @@ namespace PVDEMCS.Services.Repositories.Impl
var minutes = (furnace.EndTime - furnace.StartTime).TotalMinutes; var minutes = (furnace.EndTime - furnace.StartTime).TotalMinutes;
switch (furnace.EquipmentType) switch (furnace.EquipmentType)
{ {
case EquipmentType.Balzers: case EquipmentType.Homegrown:
if (minutes >= balzers) if (minutes >= homegrown)
{
value.FurnaceNum++;
}
break;
case EquipmentType.Ionbond:
if (minutes >= ionbond)
{ {
value.FurnaceNum++; value.FurnaceNum++;
} }
break; break;
case EquipmentType.CemeCon: case EquipmentType.Import:
if (minutes >= cemecon) if (minutes >= import)
{ {
value.FurnaceNum++; value.FurnaceNum++;
} }
break; break;
//case EquipmentType.CemeCon:
// if (minutes >= import)
// {
// value.FurnaceNum++;
// }
// break;
} }
} }
} }
@ -518,7 +518,7 @@ namespace PVDEMCS.Services.Repositories.Impl
{ {
query = query.Where(f => f.TotalDay <= endTime); query = query.Where(f => f.TotalDay <= endTime);
} }
// query = query.Where(f => f.TotalDay >= begTime && f.TotalDay <= endTime); // query = query.Where(f => f.TotalDay >= begTime && f.TotalDay <= endTime);
return query; return query;
} }
@ -714,24 +714,24 @@ namespace PVDEMCS.Services.Repositories.Impl
//计算OEE //计算OEE
//获取配置的设备的初尝值 //获取配置的设备的初尝值
var balzersConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.BalzersOffset).Content; var homegrownConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.HomegrownOffset).Content;
var cemeconConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.CemeConOffset).Content; var importConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.ImportOffset).Content;
var ionbondConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.IonbondOffset).Content; //var ionbondConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.IonbondOffset).Content;
var balzers = 0m; var homegrown = 0m;
var cemecon = 0m; var import = 0m;
var ionbond = 0m; //var ionbond = 0m;
if (balzersConfig != null && !balzersConfig.ConfigValue.IsNullOrEmpty()) if (homegrownConfig != null && !homegrownConfig.ConfigValue.IsNullOrEmpty())
{ {
decimal.TryParse(balzersConfig.ConfigValue, out balzers); decimal.TryParse(homegrownConfig.ConfigValue, out homegrown);
} }
if (cemeconConfig != null && !cemeconConfig.ConfigValue.IsNullOrEmpty()) if (importConfig != null && !importConfig.ConfigValue.IsNullOrEmpty())
{ {
decimal.TryParse(cemeconConfig.ConfigValue, out cemecon); decimal.TryParse(importConfig.ConfigValue, out import);
}
if (ionbondConfig != null && !ionbondConfig.ConfigValue.IsNullOrEmpty())
{
decimal.TryParse(ionbondConfig.ConfigValue, out ionbond);
} }
//if (ionbondConfig != null && !ionbondConfig.ConfigValue.IsNullOrEmpty())
//{
// decimal.TryParse(ionbondConfig.ConfigValue, out ionbond);
//}
foreach (var item in list) foreach (var item in list)
{ {
@ -742,7 +742,7 @@ namespace PVDEMCS.Services.Repositories.Impl
if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM")) if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM"))
{ {
//初尝值不包括今天 //初尝值不包括今天
// days = now.Day - 1; // days = now.Day - 1;
//获取当月到当前的分钟 //获取当月到当前的分钟
minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute; minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
} }
@ -759,15 +759,15 @@ namespace PVDEMCS.Services.Repositories.Impl
var value = 0m; var value = 0m;
switch (item.EquipmentType) switch (item.EquipmentType)
{ {
case EquipmentType.Balzers: case EquipmentType.Homegrown:
value = days * balzers; value = days * homegrown;
break; break;
case EquipmentType.Ionbond: case EquipmentType.Import:
value = days * ionbond; value = days * import;
break;
case EquipmentType.CemeCon:
value = days * cemecon;
break; break;
//case EquipmentType.CemeCon:
// value = days * cemecon;
// break;
default: default:
break; break;
} }
@ -828,24 +828,24 @@ namespace PVDEMCS.Services.Repositories.Impl
var detail = list[0]; var detail = list[0];
//获取配置的设备的初尝值 //获取配置的设备的初尝值
var balzersConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.BalzersOffset).Content; var homegrownConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.HomegrownOffset).Content;
var cemeconConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.CemeConOffset).Content; var importConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.ImportOffset).Content;
var ionbondConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.IonbondOffset).Content; //var ionbondConfig = _configRepository.GetSysConfigDetailNameOrKey("", EquipmentTypeOffset.IonbondOffset).Content;
var balzers = 0m; var homegrown = 0m;
var cemecon = 0m; var import = 0m;
var ionbond = 0m; //var ionbond = 0m;
if (balzersConfig != null && !balzersConfig.ConfigValue.IsNullOrEmpty()) if (homegrownConfig != null && !homegrownConfig.ConfigValue.IsNullOrEmpty())
{
decimal.TryParse(balzersConfig.ConfigValue, out balzers);
}
if (cemeconConfig != null && !cemeconConfig.ConfigValue.IsNullOrEmpty())
{ {
decimal.TryParse(cemeconConfig.ConfigValue, out cemecon); decimal.TryParse(homegrownConfig.ConfigValue, out homegrown);
} }
if (ionbondConfig != null && !ionbondConfig.ConfigValue.IsNullOrEmpty()) if (importConfig != null && !importConfig.ConfigValue.IsNullOrEmpty())
{ {
decimal.TryParse(ionbondConfig.ConfigValue, out ionbond); decimal.TryParse(importConfig.ConfigValue, out import);
} }
//if (ionbondConfig != null && !ionbondConfig.ConfigValue.IsNullOrEmpty())
//{
// decimal.TryParse(ionbondConfig.ConfigValue, out ionbond);
//}
var now = DateTime.Now; var now = DateTime.Now;
var minutes = 0m; var minutes = 0m;
@ -871,15 +871,15 @@ namespace PVDEMCS.Services.Repositories.Impl
var value = 0m; var value = 0m;
switch (detail.EquipmentType) switch (detail.EquipmentType)
{ {
case EquipmentType.Balzers: case EquipmentType.Homegrown:
value = days * balzers; value = days * homegrown;
break;
case EquipmentType.Ionbond:
value = days * ionbond;
break; break;
case EquipmentType.CemeCon: case EquipmentType.Import:
value = days * cemecon; value = days * import;
break; break;
//case EquipmentType.CemeCon:
// value = days * import;
// break;
default: default:
break; break;
} }

Write Preview
Loading…
Cancel
Save