|
|
|
@ -256,9 +256,9 @@ async def generate_transaction(
|
|
|
|
|
|
|
|
|
|
|
|
# # Query existing records with is_actual=1
|
|
|
|
# # Query existing records with is_actual=1
|
|
|
|
# actual_years_query = (
|
|
|
|
# actual_years_query = (
|
|
|
|
# Select(MasterRecords.tahun)
|
|
|
|
# Select(EquipmentTransactionRecordss.tahun)
|
|
|
|
# .filter(MasterRecords.assetnum == data_in.assetnum)
|
|
|
|
# .filter(EquipmentTransactionRecordss.assetnum == data_in.assetnum)
|
|
|
|
# .filter(MasterRecords.is_actual == 1)
|
|
|
|
# .filter(EquipmentTransactionRecordss.is_actual == 1)
|
|
|
|
# )
|
|
|
|
# )
|
|
|
|
# result = await db_session.execute(actual_years_query)
|
|
|
|
# result = await db_session.execute(actual_years_query)
|
|
|
|
# actual_years = {row[0] for row in result.all()}
|
|
|
|
# actual_years = {row[0] for row in result.all()}
|
|
|
|
@ -280,9 +280,9 @@ async def generate_transaction(
|
|
|
|
|
|
|
|
|
|
|
|
# # # Calculate sum of previous failures for this asset
|
|
|
|
# # # Calculate sum of previous failures for this asset
|
|
|
|
# # previous_failures_query = (
|
|
|
|
# # previous_failures_query = (
|
|
|
|
# # Select(func.sum(MasterRecords.raw_cm_interval))
|
|
|
|
# # Select(func.sum(EquipmentTransactionRecordss.raw_cm_interval))
|
|
|
|
# # .filter(MasterRecords.assetnum == data_in.assetnum)
|
|
|
|
# # .filter(EquipmentTransactionRecordss.assetnum == data_in.assetnum)
|
|
|
|
# # .filter(MasterRecords.tahun < year)
|
|
|
|
# # .filter(EquipmentTransactionRecordss.tahun < year)
|
|
|
|
# # )
|
|
|
|
# # )
|
|
|
|
# # previous_failures_result = await db_session.execute(previous_failures_query)
|
|
|
|
# # previous_failures_result = await db_session.execute(previous_failures_query)
|
|
|
|
# # previous_failures_sum = previous_failures_result.scalar() or 0
|
|
|
|
# # previous_failures_sum = previous_failures_result.scalar() or 0
|
|
|
|
@ -291,7 +291,7 @@ async def generate_transaction(
|
|
|
|
# # transaction.update({"raw_cm_interval": current_num_fail - previous_failures_sum})
|
|
|
|
# # transaction.update({"raw_cm_interval": current_num_fail - previous_failures_sum})
|
|
|
|
# transaction.update({"raw_cm_interval": current_num_fail})
|
|
|
|
# transaction.update({"raw_cm_interval": current_num_fail})
|
|
|
|
# transaction.update({"tahun": int(year), "seq": int(sequence)})
|
|
|
|
# transaction.update({"tahun": int(year), "seq": int(sequence)})
|
|
|
|
# transactions.append(MasterRecords(**transaction))
|
|
|
|
# transactions.append(EquipmentTransactionRecordss(**transaction))
|
|
|
|
|
|
|
|
|
|
|
|
# db_session.add_all(transactions)
|
|
|
|
# db_session.add_all(transactions)
|
|
|
|
# await db_session.commit()
|
|
|
|
# await db_session.commit()
|
|
|
|
|