fix: 完善报工归属输出安全性
This commit is contained in:
@@ -4,7 +4,7 @@ from types import SimpleNamespace
|
||||
|
||||
from sqlalchemy import BigInteger, create_engine, select
|
||||
from sqlalchemy.ext.compiler import compiles
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from sqlalchemy.orm import raiseload, selectinload, sessionmaker
|
||||
|
||||
from app.database import Base
|
||||
from app.models import (
|
||||
@@ -511,16 +511,33 @@ def test_report_out_exposes_allocation_summary_and_item_allocations():
|
||||
changeover_count=Decimal("1.50"),
|
||||
reference_wage=Decimal("251.25"),
|
||||
)
|
||||
item.allocations = [allocation]
|
||||
previous_allocation = ProductionReportAllocation(
|
||||
id=2,
|
||||
report_id=1,
|
||||
report_item_id=1,
|
||||
attendance_point_name="总厂",
|
||||
employee_phone="13800000000",
|
||||
allocation_date=date(2026, 7, 24),
|
||||
day_minutes=Decimal("0.00"),
|
||||
overtime_minutes=Decimal("0.00"),
|
||||
night_minutes=Decimal("60.00"),
|
||||
effective_minutes=Decimal("60.00"),
|
||||
good_qty=Decimal("40.00"),
|
||||
defect_qty=Decimal("0.00"),
|
||||
scrap_qty=Decimal("0.00"),
|
||||
changeover_count=Decimal("0.00"),
|
||||
reference_wage=Decimal("100.00"),
|
||||
)
|
||||
item.allocations = [allocation, previous_allocation]
|
||||
report.items = [item]
|
||||
report.allocations = [allocation]
|
||||
report.allocations = [allocation, previous_allocation]
|
||||
report.audit_logs = []
|
||||
|
||||
output = report_out(report)
|
||||
|
||||
assert output.allocation_summary_text == "2026-07-25 白班2.01小时、加班0.5小时"
|
||||
assert len(output.items[0].allocations) == 1
|
||||
item_allocation = output.items[0].allocations[0]
|
||||
assert output.allocation_summary_text == "2026-07-24 夜班1小时;2026-07-25 白班2.01小时、加班0.5小时"
|
||||
assert [row.allocation_date for row in output.items[0].allocations] == [date(2026, 7, 24), date(2026, 7, 25)]
|
||||
item_allocation = output.items[0].allocations[1]
|
||||
assert item_allocation.allocation_date == date(2026, 7, 25)
|
||||
assert item_allocation.day_minutes == 120.5
|
||||
assert item_allocation.overtime_minutes == 30.25
|
||||
@@ -643,6 +660,81 @@ def _sqlite_db():
|
||||
return SessionLocal()
|
||||
|
||||
|
||||
def test_report_out_skips_unloaded_allocations_without_lazy_load():
|
||||
db = _sqlite_db()
|
||||
try:
|
||||
person = Personnel(phone="13800000000", name="张三")
|
||||
session = WorkSession(
|
||||
id=1,
|
||||
attendance_point_name="总厂",
|
||||
employee_phone=person.phone,
|
||||
start_at=datetime(2026, 7, 25, 8, 0),
|
||||
end_at=datetime(2026, 7, 25, 10, 0),
|
||||
status=SessionStatus.submitted,
|
||||
)
|
||||
report = ProductionReport(
|
||||
id=1,
|
||||
session_id=session.id,
|
||||
attendance_point_name="总厂",
|
||||
employee_phone=person.phone,
|
||||
report_date=date(2026, 7, 25),
|
||||
start_at=datetime(2026, 7, 25, 8, 0),
|
||||
end_at=datetime(2026, 7, 25, 10, 0),
|
||||
break_minutes=0,
|
||||
status=ReportStatus.pending,
|
||||
submitted_at=datetime(2026, 7, 25, 10, 1),
|
||||
)
|
||||
item = ProductionReportItem(
|
||||
id=1,
|
||||
report_id=report.id,
|
||||
attendance_point_name="总厂",
|
||||
device_no="23#",
|
||||
project_no="P1",
|
||||
product_name="23#",
|
||||
process_name="冲压",
|
||||
process_unit_price_yuan=1,
|
||||
good_qty=100,
|
||||
defect_qty=0,
|
||||
scrap_qty=0,
|
||||
changeover_count=0,
|
||||
standard_beat=1,
|
||||
standard_workload=0,
|
||||
)
|
||||
allocation = ProductionReportAllocation(
|
||||
id=1,
|
||||
report_id=report.id,
|
||||
report_item_id=item.id,
|
||||
attendance_point_name="总厂",
|
||||
employee_phone=person.phone,
|
||||
allocation_date=date(2026, 7, 25),
|
||||
day_minutes=120,
|
||||
effective_minutes=120,
|
||||
good_qty=100,
|
||||
reference_wage=100,
|
||||
)
|
||||
db.add_all([person, session, report, item, allocation])
|
||||
db.commit()
|
||||
|
||||
loaded_report = db.scalar(
|
||||
select(ProductionReport)
|
||||
.options(
|
||||
selectinload(ProductionReport.employee),
|
||||
selectinload(ProductionReport.items).raiseload(ProductionReportItem.allocations),
|
||||
selectinload(ProductionReport.audit_logs),
|
||||
selectinload(ProductionReport.session).selectinload(WorkSession.devices),
|
||||
raiseload(ProductionReport.allocations),
|
||||
)
|
||||
.where(ProductionReport.id == report.id)
|
||||
)
|
||||
|
||||
output = report_out(loaded_report)
|
||||
|
||||
assert output.allocation_summary_text == ""
|
||||
assert output.items[0].allocations == []
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
def _product(
|
||||
*,
|
||||
point_name: str = "总厂",
|
||||
|
||||
Reference in New Issue
Block a user