Merge pull request #258 feature-NEWDWH2021-1194 into develop

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('処理終了')

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('実績更新：終了')

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('処理終了')