|
@@ -95,7 +95,7 @@ async def list_consumables(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = consumable_svc.list_consumables(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = consumable_svc.list_consumables(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = consumable_svc.total_pages(total, pageSize)
|
|
tp = consumable_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -106,7 +106,7 @@ async def list_all_consumables(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, _ = consumable_svc.list_consumables(db, page=1, page_size=9999, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, _ = consumable_svc.list_consumables(db, page=1, page_size=9999, tenant_no=tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -214,7 +214,7 @@ async def list_reagents(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = reagent_svc.list_reagents(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = reagent_svc.list_reagents(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = reagent_svc.total_pages(total, pageSize)
|
|
tp = reagent_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -225,7 +225,7 @@ async def list_all_reagents(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, _ = reagent_svc.list_reagents(db, page=1, page_size=9999, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, _ = reagent_svc.list_reagents(db, page=1, page_size=9999, tenant_no=tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -329,7 +329,7 @@ async def list_sop_documents(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = sop_document_svc.list_sop_documents(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = sop_document_svc.list_sop_documents(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = sop_document_svc.total_pages(total, pageSize)
|
|
tp = sop_document_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -340,7 +340,7 @@ async def list_all_sop_documents(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, _ = sop_document_svc.list_sop_documents(db, page=1, page_size=9999, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, _ = sop_document_svc.list_sop_documents(db, page=1, page_size=9999, tenant_no=tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -443,7 +443,7 @@ async def list_process_categories(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = process_category_svc.list_process_categories(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = process_category_svc.list_process_categories(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = process_category_svc.total_pages(total, pageSize)
|
|
tp = process_category_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -454,7 +454,7 @@ async def list_all_process_categories(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, _ = process_category_svc.list_process_categories(db, page=1, page_size=9999, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, _ = process_category_svc.list_process_categories(db, page=1, page_size=9999, tenant_no=tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -546,7 +546,7 @@ async def list_output_types(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = output_type_svc.list_output_types(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = output_type_svc.list_output_types(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = output_type_svc.total_pages(total, pageSize)
|
|
tp = output_type_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -557,7 +557,7 @@ async def list_all_output_types(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, _ = output_type_svc.list_output_types(db, page=1, page_size=9999, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, _ = output_type_svc.list_output_types(db, page=1, page_size=9999, tenant_no=tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -667,7 +667,7 @@ async def list_consumable_packs(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = consumable_pack_svc.list_consumable_packs(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = consumable_pack_svc.list_consumable_packs(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = consumable_pack_svc.total_pages(total, pageSize)
|
|
tp = consumable_pack_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -678,7 +678,7 @@ async def list_all_consumable_packs(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items = consumable_pack_svc.list_all_packs(db, tenant_no)
|
|
|
|
|
|
|
+ items = consumable_pack_svc.list_all_packs(db, tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -848,7 +848,7 @@ async def list_processes(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items, total = process_svc.list_processes(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no)
|
|
|
|
|
|
|
+ items, total = process_svc.list_processes(db, page=page, page_size=pageSize, keyword=keyword, tenant_no=tenant_no, user_info=user)
|
|
|
tp = process_svc.total_pages(total, pageSize)
|
|
tp = process_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
|
|
|
|
|
@@ -859,7 +859,7 @@ async def list_all_processes(
|
|
|
db: Session = Depends(get_db),
|
|
db: Session = Depends(get_db),
|
|
|
):
|
|
):
|
|
|
tenant_no = _get_tenant_no(db, user)
|
|
tenant_no = _get_tenant_no(db, user)
|
|
|
- items = process_svc.list_all_processes(db, tenant_no)
|
|
|
|
|
|
|
+ items = process_svc.list_all_processes(db, tenant_no, user_info=user)
|
|
|
return success_response(items)
|
|
return success_response(items)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -993,6 +993,7 @@ async def list_process_routes(
|
|
|
db, page=page, page_size=pageSize,
|
|
db, page=page, page_size=pageSize,
|
|
|
route_name=routeName, route_code=routeCode,
|
|
route_name=routeName, route_code=routeCode,
|
|
|
product_type_id=productTypeId, tenant_no=tenant_no,
|
|
product_type_id=productTypeId, tenant_no=tenant_no,
|
|
|
|
|
+ user_info=user,
|
|
|
)
|
|
)
|
|
|
tp = route_svc.total_pages(total, pageSize)
|
|
tp = route_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
@@ -1252,6 +1253,7 @@ async def list_production_work_orders(
|
|
|
)
|
|
)
|
|
|
result = production_work_order_svc.list_production_work_orders(
|
|
result = production_work_order_svc.list_production_work_orders(
|
|
|
db, tenant_no=tenant_no, query=query, page=page, page_size=pageSize,
|
|
db, tenant_no=tenant_no, query=query, page=page, page_size=pageSize,
|
|
|
|
|
+ user_info=user,
|
|
|
)
|
|
)
|
|
|
items = result.get("items", [])
|
|
items = result.get("items", [])
|
|
|
total = result.get("total", 0)
|
|
total = result.get("total", 0)
|
|
@@ -1327,6 +1329,7 @@ async def list_production_tasks(
|
|
|
items, total = production_task_svc.list_production_tasks(
|
|
items, total = production_task_svc.list_production_tasks(
|
|
|
db, tenant_no=tenant_no, page=page, page_size=pageSize,
|
|
db, tenant_no=tenant_no, page=page, page_size=pageSize,
|
|
|
work_order_id=workOrderId, task_no=taskNo, task_status=taskStatus,
|
|
work_order_id=workOrderId, task_no=taskNo, task_status=taskStatus,
|
|
|
|
|
+ user_info=user,
|
|
|
)
|
|
)
|
|
|
tp = production_task_svc.total_pages(total, pageSize)
|
|
tp = production_task_svc.total_pages(total, pageSize)
|
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
|
@@ -1560,6 +1563,7 @@ async def list_cell_products(
|
|
|
db, tenant_no=tenant_no, page=page, page_size=pageSize,
|
|
db, tenant_no=tenant_no, page=page, page_size=pageSize,
|
|
|
product_code=productCode, product_name=productName,
|
|
product_code=productCode, product_name=productName,
|
|
|
product_type_id=productTypeId, product_status=productStatus,
|
|
product_type_id=productTypeId, product_status=productStatus,
|
|
|
|
|
+ user_info=user,
|
|
|
)
|
|
)
|
|
|
items = result.get("items", [])
|
|
items = result.get("items", [])
|
|
|
total = result.get("total", 0)
|
|
total = result.get("total", 0)
|