|
|
@@ -5,7 +5,7 @@ from fastapi import APIRouter, Depends, Query
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
|
|
from app.core.database import get_db
|
|
|
-from app.core.menu_guard import require_menu_code
|
|
|
+from app.core.menu_guard import require_any_menu_code
|
|
|
from app.core.response import error_response, success_response
|
|
|
from app.crud import pre_transit_sample as pts_svc
|
|
|
from app.models.models import SysUser
|
|
|
@@ -44,7 +44,12 @@ async def list_in_transit_samples(
|
|
|
sampleCollectTimeStart: Optional[str] = Query(None, alias="sampleCollectTimeStart"),
|
|
|
sampleCollectTimeEnd: Optional[str] = Query(None, alias="sampleCollectTimeEnd"),
|
|
|
db: Session = Depends(get_db),
|
|
|
- user: dict = Depends(require_menu_code("biz:preTransitSample:list")),
|
|
|
+ user: dict = Depends(
|
|
|
+ require_any_menu_code(
|
|
|
+ "biz:preTransitSample:list",
|
|
|
+ "production:preTransitSample:list",
|
|
|
+ )
|
|
|
+ ),
|
|
|
):
|
|
|
try:
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
@@ -79,7 +84,12 @@ async def list_pre_delivery_samples(
|
|
|
sampleCollectTimeStart: Optional[str] = Query(None, alias="sampleCollectTimeStart"),
|
|
|
sampleCollectTimeEnd: Optional[str] = Query(None, alias="sampleCollectTimeEnd"),
|
|
|
db: Session = Depends(get_db),
|
|
|
- user: dict = Depends(require_menu_code("biz:preTransitSample:list")),
|
|
|
+ user: dict = Depends(
|
|
|
+ require_any_menu_code(
|
|
|
+ "biz:preTransitSample:list",
|
|
|
+ "production:preTransitSample:list",
|
|
|
+ )
|
|
|
+ ),
|
|
|
):
|
|
|
try:
|
|
|
tenant_no = _get_tenant_no(db, user)
|