feat(production): 临床科研出库细胞改由生产确认
市场出库交接对 basic_experiment 保留细胞只读并不改库存;生产工单新增确认出库细胞 API/弹窗,从细胞产品库勾选并联动已售状态。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
4de69c37ff
commit
f3672d3cc2
11 files changed
+713
-55
No files matched your search
@@ -49,7 +49,9 @@ from app.schemas.production_work_order import (
|
||||
ProductionWorkOrderCreate,
|
||||
ProductionWorkOrderConfigureBody,
|
||||
ProductionWorkOrderUpdate,
|
||||
ProductionDeliveryCellOutboundBody,
|
||||
)
|
||||
from app.crud import outbound_handover as outbound_handover_svc
|
||||
from app.schemas.production_task_set import (
|
||||
ProductionTaskSetCreateBody,
|
||||
ProductionTaskSetFromWorkOrderBody,
|
||||
@@ -2025,6 +2027,56 @@ async def list_production_work_order_cell_product_options(
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/production-work-orders/{wo_id}/delivery-cell-outbound")
|
||||
async def get_production_delivery_cell_outbound_api(
|
||||
wo_id: str,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""临床科研出库工单 — 获取已确认的交付出库细胞。"""
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
data = outbound_handover_svc.get_production_delivery_cell_outbound(
|
||||
db, wo_id, tenant_no
|
||||
)
|
||||
return success_response(data)
|
||||
except HTTPException as e:
|
||||
return error_response(e.status_code, e.detail)
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.put("/production-work-orders/{wo_id}/delivery-cell-outbound")
|
||||
async def save_production_delivery_cell_outbound_api(
|
||||
wo_id: str,
|
||||
body: ProductionDeliveryCellOutboundBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""临床科研出库工单 — 确认出库细胞(写台账并联动库存)。"""
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
data = outbound_handover_svc.save_production_delivery_cell_outbound(
|
||||
db,
|
||||
wo_id,
|
||||
cells=body.cells or [],
|
||||
tenant_no=tenant_no,
|
||||
user_id=user.get("user_id") or "",
|
||||
create_dept_id=user.get("dept_id") or "",
|
||||
)
|
||||
db.commit()
|
||||
return success_response(data, message="出库细胞已确认")
|
||||
except HTTPException as e:
|
||||
db.rollback()
|
||||
return error_response(e.status_code, e.detail)
|
||||
except ValueError as e:
|
||||
db.rollback()
|
||||
return error_response(400, str(e))
|
||||
except Exception as e:
|
||||
db.rollback()
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/production-work-orders/{wo_id}/qc-info")
|
||||
async def get_production_work_order_qc_info_api(
|
||||
wo_id: str,
|
||||
|
||||
@@ -179,23 +179,38 @@ def save_outbound_handover(
|
||||
handover_person = handover_user_id
|
||||
|
||||
om = outbound_material or {}
|
||||
cells = om.get("cells") or []
|
||||
qc_materials = om.get("qcMaterials") or om.get("qc_materials") or []
|
||||
paper_materials = om.get("paperMaterials") or om.get("paper_materials") or []
|
||||
material_remark = om.get("remark")
|
||||
|
||||
biz_type = (detail.get("bizType") or "").strip()
|
||||
if not biz_type:
|
||||
biz_type = ((detail.get("application") or {}).get("bizType") or "").strip()
|
||||
# 临床科研:细胞出库由生产工单确认,市场交接只维护物料/交接信息
|
||||
cells_owned_by_production = biz_type == "basic_experiment"
|
||||
|
||||
# 读取保存前台账,用于回滚上次出库交接的库存/状态变更
|
||||
previous_material = orm_material_svc.get_outbound_material(db, schedule_id, tenant_no)
|
||||
previous_cells = previous_material.get("cells") or []
|
||||
previous_cell_ids = [
|
||||
(c.get("cellProductId") or c.get("cell_product_id") or "").strip()
|
||||
for c in (previous_material.get("cells") or [])
|
||||
for c in previous_cells
|
||||
]
|
||||
had_previous_handover = get_handover_by_schedule(db, schedule_id, tenant_no) is not None
|
||||
|
||||
if cells_owned_by_production:
|
||||
cells = previous_cells
|
||||
revert_cell_ids: List[str] = []
|
||||
apply_cells: List[Any] = []
|
||||
else:
|
||||
cells = om.get("cells") or []
|
||||
revert_cell_ids = previous_cell_ids if had_previous_handover else []
|
||||
apply_cells = cells
|
||||
|
||||
handover_inv_svc.revert_handover_inventory(
|
||||
db,
|
||||
schedule_id,
|
||||
cell_product_ids=previous_cell_ids if had_previous_handover else [],
|
||||
cell_product_ids=revert_cell_ids,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
)
|
||||
@@ -216,7 +231,7 @@ def save_outbound_handover(
|
||||
handover_inv_svc.apply_handover_inventory(
|
||||
db,
|
||||
schedule_id,
|
||||
cells=cells,
|
||||
cells=apply_cells,
|
||||
qc_materials=qc_materials,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
@@ -255,3 +270,111 @@ def save_outbound_handover(
|
||||
db.flush()
|
||||
|
||||
return get_outbound_handover(db, schedule_id, tenant_no)
|
||||
|
||||
|
||||
def _assert_basic_experiment_outbound_wo(wo: Any) -> str:
|
||||
"""校验临床科研出库工单,返回关联交付计划 ID。"""
|
||||
if not wo:
|
||||
raise HTTPException(status_code=404, detail="工单不存在")
|
||||
if (getattr(wo, "work_order_type", None) or "") != "outbound":
|
||||
raise HTTPException(status_code=400, detail="仅出库工单可确认出库细胞")
|
||||
if (getattr(wo, "biz_type", None) or "") != "basic_experiment":
|
||||
raise HTTPException(status_code=400, detail="仅临床科研出库工单可确认出库细胞")
|
||||
if (getattr(wo, "work_order_status", None) or "") == "yzf":
|
||||
raise HTTPException(status_code=400, detail="已作废工单不可确认出库细胞")
|
||||
schedule_id = (getattr(wo, "infusion_schedule_id", None) or "").strip()
|
||||
if not schedule_id:
|
||||
raise HTTPException(status_code=400, detail="工单未关联交付计划,无法确认出库细胞")
|
||||
return schedule_id
|
||||
|
||||
|
||||
def get_production_delivery_cell_outbound(
|
||||
db: Session,
|
||||
work_order_id: str,
|
||||
tenant_no: str,
|
||||
) -> Dict[str, Any]:
|
||||
"""生产工单 — 临床科研交付出库细胞编辑数据。"""
|
||||
from app.crud import production_work_order as production_work_order_svc
|
||||
|
||||
wo = production_work_order_svc.get_production_work_order(db, work_order_id, tenant_no)
|
||||
schedule_id = _assert_basic_experiment_outbound_wo(wo)
|
||||
detail = schedule_mgmt_svc.get_infusion_schedule_detail(db, schedule_id, tenant_no)
|
||||
if not detail:
|
||||
raise HTTPException(status_code=404, detail="交付计划不存在")
|
||||
outbound_material = orm_material_svc.get_outbound_material(db, schedule_id, tenant_no)
|
||||
return {
|
||||
"workOrderId": wo.id,
|
||||
"workOrderNo": wo.work_order_no or "",
|
||||
"infusionScheduleId": schedule_id,
|
||||
"scheduleSummary": {
|
||||
"applicationNo": detail.get("applicationNo") or "",
|
||||
"patientName": detail.get("patientName") or "",
|
||||
"infusionTime": detail.get("infusionTime") or "",
|
||||
"projectTitle": detail.get("projectTitle")
|
||||
or ((detail.get("application") or {}).get("projectTitle") or ""),
|
||||
"customerName": detail.get("customerName")
|
||||
or ((detail.get("application") or {}).get("customerName") or ""),
|
||||
},
|
||||
"cells": outbound_material.get("cells") or [],
|
||||
}
|
||||
|
||||
|
||||
def save_production_delivery_cell_outbound(
|
||||
db: Session,
|
||||
work_order_id: str,
|
||||
*,
|
||||
cells: List[Dict[str, Any]],
|
||||
tenant_no: str,
|
||||
user_id: str,
|
||||
create_dept_id: str = "",
|
||||
) -> Dict[str, Any]:
|
||||
"""生产确认临床科研交付出库细胞:写台账并联动细胞产品库存(不 commit)。"""
|
||||
from app.crud import production_work_order as production_work_order_svc
|
||||
|
||||
wo = production_work_order_svc.get_production_work_order(db, work_order_id, tenant_no)
|
||||
schedule_id = _assert_basic_experiment_outbound_wo(wo)
|
||||
detail = schedule_mgmt_svc.get_infusion_schedule_detail(db, schedule_id, tenant_no)
|
||||
if not detail:
|
||||
raise HTTPException(status_code=404, detail="交付计划不存在")
|
||||
|
||||
previous_material = orm_material_svc.get_outbound_material(db, schedule_id, tenant_no)
|
||||
previous_cell_ids = [
|
||||
(c.get("cellProductId") or c.get("cell_product_id") or "").strip()
|
||||
for c in (previous_material.get("cells") or [])
|
||||
]
|
||||
|
||||
# 仅回滚细胞;市场物料扣减由出库交接维护,不可一并撤销
|
||||
handover_inv_svc.revert_handover_inventory(
|
||||
db,
|
||||
schedule_id,
|
||||
cell_product_ids=previous_cell_ids,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
skip_materials=True,
|
||||
)
|
||||
|
||||
orm_material_svc.save_outbound_material(
|
||||
db,
|
||||
schedule_id,
|
||||
paper_attachments=None,
|
||||
paper_materials=previous_material.get("paperMaterials") or [],
|
||||
remark=previous_material.get("remark"),
|
||||
cells=cells or [],
|
||||
qc_materials=previous_material.get("qcMaterials") or [],
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=create_dept_id,
|
||||
)
|
||||
|
||||
handover_inv_svc.apply_handover_inventory(
|
||||
db,
|
||||
schedule_id,
|
||||
cells=cells or [],
|
||||
qc_materials=[],
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=create_dept_id,
|
||||
receiver_person="",
|
||||
)
|
||||
|
||||
return get_production_delivery_cell_outbound(db, work_order_id, tenant_no)
|
||||
@@ -264,30 +264,35 @@ def revert_handover_inventory(
|
||||
cell_product_ids: Iterable[str],
|
||||
tenant_no: str,
|
||||
user_id: Optional[str] = None,
|
||||
skip_materials: bool = False,
|
||||
) -> None:
|
||||
"""回滚本输注计划上次出库交接产生的库存/状态变更(不 commit)。"""
|
||||
"""回滚本输注计划上次出库交接产生的库存/状态变更(不 commit)。
|
||||
|
||||
skip_materials=True 时仅回滚细胞产品状态(临床科研由生产单独出库细胞时使用)。
|
||||
"""
|
||||
sid = (schedule_id or "").strip()
|
||||
if not sid:
|
||||
return
|
||||
|
||||
remark_prefix = _handover_usage_remark_prefix(sid)
|
||||
now = datetime.now()
|
||||
_revert_legacy_qc_handover_usages(
|
||||
db,
|
||||
schedule_id=sid,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
remark_prefix=remark_prefix,
|
||||
now=now,
|
||||
)
|
||||
_revert_market_handover_usages(
|
||||
db,
|
||||
schedule_id=sid,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
remark_prefix=remark_prefix,
|
||||
now=now,
|
||||
)
|
||||
if not skip_materials:
|
||||
_revert_legacy_qc_handover_usages(
|
||||
db,
|
||||
schedule_id=sid,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
remark_prefix=remark_prefix,
|
||||
now=now,
|
||||
)
|
||||
_revert_market_handover_usages(
|
||||
db,
|
||||
schedule_id=sid,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
remark_prefix=remark_prefix,
|
||||
now=now,
|
||||
)
|
||||
|
||||
seen: Set[str] = set()
|
||||
for raw_id in cell_product_ids:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from typing import Optional
|
||||
from typing import Any, Dict, List, Optional
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
@@ -57,3 +57,11 @@ class ProductionWorkOrderConfigureBody(BaseModel):
|
||||
route_id: Optional[str] = Field(None, alias="routeId")
|
||||
description: Optional[str] = Field("", alias="description")
|
||||
remark: Optional[str] = Field("", alias="remark")
|
||||
|
||||
|
||||
class ProductionDeliveryCellOutboundBody(BaseModel):
|
||||
"""临床科研出库工单 — 确认出库细胞。"""
|
||||
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
cells: List[Dict[str, Any]] = Field(default_factory=list, description="出库细胞产品列表")
|
||||
@@ -0,0 +1,172 @@
|
||||
"""临床科研:生产确认出库细胞 / 市场交接不改细胞库存。"""
|
||||
import unittest
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from fastapi import HTTPException
|
||||
|
||||
|
||||
class TestAssertBasicExperimentOutboundWo(unittest.TestCase):
|
||||
def test_rejects_non_outbound(self):
|
||||
from app.crud.outbound_handover import _assert_basic_experiment_outbound_wo
|
||||
|
||||
wo = MagicMock(
|
||||
work_order_type="inbound",
|
||||
biz_type="basic_experiment",
|
||||
work_order_status="jxz",
|
||||
infusion_schedule_id="s1",
|
||||
)
|
||||
with self.assertRaises(HTTPException) as ctx:
|
||||
_assert_basic_experiment_outbound_wo(wo)
|
||||
self.assertEqual(ctx.exception.status_code, 400)
|
||||
|
||||
def test_rejects_other_biz_type(self):
|
||||
from app.crud.outbound_handover import _assert_basic_experiment_outbound_wo
|
||||
|
||||
wo = MagicMock(
|
||||
work_order_type="outbound",
|
||||
biz_type="pilot_service",
|
||||
work_order_status="jxz",
|
||||
infusion_schedule_id="s1",
|
||||
)
|
||||
with self.assertRaises(HTTPException) as ctx:
|
||||
_assert_basic_experiment_outbound_wo(wo)
|
||||
self.assertEqual(ctx.exception.status_code, 400)
|
||||
|
||||
def test_ok_returns_schedule_id(self):
|
||||
from app.crud.outbound_handover import _assert_basic_experiment_outbound_wo
|
||||
|
||||
wo = MagicMock(
|
||||
work_order_type="outbound",
|
||||
biz_type="basic_experiment",
|
||||
work_order_status="jxz",
|
||||
infusion_schedule_id="sched-1",
|
||||
)
|
||||
self.assertEqual(_assert_basic_experiment_outbound_wo(wo), "sched-1")
|
||||
|
||||
|
||||
class TestSaveOutboundHandoverBasicExperiment(unittest.TestCase):
|
||||
@patch("app.crud.outbound_handover.handover_inv_svc")
|
||||
@patch("app.crud.outbound_handover.orm_material_svc")
|
||||
@patch("app.crud.outbound_handover.get_outbound_handover")
|
||||
@patch("app.crud.outbound_handover.get_handover_by_schedule")
|
||||
@patch("app.crud.outbound_handover.schedule_mgmt_svc")
|
||||
def test_market_keeps_previous_cells_and_skips_cell_inventory(
|
||||
self,
|
||||
schedule_mgmt_svc,
|
||||
get_handover_by_schedule,
|
||||
get_outbound_handover,
|
||||
orm_material_svc,
|
||||
handover_inv_svc,
|
||||
):
|
||||
from app.crud.outbound_handover import save_outbound_handover
|
||||
|
||||
schedule_mgmt_svc.get_infusion_schedule_detail.return_value = {
|
||||
"bizType": "basic_experiment",
|
||||
"applicationNo": "A1",
|
||||
}
|
||||
previous_cells = [{"cellProductId": "cp-prod", "productCode": "P1"}]
|
||||
orm_material_svc.get_outbound_material.return_value = {
|
||||
"cells": previous_cells,
|
||||
"qcMaterials": [],
|
||||
"paperMaterials": [],
|
||||
"remark": "",
|
||||
}
|
||||
get_handover_by_schedule.return_value = None
|
||||
get_outbound_handover.return_value = {"ok": True}
|
||||
|
||||
db = MagicMock()
|
||||
sys_user = MagicMock(nick_name="张三", user_no="u1", del_flag=0)
|
||||
db.query.return_value.filter.return_value.first.return_value = sys_user
|
||||
|
||||
save_outbound_handover(
|
||||
db,
|
||||
"sched-1",
|
||||
outbound_material={
|
||||
"cells": [{"cellProductId": "cp-market-tamper"}],
|
||||
"qcMaterials": [{"materialId": "m1", "qty": 1}],
|
||||
"paperMaterials": [],
|
||||
},
|
||||
handover={
|
||||
"handoverUserId": "u1",
|
||||
"receiverPerson": "李四",
|
||||
"handoverTime": "2026-11-20 10:00:00",
|
||||
},
|
||||
tenant_no="t1",
|
||||
user_id="u1",
|
||||
)
|
||||
|
||||
handover_inv_svc.revert_handover_inventory.assert_called_once()
|
||||
revert_kwargs = handover_inv_svc.revert_handover_inventory.call_args.kwargs
|
||||
self.assertEqual(revert_kwargs["cell_product_ids"], [])
|
||||
|
||||
save_kwargs = orm_material_svc.save_outbound_material.call_args.kwargs
|
||||
self.assertEqual(save_kwargs["cells"], previous_cells)
|
||||
|
||||
apply_kwargs = handover_inv_svc.apply_handover_inventory.call_args.kwargs
|
||||
self.assertEqual(apply_kwargs["cells"], [])
|
||||
self.assertEqual(apply_kwargs["qc_materials"], [{"materialId": "m1", "qty": 1}])
|
||||
|
||||
|
||||
class TestSaveProductionDeliveryCellOutbound(unittest.TestCase):
|
||||
@patch("app.crud.outbound_handover.get_production_delivery_cell_outbound")
|
||||
@patch("app.crud.outbound_handover.handover_inv_svc")
|
||||
@patch("app.crud.outbound_handover.orm_material_svc")
|
||||
@patch("app.crud.outbound_handover.schedule_mgmt_svc")
|
||||
@patch("app.crud.production_work_order.get_production_work_order")
|
||||
def test_reverts_cells_only_then_applies(
|
||||
self,
|
||||
get_wo,
|
||||
schedule_mgmt_svc,
|
||||
orm_material_svc,
|
||||
handover_inv_svc,
|
||||
get_delivery,
|
||||
):
|
||||
from app.crud.outbound_handover import save_production_delivery_cell_outbound
|
||||
|
||||
get_wo.return_value = MagicMock(
|
||||
id="wo1",
|
||||
work_order_no="WO1",
|
||||
work_order_type="outbound",
|
||||
biz_type="basic_experiment",
|
||||
work_order_status="jxz",
|
||||
infusion_schedule_id="sched-1",
|
||||
)
|
||||
schedule_mgmt_svc.get_infusion_schedule_detail.return_value = {
|
||||
"bizType": "basic_experiment"
|
||||
}
|
||||
orm_material_svc.get_outbound_material.return_value = {
|
||||
"cells": [{"cellProductId": "old-cp"}],
|
||||
"qcMaterials": [{"materialId": "m1", "qty": 2}],
|
||||
"paperMaterials": [{"paperName": "出库单", "copies": 1}],
|
||||
"remark": "keep",
|
||||
}
|
||||
get_delivery.return_value = {"cells": []}
|
||||
|
||||
cells = [{"cellProductId": "new-cp"}]
|
||||
save_production_delivery_cell_outbound(
|
||||
MagicMock(),
|
||||
"wo1",
|
||||
cells=cells,
|
||||
tenant_no="t1",
|
||||
user_id="u1",
|
||||
create_dept_id="d1",
|
||||
)
|
||||
|
||||
revert_kwargs = handover_inv_svc.revert_handover_inventory.call_args.kwargs
|
||||
self.assertEqual(revert_kwargs["cell_product_ids"], ["old-cp"])
|
||||
self.assertTrue(revert_kwargs["skip_materials"])
|
||||
|
||||
save_kwargs = orm_material_svc.save_outbound_material.call_args.kwargs
|
||||
self.assertEqual(save_kwargs["cells"], cells)
|
||||
self.assertEqual(save_kwargs["qc_materials"], [{"materialId": "m1", "qty": 2}])
|
||||
self.assertEqual(
|
||||
save_kwargs["paper_materials"], [{"paperName": "出库单", "copies": 1}]
|
||||
)
|
||||
|
||||
apply_kwargs = handover_inv_svc.apply_handover_inventory.call_args.kwargs
|
||||
self.assertEqual(apply_kwargs["cells"], cells)
|
||||
self.assertEqual(apply_kwargs["qc_materials"], [])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -316,3 +316,45 @@ export function fetchMineProductionWorkOrderTabStepCountsDeduped() {
|
||||
}
|
||||
return mineTabStepCountsInflight
|
||||
}
|
||||
|
||||
/** 临床科研出库工单 — 交付出库细胞 */
|
||||
export type ProductionDeliveryCellOutbound = {
|
||||
workOrderId?: string
|
||||
workOrderNo?: string
|
||||
infusionScheduleId?: string
|
||||
scheduleSummary?: {
|
||||
applicationNo?: string
|
||||
patientName?: string
|
||||
infusionTime?: string
|
||||
projectTitle?: string
|
||||
customerName?: string
|
||||
}
|
||||
cells?: Array<{
|
||||
cellProductId?: string
|
||||
productCode?: string
|
||||
productName?: string
|
||||
productTypeName?: string
|
||||
specName?: string
|
||||
passage?: string
|
||||
batchNo?: string
|
||||
storageSlotName?: string
|
||||
productStatus?: string
|
||||
remark?: string
|
||||
}>
|
||||
}
|
||||
|
||||
export function fetchProductionDeliveryCellOutbound(workOrderId: string) {
|
||||
return request.get<ProductionDeliveryCellOutbound>({
|
||||
url: `/web/admin/production-work-orders/${workOrderId}/delivery-cell-outbound`
|
||||
})
|
||||
}
|
||||
|
||||
export function saveProductionDeliveryCellOutbound(
|
||||
workOrderId: string,
|
||||
data: { cells: Array<{ cellProductId: string; remark?: string }> }
|
||||
) {
|
||||
return request.put<ProductionDeliveryCellOutbound>({
|
||||
url: `/web/admin/production-work-orders/${workOrderId}/delivery-cell-outbound`,
|
||||
data
|
||||
})
|
||||
}
|
||||
@@ -4,10 +4,16 @@
|
||||
<div class="outbound-material-form-sections">
|
||||
<div class="material-sections">
|
||||
<!-- 出库细胞 -->
|
||||
<section class="section-card">
|
||||
<section v-if="showCells" class="section-card">
|
||||
<div class="section-head">
|
||||
<h3 class="section-title section-title--mint-bar">出库细胞</h3>
|
||||
<el-button type="primary" size="small" class="btn-main" @click="openCellSelect">
|
||||
<el-button
|
||||
v-if="!cellsReadonly"
|
||||
type="primary"
|
||||
size="small"
|
||||
class="btn-main"
|
||||
@click="openCellSelect"
|
||||
>
|
||||
<el-icon><Plus /></el-icon>
|
||||
添加细胞产品
|
||||
</el-button>
|
||||
@@ -18,7 +24,7 @@
|
||||
class="list-table inner-table"
|
||||
stripe
|
||||
max-height="280"
|
||||
empty-text="请从细胞产品库勾选"
|
||||
:empty-text="cellsReadonly ? '暂无生产确认的出库细胞' : '请从细胞产品库勾选'"
|
||||
>
|
||||
<el-table-column type="index" label="序号" min-width="56" align="center" />
|
||||
<el-table-column
|
||||
@@ -56,7 +62,13 @@
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" min-width="80" align="center" fixed="right">
|
||||
<el-table-column
|
||||
v-if="!cellsReadonly"
|
||||
label="操作"
|
||||
min-width="80"
|
||||
align="center"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="{ $index }">
|
||||
<el-button type="danger" link size="small" @click="removeCellRow($index)">
|
||||
<el-icon><Delete /></el-icon>
|
||||
@@ -69,7 +81,7 @@
|
||||
</section>
|
||||
|
||||
<!-- 使用的物料 -->
|
||||
<section class="section-card">
|
||||
<section v-if="showMaterials" class="section-card">
|
||||
<div class="section-head">
|
||||
<h3 class="section-title section-title--mint-bar">使用的物料</h3>
|
||||
<el-button type="primary" size="small" class="btn-main" @click="addMaterialRow">
|
||||
@@ -145,7 +157,7 @@
|
||||
</section>
|
||||
|
||||
<!-- 纸质材料 -->
|
||||
<section class="section-card">
|
||||
<section v-if="showPapers" class="section-card">
|
||||
<div class="section-head">
|
||||
<h3 class="section-title section-title--mint-bar">纸质材料</h3>
|
||||
<el-button type="primary" size="small" class="btn-main" @click="addPaperRow">
|
||||
@@ -289,7 +301,7 @@
|
||||
<p v-else class="section-empty-hint">点击「添加纸质材料」逐条填写名称、份数并上传附件;仅作台账留存,不扣库存</p>
|
||||
</section>
|
||||
|
||||
<el-form label-position="top" class="biz-dialog-form">
|
||||
<el-form v-if="showRemark" label-position="top" class="biz-dialog-form">
|
||||
<el-form-item label="备注">
|
||||
<el-input
|
||||
v-model="formRemark"
|
||||
@@ -424,9 +436,20 @@
|
||||
defineProps<{
|
||||
/** 出库交接等需扣库存场景:仅允许选择已冻存细胞,且已选行保留可选 */
|
||||
requireFrozenCellProduct?: boolean
|
||||
/** 临床科研市场交接:细胞由生产确认,仅只读展示 */
|
||||
cellsReadonly?: boolean
|
||||
showCells?: boolean
|
||||
showMaterials?: boolean
|
||||
showPapers?: boolean
|
||||
showRemark?: boolean
|
||||
}>(),
|
||||
{
|
||||
requireFrozenCellProduct: false
|
||||
requireFrozenCellProduct: false,
|
||||
cellsReadonly: false,
|
||||
showCells: true,
|
||||
showMaterials: true,
|
||||
showPapers: true,
|
||||
showRemark: true
|
||||
}
|
||||
)
|
||||
|
||||
@@ -785,34 +808,38 @@
|
||||
}
|
||||
|
||||
function validateMaterial() {
|
||||
if (paperRows.value.some((r) => r._uploading)) {
|
||||
if (props.showPapers && paperRows.value.some((r) => r._uploading)) {
|
||||
ElMessage.warning('纸质材料附件上传中,请稍候')
|
||||
return false
|
||||
}
|
||||
for (const row of materialRows.value) {
|
||||
if (!row.materialId) {
|
||||
ElMessage.warning('请为每条物料选择名称')
|
||||
return false
|
||||
}
|
||||
const qty = row.qty
|
||||
if (qty == null || !Number.isFinite(Number(qty)) || Number(qty) <= 0) {
|
||||
ElMessage.warning('物料计划用量须大于 0')
|
||||
return false
|
||||
if (props.showMaterials) {
|
||||
for (const row of materialRows.value) {
|
||||
if (!row.materialId) {
|
||||
ElMessage.warning('请为每条物料选择名称')
|
||||
return false
|
||||
}
|
||||
const qty = row.qty
|
||||
if (qty == null || !Number.isFinite(Number(qty)) || Number(qty) <= 0) {
|
||||
ElMessage.warning('物料计划用量须大于 0')
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const row of paperRows.value) {
|
||||
if (!row.paperName?.trim()) {
|
||||
ElMessage.warning('请填写每条纸质材料的名称')
|
||||
return false
|
||||
}
|
||||
const copies = row.copies
|
||||
if (copies == null || !Number.isFinite(Number(copies)) || Number(copies) <= 0) {
|
||||
ElMessage.warning('纸质材料份数须大于 0')
|
||||
return false
|
||||
}
|
||||
if (!row.attachments.length) {
|
||||
ElMessage.warning('请为每条纸质材料上传附件')
|
||||
return false
|
||||
if (props.showPapers) {
|
||||
for (const row of paperRows.value) {
|
||||
if (!row.paperName?.trim()) {
|
||||
ElMessage.warning('请填写每条纸质材料的名称')
|
||||
return false
|
||||
}
|
||||
const copies = row.copies
|
||||
if (copies == null || !Number.isFinite(Number(copies)) || Number(copies) <= 0) {
|
||||
ElMessage.warning('纸质材料份数须大于 0')
|
||||
return false
|
||||
}
|
||||
if (!row.attachments.length) {
|
||||
ElMessage.warning('请为每条纸质材料上传附件')
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
|
||||
+8
-1
@@ -31,7 +31,11 @@
|
||||
</div>
|
||||
|
||||
<div v-loading="loading" class="handover-body">
|
||||
<OutboundMaterialFormSections ref="materialSectionsRef" require-frozen-cell-product />
|
||||
<OutboundMaterialFormSections
|
||||
ref="materialSectionsRef"
|
||||
require-frozen-cell-product
|
||||
:cells-readonly="isBasicExperiment"
|
||||
/>
|
||||
|
||||
<section class="section-card handover-form-section">
|
||||
<h3 class="section-title section-title--mint-bar">交接信息</h3>
|
||||
@@ -264,6 +268,9 @@
|
||||
const pickupTimeLabel = computed(
|
||||
() => getPilotBizConfig(resolvePilotBizType(props.bizType)).pickupTimeLabel
|
||||
)
|
||||
const isBasicExperiment = computed(
|
||||
() => resolvePilotBizType(props.bizType) === 'basic_experiment'
|
||||
)
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', val: boolean): void
|
||||
|
||||
+185
@@ -0,0 +1,185 @@
|
||||
<!-- 临床科研出库工单 — 确认出库细胞 -->
|
||||
<!-- eslint-disable vue/no-v-model-argument vue/no-multiple-template-root -->
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="modelValue"
|
||||
title="确认出库细胞"
|
||||
width="1100px"
|
||||
class="dialog-form-layout production-delivery-cell-outbound-dialog"
|
||||
align-center
|
||||
append-to-body
|
||||
modal-class="protocol-dialog-mask"
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
style="backdrop-filter: none"
|
||||
@update:model-value="emit('update:modelValue', $event)"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<div v-if="scheduleSummary" class="material-summary">
|
||||
<div class="material-summary-row">
|
||||
<span class="material-summary-label">工单号</span>
|
||||
<span class="material-summary-value">{{ workOrderNo || '—' }}</span>
|
||||
</div>
|
||||
<div class="material-summary-row">
|
||||
<span class="material-summary-label">申请单号</span>
|
||||
<span class="material-summary-value">{{ scheduleSummary.applicationNo || '—' }}</span>
|
||||
</div>
|
||||
<div class="material-summary-row">
|
||||
<span class="material-summary-label">课题名称</span>
|
||||
<span class="material-summary-value">{{ scheduleSummary.projectTitle || '—' }}</span>
|
||||
</div>
|
||||
<div class="material-summary-row">
|
||||
<span class="material-summary-label">客户名称</span>
|
||||
<span class="material-summary-value">{{ scheduleSummary.customerName || '—' }}</span>
|
||||
</div>
|
||||
<div class="material-summary-row">
|
||||
<span class="material-summary-label">交付时间</span>
|
||||
<span class="material-summary-value">{{ scheduleSummary.infusionTime || '—' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-loading="loading" class="outbound-body">
|
||||
<OutboundMaterialFormSections
|
||||
ref="materialSectionsRef"
|
||||
require-frozen-cell-product
|
||||
:show-materials="false"
|
||||
:show-papers="false"
|
||||
:show-remark="false"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button class="btn-ghost" @click="emit('update:modelValue', false)">
|
||||
<el-icon><Close /></el-icon>
|
||||
取消
|
||||
</el-button>
|
||||
<el-button class="btn-main" type="primary" :loading="submitting" @click="handleSubmit">
|
||||
<el-icon><Check /></el-icon>
|
||||
确认出库
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { nextTick, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { Check, Close } from '@element-plus/icons-vue'
|
||||
import {
|
||||
fetchProductionDeliveryCellOutbound,
|
||||
saveProductionDeliveryCellOutbound
|
||||
} from '@/api/production-work-order'
|
||||
import OutboundMaterialFormSections from '@/components/business/outbound-material-form-sections/index.vue'
|
||||
|
||||
defineOptions({ name: 'ProductionDeliveryCellOutboundDialog' })
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: boolean
|
||||
workOrderId: string
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', val: boolean): void
|
||||
(e: 'saved'): void
|
||||
}>()
|
||||
|
||||
const materialSectionsRef = ref<InstanceType<typeof OutboundMaterialFormSections> | null>(null)
|
||||
const loading = ref(false)
|
||||
const submitting = ref(false)
|
||||
const workOrderNo = ref('')
|
||||
const scheduleSummary = ref<{
|
||||
applicationNo?: string
|
||||
patientName?: string
|
||||
infusionTime?: string
|
||||
projectTitle?: string
|
||||
customerName?: string
|
||||
} | null>(null)
|
||||
|
||||
async function loadData() {
|
||||
if (!props.workOrderId) return
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await fetchProductionDeliveryCellOutbound(props.workOrderId)
|
||||
workOrderNo.value = data.workOrderNo || ''
|
||||
scheduleSummary.value = data.scheduleSummary || null
|
||||
await nextTick()
|
||||
materialSectionsRef.value?.loadFromApiData({
|
||||
cells: data.cells as any
|
||||
})
|
||||
} catch (e: any) {
|
||||
ElMessage.error(e?.message || '加载出库细胞失败')
|
||||
emit('update:modelValue', false)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSubmit() {
|
||||
if (!props.workOrderId) return
|
||||
if (!materialSectionsRef.value?.validateMaterial()) return
|
||||
const payload = materialSectionsRef.value.buildSavePayload()
|
||||
submitting.value = true
|
||||
try {
|
||||
await saveProductionDeliveryCellOutbound(props.workOrderId, {
|
||||
cells: (payload.cells || []).map((c: { cellProductId: string; remark?: string }) => ({
|
||||
cellProductId: c.cellProductId,
|
||||
remark: c.remark
|
||||
}))
|
||||
})
|
||||
ElMessage.success('出库细胞已确认')
|
||||
emit('saved')
|
||||
emit('update:modelValue', false)
|
||||
} catch (e: any) {
|
||||
ElMessage.error(e?.message || '确认出库失败')
|
||||
} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function handleClosed() {
|
||||
workOrderNo.value = ''
|
||||
scheduleSummary.value = null
|
||||
materialSectionsRef.value?.resetState()
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(visible) => {
|
||||
if (visible) void loadData()
|
||||
}
|
||||
)
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.material-summary {
|
||||
margin-bottom: 16px;
|
||||
padding: 12px 16px;
|
||||
background: var(--el-fill-color-lighter);
|
||||
border-radius: 8px;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 8px 24px;
|
||||
}
|
||||
|
||||
.material-summary-row {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.material-summary-label {
|
||||
flex: 0 0 auto;
|
||||
color: var(--el-text-color-secondary);
|
||||
}
|
||||
|
||||
.material-summary-value {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.outbound-body {
|
||||
min-height: 160px;
|
||||
}
|
||||
</style>
|
||||
+18
-1
@@ -75,6 +75,13 @@
|
||||
<el-button class="btn-op-item" @click="emit('view-qc', row)">
|
||||
<el-icon><DataLine /></el-icon>查看质检数据
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="showDeliveryCellOutbound(row)"
|
||||
class="btn-op-item"
|
||||
@click="emit('delivery-cell-outbound', row)"
|
||||
>
|
||||
<el-icon><Box /></el-icon>确认出库细胞
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="showStorageCertQcButton(row)"
|
||||
class="btn-op-item"
|
||||
@@ -353,7 +360,8 @@
|
||||
ArrowDown,
|
||||
ArrowUp,
|
||||
DataLine,
|
||||
FolderAdd
|
||||
FolderAdd,
|
||||
Box
|
||||
} from '@element-plus/icons-vue'
|
||||
import type { ProductionWorkOrderItem } from '@/api/production-work-order'
|
||||
import type { OutboundQcDetailProduct } from '@/api/qc-work-order'
|
||||
@@ -545,6 +553,7 @@
|
||||
const emit = defineEmits<{
|
||||
view: [row: ProductionWorkOrderItem]
|
||||
'view-qc': [row: ProductionWorkOrderItem]
|
||||
'delivery-cell-outbound': [row: ProductionWorkOrderItem]
|
||||
dispatch: [row: ProductionWorkOrderItem]
|
||||
'dispatch-qc': [row: ProductionWorkOrderItem]
|
||||
complete: [row: ProductionWorkOrderItem]
|
||||
@@ -649,6 +658,14 @@
|
||||
return row.workOrderStatus === 'dpz' || row.workOrderStatus === 'jxz'
|
||||
}
|
||||
|
||||
function showDeliveryCellOutbound(row: ProductionWorkOrderItem) {
|
||||
if (isMineMode.value) return false
|
||||
if (row.workOrderStatus === 'yzf') return false
|
||||
const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row)
|
||||
if (tabKey === 'outbound_basic_experiment') return true
|
||||
return row.bizType === 'basic_experiment' && (row.workOrderType || '') === 'outbound'
|
||||
}
|
||||
|
||||
function canVoidWorkOrder(row: ProductionWorkOrderItem) {
|
||||
return row.workOrderStatus === 'dpz' || row.workOrderStatus === 'jxz'
|
||||
}
|
||||
|
||||
+20
@@ -189,6 +189,7 @@
|
||||
:tasks-batch-loading="tasksBatchLoading"
|
||||
@view="handleView"
|
||||
@view-qc="handleViewQc"
|
||||
@delivery-cell-outbound="handleDeliveryCellOutbound"
|
||||
@dispatch="(row) => emit('dispatch', row)"
|
||||
@dispatch-qc="(row) => emit('dispatch-qc', row)"
|
||||
@complete="(row) => emit('complete', row)"
|
||||
@@ -229,6 +230,12 @@
|
||||
:tasks="saveSetTasks"
|
||||
:lab-storage-code="saveSetLabStorageCode"
|
||||
/>
|
||||
|
||||
<ProductionDeliveryCellOutboundDialog
|
||||
v-model="deliveryCellOutboundVisible"
|
||||
:work-order-id="deliveryCellOutboundWorkOrderId"
|
||||
@saved="handleDeliveryCellOutboundSaved"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -242,6 +249,7 @@
|
||||
import { PRODUCTION_WORK_ORDER_STATUS_FILTER_OPTIONS } from '@/utils/status-tag-registry'
|
||||
import ProductionWorkOrderCardList from '../ProductionWorkOrderCardList.vue'
|
||||
import ProductionWorkOrderQcViewDialog from '../ProductionWorkOrderQcViewDialog.vue'
|
||||
import ProductionDeliveryCellOutboundDialog from '../ProductionDeliveryCellOutboundDialog.vue'
|
||||
import SampleReceptionDialog from '../SampleReceptionDialog.vue'
|
||||
import SaveProductionTaskSetDialog from '../SaveProductionTaskSetDialog.vue'
|
||||
import { PRODUCTION_WORK_ORDER_VIEW_DIALOG_COMPONENTS } from '../view-dialogs/view-dialog-registry'
|
||||
@@ -283,6 +291,8 @@
|
||||
const saveSetLabStorageCode = computed(() =>
|
||||
resolveWorkOrderLabStorageCode(saveSetRow.value)
|
||||
)
|
||||
const deliveryCellOutboundVisible = ref(false)
|
||||
const deliveryCellOutboundWorkOrderId = ref('')
|
||||
|
||||
const {
|
||||
cardMetaConfig,
|
||||
@@ -366,6 +376,16 @@
|
||||
qcViewVisible.value = true
|
||||
}
|
||||
|
||||
function handleDeliveryCellOutbound(row: ProductionWorkOrderItem) {
|
||||
deliveryCellOutboundWorkOrderId.value = row.id || ''
|
||||
deliveryCellOutboundVisible.value = true
|
||||
}
|
||||
|
||||
function handleDeliveryCellOutboundSaved() {
|
||||
loadData()
|
||||
emit('data-changed')
|
||||
}
|
||||
|
||||
function handleSampleReceptionSuccess() {
|
||||
bumpTaskRefresh()
|
||||
loadData()
|
||||
|
||||
Reference in new issue
Block a user