修改增加完整工程json
This commit is contained in:
@@ -4,12 +4,12 @@ import math
|
||||
from typing import Dict, List, Any, Tuple
|
||||
from copy import deepcopy
|
||||
|
||||
from item_acquisition import get_quantity_nodes, get_classified_resource_nodes, load_project_data
|
||||
from equipment_calculation.item_acquisition import get_quantity_nodes, get_classified_resource_nodes, load_project_data
|
||||
|
||||
# 修改后的代码:先将字典转换为对象
|
||||
from bcl_utils import create_node_from_type, create_material_or_equipment_from_node
|
||||
from equipment_calculation.bcl_utils import create_node_from_type, create_material_or_equipment_from_node
|
||||
|
||||
from bcl_utils import (
|
||||
from equipment_calculation.bcl_utils import (
|
||||
ZjMaterialOrEquipmentBCLContext,
|
||||
ZjProjectBCLContext,
|
||||
BCLVariant,
|
||||
@@ -19,8 +19,8 @@ from bcl_utils import (
|
||||
calculator,
|
||||
)
|
||||
|
||||
from bcl_utils import BCLDataSourceItem, BCLDataSourceContext
|
||||
from item_acquisition import get_quantity_nodes, get_classified_resource_nodes
|
||||
from equipment_calculation.bcl_utils import BCLDataSourceItem, BCLDataSourceContext
|
||||
from equipment_calculation.item_acquisition import get_quantity_nodes, get_classified_resource_nodes
|
||||
|
||||
# 人材机节点定义合并条件常量
|
||||
LABOR_MERGE_CONDITIONS = [
|
||||
@@ -999,7 +999,7 @@ def calculate_resource_fees(
|
||||
"""
|
||||
# 如果没有提供计算策略,使用默认策略
|
||||
if calculation_strategy is None:
|
||||
from calculation_strategy import DefaultCalculationStrategy
|
||||
from equipment_calculation.calculation_strategy import DefaultCalculationStrategy
|
||||
|
||||
calculation_strategy = DefaultCalculationStrategy()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user