diff --git a/DOAN.Admin.WebApi/Controllers/MES/Group/AchievementController.cs b/DOAN.Admin.WebApi/Controllers/MES/Group/AchievementController.cs
index 0d2d085..0b8f0c1 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Group/AchievementController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Group/AchievementController.cs
@@ -9,7 +9,7 @@ namespace DOAN.Admin.WebApi.Controllers.MES.Group
/// 员工绩效
///
[Verify]
- [Route("mes/deviceManagement/DeviceAccount")]
+ [Route("mes/groupManagement/Achievement")]
public class AchievementController : BaseController
{
private readonly IAchievementService _achievementService;
diff --git a/DOAN.Model/MES/Group/Dto/AchievementDto.cs b/DOAN.Model/MES/Group/Dto/AchievementDto.cs
index e7a6672..3887be3 100644
--- a/DOAN.Model/MES/Group/Dto/AchievementDto.cs
+++ b/DOAN.Model/MES/Group/Dto/AchievementDto.cs
@@ -23,77 +23,49 @@ namespace DOAN.Model.MES.Group.Dto
///
public int MaterialUse { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime01 { get; set; }
+
///
/// 机械加工
///
public int MechanicalProcessing { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime02 { get; set; }
+
///
/// 中间检查
///
public int MiddleCheck { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime03 { get; set; }
+
///
/// 手工研磨
///
public int Handgrind { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime04 { get; set; }
+
///
/// 机研磨
///
public int Machinegrind { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime05 { get; set; }
+
///
/// 精研磨
///
public int Finegrind { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime06 { get; set; }
///
/// 入库检查
///
public int WarehouseInspection { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime07 { get; set; }
-
+
///
/// 出货
///
public int Shipment { get; set; }
- ///
- /// 工作时间
- ///
- public DateTime? JobDatetime08 { get; set; }
-
-
+
}
diff --git a/DOAN.Service/MES/Group/AchievementService.cs b/DOAN.Service/MES/Group/AchievementService.cs
index 0e2c4ea..378debd 100644
--- a/DOAN.Service/MES/Group/AchievementService.cs
+++ b/DOAN.Service/MES/Group/AchievementService.cs
@@ -32,34 +32,27 @@ namespace DOAN.Service.MES.Group
Worker = it.Worker,
MaterialUse=SqlFunc.Subqueryable().Where(x=>x.Worker==it.Worker&&x.ProcessId==10).Where(predicate.ToExpression()).Sum(x=>x.FinishNum??0),
- JobDatetime01=SqlFunc.Subqueryable().Where(x=>x.Worker==it.Worker&&x.ProcessId==10).Where(predicate.ToExpression()).Max(x=>x.JobDateTime),
+
MechanicalProcessing = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 20).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime02 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 20).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
+
MiddleCheck = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime03 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
-
+
Handgrind = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime04 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
-
-
+
Machinegrind = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime05 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
-
+
Finegrind = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime06 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
-
+
WarehouseInspection = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime07 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
-
+
Shipment = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
- JobDatetime08 = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
-
+
}).Distinct().ToList();
}