增加了项目侧关于steps的处理。允许保存和提取steps信息。
This commit is contained in:
@@ -102,6 +102,7 @@ class MaterialDetailApiHandler(BaseApiHandler):
|
||||
self.api_client,
|
||||
create_model,
|
||||
push_id,
|
||||
steps=self._get_request_steps(node),
|
||||
)
|
||||
if self.poll_mode == "sync":
|
||||
created_id = self._extract_created_id_from_response(response)
|
||||
@@ -144,7 +145,14 @@ class MaterialDetailApiHandler(BaseApiHandler):
|
||||
origin_data = node.get_origin_data() or {}
|
||||
|
||||
# 使用 _get_schema_diff 检查差异并打印日志
|
||||
diff_fields = self._get_schema_diff(MaterialDetailUpdate, data, origin_data, node.node_id)
|
||||
force_steps_update = self._steps_changed(node)
|
||||
diff_fields = self._get_schema_diff(
|
||||
MaterialDetailUpdate,
|
||||
data,
|
||||
origin_data,
|
||||
node.node_id,
|
||||
force_full_schema=force_steps_update,
|
||||
)
|
||||
if not diff_fields:
|
||||
from ...common.types import SyncAction
|
||||
results.append(TaskResult.skipped(node_id=node.node_id, reason="No updatable fields changed"))
|
||||
@@ -157,7 +165,12 @@ class MaterialDetailApiHandler(BaseApiHandler):
|
||||
continue
|
||||
|
||||
# 需要完整的 schema 数据(包括必填字段)
|
||||
update_data = self._filter_update_data(data, origin_data, MaterialDetailUpdate)
|
||||
update_data = self._filter_update_data(
|
||||
data,
|
||||
origin_data,
|
||||
MaterialDetailUpdate,
|
||||
force_full_schema=force_steps_update,
|
||||
)
|
||||
|
||||
# 验证并转换为 Pydantic model
|
||||
try:
|
||||
@@ -174,6 +187,7 @@ class MaterialDetailApiHandler(BaseApiHandler):
|
||||
|
||||
# 准备批量数据
|
||||
detail_list = [model.model_dump(mode='json', exclude_unset=True) for node, model in group_items]
|
||||
steps = self._get_request_steps(group_items[0][0]) if group_items else []
|
||||
|
||||
# 使用 parent_id(material_id)作为 biz_id
|
||||
biz_id = material_id
|
||||
@@ -184,10 +198,12 @@ class MaterialDetailApiHandler(BaseApiHandler):
|
||||
self.api_client,
|
||||
{"detail_list": detail_list},
|
||||
push_id,
|
||||
biz_id
|
||||
biz_id,
|
||||
steps=steps,
|
||||
)
|
||||
# 整组成功
|
||||
for node, _ in group_items:
|
||||
self._mark_approval_snapshot_synced(node)
|
||||
results.append(TaskResult.in_progress(node_id=node.node_id, task_id=push_id))
|
||||
except Exception as e:
|
||||
# 整组失败
|
||||
@@ -271,7 +287,13 @@ async def api_get_material_detail_list(client, material_id: str) -> List[Materia
|
||||
return validated_items
|
||||
|
||||
|
||||
async def api_create_material_detail(client, data: MaterialDetailCreate, push_id: str) -> Dict[str, Any]:
|
||||
async def api_create_material_detail(
|
||||
client,
|
||||
data: MaterialDetailCreate,
|
||||
push_id: str,
|
||||
*,
|
||||
steps: List[Dict[str, Any]] | None = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
创建物资明细 POST /material_detail/create
|
||||
|
||||
@@ -281,7 +303,7 @@ async def api_create_material_detail(client, data: MaterialDetailCreate, push_id
|
||||
push_id: 推送ID
|
||||
biz_id: 业务ID
|
||||
"""
|
||||
request_data = {"push_id": push_id, "data": data.model_dump(mode='json')}
|
||||
request_data = {"push_id": push_id, "data": data.model_dump(mode='json'), "steps": steps or []}
|
||||
response = await client.request(
|
||||
method="POST",
|
||||
endpoint="/material/detail/create",
|
||||
@@ -292,7 +314,14 @@ async def api_create_material_detail(client, data: MaterialDetailCreate, push_id
|
||||
return response
|
||||
|
||||
|
||||
async def api_update_material_detail(client, data: Dict[str, Any], push_id: str, biz_id: str):
|
||||
async def api_update_material_detail(
|
||||
client,
|
||||
data: Dict[str, Any],
|
||||
push_id: str,
|
||||
biz_id: str,
|
||||
*,
|
||||
steps: List[Dict[str, Any]] | None = None,
|
||||
):
|
||||
"""
|
||||
更新物资明细 PUT /material_detail/update
|
||||
|
||||
@@ -305,7 +334,8 @@ async def api_update_material_detail(client, data: Dict[str, Any], push_id: str,
|
||||
request_data = {
|
||||
"push_id": push_id,
|
||||
"biz_id": biz_id,
|
||||
"data": data
|
||||
"data": data,
|
||||
"steps": steps or [],
|
||||
}
|
||||
response = await client.request(
|
||||
method="PUT",
|
||||
|
||||
Reference in New Issue
Block a user