nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

再レビュー結果の反映

Browse Source
This commit is contained in:
mori.k 2025-06-05 10:52:58 +09:00
parent 5bde7acbd8
commit c8b1bf19a8
4 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ecs/jskult-batch/src/batch/update_business_day.py
View File

@ -80,7 +80,6 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
jskult_batch_run_manager.batch_failed() jskult_batch_run_manager.batch_failed()
jskult_batch_status_manager.set_process_status( jskult_batch_status_manager.set_process_status(
constants.PROCESS_STATUS_ERROR) constants.PROCESS_STATUS_ERROR)
logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}')
return return
try: try:
# 日付テーブルの処理年月日を取得する # 日付テーブルの処理年月日を取得する
@ -117,7 +116,6 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
jskult_batch_run_manager.batch_failed() jskult_batch_run_manager.batch_failed()
jskult_batch_status_manager.set_process_status( jskult_batch_status_manager.set_process_status(
constants.PROCESS_STATUS_ERROR) constants.PROCESS_STATUS_ERROR)
logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}')
return return
with open(transfer_list_file_path) as f: with open(transfer_list_file_path) as f:
@ -135,7 +133,6 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
jskult_batch_run_manager.batch_failed() jskult_batch_run_manager.batch_failed()
jskult_batch_status_manager.set_process_status( jskult_batch_status_manager.set_process_status(
constants.PROCESS_STATUS_ERROR) constants.PROCESS_STATUS_ERROR)
logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}')
return return
@ -145,10 +142,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
jsk_transfer_expected_data_list = jsk_expected_data_list['jsk_transfer_list'] jsk_transfer_expected_data_list = jsk_expected_data_list['jsk_transfer_list']
if len(jsk_transfer_data_list) != 0: if len(jsk_transfer_data_list) != 0:
# 不足ファイルがあった場合ログ出力
self._check_missing_received_files( self._check_missing_received_files(
jsk_transfer_expected_data_list, jsk_transfer_data_list) jsk_transfer_expected_data_list, jsk_transfer_data_list)
# 受領予定にないファイルがあった場合ログ出力
self._check_extra_received_files( self._check_extra_received_files(
jsk_transfer_expected_data_list, jsk_transfer_data_list) jsk_transfer_expected_data_list, jsk_transfer_data_list)
@ -168,7 +163,7 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
constants.PROCESS_STATUS_ERROR) constants.PROCESS_STATUS_ERROR)
logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}') logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}')
def _is_archive_run_day(self, syor_date: str): def _is_archive_run_day(self, syor_date: str) -> bool:
"""アーカイブ取得日カレンダーを取得し、処理日がアーカイブ起動日かを確認 """アーカイブ取得日カレンダーを取得し、処理日がアーカイブ起動日かを確認
Returns: Returns:
@ -184,7 +179,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
return target_days.compare_date(syor_date) return target_days.compare_date(syor_date)
def _check_missing_received_files(self, jsk_transfer_expected_data_list: list, jsk_transfer_data_list: list): def _check_missing_received_files(self, jsk_transfer_expected_data_list: list, jsk_transfer_data_list: list):
# jsk_transfer_data_listと比較し、結果不足ファイルがあった場合ログ出力 """jsk_transfer_data_listと比較し、結果不足ファイルがあった場合ログ出力
"""
missing_files = [ missing_files = [
jsk_transfer_expected_data jsk_transfer_expected_data
for jsk_transfer_expected_data in jsk_transfer_expected_data_list for jsk_transfer_expected_data in jsk_transfer_expected_data_list
@ -199,7 +195,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint):
f'I-5 [NOTICE]日次連携受領ファイルに不足がありました。ファイル名：{missing_files}') f'I-5 [NOTICE]日次連携受領ファイルに不足がありました。ファイル名：{missing_files}')
def _check_extra_received_files(self, jsk_transfer_expected_data_list: list, jsk_transfer_data_list: list): def _check_extra_received_files(self, jsk_transfer_expected_data_list: list, jsk_transfer_data_list: list):
# jsk_transfer_data_listと比較し、受領予定にないファイルがあった場合ログ出力 """jsk_transfer_data_listと比較し、受領予定にないファイルがあった場合ログ出力
"""
unexpected_data = [ unexpected_data = [
jsk_transfer_data jsk_transfer_data
for jsk_transfer_data in jsk_transfer_data_list for jsk_transfer_data in jsk_transfer_data_list

37
s3/config/jsk_expected_data_list.json
View File

@ -1,37 +0,0 @@
{
"jsk_transfer_list":[
"TRN_RESULT_DATA",
"TRN_RESULT_DATA_BIO",
"TRN_Recive_Inventry",
"INST_IM_PLN",
"MR_YR_PLN_INST_KY",
"MST_WHLSLR",
"MST_SALES_PLACE",
"WHLSLR_LVL4",
"WHLSLR_LVL3",
"WHLSLR_LVL2",
"WHLSLR_LVL1",
"MST_COMPANY",
"MST_COMPANY_GRP",
"MST_DEAL_DIV",
"MST_PROD_PKG",
"PROD_PRICE",
"IM_PLN_PROD",
"MST_ASSN_PROD_GRP",
"PROD_ASSN_TEAM",
"MST_ATC_PHARM_PROD_GRP",
"CUSTOMER_LOTNO_ALL",
"MST_INST",
"ATC_PHARM",
"MST_WAREHOUSE",
"EMP",
"ORG_LVL4",
"ORG_LVL3",
"ORG_LVL2",
"ORG_LVL1",
"MST_JIS_PREF",
"MST_JIS_CITY",
"MST_INST_ASSN",
"MST_GENERAL"
]
}

0
s3/config/jsk_archive_run_day.txt → s3/config/jskult/calendar/jsk_archive_run_day.txt
View File

37
s3/config/jskult/expected_data_list/jsk_expected_data_list.json Normal file
View File

@ -0,0 +1,37 @@
{
"jsk_transfer_list": [
"TRN_RESULT_DATA",
"TRN_RESULT_DATA_BIO",
"TRN_Recive_Inventry",
"INST_IM_PLN",
"MR_YR_PLN_INST_KY",
"MST_WHLSLR",
"MST_SALES_PLACE",
"WHLSLR_LVL4",
"WHLSLR_LVL3",
"WHLSLR_LVL2",
"WHLSLR_LVL1",
"MST_COMPANY",
"MST_COMPANY_GRP",
"MST_DEAL_DIV",
"MST_PROD_PKG",
"PROD_PRICE",
"IM_PLN_PROD",
"MST_ASSN_PROD_GRP",
"PROD_ASSN_TEAM",
"MST_ATC_PHARM_PROD_GRP",
"CUSTOMER_LOTNO_ALL",
"MST_INST",
"ATC_PHARM",
"MST_WAREHOUSE",
"EMP",
"ORG_LVL4",
"ORG_LVL3",
"ORG_LVL2",
"ORG_LVL1",
"MST_JIS_PREF",
"MST_JIS_CITY",
"MST_INST_ASSN",
"MST_GENERAL"
]
}