...
|
...
|
@@ -80,6 +80,7 @@ func (ptr *PGProductRecordService) EmployeeProductStatics(productRecord *domain. |
|
|
if _, ok := groupMembers[groupMembersKeyFunc(r.ProductWorker.UserId)]; !ok {
|
|
|
participateType = domain.ParticipateSupport
|
|
|
}
|
|
|
|
|
|
var employeeProductRecord *domain.EmployeeProductRecord
|
|
|
employeeProductRecord, err = employeeProductRecordDao.WorkerProductRecord(cid, oid, productRecord.ProductRecordInfo.ProductPlanId, r.ProductWorker.UserId, productRecord.CreatedAt)
|
|
|
if err == domain.ErrorNotFound {
|
...
|
...
|
@@ -90,7 +91,23 @@ func (ptr *PGProductRecordService) EmployeeProductStatics(productRecord *domain. |
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName)
|
|
|
|
|
|
// 查询当前员工 昨日产能 、历史最好产能
|
|
|
var (
|
|
|
yesterdayOutputWeight float64 = 0
|
|
|
bestOutputWeight float64 = 0
|
|
|
)
|
|
|
if record, e := employeeProductRecordDao.WorkerProductRecord(cid, oid, planId, r.ProductWorker.UserId, productRecord.CreatedAt.AddDate(0, 0, -1)); e == nil && record != nil {
|
|
|
yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
|
|
|
bestOutputWeight = record.ProductRecordInfo.BestOutputWeight
|
|
|
|
|
|
} else {
|
|
|
if record, e := employeeProductRecordDao.WorkerBestOutputRecord(cid, oid, planId, r.ProductWorker.UserId); e == nil && record != nil {
|
|
|
yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
|
|
|
}
|
|
|
}
|
|
|
|
|
|
employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName, yesterdayOutputWeight, bestOutputWeight)
|
|
|
|
|
|
if employeeProductRecord, err = employeeProductRecordRepository.Save(employeeProductRecord); err != nil {
|
|
|
// TODO:异常处理
|
...
|
...
|
@@ -211,7 +228,23 @@ func (ptr *PGProductRecordService) personalProductStatics(productRecord *domain. |
|
|
if err == domain.ErrorNotFound {
|
|
|
employeeProductRecord = newEmployeeProductRecord(productRecord, participateType, productPlan, productRecord.ProductWorker)
|
|
|
}
|
|
|
employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName)
|
|
|
|
|
|
// 查询当前员工 昨日产能 、历史最好产能
|
|
|
var (
|
|
|
yesterdayOutputWeight float64 = 0
|
|
|
bestOutputWeight float64 = 0
|
|
|
)
|
|
|
if record, e := employeeProductRecordDao.WorkerProductRecord(cid, oid, planId, productRecord.ProductWorker.UserId, productRecord.CreatedAt.AddDate(0, 0, -1)); e == nil && record != nil {
|
|
|
yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
|
|
|
bestOutputWeight = record.ProductRecordInfo.BestOutputWeight
|
|
|
|
|
|
} else {
|
|
|
if record, e := employeeProductRecordDao.WorkerBestOutputRecord(cid, oid, planId, productRecord.ProductWorker.UserId); e == nil && record != nil {
|
|
|
yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
|
|
|
}
|
|
|
}
|
|
|
|
|
|
employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName, yesterdayOutputWeight, bestOutputWeight)
|
|
|
|
|
|
if employeeProductRecord, err = employeeProductRecordRepository.Save(employeeProductRecord); err != nil {
|
|
|
// TODO:异常处理
|
...
|
...
|
|