|
|
@@ -162,16 +162,28 @@ async def get_pattern_info(
|
|
|
detail=[]
|
|
|
for detail_info in declaration_id_get_declaration_detail_list(db,id):
|
|
|
material_type_info = type_id_get_material_type_info(db,detail_info.material_type)
|
|
|
+ if material_type_info:
|
|
|
+ material_category_name=material_type_info.material_category_name
|
|
|
+ else:
|
|
|
+ material_category_name = None
|
|
|
material_into = material_id_get_material_info(db,detail_info.material_code)
|
|
|
+ if material_into:
|
|
|
+ material_name = material_into.material_name
|
|
|
+ else:
|
|
|
+ material_name = None
|
|
|
warehouse_info = warehouse_id_get_warehouse_info(db,detail_info.warehouse_id)
|
|
|
+ if warehouse_info:
|
|
|
+ warehouse_name = warehouse_info.warehouse_name
|
|
|
+ else:
|
|
|
+ warehouse_name = None
|
|
|
detail.append({"id":detail_info.id,
|
|
|
"serial_number":detail_info.serial_number,
|
|
|
"warehouse_id":detail_info.warehouse_id,
|
|
|
- "warehouse_name":warehouse_info.warehouse_name,
|
|
|
+ "warehouse_name":warehouse_name,
|
|
|
"material_type":detail_info.material_type,
|
|
|
- "material_category_name":material_type_info.material_category_name,
|
|
|
+ "material_category_name":material_category_name,
|
|
|
"material_code":detail_info.material_code,
|
|
|
- "material_name":material_into.material_name,
|
|
|
+ "material_name":material_name,
|
|
|
"material_quantity":detail_info.material_quantity,
|
|
|
"material_unit_price":detail_info.material_unit_price,
|
|
|
"material_purpose":detail_info.material_purpose})
|
