正在显示
5 个修改的文件
包含
10 行增加
和
1 行删除
| @@ -92,6 +92,7 @@ func (employeeProductRecord *EmployeeProductRecord) UpdateProductWeigh(weigh flo | @@ -92,6 +92,7 @@ func (employeeProductRecord *EmployeeProductRecord) UpdateProductWeigh(weigh flo | ||
| 92 | if productRecordType == RecordTypeWeigh { | 92 | if productRecordType == RecordTypeWeigh { |
| 93 | employeeProductRecord.ProductWeigh += weigh | 93 | employeeProductRecord.ProductWeigh += weigh |
| 94 | } | 94 | } |
| 95 | + employeeProductRecord.ProductWeigh = utils.Round(employeeProductRecord.ProductWeigh, 1) | ||
| 95 | employeeProductRecord.ProductRecordInfo.PreStatistics(employeeProductRecord.ProductWeigh, employeeProductRecord.SecondLevelWeigh, yesterdayWeight, bestWeight) | 96 | employeeProductRecord.ProductRecordInfo.PreStatistics(employeeProductRecord.ProductWeigh, employeeProductRecord.SecondLevelWeigh, yesterdayWeight, bestWeight) |
| 96 | employeeProductRecord.UpdatedAt = time.Now() | 97 | employeeProductRecord.UpdatedAt = time.Now() |
| 97 | employeeProductRecord.Version += 1 | 98 | employeeProductRecord.Version += 1 |
| @@ -74,6 +74,7 @@ func (employeeProductRecord *WorkshopProductRecord) UpdateProductWeigh(weigh flo | @@ -74,6 +74,7 @@ func (employeeProductRecord *WorkshopProductRecord) UpdateProductWeigh(weigh flo | ||
| 74 | if productRecordType == RecordTypeWeigh { | 74 | if productRecordType == RecordTypeWeigh { |
| 75 | employeeProductRecord.ProductWeigh += weigh | 75 | employeeProductRecord.ProductWeigh += weigh |
| 76 | } | 76 | } |
| 77 | + employeeProductRecord.ProductWeigh = utils.Round(employeeProductRecord.ProductWeigh, 1) | ||
| 77 | employeeProductRecord.ProductRecordInfo.PreStatistics(employeeProductRecord.ProductWeigh, employeeProductRecord.SecondLevelWeigh, 0, 0) | 78 | employeeProductRecord.ProductRecordInfo.PreStatistics(employeeProductRecord.ProductWeigh, employeeProductRecord.SecondLevelWeigh, 0, 0) |
| 78 | employeeProductRecord.UpdatedAt = time.Now() | 79 | employeeProductRecord.UpdatedAt = time.Now() |
| 79 | employeeProductRecord.Version += 1 | 80 | employeeProductRecord.Version += 1 |
| @@ -53,7 +53,7 @@ func (ptr *PGWorkerAttendanceReportService) Report(cid, oid int, report *domain. | @@ -53,7 +53,7 @@ func (ptr *PGWorkerAttendanceReportService) Report(cid, oid int, report *domain. | ||
| 53 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) | 53 | return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | - worker, err = userService.UserByCode(cid, oid, report.UserNo) | 56 | + worker, err = userService.UserByICCode(cid, oid, report.UserNo) |
| 57 | if err != nil { | 57 | if err != nil { |
| 58 | return nil, err | 58 | return nil, err |
| 59 | } | 59 | } |
| @@ -61,6 +61,10 @@ func (ptr *PGWorkshopPlanCompletionRecordService) WorkshopPlanCompletion(begin t | @@ -61,6 +61,10 @@ func (ptr *PGWorkshopPlanCompletionRecordService) WorkshopPlanCompletion(begin t | ||
| 61 | if !(totalPlan == 0 || totalReal == 0) { | 61 | if !(totalPlan == 0 || totalReal == 0) { |
| 62 | completionRate = utils.Round(totalReal*100.0/totalPlan, 0) | 62 | completionRate = utils.Round(totalReal*100.0/totalPlan, 0) |
| 63 | } | 63 | } |
| 64 | + // 超出计划生产的,最多完成效率 100% | ||
| 65 | + if totalPlan <= totalReal { | ||
| 66 | + completionRate = 100 | ||
| 67 | + } | ||
| 64 | 68 | ||
| 65 | var record *models.WorkshopPlanCompletionRecord | 69 | var record *models.WorkshopPlanCompletionRecord |
| 66 | if record, err = workshopProductRecordDao.FindOne(cid, oid, workshops[i].WorkshopId, begin); err == domain.ErrorNotFound && record == nil { | 70 | if record, err = workshopProductRecordDao.FindOne(cid, oid, workshops[i].WorkshopId, begin); err == domain.ErrorNotFound && record == nil { |
| @@ -78,6 +78,9 @@ func (controller *StatisticsController) TaskHandler() func(ctx *context.Context) | @@ -78,6 +78,9 @@ func (controller *StatisticsController) TaskHandler() func(ctx *context.Context) | ||
| 78 | } | 78 | } |
| 79 | crontab.SyncProductPlan(bc) | 79 | crontab.SyncProductPlan(bc) |
| 80 | break | 80 | break |
| 81 | + case "7": | ||
| 82 | + crontab.AutoTodayWorkshopPlanCompletionRecord(nil) | ||
| 83 | + break | ||
| 81 | } | 84 | } |
| 82 | Response(ctx, nil, nil) | 85 | Response(ctx, nil, nil) |
| 83 | } | 86 | } |
-
请 注册 或 登录 后发表评论