This commit is contained in:
zlwu committed 2026-06-16 07:38:27 +08:00
1 parent a1c2511eb7
commit eaf7d490ec
382 files changed
+44146 -34245

No files matched your search

+21 -21
View File
@@ -1224,7 +1224,7 @@ class ProcessCreateBody(BaseModel):
category_id: Optional[str] = Field(None, alias="categoryId")
process_name: str = Field(..., alias="processName")
description: Optional[str] = None
equipment_name: Optional[str] = Field(None, alias="equipmentName")
equipment_ids: Optional[List[str]] = Field(None, alias="equipmentIds")
estimated_duration: Optional[str] = Field(None, alias="estimatedDuration")
sop_ids: Optional[str] = Field(None, alias="sopIds")
order_num: Optional[int] = Field(0, alias="orderNum")
@@ -1241,7 +1241,7 @@ class ProcessUpdateBody(BaseModel):
category_id: Optional[str] = Field(None, alias="categoryId")
process_name: Optional[str] = Field(None, alias="processName")
description: Optional[str] = None
equipment_name: Optional[str] = Field(None, alias="equipmentName")
equipment_ids: Optional[List[str]] = Field(None, alias="equipmentIds")
estimated_duration: Optional[str] = Field(None, alias="estimatedDuration")
sop_ids: Optional[str] = Field(None, alias="sopIds")
order_num: Optional[int] = Field(None, alias="orderNum")
@@ -1313,7 +1313,7 @@ async def create_process(
category_id=body.category_id,
process_name=body.process_name,
description=body.description,
equipment_name=body.equipment_name,
equipment_ids=body.equipment_ids,
estimated_duration=body.estimated_duration,
sop_ids=body.sop_ids,
reagents=reagents_data,
@@ -1350,24 +1350,24 @@ async def update_process(
for cd in (consumables_data or []):
if "is_required" in cd and isinstance(cd["is_required"], str):
cd["is_required"] = int(cd["is_required"])
obj = process_svc.update_process(
db,
process_id,
process_code=payload.get("process_code"),
category_id=payload.get("category_id"),
process_name=payload.get("process_name"),
description=payload.get("description"),
equipment_name=payload.get("equipment_name"),
estimated_duration=payload.get("estimated_duration"),
sop_ids=payload.get("sop_ids"),
reagents=reagents_data,
consumables=consumables_data,
outputs=outputs_data,
data_collections=data_collections_data,
order_num=payload.get("order_num"),
remark=payload.get("remark"),
user_id=user.get("user_id"),
)
update_kwargs: dict[str, Any] = {
"process_code": payload.get("process_code"),
"category_id": payload.get("category_id"),
"process_name": payload.get("process_name"),
"description": payload.get("description"),
"estimated_duration": payload.get("estimated_duration"),
"sop_ids": payload.get("sop_ids"),
"reagents": reagents_data,
"consumables": consumables_data,
"outputs": outputs_data,
"data_collections": data_collections_data,
"order_num": payload.get("order_num"),
"remark": payload.get("remark"),
"user_id": user.get("user_id"),
}
if "equipment_ids" in payload:
update_kwargs["equipment_ids"] = payload.get("equipment_ids")
obj = process_svc.update_process(db, process_id, **update_kwargs)
return success_response(process_svc._row_to_dict(obj), message="更新成功")
except ValueError as e:
return error_response(400, str(e))
+20 -20
View File
@@ -262,6 +262,26 @@ async def list_received_samples(
return error_response(400, str(e))
@router.get("/sample-receptions/by-sample-code")
async def get_sample_reception_by_sample_code(
sampleCode: str = Query(..., alias="sampleCode"),
sourceType: Optional[str] = Query(None, alias="sourceType"),
db: Session = Depends(get_db),
user: dict = Depends(require_any_menu_code(*SAMPLE_RECEPTION_READ_MENU_CODES)),
):
"""根据样本编码查询样本接收记录:有则返回 receptionId + sampleInfo;无则仅返回 sampleInfo(用于新建)。"""
try:
tenant_no = _get_tenant_no(db, user)
result = sr_svc.get_reception_by_sample_code(
db, sample_code=sampleCode, source_type=sourceType, tenant_no=tenant_no
)
return success_response(result)
except PermissionError as e:
return error_response(403, str(e))
except Exception as e:
return error_response(400, str(e))
@router.get("/sample-receptions/{reception_id}")
async def get_sample_reception_detail(
reception_id: str,
@@ -444,23 +464,3 @@ async def put_sample_reception(
return error_response(400, str(e))
except Exception as e:
return error_response(400, str(e))
@router.get("/sample-receptions/by-sample-code")
async def get_sample_reception_by_sample_code(
sampleCode: str = Query(..., alias="sampleCode"),
sourceType: Optional[str] = Query(None, alias="sourceType"),
db: Session = Depends(get_db),
user: dict = Depends(require_any_menu_code(*SAMPLE_RECEPTION_READ_MENU_CODES)),
):
"""根据样本编码查询样本接收记录:有则返回 receptionId + sampleInfo;无则仅返回 sampleInfo(用于新建)。"""
try:
tenant_no = _get_tenant_no(db, user)
result = sr_svc.get_reception_by_sample_code(
db, sample_code=sampleCode, source_type=sourceType, tenant_no=tenant_no
)
return success_response(result)
except PermissionError as e:
return error_response(403, str(e))
except Exception as e:
return error_response(400, str(e))