niuniu/JhHardwareWRS_BackPoint
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修正空白加班餐扣归属计算

Browse Source
This commit is contained in:
souplearn 2026-07-25 03:18:53 +08:00
parent 63ea6fdcc5
commit 65fd7f85ff
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/report_allocations.py
View File

@ -11,7 +11,6 @@ from app.services.metrics import (
SHIFT_BUCKETS, SHIFT_BUCKETS,
SHIFT_LABELS, SHIFT_LABELS,
_blank_overtime_intervals, _blank_overtime_intervals,
_covered_meal_overlap_minutes,
_iter_shift_base_dates, _iter_shift_base_dates,
_overlap_minutes, _overlap_minutes,
_schedule_interval, _schedule_interval,
@ -101,8 +100,13 @@ def _range_allocation_minutes(
if overlap_end <= overlap_start: if overlap_end <= overlap_start:
continue continue
meal_minutes = sum( meal_minutes = sum(
_covered_meal_overlap_minutes(start_at, end_at, meal_start, meal_end) _overlap_minutes(overlap_start, overlap_end, meal_start, meal_end)
for meal_start, meal_end in meal_intervals for meal_start, meal_end in meal_intervals
if (
start_at <= meal_start
and end_at >= meal_end
and end_at > meal_end + timedelta(minutes=5)
)
) )
minutes = max(0.0, minutes_between(overlap_start, overlap_end) - meal_minutes) minutes = max(0.0, minutes_between(overlap_start, overlap_end) - meal_minutes)
_add_minutes(rows, overlap_start.date(), "overtime", minutes) _add_minutes(rows, overlap_start.date(), "overtime", minutes)

17
tests/test_report_allocations.py
View File

@ -221,6 +221,23 @@ def test_night_allocation_uses_meal_deducted_minutes_with_previous_date_rules():
] ]
def test_blank_overtime_meal_deduction_is_clipped_like_metrics():
start_at = datetime(2026, 7, 25, 6, 0)
end_at = datetime(2026, 7, 25, 19, 0)
item = _item(id=1, good_qty=680)
report = _report(start_at, end_at, item)
metrics = calculate_report_metrics(start_at, end_at, [item])
rows = build_report_allocation_drafts(report)
assert metrics["effective_minutes"] == 680
assert metrics["shift_day_minutes"] == 500
assert metrics["shift_overtime_minutes"] == 180
assert [(row.effective_minutes, row.day_minutes, row.overtime_minutes, row.night_minutes) for row in rows] == [
(680, 500, 180, 0),
]
def test_zero_effective_minutes_falls_back_to_original_report_date(): def test_zero_effective_minutes_falls_back_to_original_report_date():
item = _item(good_qty=5, defect_qty=1, scrap_qty=0.5, changeover_count=2, process_unit_price_yuan=3) item = _item(good_qty=5, defect_qty=1, scrap_qty=0.5, changeover_count=2, process_unit_price_yuan=3)
report = _report( report = _report(