From 647b77fb6e3965050b001cceb1de515dc569b738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 22 Aug 2023 15:42:44 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20L-7-3=20=E6=96=BD=E8=A8=AD=E6=8B=85?= =?UTF-8?q?=E5=BD=93=E8=80=85=E3=83=9E=E3=82=B9=E3=82=BF=E6=B4=97=E6=9B=BF?= =?UTF-8?q?=E3=81=AE=E7=B5=90=E6=9E=9C=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F?= =?UTF-8?q?=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laundering/create_inst_merge_for_laundering.py | 1 + .../src/batch/laundering/sales_laundering.py | 10 ++-------- .../laundering/create_inst_merge_for_laundering.py | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/create_inst_merge_for_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/create_inst_merge_for_laundering.py index 2c9d7353..0fee58d5 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/create_inst_merge_for_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/create_inst_merge_for_laundering.py @@ -12,6 +12,7 @@ def exec(): db.connect() logger.debug('処理開始') + db.to_jst() call_v_inst_merge_t_create(db) call_inst_merge_t_create(db) logger.debug('処理終了') diff --git a/ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py index 3c086ca5..2cc530f9 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py @@ -17,10 +17,10 @@ def exec(): if batch_context.is_not_business_day: logger.info('営業日ではないため、実績洗替処理をスキップします。') return + # DCF施設統合マスタ日次更新 + integrate_dcf_inst_merge.exec() # 洗替用マスタ作成 create_inst_merge_for_laundering.exec() - # DCF施設統合マスタ日次更新 - integrate_dcf_inst_merge.exec() # 施設担当者洗替 emp_chg_inst_laundering.exec() # 納入先処方元マスタ洗替 @@ -28,10 +28,4 @@ def exec(): # 卸販売洗替 sales_results_laundering.exec() - # # 並列処理のテスト用コード - # import time - # for _ in range(100): - # logger.info('実績洗替処理中') - # time.sleep(0.25) - logger.info('実績更新：終了') diff --git a/ecs/jskult-batch-laundering/src/batch/laundering/create_inst_merge_for_laundering.py b/ecs/jskult-batch-laundering/src/batch/laundering/create_inst_merge_for_laundering.py index 2c9d7353..0fee58d5 100644 --- a/ecs/jskult-batch-laundering/src/batch/laundering/create_inst_merge_for_laundering.py +++ b/ecs/jskult-batch-laundering/src/batch/laundering/create_inst_merge_for_laundering.py @@ -12,6 +12,7 @@ def exec(): db.connect() logger.debug('処理開始') + db.to_jst() call_v_inst_merge_t_create(db) call_inst_merge_t_create(db) logger.debug('処理終了')