Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50679fa75e | ||
|
|
2124ce9208 | ||
|
|
e7b3876db6 | ||
|
|
c0aba421da | ||
|
|
2aecb69cc4 | ||
|
|
2878c6889d | ||
|
|
4aee2b1fe5 | ||
|
|
5698a9dfc4 | ||
|
|
77d45d0bc5 | ||
|
|
dc0f8541c4 | ||
|
|
4fd6ef4be5 | ||
|
|
b3c191ee99 | ||
|
|
bbef46b645 |
No files matched your search
@@ -6,7 +6,7 @@ from pydantic import BaseModel, ConfigDict, Field
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.core.database import get_db
|
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.core.response import error_response, success_response
|
||||||
from app.crud import lab_sample_process as svc
|
from app.crud import lab_sample_process as svc
|
||||||
from app.models.models import SysUser
|
from app.models.models import SysUser
|
||||||
@@ -14,8 +14,17 @@ from app.services import lab_sample_process as ledger
|
|||||||
|
|
||||||
router = APIRouter(prefix="/web/admin", tags=["质检管理"])
|
router = APIRouter(prefix="/web/admin", tags=["质检管理"])
|
||||||
|
|
||||||
LIST_MENU = "biz:labSampleProcess:list"
|
# 市场/生产/质检三处菜单权限码不同,接口按并集鉴权
|
||||||
SUPPLEMENT_MENU = "biz:labSampleProcess:supplement"
|
LIST_MENU_CODES = (
|
||||||
|
"biz:labSampleProcess:list",
|
||||||
|
"production:labSampleProcess:list",
|
||||||
|
"cellStorage:labSampleProcess:list",
|
||||||
|
)
|
||||||
|
SUPPLEMENT_MENU_CODES = (
|
||||||
|
"biz:labSampleProcess:supplement",
|
||||||
|
"production:labSampleProcess:supplement",
|
||||||
|
"cellStorage:labSampleProcess:supplement",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _tenant_no(db: Session, user: dict) -> str:
|
def _tenant_no(db: Session, user: dict) -> str:
|
||||||
@@ -59,7 +68,7 @@ def list_lab_sample_process(
|
|||||||
createTimeStart: Optional[str] = Query(None),
|
createTimeStart: Optional[str] = Query(None),
|
||||||
createTimeEnd: Optional[str] = Query(None),
|
createTimeEnd: Optional[str] = Query(None),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
user=Depends(require_menu_code(LIST_MENU)),
|
user=Depends(require_any_menu_code(*LIST_MENU_CODES)),
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
tenant_no = _tenant_no(db, user)
|
tenant_no = _tenant_no(db, user)
|
||||||
@@ -98,7 +107,7 @@ def list_lab_sample_process(
|
|||||||
def get_supplement(
|
def get_supplement(
|
||||||
labStorageCode: str = Query(...),
|
labStorageCode: str = Query(...),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
user=Depends(require_menu_code(LIST_MENU)),
|
user=Depends(require_any_menu_code(*LIST_MENU_CODES)),
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
tenant_no = _tenant_no(db, user)
|
tenant_no = _tenant_no(db, user)
|
||||||
@@ -114,7 +123,7 @@ def get_supplement(
|
|||||||
def save_supplement(
|
def save_supplement(
|
||||||
body: SupplementBody,
|
body: SupplementBody,
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
user=Depends(require_menu_code(SUPPLEMENT_MENU)),
|
user=Depends(require_any_menu_code(*SUPPLEMENT_MENU_CODES)),
|
||||||
):
|
):
|
||||||
try:
|
try:
|
||||||
tenant_no = _tenant_no(db, user)
|
tenant_no = _tenant_no(db, user)
|
||||||
|
|||||||
@@ -179,6 +179,17 @@ def upsert_supplement(
|
|||||||
del_flag=0,
|
del_flag=0,
|
||||||
)
|
)
|
||||||
db.add(row)
|
db.add(row)
|
||||||
|
# 同步到新模块补充表/生产接收,保证实验室样本处理数据联动
|
||||||
|
from app.services.lab_sample_processing import sync_legacy_supplement_to_processing
|
||||||
|
|
||||||
|
sync_legacy_supplement_to_processing(
|
||||||
|
db,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
lab_storage_code=code,
|
||||||
|
sample_type_name=type_name,
|
||||||
|
payload=clean_payload,
|
||||||
|
operator_id=user_id,
|
||||||
|
)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(row)
|
db.refresh(row)
|
||||||
return get_supplement(db, tenant_no=tenant_no, lab_storage_code=code) or {}
|
return get_supplement(db, tenant_no=tenant_no, lab_storage_code=code) or {}
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,472 @@
|
|||||||
|
"""确保 UC 入库编码对应的 5 步内置工艺路线 / 任务组合存在。
|
||||||
|
|
||||||
|
步骤顺序(业务确认):
|
||||||
|
1. 脐带MSC原代细胞培养
|
||||||
|
2. 脐带MSC原代细胞培养半换液
|
||||||
|
3. 脐带MSC原代二次贴壁
|
||||||
|
4. 脐带MSC原代重铺操作
|
||||||
|
5. 干细胞冻存
|
||||||
|
|
||||||
|
内容从既有「干细胞培养(内置模版)」按工序代码拷贝,排除传代。
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from app.models.models import (
|
||||||
|
BizProcessRoute,
|
||||||
|
BizProcessRouteStep,
|
||||||
|
BizProcessRouteStepConsumable,
|
||||||
|
BizProcessRouteStepDataCollection,
|
||||||
|
BizProcessRouteStepOutput,
|
||||||
|
BizProcessRouteStepReagent,
|
||||||
|
BizProductionTaskSet,
|
||||||
|
BizProductionTaskSetItem,
|
||||||
|
)
|
||||||
|
from app.core.utils import generate_uuid
|
||||||
|
from app.utils.lab_storage_code_task_set import (
|
||||||
|
BC_MSC_BUILTIN_SET_NAME,
|
||||||
|
UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
)
|
||||||
|
|
||||||
|
UC_MSC_ROUTE_CODE = "MSC原代-UC-BUILTIN"
|
||||||
|
UC_MSC_ROUTE_NAME = UC_MSC_BUILTIN_SET_NAME
|
||||||
|
SOURCE_MSC_ROUTE_CODE = "MSC培养-BUILTIN"
|
||||||
|
SOURCE_MSC_ROUTE_NAME = BC_MSC_BUILTIN_SET_NAME
|
||||||
|
|
||||||
|
# process_code → 目标 step_order
|
||||||
|
UC_MSC_STEP_ORDER: List[str] = [
|
||||||
|
"SOP-SC-003-E01-01", # 原代细胞培养
|
||||||
|
"SOP-SC-004-E01-01", # 半换液
|
||||||
|
"SOP-SC-006-E01-01", # 二次贴壁
|
||||||
|
"SOP-SC-005-E01-01", # 重铺
|
||||||
|
"SOP-SC-008-E01-01", # 冻存
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def _now() -> datetime:
|
||||||
|
return datetime.now()
|
||||||
|
|
||||||
|
|
||||||
|
def get_uc_msc_builtin_set(
|
||||||
|
db: Session, *, tenant_no: str
|
||||||
|
) -> Optional[BizProductionTaskSet]:
|
||||||
|
return (
|
||||||
|
db.query(BizProductionTaskSet)
|
||||||
|
.filter(
|
||||||
|
BizProductionTaskSet.tenant_no == tenant_no,
|
||||||
|
BizProductionTaskSet.set_name == UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
BizProductionTaskSet.is_builtin == "1",
|
||||||
|
BizProductionTaskSet.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _find_source_route(db: Session, *, tenant_no: str) -> BizProcessRoute:
|
||||||
|
route = (
|
||||||
|
db.query(BizProcessRoute)
|
||||||
|
.filter(
|
||||||
|
BizProcessRoute.tenant_no == tenant_no,
|
||||||
|
BizProcessRoute.route_code == SOURCE_MSC_ROUTE_CODE,
|
||||||
|
BizProcessRoute.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if route:
|
||||||
|
return route
|
||||||
|
route = (
|
||||||
|
db.query(BizProcessRoute)
|
||||||
|
.filter(
|
||||||
|
BizProcessRoute.tenant_no == tenant_no,
|
||||||
|
BizProcessRoute.route_name == SOURCE_MSC_ROUTE_NAME,
|
||||||
|
BizProcessRoute.is_builtin == "1",
|
||||||
|
BizProcessRoute.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not route:
|
||||||
|
raise ValueError(
|
||||||
|
f"缺少源工艺路线 {SOURCE_MSC_ROUTE_CODE}/{SOURCE_MSC_ROUTE_NAME},无法创建 UC 模版"
|
||||||
|
)
|
||||||
|
return route
|
||||||
|
|
||||||
|
|
||||||
|
def _clone_step_children(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
src_step_id: str,
|
||||||
|
dst_step_id: str,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str],
|
||||||
|
create_dept_id: str,
|
||||||
|
now: datetime,
|
||||||
|
) -> None:
|
||||||
|
reagent_rows = (
|
||||||
|
db.query(BizProcessRouteStepReagent)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStepReagent.step_id == src_step_id,
|
||||||
|
BizProcessRouteStepReagent.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStepReagent.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for r in reagent_rows:
|
||||||
|
db.add(
|
||||||
|
BizProcessRouteStepReagent(
|
||||||
|
id=generate_uuid(),
|
||||||
|
step_id=dst_step_id,
|
||||||
|
reagent_code=r.reagent_code,
|
||||||
|
reagent_name=r.reagent_name,
|
||||||
|
spec=r.spec,
|
||||||
|
standard_usage=r.standard_usage,
|
||||||
|
unit=r.unit,
|
||||||
|
is_key_material=r.is_key_material,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=r.order_num,
|
||||||
|
remark=r.remark,
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
consumable_rows = (
|
||||||
|
db.query(BizProcessRouteStepConsumable)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStepConsumable.step_id == src_step_id,
|
||||||
|
BizProcessRouteStepConsumable.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStepConsumable.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for c in consumable_rows:
|
||||||
|
db.add(
|
||||||
|
BizProcessRouteStepConsumable(
|
||||||
|
id=generate_uuid(),
|
||||||
|
step_id=dst_step_id,
|
||||||
|
consumable_code=c.consumable_code,
|
||||||
|
consumable_name=c.consumable_name,
|
||||||
|
spec_model=c.spec_model,
|
||||||
|
standard_usage=c.standard_usage,
|
||||||
|
unit=c.unit,
|
||||||
|
is_required=c.is_required,
|
||||||
|
remark=c.remark,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=c.order_num,
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
output_rows = (
|
||||||
|
db.query(BizProcessRouteStepOutput)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStepOutput.step_id == src_step_id,
|
||||||
|
BizProcessRouteStepOutput.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStepOutput.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for o in output_rows:
|
||||||
|
db.add(
|
||||||
|
BizProcessRouteStepOutput(
|
||||||
|
id=generate_uuid(),
|
||||||
|
step_id=dst_step_id,
|
||||||
|
output_type_id=o.output_type_id,
|
||||||
|
output_name=o.output_name,
|
||||||
|
output_barcode=o.output_barcode,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=o.order_num,
|
||||||
|
remark=o.remark,
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
dc_rows = (
|
||||||
|
db.query(BizProcessRouteStepDataCollection)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStepDataCollection.step_id == src_step_id,
|
||||||
|
BizProcessRouteStepDataCollection.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStepDataCollection.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for d in dc_rows:
|
||||||
|
db.add(
|
||||||
|
BizProcessRouteStepDataCollection(
|
||||||
|
id=generate_uuid(),
|
||||||
|
step_id=dst_step_id,
|
||||||
|
collection_name=d.collection_name,
|
||||||
|
unit=d.unit,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=d.order_num,
|
||||||
|
remark=d.remark,
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _source_steps_by_code(
|
||||||
|
db: Session, *, route_id: str, tenant_no: str
|
||||||
|
) -> Dict[str, BizProcessRouteStep]:
|
||||||
|
rows = (
|
||||||
|
db.query(BizProcessRouteStep)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStep.route_id == route_id,
|
||||||
|
BizProcessRouteStep.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStep.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
out: Dict[str, BizProcessRouteStep] = {}
|
||||||
|
for row in rows:
|
||||||
|
code = (row.process_code or "").strip()
|
||||||
|
if code and code not in out:
|
||||||
|
out[code] = row
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_uc_msc_builtin_template(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str] = None,
|
||||||
|
create_dept_id: str = "",
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""幂等创建 UC 5 步内置路线与任务组合;已存在则直接返回。"""
|
||||||
|
existing = get_uc_msc_builtin_set(db, tenant_no=tenant_no)
|
||||||
|
if existing and (existing.status or "1") == "1":
|
||||||
|
item = (
|
||||||
|
db.query(BizProductionTaskSetItem)
|
||||||
|
.filter(
|
||||||
|
BizProductionTaskSetItem.set_id == existing.id,
|
||||||
|
BizProductionTaskSetItem.tenant_no == tenant_no,
|
||||||
|
BizProductionTaskSetItem.del_flag == 0,
|
||||||
|
)
|
||||||
|
.order_by(
|
||||||
|
BizProductionTaskSetItem.order_num.asc(),
|
||||||
|
BizProductionTaskSetItem.create_time.asc(),
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if item and item.route_id:
|
||||||
|
route = (
|
||||||
|
db.query(BizProcessRoute)
|
||||||
|
.filter(
|
||||||
|
BizProcessRoute.id == item.route_id,
|
||||||
|
BizProcessRoute.tenant_no == tenant_no,
|
||||||
|
BizProcessRoute.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
step_count = (
|
||||||
|
db.query(BizProcessRouteStep.id)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStep.route_id == item.route_id,
|
||||||
|
BizProcessRouteStep.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStep.del_flag == 0,
|
||||||
|
)
|
||||||
|
.count()
|
||||||
|
)
|
||||||
|
if route and step_count >= len(UC_MSC_STEP_ORDER):
|
||||||
|
return {
|
||||||
|
"created": False,
|
||||||
|
"setId": existing.id,
|
||||||
|
"setName": existing.set_name,
|
||||||
|
"routeId": route.id,
|
||||||
|
"routeCode": route.route_code,
|
||||||
|
"stepCount": step_count,
|
||||||
|
}
|
||||||
|
|
||||||
|
source = _find_source_route(db, tenant_no=tenant_no)
|
||||||
|
by_code = _source_steps_by_code(db, route_id=source.id, tenant_no=tenant_no)
|
||||||
|
missing = [c for c in UC_MSC_STEP_ORDER if c not in by_code]
|
||||||
|
if missing:
|
||||||
|
raise ValueError(
|
||||||
|
"源工艺路线缺少工序,无法创建 UC 模版:" + "、".join(missing)
|
||||||
|
)
|
||||||
|
|
||||||
|
now = _now()
|
||||||
|
route = (
|
||||||
|
db.query(BizProcessRoute)
|
||||||
|
.filter(
|
||||||
|
BizProcessRoute.tenant_no == tenant_no,
|
||||||
|
BizProcessRoute.route_code == UC_MSC_ROUTE_CODE,
|
||||||
|
BizProcessRoute.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not route:
|
||||||
|
route = BizProcessRoute(
|
||||||
|
id=generate_uuid(),
|
||||||
|
route_code=UC_MSC_ROUTE_CODE,
|
||||||
|
route_name=UC_MSC_ROUTE_NAME,
|
||||||
|
product_type_id=source.product_type_id,
|
||||||
|
version=source.version,
|
||||||
|
is_current="0",
|
||||||
|
equipment_ids=source.equipment_ids,
|
||||||
|
equipment_name=source.equipment_name,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=0,
|
||||||
|
remark="内置模版:UC 入库编码自动派发(5 步,不含传代)",
|
||||||
|
is_builtin="1",
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
db.add(route)
|
||||||
|
db.flush()
|
||||||
|
else:
|
||||||
|
route.route_name = UC_MSC_ROUTE_NAME
|
||||||
|
route.is_builtin = "1"
|
||||||
|
route.update_by = user_id
|
||||||
|
route.update_time = now
|
||||||
|
db.add(route)
|
||||||
|
|
||||||
|
# 重建步骤(幂等:软删旧步骤后按目标顺序插入)
|
||||||
|
old_steps = (
|
||||||
|
db.query(BizProcessRouteStep)
|
||||||
|
.filter(
|
||||||
|
BizProcessRouteStep.route_id == route.id,
|
||||||
|
BizProcessRouteStep.tenant_no == tenant_no,
|
||||||
|
BizProcessRouteStep.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for s in old_steps:
|
||||||
|
s.del_flag = 1
|
||||||
|
s.update_by = user_id
|
||||||
|
s.update_time = now
|
||||||
|
db.add(s)
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
for order, code in enumerate(UC_MSC_STEP_ORDER, start=1):
|
||||||
|
src = by_code[code]
|
||||||
|
new_step = BizProcessRouteStep(
|
||||||
|
id=generate_uuid(),
|
||||||
|
route_id=route.id,
|
||||||
|
process_id=src.process_id,
|
||||||
|
step_order=order,
|
||||||
|
process_code=src.process_code,
|
||||||
|
category_id=src.category_id,
|
||||||
|
process_name=src.process_name,
|
||||||
|
description=src.description,
|
||||||
|
equipment_ids=src.equipment_ids,
|
||||||
|
equipment_name=src.equipment_name,
|
||||||
|
estimated_duration=src.estimated_duration,
|
||||||
|
sop_ids=src.sop_ids,
|
||||||
|
sop_content=src.sop_content,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=order,
|
||||||
|
remark=src.remark,
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
db.add(new_step)
|
||||||
|
db.flush()
|
||||||
|
_clone_step_children(
|
||||||
|
db,
|
||||||
|
src_step_id=src.id,
|
||||||
|
dst_step_id=new_step.id,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
user_id=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
now=now,
|
||||||
|
)
|
||||||
|
|
||||||
|
header = existing or BizProductionTaskSet(
|
||||||
|
id=generate_uuid(),
|
||||||
|
set_name=UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
status="1",
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=0,
|
||||||
|
remark="内置模版:UC 入库编码自动派发",
|
||||||
|
is_builtin="1",
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
if existing:
|
||||||
|
header.status = "1"
|
||||||
|
header.is_builtin = "1"
|
||||||
|
header.update_by = user_id
|
||||||
|
header.update_time = now
|
||||||
|
db.add(header)
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
items = (
|
||||||
|
db.query(BizProductionTaskSetItem)
|
||||||
|
.filter(
|
||||||
|
BizProductionTaskSetItem.set_id == header.id,
|
||||||
|
BizProductionTaskSetItem.tenant_no == tenant_no,
|
||||||
|
BizProductionTaskSetItem.del_flag == 0,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for it in items:
|
||||||
|
it.del_flag = 1
|
||||||
|
it.update_by = user_id
|
||||||
|
it.update_time = now
|
||||||
|
db.add(it)
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
item = BizProductionTaskSetItem(
|
||||||
|
id=generate_uuid(),
|
||||||
|
set_id=header.id,
|
||||||
|
task_name="{lab_storage_code}样本处理",
|
||||||
|
route_id=route.id,
|
||||||
|
route_name=route.route_name,
|
||||||
|
description=UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
remark=None,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
order_num=1,
|
||||||
|
create_by=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
create_time=now,
|
||||||
|
update_by=user_id,
|
||||||
|
update_time=now,
|
||||||
|
del_flag=0,
|
||||||
|
)
|
||||||
|
db.add(item)
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
return {
|
||||||
|
"created": True,
|
||||||
|
"setId": header.id,
|
||||||
|
"setName": header.set_name,
|
||||||
|
"routeId": route.id,
|
||||||
|
"routeCode": route.route_code,
|
||||||
|
"stepCount": len(UC_MSC_STEP_ORDER),
|
||||||
|
}
|
||||||
@@ -2,12 +2,20 @@
|
|||||||
|
|
||||||
from typing import List, Optional, Tuple
|
from typing import List, Optional, Tuple
|
||||||
|
|
||||||
|
# 科研捐赠脐带间充质:UC… → 5 步原代培养模版(与细胞存储 BC 的 6 步模版分离)
|
||||||
|
UC_MSC_BUILTIN_SET_NAME = "脐带MSC原代培养(内置模版)"
|
||||||
|
BC_MSC_BUILTIN_SET_NAME = "干细胞培养(内置模版)"
|
||||||
|
HSC_BUILTIN_SET_NAME = "造血干样本处理(内置模版)"
|
||||||
|
UBMC_BUILTIN_SET_NAME = "UBMC冻存(内置模版)"
|
||||||
|
PBMC_BUILTIN_SET_NAME = "PBMC冻存(内置模版)"
|
||||||
|
|
||||||
# 最长前缀优先:BC 必须在 B 之前,避免 BC… 误匹配造血干
|
# 最长前缀优先:BC 必须在 B 之前,避免 BC… 误匹配造血干
|
||||||
_LAB_CODE_BUILTIN_SET_RULES: List[Tuple[str, str]] = [
|
_LAB_CODE_BUILTIN_SET_RULES: List[Tuple[str, str]] = [
|
||||||
("UBMC", "UBMC冻存(内置模版)"),
|
("UBMC", UBMC_BUILTIN_SET_NAME),
|
||||||
("PBMC", "PBMC冻存(内置模版)"),
|
("PBMC", PBMC_BUILTIN_SET_NAME),
|
||||||
("BC", "干细胞培养(内置模版)"),
|
("UC", UC_MSC_BUILTIN_SET_NAME),
|
||||||
("B", "造血干样本处理(内置模版)"),
|
("BC", BC_MSC_BUILTIN_SET_NAME),
|
||||||
|
("B", HSC_BUILTIN_SET_NAME),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,249 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""为 UC 开头实验室入库编码的入库生产工单补派 5 步脐带MSC原代任务。
|
||||||
|
|
||||||
|
默认 dry-run;加 --apply 才写库。会先幂等确保内置模版存在。
|
||||||
|
|
||||||
|
用法(在 backend 目录、已配置可连目标库的 .env):
|
||||||
|
python -m scripts.backfill_uc_msc_production_tasks
|
||||||
|
python -m scripts.backfill_uc_msc_production_tasks --apply
|
||||||
|
python -m scripts.backfill_uc_msc_production_tasks --tenant zkxw --apply
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from typing import Any, Dict, List, Optional, Tuple
|
||||||
|
|
||||||
|
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
|
|
||||||
|
from sqlalchemy import or_
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from app.core.database import SessionLocal
|
||||||
|
from app.crud import production_task_set as production_task_set_svc
|
||||||
|
from app.models.models import (
|
||||||
|
BizProductionTask,
|
||||||
|
BizProductionTaskSet,
|
||||||
|
BizProductionWorkOrder,
|
||||||
|
BizSampleReception,
|
||||||
|
)
|
||||||
|
from app.services.uc_msc_builtin_template import ensure_uc_msc_builtin_template
|
||||||
|
from app.utils.lab_storage_code_task_set import UC_MSC_BUILTIN_SET_NAME
|
||||||
|
|
||||||
|
|
||||||
|
def _list_candidate_work_orders(
|
||||||
|
db: Session, *, tenant_no: str
|
||||||
|
) -> List[Tuple[BizProductionWorkOrder, BizSampleReception]]:
|
||||||
|
"""UC 接收记录关联的入库工单,且当前无有效生产任务。"""
|
||||||
|
q = (
|
||||||
|
db.query(BizProductionWorkOrder, BizSampleReception)
|
||||||
|
.join(
|
||||||
|
BizSampleReception,
|
||||||
|
BizSampleReception.id == BizProductionWorkOrder.reception_id,
|
||||||
|
)
|
||||||
|
.filter(
|
||||||
|
BizProductionWorkOrder.tenant_no == tenant_no,
|
||||||
|
BizProductionWorkOrder.del_flag == 0,
|
||||||
|
BizProductionWorkOrder.work_order_type == "inbound",
|
||||||
|
BizProductionWorkOrder.work_order_status.in_(("dpz", "jxz")),
|
||||||
|
BizSampleReception.tenant_no == tenant_no,
|
||||||
|
BizSampleReception.del_flag == 0,
|
||||||
|
BizSampleReception.accept_conclusion == "js",
|
||||||
|
BizSampleReception.lab_storage_code.isnot(None),
|
||||||
|
BizSampleReception.lab_storage_code != "",
|
||||||
|
or_(
|
||||||
|
BizSampleReception.lab_storage_code.like("UC%"),
|
||||||
|
BizSampleReception.lab_storage_code.like("uc%"),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.order_by(BizSampleReception.reception_time.asc())
|
||||||
|
)
|
||||||
|
rows = q.all()
|
||||||
|
out: List[Tuple[BizProductionWorkOrder, BizSampleReception]] = []
|
||||||
|
for wo, rec in rows:
|
||||||
|
has_task = (
|
||||||
|
db.query(BizProductionTask.id)
|
||||||
|
.filter(
|
||||||
|
BizProductionTask.work_order_id == wo.id,
|
||||||
|
BizProductionTask.tenant_no == tenant_no,
|
||||||
|
BizProductionTask.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if has_task:
|
||||||
|
continue
|
||||||
|
code = (rec.lab_storage_code or "").strip().upper()
|
||||||
|
if not code.startswith("UC"):
|
||||||
|
continue
|
||||||
|
out.append((wo, rec))
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def _dispatch_one(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
tenant_no: str,
|
||||||
|
user_id: Optional[str],
|
||||||
|
create_dept_id: str,
|
||||||
|
wo: BizProductionWorkOrder,
|
||||||
|
rec: BizSampleReception,
|
||||||
|
set_id: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
result = production_task_set_svc.create_tasks_from_set(
|
||||||
|
db,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
user_id=user_id,
|
||||||
|
create_dept_id=create_dept_id or "",
|
||||||
|
work_order_id=wo.id,
|
||||||
|
set_id=set_id,
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"workOrderId": wo.id,
|
||||||
|
"workOrderNo": wo.work_order_no,
|
||||||
|
"sampleCode": wo.sample_code or rec.sample_code,
|
||||||
|
"labStorageCode": rec.lab_storage_code,
|
||||||
|
"createdCount": result.get("createdCount"),
|
||||||
|
"tasks": [
|
||||||
|
{"id": t.get("id"), "taskName": t.get("taskName"), "routeId": t.get("routeId")}
|
||||||
|
for t in (result.get("list") or [])
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def run(
|
||||||
|
*,
|
||||||
|
tenant_no: str,
|
||||||
|
apply: bool,
|
||||||
|
user_id: Optional[str],
|
||||||
|
create_dept_id: str,
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
ensure_info = ensure_uc_msc_builtin_template(
|
||||||
|
db,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
user_id=user_id,
|
||||||
|
create_dept_id=create_dept_id,
|
||||||
|
)
|
||||||
|
set_row = (
|
||||||
|
db.query(BizProductionTaskSet)
|
||||||
|
.filter(
|
||||||
|
BizProductionTaskSet.tenant_no == tenant_no,
|
||||||
|
BizProductionTaskSet.set_name == UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
BizProductionTaskSet.is_builtin == "1",
|
||||||
|
BizProductionTaskSet.status == "1",
|
||||||
|
BizProductionTaskSet.del_flag == 0,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not set_row:
|
||||||
|
raise RuntimeError("UC 内置任务组合创建失败")
|
||||||
|
|
||||||
|
candidates = _list_candidate_work_orders(db, tenant_no=tenant_no)
|
||||||
|
preview = [
|
||||||
|
{
|
||||||
|
"workOrderId": wo.id,
|
||||||
|
"workOrderNo": wo.work_order_no,
|
||||||
|
"workOrderStatus": wo.work_order_status,
|
||||||
|
"sampleCode": wo.sample_code or rec.sample_code,
|
||||||
|
"labStorageCode": rec.lab_storage_code,
|
||||||
|
"receptionId": rec.id,
|
||||||
|
"receptionTime": str(rec.reception_time) if rec.reception_time else None,
|
||||||
|
}
|
||||||
|
for wo, rec in candidates
|
||||||
|
]
|
||||||
|
|
||||||
|
if not apply:
|
||||||
|
db.rollback()
|
||||||
|
return {
|
||||||
|
"dryRun": True,
|
||||||
|
"template": ensure_info,
|
||||||
|
"candidateCount": len(preview),
|
||||||
|
"candidates": preview,
|
||||||
|
"message": "dry-run:未写库。确认后加 --apply 执行补派。",
|
||||||
|
}
|
||||||
|
|
||||||
|
dispatched: List[Dict[str, Any]] = []
|
||||||
|
errors: List[Dict[str, Any]] = []
|
||||||
|
for wo, rec in candidates:
|
||||||
|
try:
|
||||||
|
dispatched.append(
|
||||||
|
_dispatch_one(
|
||||||
|
db,
|
||||||
|
tenant_no=tenant_no,
|
||||||
|
user_id=user_id,
|
||||||
|
create_dept_id=create_dept_id,
|
||||||
|
wo=wo,
|
||||||
|
rec=rec,
|
||||||
|
set_id=set_row.id,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except Exception as exc: # noqa: BLE001 - 汇总后继续
|
||||||
|
errors.append(
|
||||||
|
{
|
||||||
|
"workOrderId": wo.id,
|
||||||
|
"workOrderNo": wo.work_order_no,
|
||||||
|
"labStorageCode": rec.lab_storage_code,
|
||||||
|
"error": str(exc),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
return {
|
||||||
|
"dryRun": False,
|
||||||
|
"template": ensure_info,
|
||||||
|
"candidateCount": len(preview),
|
||||||
|
"dispatchedCount": len(dispatched),
|
||||||
|
"dispatched": dispatched,
|
||||||
|
"errorCount": len(errors),
|
||||||
|
"errors": errors,
|
||||||
|
}
|
||||||
|
except Exception:
|
||||||
|
db.rollback()
|
||||||
|
raise
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def main(argv: Optional[List[str]] = None) -> int:
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description="回补 UC 入库编码生产工单的 5 步脐带MSC原代任务"
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--tenant",
|
||||||
|
default="zkxw",
|
||||||
|
help="租户编号,默认 zkxw",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--apply",
|
||||||
|
action="store_true",
|
||||||
|
help="实际写库;默认仅 dry-run",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--user-id",
|
||||||
|
default=None,
|
||||||
|
help="写库 create_by/update_by,可选",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--create-dept-id",
|
||||||
|
default="",
|
||||||
|
help="写库 create_dept_id,可选",
|
||||||
|
)
|
||||||
|
args = parser.parse_args(argv)
|
||||||
|
|
||||||
|
result = run(
|
||||||
|
tenant_no=(args.tenant or "zkxw").strip() or "zkxw",
|
||||||
|
apply=bool(args.apply),
|
||||||
|
user_id=(args.user_id or None),
|
||||||
|
create_dept_id=(args.create_dept_id or ""),
|
||||||
|
)
|
||||||
|
import json
|
||||||
|
|
||||||
|
print(json.dumps(result, ensure_ascii=False, indent=2, default=str))
|
||||||
|
if result.get("errorCount"):
|
||||||
|
return 2
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
raise SystemExit(main())
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
"""恢复被误软删的 Excel 补充字段(真菌/内毒素/CD34 等)并同步旧台账。
|
||||||
|
|
||||||
|
用法:
|
||||||
|
ENV_FILE=.../backend/.env python backend/scripts/restore_lab_sample_processing_excel_extras.py
|
||||||
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[2]
|
||||||
|
BACKEND = ROOT / "backend"
|
||||||
|
if str(BACKEND) not in sys.path:
|
||||||
|
sys.path.insert(0, str(BACKEND))
|
||||||
|
|
||||||
|
from app.core.database import SessionLocal # noqa: E402
|
||||||
|
from app.services.lab_sample_processing import restore_retired_excel_extras # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
result = restore_retired_excel_extras(db, tenant_no="zkxw")
|
||||||
|
print(result)
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -48,6 +48,183 @@ class LabSampleProcessingFieldsTest(unittest.TestCase):
|
|||||||
self.assertEqual(fmap["cd34Count"].dept, DEPT_QC)
|
self.assertEqual(fmap["cd34Count"].dept, DEPT_QC)
|
||||||
self.assertEqual(fmap["originalBloodWeightG"].dept, DEPT_PRODUCTION)
|
self.assertEqual(fmap["originalBloodWeightG"].dept, DEPT_PRODUCTION)
|
||||||
|
|
||||||
|
def test_source_fields_not_overridden_by_extra(self):
|
||||||
|
from datetime import datetime
|
||||||
|
from app.services.lab_sample_processing import _build_row
|
||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
|
sample = SimpleNamespace(id="S1", sample_code="ZKZX34000865", collection_protocol_id="P1")
|
||||||
|
party = SimpleNamespace(mother_name="真实妈妈")
|
||||||
|
coll = SimpleNamespace(
|
||||||
|
sample_collect_time=None,
|
||||||
|
maternal_blood_collect_time=datetime(2026, 11, 4, 5, 20),
|
||||||
|
)
|
||||||
|
hospital = SimpleNamespace(hospital_name="真实医院")
|
||||||
|
protocol = SimpleNamespace(
|
||||||
|
consent_form_urls="protocol-consent/a",
|
||||||
|
health_survey_form_urls="",
|
||||||
|
)
|
||||||
|
reception = SimpleNamespace(
|
||||||
|
id="R1",
|
||||||
|
reception_time=None,
|
||||||
|
receive_temperature=None,
|
||||||
|
handler_name="接收人",
|
||||||
|
remark=None,
|
||||||
|
lab_storage_code="B0000103",
|
||||||
|
)
|
||||||
|
production = SimpleNamespace(
|
||||||
|
id="PR1",
|
||||||
|
original_blood_weight_g=72.08,
|
||||||
|
hes_volume_ml=None,
|
||||||
|
blood_type="B",
|
||||||
|
infectious_four_test_result="zc",
|
||||||
|
enriched_blood_weight_g=None,
|
||||||
|
cryopreservation_volume_ml=None,
|
||||||
|
handler_name="操作人",
|
||||||
|
remark=None,
|
||||||
|
original_blood_volume_ml=None,
|
||||||
|
nucleated_cell_count_1e8=None,
|
||||||
|
inoculation_amount=None,
|
||||||
|
cryopreservation_time=None,
|
||||||
|
storage_total_tubes=None,
|
||||||
|
available_cell_count_1e7=None,
|
||||||
|
)
|
||||||
|
row = _build_row(
|
||||||
|
dataset=DATASET_HSC,
|
||||||
|
sample=sample,
|
||||||
|
type_name="围产期造血干细胞",
|
||||||
|
party=party,
|
||||||
|
coll=coll,
|
||||||
|
hospital=hospital,
|
||||||
|
reception=reception,
|
||||||
|
production=production,
|
||||||
|
extra={
|
||||||
|
"motherName": "Excel妈妈",
|
||||||
|
"originalBloodWeightG": 1,
|
||||||
|
"cd34Count": "11.4",
|
||||||
|
},
|
||||||
|
protocol=protocol,
|
||||||
|
check_flags={
|
||||||
|
"健康调查表": True,
|
||||||
|
"样本信息正确,标识清晰": True,
|
||||||
|
"针路密闭": True,
|
||||||
|
"容器无破损": True,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(row["sampleCode"], "B0000103")
|
||||||
|
self.assertEqual(row["protocolSampleCode"], "ZKZX34000865")
|
||||||
|
self.assertEqual(row["motherName"], "真实妈妈")
|
||||||
|
self.assertEqual(row["originalBloodWeightG"], 72.08)
|
||||||
|
self.assertEqual(row["bloodType"], "B")
|
||||||
|
self.assertEqual(row["cd34Count"], "11.4")
|
||||||
|
self.assertEqual(row["hasMaternalBlood"], "是")
|
||||||
|
self.assertEqual(row["hasConsent"], "是")
|
||||||
|
self.assertEqual(row["hasHealthSurvey"], "是")
|
||||||
|
self.assertEqual(row["labelClear"], "是")
|
||||||
|
self.assertEqual(row["infectiousFourCard"], "正常")
|
||||||
|
self.assertIn("针路密闭", row["receiveCheck"] or "")
|
||||||
|
self.assertFalse(row["fromExtraOnly"])
|
||||||
|
|
||||||
|
def test_infectious_code_roundtrip(self):
|
||||||
|
from app.services.lab_sample_processing import _infectious_code, _infectious_label
|
||||||
|
|
||||||
|
self.assertEqual(_infectious_label("zc"), "正常")
|
||||||
|
self.assertEqual(_infectious_label("bzc"), "不正常")
|
||||||
|
self.assertEqual(_infectious_code("正常"), "zc")
|
||||||
|
self.assertEqual(_infectious_code("不正常"), "bzc")
|
||||||
|
|
||||||
|
def test_extra_field_keys_include_fungus(self):
|
||||||
|
from app.services.lab_sample_processing import _extra_field_keys
|
||||||
|
|
||||||
|
keys = _extra_field_keys(DATASET_MSC)
|
||||||
|
self.assertIn("fungusTest", keys)
|
||||||
|
self.assertIn("endotoxinTest", keys)
|
||||||
|
self.assertIn("bacteriaTest", keys)
|
||||||
|
self.assertIn("mycoplasmaTest", keys)
|
||||||
|
|
||||||
|
def test_msc_donation_collect_and_transport_fallback(self):
|
||||||
|
from datetime import datetime
|
||||||
|
from app.services.lab_sample_processing import _build_row
|
||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
|
sample = SimpleNamespace(id="D1", sample_code="KYJZ1", collection_protocol_id=None)
|
||||||
|
party = SimpleNamespace(mother_name="孙玲")
|
||||||
|
coll = SimpleNamespace(
|
||||||
|
sample_collect_time=datetime(2026, 10, 10, 10, 5),
|
||||||
|
maternal_blood_collect_time=None,
|
||||||
|
)
|
||||||
|
reception = SimpleNamespace(
|
||||||
|
id="R1",
|
||||||
|
reception_time=datetime(2026, 10, 10, 15, 40, 57),
|
||||||
|
receive_temperature="23.1",
|
||||||
|
handler_name="侯以婷",
|
||||||
|
remark=None,
|
||||||
|
lab_storage_code="UC2026006",
|
||||||
|
)
|
||||||
|
row = _build_row(
|
||||||
|
dataset=DATASET_MSC,
|
||||||
|
sample=sample,
|
||||||
|
type_name="脐带间充质干细胞",
|
||||||
|
party=party,
|
||||||
|
coll=coll,
|
||||||
|
hospital=None,
|
||||||
|
reception=reception,
|
||||||
|
production=None,
|
||||||
|
extra={},
|
||||||
|
)
|
||||||
|
self.assertEqual(row["sampleCode"], "UC2026006")
|
||||||
|
self.assertEqual(row["collectTime"], "2026-10-10 10:05:00")
|
||||||
|
self.assertEqual(row["transportTempC"], "23.1")
|
||||||
|
self.assertNotIn("导出自存", row["motherName"] or "")
|
||||||
|
|
||||||
|
def test_legacy_supplement_fills_empty_source_fields(self):
|
||||||
|
from app.services.lab_sample_processing import _build_row, _merge_extra_with_legacy
|
||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
|
extra = _merge_extra_with_legacy(
|
||||||
|
{},
|
||||||
|
{"infectiousFourTestLabel": "正常", "labMaterialCode": "202611006"},
|
||||||
|
)
|
||||||
|
sample = SimpleNamespace(id="S1", sample_code="UBMC202611006", collection_protocol_id=None)
|
||||||
|
reception = SimpleNamespace(
|
||||||
|
id="R1",
|
||||||
|
reception_time=None,
|
||||||
|
receive_temperature=None,
|
||||||
|
handler_name=None,
|
||||||
|
remark=None,
|
||||||
|
lab_storage_code="UBMC202611006",
|
||||||
|
)
|
||||||
|
production = SimpleNamespace(
|
||||||
|
id="PR1",
|
||||||
|
original_blood_weight_g=None,
|
||||||
|
hes_volume_ml=None,
|
||||||
|
blood_type=None,
|
||||||
|
infectious_four_test_result=None,
|
||||||
|
enriched_blood_weight_g=None,
|
||||||
|
cryopreservation_volume_ml=None,
|
||||||
|
handler_name=None,
|
||||||
|
remark=None,
|
||||||
|
original_blood_volume_ml=None,
|
||||||
|
nucleated_cell_count_1e8=None,
|
||||||
|
inoculation_amount=None,
|
||||||
|
cryopreservation_time=None,
|
||||||
|
storage_total_tubes=None,
|
||||||
|
available_cell_count_1e7=None,
|
||||||
|
)
|
||||||
|
row = _build_row(
|
||||||
|
dataset=DATASET_UBMC,
|
||||||
|
sample=sample,
|
||||||
|
type_name="脐血单个核细胞",
|
||||||
|
party=None,
|
||||||
|
coll=None,
|
||||||
|
hospital=None,
|
||||||
|
reception=reception,
|
||||||
|
production=production,
|
||||||
|
extra=extra,
|
||||||
|
)
|
||||||
|
self.assertEqual(row["infectiousFourCard"], "正常")
|
||||||
|
self.assertEqual(row["labMaterialCode"], "202611006")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
@@ -1,19 +1,36 @@
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from app.utils.lab_storage_code_task_set import match_builtin_task_set_name_by_lab_storage_code
|
from app.utils.lab_storage_code_task_set import (
|
||||||
|
BC_MSC_BUILTIN_SET_NAME,
|
||||||
|
HSC_BUILTIN_SET_NAME,
|
||||||
|
UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
match_builtin_task_set_name_by_lab_storage_code,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestMatchBuiltinTaskSetName(unittest.TestCase):
|
class TestMatchBuiltinTaskSetName(unittest.TestCase):
|
||||||
def test_bc_before_b(self):
|
def test_bc_before_b(self):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
match_builtin_task_set_name_by_lab_storage_code("BC20260101"),
|
match_builtin_task_set_name_by_lab_storage_code("BC20260101"),
|
||||||
"干细胞培养(内置模版)",
|
BC_MSC_BUILTIN_SET_NAME,
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_b_only(self):
|
def test_b_only(self):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
match_builtin_task_set_name_by_lab_storage_code("B20260101"),
|
match_builtin_task_set_name_by_lab_storage_code("B20260101"),
|
||||||
"造血干样本处理(内置模版)",
|
HSC_BUILTIN_SET_NAME,
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_uc_msc(self):
|
||||||
|
self.assertEqual(
|
||||||
|
match_builtin_task_set_name_by_lab_storage_code("UC2026010"),
|
||||||
|
UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_uc_case_insensitive(self):
|
||||||
|
self.assertEqual(
|
||||||
|
match_builtin_task_set_name_by_lab_storage_code("uc2026016"),
|
||||||
|
UC_MSC_BUILTIN_SET_NAME,
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_ubmc(self):
|
def test_ubmc(self):
|
||||||
@@ -35,7 +52,7 @@ class TestMatchBuiltinTaskSetName(unittest.TestCase):
|
|||||||
def test_bc_case_insensitive(self):
|
def test_bc_case_insensitive(self):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
match_builtin_task_set_name_by_lab_storage_code("bc99"),
|
match_builtin_task_set_name_by_lab_storage_code("bc99"),
|
||||||
"干细胞培养(内置模版)",
|
BC_MSC_BUILTIN_SET_NAME,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import os
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
# 避免导入 app.models 时 Settings 因缺 SECRET_KEY 失败
|
||||||
|
os.environ.setdefault(
|
||||||
|
"SECRET_KEY", "test-secret-key-for-uc-msc-unit-tests-32c"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestUcMscBuiltinTemplate(unittest.TestCase):
|
||||||
|
def test_step_order_matches_business_five_nodes(self):
|
||||||
|
from app.services.uc_msc_builtin_template import UC_MSC_STEP_ORDER
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
UC_MSC_STEP_ORDER,
|
||||||
|
[
|
||||||
|
"SOP-SC-003-E01-01",
|
||||||
|
"SOP-SC-004-E01-01",
|
||||||
|
"SOP-SC-006-E01-01",
|
||||||
|
"SOP-SC-005-E01-01",
|
||||||
|
"SOP-SC-008-E01-01",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
self.assertNotIn("SOP-SC-007-E01-01", UC_MSC_STEP_ORDER)
|
||||||
|
|
||||||
|
def test_uc_prefix_maps_to_uc_set_name(self):
|
||||||
|
from app.services.uc_msc_builtin_template import UC_MSC_ROUTE_CODE
|
||||||
|
from app.utils.lab_storage_code_task_set import (
|
||||||
|
UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
match_builtin_task_set_name_by_lab_storage_code,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertEqual(UC_MSC_ROUTE_CODE, "MSC原代-UC-BUILTIN")
|
||||||
|
self.assertEqual(
|
||||||
|
match_builtin_task_set_name_by_lab_storage_code("UC2026010"),
|
||||||
|
UC_MSC_BUILTIN_SET_NAME,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
-- 实验室样本处理 ACL 归一化(可重复执行)
|
||||||
|
-- 1) 撤销所有 lab:sample-processing* / menu:lab-sample-processing 角色菜单
|
||||||
|
-- 2) 仅按下列角色重授:
|
||||||
|
-- 市场编辑:市场专员/临床销售/销售助理/客服/采集专员
|
||||||
|
-- 生产编辑:生产专员/实验专员/细胞实验员/研发专员
|
||||||
|
-- 质检编辑:质检专员/质量安全员
|
||||||
|
-- 主管:生产主管/质量主管/采集主管/采集经理/研发主管/研发总监/总经理/副总经理/董事长/超级管理员
|
||||||
|
-- 只读:采集接受人
|
||||||
|
-- 说明:正式执行请用 Agent 脚本 tmp_normalize_lab_acl.py(含幂等 undelete/insert)。
|
||||||
|
-- 本文件作为规则记录;勿在未核对角色名时直接全量套用到其他环境。
|
||||||
|
|
||||||
|
UPDATE sys_role_menu rm
|
||||||
|
JOIN sys_menu m ON m.id = rm.menu_id
|
||||||
|
SET rm.del_flag = 1,
|
||||||
|
rm.update_by = 'normalize-acl',
|
||||||
|
rm.update_time = NOW()
|
||||||
|
WHERE rm.del_flag = 0
|
||||||
|
AND (
|
||||||
|
m.perms LIKE 'lab:sample-processing%'
|
||||||
|
OR m.perms = 'menu:lab-sample-processing'
|
||||||
|
);
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# 恢复 Excel 补充字段(真菌等)
|
||||||
|
|
||||||
|
## 原因
|
||||||
|
|
||||||
|
`20261112_lab_sample_processing_retire_excel_demo.sql` 按「补充表 sample_code = 协议样本号」软删演示行。
|
||||||
|
会议 Excel 实际多用实验室入库编码(`B000*` / `BC*` / `UBMC*`),与协议号不一致,导致真实样本的真菌/内毒素/CD34 等补充字段被误删。
|
||||||
|
|
||||||
|
## 处理
|
||||||
|
|
||||||
|
运行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ENV_FILE=backend/.env python backend/scripts/restore_lab_sample_processing_excel_extras.py
|
||||||
|
```
|
||||||
|
|
||||||
|
脚本会:
|
||||||
|
|
||||||
|
1. 找出 `update_by=retire-excel-demo` 且 `del_flag=1` 的补充行
|
||||||
|
2. 仅恢复仍能关联到当前有效协议/接收编码的行
|
||||||
|
3. 只写回 `SOURCE_EXTRA` 字段到有效补充表
|
||||||
|
4. 同步旧台账 `biz_lab_sample_process_supplement`
|
||||||
|
|
||||||
|
列表侧同时会从质检完成任务填空(内毒素/真菌/支原体/细菌及母血相关)。
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- 软删除实验室样本处理 Excel 演示补充行:
|
||||||
|
-- 仅删除在协议样本表中不存在对应 sample_code 的补充记录。
|
||||||
|
-- Excel 列结构仍由代码字段目录维护;真实列表只聚合协议/接收/生产源数据。
|
||||||
|
|
||||||
|
UPDATE biz_lab_sample_processing_extra e
|
||||||
|
LEFT JOIN biz_protocol_sample s
|
||||||
|
ON s.sample_code = e.sample_code
|
||||||
|
AND s.tenant_no = e.tenant_no
|
||||||
|
AND s.del_flag = 0
|
||||||
|
SET e.del_flag = 1,
|
||||||
|
e.update_by = 'retire-excel-demo',
|
||||||
|
e.update_time = NOW()
|
||||||
|
WHERE e.del_flag = 0
|
||||||
|
AND s.id IS NULL;
|
||||||
@@ -0,0 +1,175 @@
|
|||||||
|
-- Issue #102:实验室样本处理数据挂到市场/生产/质检,权限码分端
|
||||||
|
-- 1) 质检管理:调到「入库放行审核」下方
|
||||||
|
-- 2) 存储服务:挂到「缴费财务确认」下方(cellStorage:labSampleProcess:*)
|
||||||
|
-- 3) 生产管理:挂到「废弃物管理」下方(production:labSampleProcess:*;若废弃物菜单缺失则先补齐)
|
||||||
|
-- 4) 拥有 menu:market / menu:production / menu:quality 的角色,授予对应大菜单下入口
|
||||||
|
-- MySQL 5.7,可重复执行
|
||||||
|
|
||||||
|
-- ── 0) 生产管理补齐「废弃物管理」(仅当缺失时,便于排序锚定)────────────────
|
||||||
|
INSERT INTO sys_menu (
|
||||||
|
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||||
|
is_frame, visible, status, tenant_no, order_num, remark,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
INSERT(INSERT(MD5(CONCAT('prod-waste-output:', p.tenant_no, ':', p.id)), 13, 1, '3'), 17, 1, '8'),
|
||||||
|
'废弃物管理', p.id, 'C', 'waste-output',
|
||||||
|
'/production/waste-output/index', 'production:waste-output:list',
|
||||||
|
1, '1', '1', p.tenant_no,
|
||||||
|
COALESCE((SELECT MAX(c.order_num) FROM sys_menu c WHERE c.parent_id = p.id AND c.del_flag = 0), 0) + 1,
|
||||||
|
'issue#102 补齐生产废弃物管理以便台账排序',
|
||||||
|
'migration', '', NOW(), 'migration', NOW(), 0
|
||||||
|
FROM sys_menu p
|
||||||
|
WHERE p.del_flag = 0 AND p.status = '1' AND p.menu_name = '生产管理'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM sys_menu e
|
||||||
|
WHERE e.tenant_no = p.tenant_no AND e.parent_id = p.id
|
||||||
|
AND e.perms = 'production:waste-output:list' AND e.del_flag = 0
|
||||||
|
);
|
||||||
|
|
||||||
|
-- ── 1) 质检:调到入库放行审核下方(可重复;不连带改动其他菜单 order)────────
|
||||||
|
UPDATE sys_menu lab
|
||||||
|
JOIN sys_menu release_m
|
||||||
|
ON release_m.parent_id = lab.parent_id
|
||||||
|
AND release_m.del_flag = 0
|
||||||
|
AND release_m.menu_name = '入库放行审核'
|
||||||
|
AND release_m.perms = 'quality:storageReleaseReview:list'
|
||||||
|
SET lab.order_num = release_m.order_num + 1,
|
||||||
|
lab.update_by = 'migration',
|
||||||
|
lab.update_time = NOW()
|
||||||
|
WHERE lab.del_flag = 0
|
||||||
|
AND lab.perms = 'biz:labSampleProcess:list'
|
||||||
|
AND lab.path = 'lab-sample-process'
|
||||||
|
AND (lab.order_num IS NULL OR lab.order_num <> release_m.order_num + 1);
|
||||||
|
|
||||||
|
-- ── 2) 存储服务:缴费财务确认下方 ───────────────────────────────────────────
|
||||||
|
INSERT INTO sys_menu (
|
||||||
|
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||||
|
is_frame, visible, status, tenant_no, order_num, remark,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
INSERT(INSERT(MD5(CONCAT('cell-lab-sample-process:', anchor.tenant_no, ':', anchor.id)), 13, 1, '3'), 17, 1, '8'),
|
||||||
|
'实验室样本处理数据', anchor.parent_id, 'C', 'lab-sample-process',
|
||||||
|
'quality-inspection/lab-sample-process/index', 'cellStorage:labSampleProcess:list',
|
||||||
|
1, '1', '1', anchor.tenant_no, anchor.order_num + 1,
|
||||||
|
'市场-存储服务-实验室样本处理数据',
|
||||||
|
'migration', '', NOW(), 'migration', NOW(), 0
|
||||||
|
FROM sys_menu anchor
|
||||||
|
WHERE anchor.del_flag = 0 AND anchor.status = '1'
|
||||||
|
AND anchor.perms = 'biz:cellStoragePaymentConfirm:list'
|
||||||
|
AND anchor.menu_name = '缴费财务确认'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM sys_menu e
|
||||||
|
WHERE e.tenant_no = anchor.tenant_no
|
||||||
|
AND e.parent_id = anchor.parent_id
|
||||||
|
AND e.perms = 'cellStorage:labSampleProcess:list'
|
||||||
|
AND e.del_flag = 0
|
||||||
|
);
|
||||||
|
|
||||||
|
-- ── 3) 生产管理:废弃物管理下方 ─────────────────────────────────────────────
|
||||||
|
INSERT INTO sys_menu (
|
||||||
|
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||||
|
is_frame, visible, status, tenant_no, order_num, remark,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
INSERT(INSERT(MD5(CONCAT('prod-lab-sample-process:', anchor.tenant_no, ':', anchor.id)), 13, 1, '3'), 17, 1, '8'),
|
||||||
|
'实验室样本处理数据', anchor.parent_id, 'C', 'lab-sample-process',
|
||||||
|
'quality-inspection/lab-sample-process/index', 'production:labSampleProcess:list',
|
||||||
|
1, '1', '1', anchor.tenant_no, anchor.order_num + 1,
|
||||||
|
'生产-生产管理-实验室样本处理数据',
|
||||||
|
'migration', '', NOW(), 'migration', NOW(), 0
|
||||||
|
FROM sys_menu anchor
|
||||||
|
WHERE anchor.del_flag = 0 AND anchor.status = '1'
|
||||||
|
AND anchor.perms = 'production:waste-output:list'
|
||||||
|
AND anchor.menu_name = '废弃物管理'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM sys_menu e
|
||||||
|
WHERE e.tenant_no = anchor.tenant_no
|
||||||
|
AND e.parent_id = anchor.parent_id
|
||||||
|
AND e.perms = 'production:labSampleProcess:list'
|
||||||
|
AND e.del_flag = 0
|
||||||
|
);
|
||||||
|
|
||||||
|
-- ── 4) 补录 / 导出按钮(三处列表菜单各挂一套)──────────────────────────────
|
||||||
|
INSERT INTO sys_menu (
|
||||||
|
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||||
|
is_frame, visible, status, tenant_no, order_num, remark,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
INSERT(INSERT(MD5(CONCAT('lab-sp-btn:', m.tenant_no, ':', m.id, ':', btn.perms)), 13, 1, '3'), 17, 1, '8'),
|
||||||
|
btn.menu_name, m.id, 'F', '', NULL, btn.perms,
|
||||||
|
1, '1', '1', m.tenant_no, btn.order_num, btn.remark,
|
||||||
|
'migration', '', NOW(), 'migration', NOW(), 0
|
||||||
|
FROM sys_menu m
|
||||||
|
JOIN (
|
||||||
|
SELECT '补录' AS menu_name, 'cellStorage:labSampleProcess:supplement' AS perms, 10 AS order_num,
|
||||||
|
'存储服务-实验室样本处理数据-补录' AS remark, 'cellStorage:labSampleProcess:list' AS parent_perms
|
||||||
|
UNION ALL
|
||||||
|
SELECT '导出', 'cellStorage:labSampleProcess:export', 20,
|
||||||
|
'存储服务-实验室样本处理数据-导出', 'cellStorage:labSampleProcess:list'
|
||||||
|
UNION ALL
|
||||||
|
SELECT '补录', 'production:labSampleProcess:supplement', 10,
|
||||||
|
'生产-实验室样本处理数据-补录', 'production:labSampleProcess:list'
|
||||||
|
UNION ALL
|
||||||
|
SELECT '导出', 'production:labSampleProcess:export', 20,
|
||||||
|
'生产-实验室样本处理数据-导出', 'production:labSampleProcess:list'
|
||||||
|
) btn ON btn.parent_perms = m.perms
|
||||||
|
WHERE m.del_flag = 0 AND m.status = '1'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM sys_menu e
|
||||||
|
WHERE e.tenant_no = m.tenant_no AND e.parent_id = m.id
|
||||||
|
AND e.perms = btn.perms AND e.del_flag = 0
|
||||||
|
);
|
||||||
|
|
||||||
|
-- ── 5) 按顶级大菜单授权对应入口(含列表/补录/导出)─────────────────────────
|
||||||
|
INSERT INTO sys_role_menu (
|
||||||
|
id, role_id, menu_id, tenant_no, order_num, remark,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
INSERT(INSERT(MD5(CONCAT('lab-sp-rm:', r.tenant_no, ':', r.id, ':', m.id)), 13, 1, '3'), 17, 1, '8'),
|
||||||
|
r.id, m.id, r.tenant_no, NULL,
|
||||||
|
CONCAT('issue#102 grant from ', map.top_perms),
|
||||||
|
'migration', '', NOW(), 'migration', NOW(), 0
|
||||||
|
FROM (
|
||||||
|
SELECT 'menu:market' AS top_perms, 'cellStorage:labSampleProcess:list' AS list_perms
|
||||||
|
UNION ALL SELECT 'menu:market', 'cellStorage:labSampleProcess:supplement'
|
||||||
|
UNION ALL SELECT 'menu:market', 'cellStorage:labSampleProcess:export'
|
||||||
|
UNION ALL SELECT 'menu:production', 'production:labSampleProcess:list'
|
||||||
|
UNION ALL SELECT 'menu:production', 'production:labSampleProcess:supplement'
|
||||||
|
UNION ALL SELECT 'menu:production', 'production:labSampleProcess:export'
|
||||||
|
UNION ALL SELECT 'menu:quality', 'biz:labSampleProcess:list'
|
||||||
|
UNION ALL SELECT 'menu:quality', 'biz:labSampleProcess:supplement'
|
||||||
|
UNION ALL SELECT 'menu:quality', 'biz:labSampleProcess:export'
|
||||||
|
) map
|
||||||
|
JOIN sys_role r ON r.del_flag = 0
|
||||||
|
JOIN sys_role_menu src
|
||||||
|
ON src.role_id = r.id AND src.tenant_no = r.tenant_no AND src.del_flag = 0
|
||||||
|
JOIN sys_menu top
|
||||||
|
ON top.id = src.menu_id AND top.tenant_no = src.tenant_no AND top.del_flag = 0
|
||||||
|
AND top.perms = map.top_perms
|
||||||
|
JOIN sys_menu m
|
||||||
|
ON m.tenant_no = r.tenant_no AND m.del_flag = 0 AND m.status = '1'
|
||||||
|
AND m.perms = map.list_perms
|
||||||
|
WHERE NOT EXISTS (
|
||||||
|
SELECT 1 FROM sys_role_menu existing
|
||||||
|
WHERE existing.role_id = r.id
|
||||||
|
AND existing.menu_id = m.id
|
||||||
|
AND existing.tenant_no = r.tenant_no
|
||||||
|
AND existing.del_flag = 0
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 核对
|
||||||
|
SELECT p.menu_name AS parent_name, c.menu_name, c.path, c.perms, c.order_num
|
||||||
|
FROM sys_menu c
|
||||||
|
JOIN sys_menu p ON p.id = c.parent_id
|
||||||
|
WHERE c.del_flag = 0
|
||||||
|
AND (
|
||||||
|
c.perms LIKE '%labSampleProcess%'
|
||||||
|
OR (c.menu_name IN ('缴费财务确认', '废弃物管理', '入库放行审核')
|
||||||
|
AND p.menu_name IN ('存储服务', '生产管理', '质检管理'))
|
||||||
|
)
|
||||||
|
ORDER BY p.menu_name, c.order_num, c.menu_name;
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
-- Issue #100:移除多余一级菜单「实验室样本处理数据」及其子菜单/按钮
|
||||||
|
-- 软删除 sys_menu 与对应 sys_role_menu;不影响质检管理下 lab-sample-process 台账
|
||||||
|
-- MySQL 5.7,可重复执行
|
||||||
|
|
||||||
|
-- 1) 角色菜单授权
|
||||||
|
UPDATE sys_role_menu rm
|
||||||
|
JOIN sys_menu m ON m.id = rm.menu_id
|
||||||
|
SET rm.del_flag = 1,
|
||||||
|
rm.update_by = 'migration',
|
||||||
|
rm.update_time = NOW()
|
||||||
|
WHERE rm.del_flag = 0
|
||||||
|
AND (
|
||||||
|
m.perms IN (
|
||||||
|
'menu:lab-sample-processing',
|
||||||
|
'lab:sample-processing:list',
|
||||||
|
'lab:sample-processing:market:edit',
|
||||||
|
'lab:sample-processing:production:edit',
|
||||||
|
'lab:sample-processing:qc:edit',
|
||||||
|
'lab:sample-processing:manager'
|
||||||
|
)
|
||||||
|
OR m.path IN (
|
||||||
|
'/lab-sample-processing',
|
||||||
|
'lab-sample-processing/hsc',
|
||||||
|
'lab-sample-processing/ubmc',
|
||||||
|
'lab-sample-processing/msc'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 2) 按钮 / 子菜单 / 一级菜单(先叶子后父级,同批软删即可)
|
||||||
|
UPDATE sys_menu
|
||||||
|
SET del_flag = 1,
|
||||||
|
update_by = 'migration',
|
||||||
|
update_time = NOW()
|
||||||
|
WHERE del_flag = 0
|
||||||
|
AND (
|
||||||
|
perms IN (
|
||||||
|
'menu:lab-sample-processing',
|
||||||
|
'lab:sample-processing:list',
|
||||||
|
'lab:sample-processing:market:edit',
|
||||||
|
'lab:sample-processing:production:edit',
|
||||||
|
'lab:sample-processing:qc:edit',
|
||||||
|
'lab:sample-processing:manager'
|
||||||
|
)
|
||||||
|
OR path IN (
|
||||||
|
'/lab-sample-processing',
|
||||||
|
'lab-sample-processing/hsc',
|
||||||
|
'lab-sample-processing/ubmc',
|
||||||
|
'lab-sample-processing/msc'
|
||||||
|
)
|
||||||
|
);
|
||||||
@@ -0,0 +1,263 @@
|
|||||||
|
-- UC 入库编码自动派发:脐带MSC原代培养(内置模版)5 步
|
||||||
|
-- 步骤:原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存(不含传代)
|
||||||
|
-- 内容从既有「干细胞培养(内置模版)」/ MSC培养-BUILTIN 按 process_code 拷贝
|
||||||
|
-- 幂等:已存在同名内置集合则跳过主数据创建-- 生产历史空任务工单请用:
|
||||||
|
-- cd backend && python -m scripts.backfill_uc_msc_production_tasks --dry-run
|
||||||
|
-- cd backend && python -m scripts.backfill_uc_msc_production_tasks --apply
|
||||||
|
|
||||||
|
SET NAMES utf8mb4;
|
||||||
|
|
||||||
|
-- 1) 工艺路线头
|
||||||
|
INSERT INTO biz_process_route (
|
||||||
|
id, route_code, route_name, product_type_id, version, is_current,
|
||||||
|
equipment_ids, equipment_name, tenant_no, order_num, remark, is_builtin,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
'MSC原代-UC-BUILTIN',
|
||||||
|
'脐带MSC原代培养(内置模版)',
|
||||||
|
src.product_type_id,
|
||||||
|
src.version,
|
||||||
|
'0',
|
||||||
|
src.equipment_ids,
|
||||||
|
src.equipment_name,
|
||||||
|
src.tenant_no,
|
||||||
|
0,
|
||||||
|
'内置模版:UC 入库编码自动派发(5 步,不含传代)',
|
||||||
|
'1',
|
||||||
|
src.create_by,
|
||||||
|
IFNULL(src.create_dept_id, ''),
|
||||||
|
NOW(),
|
||||||
|
src.update_by,
|
||||||
|
NOW(),
|
||||||
|
0
|
||||||
|
FROM biz_process_route src
|
||||||
|
WHERE src.del_flag = 0
|
||||||
|
AND (
|
||||||
|
src.route_code = 'MSC培养-BUILTIN'
|
||||||
|
OR (src.route_name = '干细胞培养(内置模版)' AND src.is_builtin = '1')
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route x
|
||||||
|
WHERE x.id = 'UCMSCROUTEA5CC11F194118AC54085447A' AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route x
|
||||||
|
WHERE x.tenant_no = src.tenant_no
|
||||||
|
AND x.route_code = 'MSC原代-UC-BUILTIN'
|
||||||
|
AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
ORDER BY CASE WHEN src.route_code = 'MSC培养-BUILTIN' THEN 0 ELSE 1 END
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
-- 2) 路线步骤(按目标顺序)
|
||||||
|
-- step 1 SOP-SC-003
|
||||||
|
INSERT INTO biz_process_route_step (
|
||||||
|
id, route_id, process_id, step_order, process_code, category_id, process_name,
|
||||||
|
description, equipment_ids, equipment_name, estimated_duration, sop_ids, sop_content,
|
||||||
|
tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCSTEP1A5CC11F194118AC54085447A',
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
s.process_id, 1, s.process_code, s.category_id, s.process_name,
|
||||||
|
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
|
||||||
|
s.tenant_no, 1, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
|
||||||
|
FROM biz_process_route_step s
|
||||||
|
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND s.process_code = 'SOP-SC-003-E01-01'
|
||||||
|
AND (
|
||||||
|
r.route_code = 'MSC培养-BUILTIN'
|
||||||
|
OR (r.route_name = '干细胞培养(内置模版)' AND r.is_builtin = '1')
|
||||||
|
)
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route nr
|
||||||
|
WHERE nr.id = 'UCMSCROUTEA5CC11F194118AC54085447A' AND nr.del_flag = 0
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route_step x
|
||||||
|
WHERE x.id = 'UCMSCSTEP1A5CC11F194118AC54085447A' AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
-- step 2 SOP-SC-004
|
||||||
|
INSERT INTO biz_process_route_step (
|
||||||
|
id, route_id, process_id, step_order, process_code, category_id, process_name,
|
||||||
|
description, equipment_ids, equipment_name, estimated_duration, sop_ids, sop_content,
|
||||||
|
tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCSTEP2A5CC11F194118AC54085447A',
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
s.process_id, 2, s.process_code, s.category_id, s.process_name,
|
||||||
|
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
|
||||||
|
s.tenant_no, 2, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
|
||||||
|
FROM biz_process_route_step s
|
||||||
|
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND s.process_code = 'SOP-SC-004-E01-01'
|
||||||
|
AND (
|
||||||
|
r.route_code = 'MSC培养-BUILTIN'
|
||||||
|
OR (r.route_name = '干细胞培养(内置模版)' AND r.is_builtin = '1')
|
||||||
|
)
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route nr
|
||||||
|
WHERE nr.id = 'UCMSCROUTEA5CC11F194118AC54085447A' AND nr.del_flag = 0
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route_step x
|
||||||
|
WHERE x.id = 'UCMSCSTEP2A5CC11F194118AC54085447A' AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
-- step 3 SOP-SC-006 二次贴壁
|
||||||
|
INSERT INTO biz_process_route_step (
|
||||||
|
id, route_id, process_id, step_order, process_code, category_id, process_name,
|
||||||
|
description, equipment_ids, equipment_name, estimated_duration, sop_ids, sop_content,
|
||||||
|
tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCSTEP3A5CC11F194118AC54085447A',
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
s.process_id, 3, s.process_code, s.category_id, s.process_name,
|
||||||
|
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
|
||||||
|
s.tenant_no, 3, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
|
||||||
|
FROM biz_process_route_step s
|
||||||
|
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND s.process_code = 'SOP-SC-006-E01-01'
|
||||||
|
AND (
|
||||||
|
r.route_code = 'MSC培养-BUILTIN'
|
||||||
|
OR (r.route_name = '干细胞培养(内置模版)' AND r.is_builtin = '1')
|
||||||
|
)
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route nr
|
||||||
|
WHERE nr.id = 'UCMSCROUTEA5CC11F194118AC54085447A' AND nr.del_flag = 0
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route_step x
|
||||||
|
WHERE x.id = 'UCMSCSTEP3A5CC11F194118AC54085447A' AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
-- step 4 SOP-SC-005 重铺
|
||||||
|
INSERT INTO biz_process_route_step (
|
||||||
|
id, route_id, process_id, step_order, process_code, category_id, process_name,
|
||||||
|
description, equipment_ids, equipment_name, estimated_duration, sop_ids, sop_content,
|
||||||
|
tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCSTEP4A5CC11F194118AC54085447A',
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
s.process_id, 4, s.process_code, s.category_id, s.process_name,
|
||||||
|
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
|
||||||
|
s.tenant_no, 4, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
|
||||||
|
FROM biz_process_route_step s
|
||||||
|
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND s.process_code = 'SOP-SC-005-E01-01'
|
||||||
|
AND (
|
||||||
|
r.route_code = 'MSC培养-BUILTIN'
|
||||||
|
OR (r.route_name = '干细胞培养(内置模版)' AND r.is_builtin = '1')
|
||||||
|
)
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route nr
|
||||||
|
WHERE nr.id = 'UCMSCROUTEA5CC11F194118AC54085447A' AND nr.del_flag = 0
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route_step x
|
||||||
|
WHERE x.id = 'UCMSCSTEP4A5CC11F194118AC54085447A' AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
-- step 5 SOP-SC-008 冻存
|
||||||
|
INSERT INTO biz_process_route_step (
|
||||||
|
id, route_id, process_id, step_order, process_code, category_id, process_name,
|
||||||
|
description, equipment_ids, equipment_name, estimated_duration, sop_ids, sop_content,
|
||||||
|
tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCSTEP5A5CC11F194118AC54085447A',
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
s.process_id, 5, s.process_code, s.category_id, s.process_name,
|
||||||
|
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
|
||||||
|
s.tenant_no, 5, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
|
||||||
|
FROM biz_process_route_step s
|
||||||
|
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0
|
||||||
|
WHERE s.del_flag = 0
|
||||||
|
AND s.process_code = 'SOP-SC-008-E01-01'
|
||||||
|
AND (
|
||||||
|
r.route_code = 'MSC培养-BUILTIN'
|
||||||
|
OR (r.route_name = '干细胞培养(内置模版)' AND r.is_builtin = '1')
|
||||||
|
)
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route nr
|
||||||
|
WHERE nr.id = 'UCMSCROUTEA5CC11F194118AC54085447A' AND nr.del_flag = 0
|
||||||
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_process_route_step x
|
||||||
|
WHERE x.id = 'UCMSCSTEP5A5CC11F194118AC54085447A' AND x.del_flag = 0
|
||||||
|
)
|
||||||
|
LIMIT 1;
|
||||||
|
|
||||||
|
-- 3) 任务组合头
|
||||||
|
INSERT INTO biz_production_task_set (
|
||||||
|
id, set_name, status, tenant_no, order_num, remark, is_builtin,
|
||||||
|
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCSET00A5CC11F194118AC54085447A',
|
||||||
|
'脐带MSC原代培养(内置模版)',
|
||||||
|
'1',
|
||||||
|
r.tenant_no,
|
||||||
|
0,
|
||||||
|
'内置模版:UC 入库编码自动派发',
|
||||||
|
'1',
|
||||||
|
r.create_by,
|
||||||
|
IFNULL(r.create_dept_id, ''),
|
||||||
|
NOW(),
|
||||||
|
r.update_by,
|
||||||
|
NOW(),
|
||||||
|
0
|
||||||
|
FROM biz_process_route r
|
||||||
|
WHERE r.id = 'UCMSCROUTEA5CC11F194118AC54085447A'
|
||||||
|
AND r.del_flag = 0
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_production_task_set x
|
||||||
|
WHERE x.tenant_no = r.tenant_no
|
||||||
|
AND x.set_name = '脐带MSC原代培养(内置模版)'
|
||||||
|
AND x.is_builtin = '1'
|
||||||
|
AND x.del_flag = 0
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 4) 任务组合条目
|
||||||
|
INSERT INTO biz_production_task_set_item (
|
||||||
|
id, set_id, task_name, route_id, route_name, description, remark,
|
||||||
|
tenant_no, order_num, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
'UCMSCITEM0A5CC11F194118AC54085447A',
|
||||||
|
s.id,
|
||||||
|
'{lab_storage_code}样本处理',
|
||||||
|
'UCMSCROUTEA5CC11F194118AC54085447A',
|
||||||
|
'脐带MSC原代培养(内置模版)',
|
||||||
|
'脐带MSC原代培养(内置模版)',
|
||||||
|
NULL,
|
||||||
|
s.tenant_no,
|
||||||
|
1,
|
||||||
|
s.create_by,
|
||||||
|
IFNULL(s.create_dept_id, ''),
|
||||||
|
NOW(),
|
||||||
|
s.update_by,
|
||||||
|
NOW(),
|
||||||
|
0
|
||||||
|
FROM biz_production_task_set s
|
||||||
|
WHERE s.set_name = '脐带MSC原代培养(内置模版)'
|
||||||
|
AND s.is_builtin = '1'
|
||||||
|
AND s.del_flag = 0
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM biz_production_task_set_item x
|
||||||
|
WHERE x.set_id = s.id AND x.del_flag = 0
|
||||||
|
);
|
||||||
@@ -190,6 +190,17 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
menuCode: 'biz:cellStoragePaymentConfirm:list'
|
menuCode: 'biz:cellStoragePaymentConfirm:list'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: 'CEL0000000000000000000000000LSP1',
|
||||||
|
name: 'CellStorageLabSampleProcess',
|
||||||
|
path: 'lab-sample-process',
|
||||||
|
component: '/quality-inspection/lab-sample-process/index',
|
||||||
|
meta: {
|
||||||
|
title: '实验室样本处理数据',
|
||||||
|
keepAlive: true,
|
||||||
|
menuCode: 'cellStorage:labSampleProcess:list'
|
||||||
|
}
|
||||||
|
},
|
||||||
// 市场侧入库放行审核(总览)暂下线:改由生产/质检入口审核
|
// 市场侧入库放行审核(总览)暂下线:改由生产/质检入口审核
|
||||||
// {
|
// {
|
||||||
// id: '70000000000000000000000000000011',
|
// id: '70000000000000000000000000000011',
|
||||||
@@ -922,6 +933,17 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
keepAlive: true,
|
keepAlive: true,
|
||||||
menuCode: 'production:waste-output:list'
|
menuCode: 'production:waste-output:list'
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'PRM0000000000000000000000000LSP1',
|
||||||
|
name: 'ProductionLabSampleProcess',
|
||||||
|
path: 'lab-sample-process',
|
||||||
|
component: '/quality-inspection/lab-sample-process/index',
|
||||||
|
meta: {
|
||||||
|
title: '实验室样本处理数据',
|
||||||
|
keepAlive: true,
|
||||||
|
menuCode: 'production:labSampleProcess:list'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -1123,17 +1145,6 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
menuCode: 'biz:sampleReception:list'
|
menuCode: 'biz:sampleReception:list'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
id: '70000000000000000000000000000015',
|
|
||||||
name: 'QualityInspectionLabSampleProcess',
|
|
||||||
path: 'lab-sample-process',
|
|
||||||
component: '/quality-inspection/lab-sample-process/index',
|
|
||||||
meta: {
|
|
||||||
title: '实验室样本处理数据',
|
|
||||||
keepAlive: true,
|
|
||||||
menuCode: 'biz:labSampleProcess:list'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
id: '70000000000000000000000000000007',
|
id: '70000000000000000000000000000007',
|
||||||
name: 'QualityInspectionQcWorkOrder',
|
name: 'QualityInspectionQcWorkOrder',
|
||||||
@@ -1201,6 +1212,17 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
menuCode: 'quality:storageReleaseReview:list'
|
menuCode: 'quality:storageReleaseReview:list'
|
||||||
},
|
},
|
||||||
props: { reviewRole: 'qc' }
|
props: { reviewRole: 'qc' }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '70000000000000000000000000000015',
|
||||||
|
name: 'QualityInspectionLabSampleProcess',
|
||||||
|
path: 'lab-sample-process',
|
||||||
|
component: '/quality-inspection/lab-sample-process/index',
|
||||||
|
meta: {
|
||||||
|
title: '实验室样本处理数据',
|
||||||
|
keepAlive: true,
|
||||||
|
menuCode: 'biz:labSampleProcess:list'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -275,15 +275,28 @@
|
|||||||
async function handleExport() {
|
async function handleExport() {
|
||||||
exporting.value = true
|
exporting.value = true
|
||||||
try {
|
try {
|
||||||
const res = await fetchLabSampleList(props.dataset, {
|
// 列表接口 pageSize 上限为 200,导出需分页拉全量后再生成 xlsx
|
||||||
keyword: searchForm.keyword || undefined,
|
const pageSize = 200
|
||||||
dateFrom: dateRange.value?.[0],
|
let page = 1
|
||||||
dateTo: dateRange.value?.[1],
|
let total = Number.POSITIVE_INFINITY
|
||||||
page: 1,
|
const rows: Record<string, any>[] = []
|
||||||
pageSize: 5000
|
let cols = fields.value
|
||||||
})
|
while (rows.length < total) {
|
||||||
const cols = res?.fields?.length ? res.fields : fields.value
|
const res = await fetchLabSampleList(props.dataset, {
|
||||||
const rows = res?.list || []
|
keyword: searchForm.keyword || undefined,
|
||||||
|
dateFrom: dateRange.value?.[0],
|
||||||
|
dateTo: dateRange.value?.[1],
|
||||||
|
page,
|
||||||
|
pageSize
|
||||||
|
})
|
||||||
|
if (res?.fields?.length) cols = res.fields
|
||||||
|
total = Number(res?.total ?? 0)
|
||||||
|
const batch = res?.list || []
|
||||||
|
rows.push(...batch)
|
||||||
|
if (!batch.length || batch.length < pageSize) break
|
||||||
|
page += 1
|
||||||
|
if (page > 500) break
|
||||||
|
}
|
||||||
const ExcelJS = (await import('exceljs')).default
|
const ExcelJS = (await import('exceljs')).default
|
||||||
const workbook = new ExcelJS.Workbook()
|
const workbook = new ExcelJS.Workbook()
|
||||||
const sheet = workbook.addWorksheet(props.title || props.dataset)
|
const sheet = workbook.addWorksheet(props.title || props.dataset)
|
||||||
|
|||||||
@@ -3,19 +3,23 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="page-container">
|
<div class="page-container">
|
||||||
<section class="panel">
|
<section class="panel">
|
||||||
<div class="panel-top">
|
<div class="panel-pill-tabs panel-pill-tabs--lg">
|
||||||
<h2 class="title-bar-heading">实验室样本处理数据</h2>
|
<div class="panel-pill-tabs__track" role="tablist">
|
||||||
|
<button
|
||||||
|
v-for="tab in LAB_PROCESS_TABS"
|
||||||
|
:key="tab.key"
|
||||||
|
type="button"
|
||||||
|
role="tab"
|
||||||
|
class="panel-pill-tabs__btn"
|
||||||
|
:class="{ 'is-active': activeTab === tab.key }"
|
||||||
|
:aria-selected="activeTab === tab.key"
|
||||||
|
@click="handleTabChange(tab.key)"
|
||||||
|
>
|
||||||
|
{{ tab.label }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-tabs v-model="activeTab" class="lab-process-tabs" @tab-change="handleTabChange">
|
|
||||||
<el-tab-pane
|
|
||||||
v-for="tab in LAB_PROCESS_TABS"
|
|
||||||
:key="tab.key"
|
|
||||||
:label="tab.label"
|
|
||||||
:name="tab.key"
|
|
||||||
/>
|
|
||||||
</el-tabs>
|
|
||||||
|
|
||||||
<div class="filter-block">
|
<div class="filter-block">
|
||||||
<el-form :model="searchForm" class="filter-form" @submit.prevent>
|
<el-form :model="searchForm" class="filter-form" @submit.prevent>
|
||||||
<div class="filter-grid">
|
<div class="filter-grid">
|
||||||
@@ -252,7 +256,9 @@
|
|||||||
handleSearch()
|
handleSearch()
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleTabChange() {
|
function handleTabChange(name: LabSampleProcessTabKey) {
|
||||||
|
if (activeTab.value === name) return
|
||||||
|
activeTab.value = name
|
||||||
pagination.page = 1
|
pagination.page = 1
|
||||||
loadData()
|
loadData()
|
||||||
}
|
}
|
||||||
@@ -335,10 +341,6 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.lab-process-tabs {
|
|
||||||
margin: 0 0 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-tip {
|
.form-tip {
|
||||||
margin: 0 0 12px;
|
margin: 0 0 12px;
|
||||||
color: var(--mint-text-muted, #6b7280);
|
color: var(--mint-text-muted, #6b7280);
|
||||||
|
|||||||
Reference in new issue
Block a user