提交
This commit is contained in:
1 parent
9a73e87ce8
commit
4ea71a1bae
70 files changed
+24056
-18383
No files matched your search
@@ -328,6 +328,17 @@ STATIC_MENU_TREE = [
|
||||
"menuCode": "biz:myQcMaterialUsage:list",
|
||||
},
|
||||
},
|
||||
{
|
||||
"id": "93000000000000000000000000000001",
|
||||
"name": "QualityInspectionMyQcTask",
|
||||
"path": "my-qc-task",
|
||||
"component": "/quality-inspection/my-qc-task/index",
|
||||
"meta": {
|
||||
"title": "我的质检任务",
|
||||
"keepAlive": True,
|
||||
"menuCode": "biz:myQcTask:list",
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
|
||||
+77
-8
@@ -9,7 +9,13 @@ from datetime import datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin, require_any_menu_code, require_menu_code
|
||||
from app.core.menu_guard import (
|
||||
SUPER_ADMIN_ROLE,
|
||||
get_user_menu_codes,
|
||||
require_admin_or_super_admin,
|
||||
require_any_menu_code,
|
||||
require_menu_code,
|
||||
)
|
||||
from app.core.response import error_response, success_response
|
||||
from app.core.utils import parse_datetime
|
||||
from app.crud import qc_lab_test_item as lab_svc
|
||||
@@ -550,6 +556,29 @@ class WorkOrderConfigureBody(BaseModel):
|
||||
has_third_party: bool = Field(False, alias="hasThirdParty")
|
||||
lab_item_ids: List[str] = Field(default_factory=list, alias="labItemIds")
|
||||
third_party_item_ids: List[str] = Field(default_factory=list, alias="thirdPartyItemIds")
|
||||
lab_item_assignees: Dict[str, List[str]] = Field(default_factory=dict, alias="labItemAssignees")
|
||||
third_party_item_assignees: Dict[str, List[str]] = Field(
|
||||
default_factory=dict, alias="thirdPartyItemAssignees"
|
||||
)
|
||||
|
||||
|
||||
def _assert_task_write_access(
|
||||
db: Session,
|
||||
user: dict,
|
||||
task_id: str,
|
||||
tenant_no: str,
|
||||
operate_scope: Optional[str],
|
||||
) -> None:
|
||||
scope = (operate_scope or "manage").strip().lower()
|
||||
user_id = _get_current_user_id(user)
|
||||
role = user.get("role")
|
||||
codes = get_user_menu_codes(db, user_id) if role != SUPER_ADMIN_ROLE else set()
|
||||
if scope == "mine":
|
||||
if role != SUPER_ADMIN_ROLE and "biz:myQcTask:list" not in codes:
|
||||
raise PermissionError("无菜单访问权限")
|
||||
task_svc.assert_task_assignee(db, task_id, user_id, tenant_no)
|
||||
elif role != SUPER_ADMIN_ROLE and "biz:qcTask:list" not in codes:
|
||||
raise PermissionError("无菜单访问权限")
|
||||
|
||||
|
||||
@router.post("/qc-work-orders")
|
||||
@@ -726,8 +755,11 @@ async def configure_qc_work_order(
|
||||
has_third_party=body.has_third_party,
|
||||
lab_item_ids=body.lab_item_ids,
|
||||
third_party_item_ids=body.third_party_item_ids,
|
||||
lab_item_assignees=body.lab_item_assignees,
|
||||
third_party_item_assignees=body.third_party_item_assignees,
|
||||
tenant_no=tenant_no,
|
||||
user_id=_get_current_user_id(user),
|
||||
create_dept_id=user.get("dept_id", ""),
|
||||
)
|
||||
return success_response(wo_svc._wo_to_dict(obj), message="配置成功")
|
||||
except PermissionError as e:
|
||||
@@ -779,6 +811,37 @@ async def create_qc_task(
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/qc-tasks/mine")
|
||||
async def list_my_qc_tasks(
|
||||
page: int = Query(1, ge=1),
|
||||
pageSize: int = Query(10, ge=1, le=100),
|
||||
keyword: Optional[str] = None,
|
||||
taskType: Optional[str] = None,
|
||||
taskStatus: Optional[str] = None,
|
||||
qcBizType: Optional[str] = None,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
items, total = task_svc.list_mine_tasks(
|
||||
db,
|
||||
assignee_user_id=_get_current_user_id(user),
|
||||
page=page,
|
||||
page_size=pageSize,
|
||||
keyword=keyword,
|
||||
task_type=taskType,
|
||||
task_status=taskStatus,
|
||||
qc_biz_type=qcBizType,
|
||||
tenant_no=tenant_no,
|
||||
)
|
||||
return success_response(_page_payload(items, total, page, pageSize))
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/qc-tasks")
|
||||
async def list_qc_tasks(
|
||||
page: int = Query(1, ge=1),
|
||||
@@ -816,7 +879,7 @@ async def list_qc_tasks(
|
||||
async def get_qc_task_detail(
|
||||
task_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
@@ -833,11 +896,13 @@ async def get_qc_task_detail(
|
||||
@router.post("/qc-tasks/{task_id}/start")
|
||||
async def start_qc_task(
|
||||
task_id: str,
|
||||
operateScope: Optional[str] = Query(None, alias="operateScope"),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
_assert_task_write_access(db, user, task_id, tenant_no, operateScope)
|
||||
obj = task_svc.start_task(db, task_id, tenant_no=tenant_no, user_id=_get_current_user_id(user))
|
||||
return success_response(task_svc._task_to_dict(obj), message="已开始")
|
||||
except PermissionError as e:
|
||||
@@ -872,7 +937,7 @@ async def complete_qc_task(
|
||||
async def get_task_results(
|
||||
task_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
@@ -888,7 +953,7 @@ async def list_qc_material_requisition_options(
|
||||
keyword: Optional[str] = None,
|
||||
limit: int = Query(50, ge=1, le=100),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
@@ -910,7 +975,7 @@ async def list_qc_material_requisition_options(
|
||||
async def get_task_material_usages(
|
||||
task_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
@@ -930,8 +995,9 @@ async def get_task_material_usages(
|
||||
async def complete_task_with_result(
|
||||
task_id: str,
|
||||
body: TaskCompleteWithResultBody,
|
||||
operateScope: Optional[str] = Query(None, alias="operateScope"),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
@@ -939,6 +1005,7 @@ async def complete_task_with_result(
|
||||
t = task_svc.get_task(db, task_id, tenant_no=tenant_no)
|
||||
if not t:
|
||||
return error_response(404, "任务不存在")
|
||||
_assert_task_write_access(db, user, task_id, tenant_no, operateScope)
|
||||
was_done = (t.task_status or "").strip() == "ywc"
|
||||
if body.results:
|
||||
result_svc.save_results_for_task(
|
||||
@@ -990,11 +1057,13 @@ async def complete_task_with_result(
|
||||
async def update_qc_task_attachments(
|
||||
task_id: str,
|
||||
body: TaskAttachmentsBody,
|
||||
operateScope: Optional[str] = Query(None, alias="operateScope"),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:qcTask:list")),
|
||||
user: dict = Depends(require_any_menu_code("biz:qcTask:list", "biz:myQcTask:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
_assert_task_write_access(db, user, task_id, tenant_no, operateScope)
|
||||
obj = task_svc.update_task_attachments(
|
||||
db,
|
||||
task_id,
|
||||
|
||||
Reference in new issue
Block a user