From 3ceb9fbb780b82e29eb95695ab4defa04a1ad82b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 21 Jun 2022 18:53:05 +0900 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E5=8F=96=E3=82=8A=E8=BE=BC=E3=81=BF=E3=83=90=E3=82=B1=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=AB=E5=BE=A9=E5=8F=B7=E5=8C=96=E6=B8=88=E3=81=BF?= =?UTF-8?q?=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=81=99=E3=82=8B=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 +++++- .../datadecrypt/main.py | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e4f6d9fb..0be1cd1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ lambda/mbj-newdwh2021-staging-NoticeToSlack/package-lock.json lambda/mbj-newdwh2021-staging-NoticeToSlack/node_modules/* lambda/mbj-newdwh2021-staging-PublishFromLog/package-lock.json -lambda/mbj-newdwh2021-staging-PublishFromLog/node_modules/* \ No newline at end of file +lambda/mbj-newdwh2021-staging-PublishFromLog/node_modules/* + +# Pythonの仮想環境 +.venv +__pycache__ diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py index ec4d24ae..344e2641 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py @@ -144,7 +144,21 @@ def handler(event, context): except Exception as e: logger.error(f'E-07-02 PGP暗号化ファイルのS3出力に失敗しました　エラー内容：{e}') raise FileOutputException('E-07-02', EXTENSION_ERROR, e) - + # 「⑥」で復号化したファイルをデータ取込用バケットに出力する + try: + copy_source = { + 'Bucket': decrypt_bucket_name, + 'Key': decrypt_file_key + } + import_file_folder = f'{s3_event.data_source_name}{DIRECTORY_TARGET}' + import_file_key = f'{import_file_folder}{decrypt_file_name}' + logger.info(f'I-07-06 復号化ファイル出力　ファイル名：{decrypt_file_name}　出力先：{import_file_folder}') + import_file_obj = s3_resource.Object(s3_event.bucket_name, import_file_key) + import_file_obj.copy(copy_source) + logger.info(f'I-07-07 復号化ファイルをS3に出力しました') + except Exception as e: + logger.error(f'E-07-03 復号化ファイルのS3出力に失敗しました　エラー内容：{e}') + raise FileOutputException('E-07-02', EXTENSION_ERROR, e) # ⑧ 処理終了ログを出力する logger.info('I-08-01 処理終了　SAPデータ復号処理') except EncryptFileReadException as e: From 0021e8b2d712f24fe28a24b79f97f4e0b49cb935 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 21 Jun 2022 18:59:07 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E5=AE=9A=E6=95=B0=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E6=BC=8F=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datadecrypt/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py index 344e2641..1c0eee70 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py @@ -23,6 +23,7 @@ LOG_LEVEL = os.environ["LOG_LEVEL"] # 定数 DIRECTORY_RECV = '/recv/' DIRECTORY_RECV_ERROR = '/recv_error/' +DIRECTORY_TARGET = '/target/' EXTENSION_ERROR = '.error' EXTENSION_DECRYPT_ERROR = '.decrypt_error' INDEX_EXTENSION_DELETE_NUM = -4 From 3cc6b93c229491be74119a6fae23be81ca480996 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 21 Jun 2022 19:07:42 +0900 Subject: [PATCH 03/11] =?UTF-8?q?feat:=20traceback=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=82=8F=E3=81=9A=E3=81=AB=E3=80=81logger.exception=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit traceback.print_exc()で取得しているものと、logger.exception()で取得しているものがどちらともsys.exc_infoなので、同じ動きをするはず。 --- .../datadecrypt/main.py | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py index 1c0eee70..49eb8db0 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py @@ -6,7 +6,6 @@ import datetime import logging from abc import * from zoneinfo import ZoneInfo -import traceback # 環境変数 SECRET_KEY_FILE_BUCKET_NAME = os.environ["SECRET_KEY_FILE_BUCKET_NAME"] @@ -79,7 +78,7 @@ def handler(event, context): s3_client.download_file(s3_event.bucket_name, s3_event.file_path, PATH_TEMP_ENCRYPT_FILE) logger.info('I-03-02 PGP暗号化ファイルを読み込みました') except Exception as e: - logger.error(f'E-03-01 PGP暗号化ファイルの読み込みに失敗しました　エラー内容：{e}') + logger.exception(f'E-03-01 PGP暗号化ファイルの読み込みに失敗しました　エラー内容：{e}') raise EncryptFileReadException('E-03-01', EXTENSION_ERROR, e) # ④ S3から秘密鍵ファイルを読み込む @@ -88,7 +87,7 @@ def handler(event, context): s3_client.download_file(SECRET_KEY_FILE_BUCKET_NAME, SECRET_KEY_FILE_PATH, PATH_TEMP_PRIVATE_KEY) logger.info('I-04-02 秘密鍵ファイルを読み込みました') except Exception as e: - logger.error(f'E-04-01 秘密鍵ファイルの読み込みに失敗しました　エラー内容：{e}') + logger.exception(f'E-04-01 秘密鍵ファイルの読み込みに失敗しました　エラー内容：{e}') raise FileReadException('E-04-01', EXTENSION_ERROR, e) # ⑤ 「③」で読み込んだ秘密鍵ファイルをPGPライブラリにインポートを行う @@ -99,7 +98,7 @@ def handler(event, context): gpg.import_keys(key_file.read()) logger.info('I-05-02 秘密鍵ファイルをインポートしました') except Exception as e: - logger.error(f'E-05-01 秘密鍵ファイルのインポートに失敗しました　エラー内容：{e}') + logger.exception(f'E-05-01 秘密鍵ファイルのインポートに失敗しました　エラー内容：{e}') raise PrivateKeyImportException('E-05-01', EXTENSION_ERROR, e) # ⑥ 「④」で読み込んだPGP暗号化ファイルを「⑤」でインポートした秘密鍵ファイルで復号する @@ -110,7 +109,7 @@ def handler(event, context): decrypt_file = open(PATH_TEMP_DECRYPT_FILE, 'rb') logger.info('I-06-02 PGP暗号化ファイルを復号しました') except Exception as e: - logger.error(f'E-06-01 PGP暗号化ファイルの復号化に失敗しました　エラー内容：{e}') + logger.exception(f'E-06-01 PGP暗号化ファイルの復号化に失敗しました　エラー内容：{e}') raise DecryptException('E-06-01', EXTENSION_DECRYPT_ERROR, e) # ⑦ 各ファイルをS3に出力する @@ -127,7 +126,7 @@ def handler(event, context): decrypt_file.close logger.info('I-07-03 復号化ファイルをS3に出力しました') except Exception as e: - logger.error(f'E-07-01 復号化ファイルのS3出力に失敗しました　エラー内容：{e}') + logger.exception(f'E-07-01 復号化ファイルのS3出力に失敗しました　エラー内容：{e}') raise FileOutputException('E-07-01', EXTENSION_ERROR, e) # 「④」で読み込んだPGP暗号化ファイルを以下に移動（コピー削除）する @@ -143,7 +142,7 @@ def handler(event, context): s3_client.delete_object(Bucket=s3_event.bucket_name, Key=s3_event.file_path) logger.info('I-07-05 PGP暗号化ファイルをバックアップ用バケットに移動しました') except Exception as e: - logger.error(f'E-07-02 PGP暗号化ファイルのS3出力に失敗しました　エラー内容：{e}') + logger.exception(f'E-07-02 PGP暗号化ファイルのS3出力に失敗しました　エラー内容：{e}') raise FileOutputException('E-07-02', EXTENSION_ERROR, e) # 「⑥」で復号化したファイルをデータ取込用バケットに出力する try: @@ -158,22 +157,19 @@ def handler(event, context): import_file_obj.copy(copy_source) logger.info(f'I-07-07 復号化ファイルをS3に出力しました') except Exception as e: - logger.error(f'E-07-03 復号化ファイルのS3出力に失敗しました　エラー内容：{e}') + logger.exception(f'E-07-03 復号化ファイルのS3出力に失敗しました　エラー内容：{e}') raise FileOutputException('E-07-02', EXTENSION_ERROR, e) # ⑧ 処理終了ログを出力する logger.info('I-08-01 処理終了　SAPデータ復号処理') except EncryptFileReadException as e: - traceback.print_exc() create_status_file(s3_event, e.extension) error_notice(e.id, e.arg) except CustomException as e: - traceback.print_exc() create_status_file(s3_event, e.extension) move_encrypt_file(s3_event) error_notice(e.id, e.arg) except Exception as e: - logger.error(f'E-99 想定外のエラーが発生しました　エラー内容：{e}') - traceback.print_exc() + logger.exception(f'E-99 想定外のエラーが発生しました　エラー内容：{e}') create_status_file(s3_event, EXTENSION_ERROR) move_encrypt_file(s3_event) error_notice('E-99', e) @@ -189,8 +185,7 @@ def create_status_file(s3_event, extension) -> None: result_error_obj.put(Body='') logger.error(f'E-ERR-01 recvディレクトリにエラーファイルを作成しました　ファイル名：{result_error_file_name}　出力先：{s3_event.bucket_name}/{result_error_key}') except Exception as e: - logger.error(f'E-96 エラーステータスファイルの作成に失敗しました　エラー内容：{e}') - traceback.print_exc() + logger.exception(f'E-96 エラーステータスファイルの作成に失敗しました　エラー内容：{e}') return @@ -208,8 +203,7 @@ def move_encrypt_file(s3_event) -> None: s3_client.delete_object(Bucket=s3_event.bucket_name, Key=s3_event.file_path) logger.error(f'E-ERR-02 recv_errorディレクトリにファイルを移動しました　移動元：{s3_event.bucket_name}/{s3_event.file_path}　移動先：{s3_event.bucket_name}/{error_key}') except Exception as e: - logger.error(f'E-97 PGP暗号化ファイルの移動に失敗しました　エラー内容：{e}') - traceback.print_exc() + logger.exception(f'E-97 PGP暗号化ファイルの移動に失敗しました　エラー内容：{e}') return @@ -225,8 +219,7 @@ def error_notice(error_log_id, exception) -> None: sns_client.publish(**params) logger.error(f'E-ERR-03 処理異常通知の送信指示をしました　通知先トピック：{NDS_NOTICE_TOPIC}') except Exception as e: - logger.error(f'E-98 処理異常通知の送信指示に失敗しました　エラー内容：{e}') - traceback.print_exc() + logger.exception(f'E-98 処理異常通知の送信指示に失敗しました　エラー内容：{e}') return From c67ff6c3f6ece9f895809ce4172a566f4975a885 Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Thu, 23 Jun 2022 15:53:42 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat:SAP=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E5=8F=96=E8=BE=BC=E3=81=AE=E3=81=9F=E3=82=81=E5=80=8B=E5=88=A5?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=83=9E=E3=83=83=E3=83=94=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AE=E4=BD=9C=E6=88=90=E3=81=A8?= =?UTF-8?q?=E5=80=8B=E5=88=A5=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_fin/settings/CostReport.txt | 11 +++++++++++ s3/data/SAP_fin/settings/IOReport.txt | 11 +++++++++++ s3/data/SAP_fin/settings/Invoice.txt | 11 +++++++++++ s3/data/SAP_fin/settings/WBSList.txt | 11 +++++++++++ s3/data/SAP_fin/settings/WBSReport.txt | 11 +++++++++++ s3/data/SAP_fin/settings/configmap.config | 7 +++++++ s3/data/SAP_sup/settings/ConfReport.txt | 11 +++++++++++ s3/data/SAP_sup/settings/GMReport.txt | 11 +++++++++++ s3/data/SAP_sup/settings/GRReport.txt | 11 +++++++++++ s3/data/SAP_sup/settings/MLCReport.txt | 11 +++++++++++ s3/data/SAP_sup/settings/POReport.txt | 11 +++++++++++ s3/data/SAP_sup/settings/QAReport.txt | 11 +++++++++++ s3/data/SAP_sup/settings/StockList.txt | 12 ++++++++++++ s3/data/SAP_sup/settings/configmap.config | 9 +++++++++ 14 files changed, 149 insertions(+) create mode 100644 s3/data/SAP_fin/settings/CostReport.txt create mode 100644 s3/data/SAP_fin/settings/IOReport.txt create mode 100644 s3/data/SAP_fin/settings/Invoice.txt create mode 100644 s3/data/SAP_fin/settings/WBSList.txt create mode 100644 s3/data/SAP_fin/settings/WBSReport.txt create mode 100644 s3/data/SAP_fin/settings/configmap.config create mode 100644 s3/data/SAP_sup/settings/ConfReport.txt create mode 100644 s3/data/SAP_sup/settings/GMReport.txt create mode 100644 s3/data/SAP_sup/settings/GRReport.txt create mode 100644 s3/data/SAP_sup/settings/MLCReport.txt create mode 100644 s3/data/SAP_sup/settings/POReport.txt create mode 100644 s3/data/SAP_sup/settings/QAReport.txt create mode 100644 s3/data/SAP_sup/settings/StockList.txt create mode 100644 s3/data/SAP_sup/settings/configmap.config diff --git a/s3/data/SAP_fin/settings/CostReport.txt b/s3/data/SAP_fin/settings/CostReport.txt new file mode 100644 index 00000000..39657e4e --- /dev/null +++ b/s3/data/SAP_fin/settings/CostReport.txt @@ -0,0 +1,11 @@ +SAP_fin + +utf-8 +　 +LF +1 +18 +VT,Fiscal Year,Fiscal Period,Cost Center,Cost element,Cost element name,Vbl.value,Offsetting account,Offsetting account name,Name,Document header text,Posting date,Document date,Purchasing document,Document number,Posting row,Ref doc number,Rev +vt,fiscal_year,fiscal_period,cost_center,cost_element,cost_element_name,vbl_value,offsetting_account,offsetting_account_name,name,document_header_text,posting_date,document_date,purchasing_document,document_number,posting_row,ref_doc_number,rev +src03a.sapf_costreport +org03a.sapf_costreport diff --git a/s3/data/SAP_fin/settings/IOReport.txt b/s3/data/SAP_fin/settings/IOReport.txt new file mode 100644 index 00000000..903bc5f1 --- /dev/null +++ b/s3/data/SAP_fin/settings/IOReport.txt @@ -0,0 +1,11 @@ +SAP_fin + +utf-8 +　 +LF +1 +17 +Fiscal Year,Fiscal Period,Internal Order,Cost element,Cost element name,Vbl.value,Offsetting account,Offsetting account name,AuxAccAs1,Name,Document header text,Posting date,Document date,Purchasing document,Document number,Posting row,Ref doc number +fiscal_year,fiscal_period,internal_order,cost_element,cost_element_name,vbl_value,offsetting_account,offsetting_account_name,auxaccas1,name,document_header_text,posting_date,document_date,purchasing_document,document_number,posting_row,ref_doc_number +src03a.sapf_ioreport +org03a.sapf_ioreport diff --git a/s3/data/SAP_fin/settings/Invoice.txt b/s3/data/SAP_fin/settings/Invoice.txt new file mode 100644 index 00000000..cc0fa03b --- /dev/null +++ b/s3/data/SAP_fin/settings/Invoice.txt @@ -0,0 +1,11 @@ +SAP_fin + +utf-8 +　 +LF +1 +25 +Billing Type,Condition Type,Distribution channel,Invoiced number,Invoice item,Invoice date,Account number (Sold-to),Customer name,Ship-to,Ship-to(Name),Quantity invoiced,Extended amount (invoiced amount),Accrual value (rebate 1),Accrual % (rebate 1),Accrual value (rebate 2),Accrual % (rebate 2),Unit selling price,Item code,Item name,Tax,Order reason,Reference doc,Sales order No.,Rejected RSN,Batch number +billing_type,condition_type,distribution_channel,invoiced_number,invoice_item,invoice_date,account_number_sold_to,customer_name,ship_to,ship_to_name,quantity_invoiced,extended_amount_invoiced_amount,accrual_value_rebate_1,accrual_percent_rebate_1,accrual_value_rebate_2,accrual_percent_rebate_2,unit_selling_price,item_code,item_name,tax,order_reason,reference_doc,sales_order_no,rejected_rsn,batch_number +src03b.sapf_invoice +org03b.sapf_invoice diff --git a/s3/data/SAP_fin/settings/WBSList.txt b/s3/data/SAP_fin/settings/WBSList.txt new file mode 100644 index 00000000..72ec9b4b --- /dev/null +++ b/s3/data/SAP_fin/settings/WBSList.txt @@ -0,0 +1,11 @@ +SAP_fin + +utf-8 +　 +LF +1 +9 +WBS element,Level,Profit center,Project Definition,Description,Control area,Responsibility,Basic finish date,Basic start date +wbs_element,level,profit_center,project_definition,description,control_area,responsibility,basic_finish_date,basic_start_date +src03a.sapf_wbslist +org03a.sapf_wbslist \ No newline at end of file diff --git a/s3/data/SAP_fin/settings/WBSReport.txt b/s3/data/SAP_fin/settings/WBSReport.txt new file mode 100644 index 00000000..959ad4b7 --- /dev/null +++ b/s3/data/SAP_fin/settings/WBSReport.txt @@ -0,0 +1,11 @@ +SAP_fin + +utf-8 +　 +LF +1 +17 +Fiscal Year,Fiscal Period,WBS element,Cost element,Cost element name,Vbl.value,Offsetting account,Offsetting account name,AuxAccAs1,Name,Document header text,Posting date,Document date,Purchasing document,Document number,Posting row,Ref doc number +fiscal_year,fiscal_period,wbs_element,cost_element,cost_element_name,vbl_value,offsetting_account,offsetting_account_name,auxaccas1,name,document_header_text,posting_date,document_date,purchasing_document,document_number,posting_row,ref_doc_number +src03a.sapf_wbsreport +org03a.sapf_wbsreport diff --git a/s3/data/SAP_fin/settings/configmap.config b/s3/data/SAP_fin/settings/configmap.config new file mode 100644 index 00000000..77f4cdba --- /dev/null +++ b/s3/data/SAP_fin/settings/configmap.config @@ -0,0 +1,7 @@ +/* SAPデータ取込:Finance */ +CostReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) CostReport.txt +IOReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) IOReport.txt +WBSReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) WBSReport.txt +WBSList_{0-9}{8}_{0-9}{6}\.(TSV|tsv) WBSList.txt +Invoice_{0-9}{8}_{0-9}{6}\.(TSV|tsv) Invoice.txt + diff --git a/s3/data/SAP_sup/settings/ConfReport.txt b/s3/data/SAP_sup/settings/ConfReport.txt new file mode 100644 index 00000000..222b70ca --- /dev/null +++ b/s3/data/SAP_sup/settings/ConfReport.txt @@ -0,0 +1,11 @@ +SAP_sup + +utf-8 +　 +LF +1 +11 +Process Order,Operation / activity,Yield,UoM,Posting date,Finish execution date,Material,Material description,Confirmation,cofirm.counter,cancelled. conf +process_order,operation_activity,yield,uom,posting_date,finish_execution_date,material,material_description,confirmation,cofirm_counter,cancelled_conf +src04.saps_gmreport +org04.saps_gmreport diff --git a/s3/data/SAP_sup/settings/GMReport.txt b/s3/data/SAP_sup/settings/GMReport.txt new file mode 100644 index 00000000..56319751 --- /dev/null +++ b/s3/data/SAP_sup/settings/GMReport.txt @@ -0,0 +1,11 @@ +SAP_sup + +utf-8 +　 +LF +1 +12 +Process Order,Material document,Material document item,Material,Material description,Goods movement,Posting date,Movement type,D/C indicator,Storage location,Batch,Qty +process_order,material_document,material_document_item,material,material_description,goods_movement,posting_date,movement_type,d_c_indicator,storage_location,batch,qty +src04.saps_gmreport +org04.saps_gmreport diff --git a/s3/data/SAP_sup/settings/GRReport.txt b/s3/data/SAP_sup/settings/GRReport.txt new file mode 100644 index 00000000..b24d2754 --- /dev/null +++ b/s3/data/SAP_sup/settings/GRReport.txt @@ -0,0 +1,11 @@ +SAP_sup + +utf-8 +　 +LF +1 +24 +Plant,Material,Material Description,Batch,Posting Date,Qty in Un. of Entry,Movement Type,Unit of Entry,Entry Date,Material Doc. Year,Document Date,Total valuated stock before the posting,Base Unit of Measure,Quantity,Reference,Purchase Order,Customer,Amount,Amount in LC,Vendor,Item,Material Document,Storage Location,Movement Type Text +plant,material,material_description4,batch,posting_date,qty_in_un_of_entry,movement_type,unit_of_entry,entry_date,material_doc_year,document_date,total_valuated_stock_before_the_posting,base_unit_of_measure,quantity,reference,purchase_order,customer,amount,amount_in_lc,vendor,item,material_document,storage_location,movement_type_text +src04.saps_grreport +org04.saps_grreport diff --git a/s3/data/SAP_sup/settings/MLCReport.txt b/s3/data/SAP_sup/settings/MLCReport.txt new file mode 100644 index 00000000..6b71aa95 --- /dev/null +++ b/s3/data/SAP_sup/settings/MLCReport.txt @@ -0,0 +1,11 @@ +SAP_sup + +utf-8 +　 +LF +1 +24 +Plant,Material,Material Description,Batch,Posting Date,Qty in Un. of Entry,Movement Type,Unit of Entry,Entry Date,Material Doc. Year,Document Date,Total valuated stock before the posting,Base Unit of Measure,Quantity,Reference,Purchase Order,Customer,Amount,Amount in LC,Vendor,Item,Material Document,Storage Location,Movement Type Text +plant,material,material_description,batch,posting_date,qty_in_un_of_entry,movement_type,unit_of_entry,entry_date,material_doc_year,document_date,total_valuated_stock_before_the_posting,base_unit_of_measure,quantity,reference,purchase_order,customer,amount,amount_in_lc,vendor,item,material_document,storage_location,movement_type_text +src04.saps_mlcreport +org04.saps_mlcreport diff --git a/s3/data/SAP_sup/settings/POReport.txt b/s3/data/SAP_sup/settings/POReport.txt new file mode 100644 index 00000000..89275e42 --- /dev/null +++ b/s3/data/SAP_sup/settings/POReport.txt @@ -0,0 +1,11 @@ +SAP_sup + +utf-8 +　 +LF +1 +12 +Purchasing Document,Vendor,Item,Material,Short Text,Document Date,Order Quantity,Order Unit,Net Order Value,Currency,Order Price Unit,Deletion Flag +purchasing_document,vendor,item,material,short_text,document_date,order_quantity,order_unit,net_order_value,currency,order_price_unit,deletion_flag +src04.saps_poreport +org04.saps_poreport diff --git a/s3/data/SAP_sup/settings/QAReport.txt b/s3/data/SAP_sup/settings/QAReport.txt new file mode 100644 index 00000000..0b5d631b --- /dev/null +++ b/s3/data/SAP_sup/settings/QAReport.txt @@ -0,0 +1,11 @@ +SAP_sup + +utf-8 +　 +LF +1 +24 +Plant,Material,Material Description,Batch,Posting Date,Qty in Un. of Entry,Movement Type,Unit of Entry,Entry Date,Material Doc. Year,Document Date,Total valuated stock before the posting,Base Unit of Measure,Quantity,Reference,Purchase Order,Customer,Amount,Amount in LC,Vendor,Item,Material Document,Storage Location,Movement Type Text +plant,material,material_description,batch,posting_date,qty_in_un_of_entry,movement_type,unit_of_entry,entry_date,material_doc_year,document_date,total_valuated_stock_before_the_posting,base_unit_of_measure,quantity,reference,purchase_order,customer,amount,amount_in_lc,vendor,item,material_document,storage_location,movement_type_text +src04.saps_qareport +org04.saps_qareport diff --git a/s3/data/SAP_sup/settings/StockList.txt b/s3/data/SAP_sup/settings/StockList.txt new file mode 100644 index 00000000..db4816e5 --- /dev/null +++ b/s3/data/SAP_sup/settings/StockList.txt @@ -0,0 +1,12 @@ +SAP_sup + +utf-8 +　 +LF +1 +13 +SPL.stock Indic,Material Num.,Material Desc.,Storage Location,Batch Num.,Expired Date,Unrestricted Stock,In Quality Stock,Blocked Stock,Consign Stock,Total Stock Quantity,Sold to,Name +spl_stock_indic,material_num,material_desc,storage_location,batch_num,expired_date,unrestricted_stock,in_quality_stock,blocked_stock,consign_stock,total_stock_quantity,sold_to,name +src04.saps_stocklist +org04.saps_stocklist +StockList_ex.sql \ No newline at end of file diff --git a/s3/data/SAP_sup/settings/configmap.config b/s3/data/SAP_sup/settings/configmap.config new file mode 100644 index 00000000..a4216eb9 --- /dev/null +++ b/s3/data/SAP_sup/settings/configmap.config @@ -0,0 +1,9 @@ +/* SAPデータ取込:SupplyChain */ +GRReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) GRReport.txt +QAReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) QAReport.txt +MLCReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) MLCReport.txt +MLCReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) MLCReport.txt +POReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) POReport.txt +StockList_{0-9}{8}_{0-9}{6}\.(TSV|tsv) StockList.txt +ConfReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) ConfReport.txt +GMReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) GMReport.txt \ No newline at end of file From 82dcb67d61e28b25a2601abc0cca1b2cff86996a Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Fri, 24 Jun 2022 14:54:41 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E9=A0=85=E7=9B=AE=E5=8C=BA=E5=88=87?= =?UTF-8?q?=E3=82=8A=E6=96=87=E5=AD=97=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E3=82=BF=E3=83=96=E6=96=87=E5=AD=97=E3=81=8B=E3=82=89\t?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_fin/settings/CostReport.txt | 2 +- s3/data/SAP_fin/settings/IOReport.txt | 2 +- s3/data/SAP_fin/settings/Invoice.txt | 2 +- s3/data/SAP_fin/settings/WBSList.txt | 2 +- s3/data/SAP_fin/settings/WBSReport.txt | 2 +- s3/data/SAP_sup/settings/ConfReport.txt | 2 +- s3/data/SAP_sup/settings/GMReport.txt | 2 +- s3/data/SAP_sup/settings/GRReport.txt | 2 +- s3/data/SAP_sup/settings/MLCReport.txt | 2 +- s3/data/SAP_sup/settings/POReport.txt | 2 +- s3/data/SAP_sup/settings/QAReport.txt | 2 +- s3/data/SAP_sup/settings/StockList.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/s3/data/SAP_fin/settings/CostReport.txt b/s3/data/SAP_fin/settings/CostReport.txt index 39657e4e..c84e21d5 100644 --- a/s3/data/SAP_fin/settings/CostReport.txt +++ b/s3/data/SAP_fin/settings/CostReport.txt @@ -1,5 +1,5 @@ SAP_fin - +\t utf-8 　 LF diff --git a/s3/data/SAP_fin/settings/IOReport.txt b/s3/data/SAP_fin/settings/IOReport.txt index 903bc5f1..3024832e 100644 --- a/s3/data/SAP_fin/settings/IOReport.txt +++ b/s3/data/SAP_fin/settings/IOReport.txt @@ -1,5 +1,5 @@ SAP_fin - +\t utf-8 　 LF diff --git a/s3/data/SAP_fin/settings/Invoice.txt b/s3/data/SAP_fin/settings/Invoice.txt index cc0fa03b..e9fab9b9 100644 --- a/s3/data/SAP_fin/settings/Invoice.txt +++ b/s3/data/SAP_fin/settings/Invoice.txt @@ -1,5 +1,5 @@ SAP_fin - +\t utf-8 　 LF diff --git a/s3/data/SAP_fin/settings/WBSList.txt b/s3/data/SAP_fin/settings/WBSList.txt index 72ec9b4b..e551215c 100644 --- a/s3/data/SAP_fin/settings/WBSList.txt +++ b/s3/data/SAP_fin/settings/WBSList.txt @@ -1,5 +1,5 @@ SAP_fin - +\t utf-8 　 LF diff --git a/s3/data/SAP_fin/settings/WBSReport.txt b/s3/data/SAP_fin/settings/WBSReport.txt index 959ad4b7..7f3f5659 100644 --- a/s3/data/SAP_fin/settings/WBSReport.txt +++ b/s3/data/SAP_fin/settings/WBSReport.txt @@ -1,5 +1,5 @@ SAP_fin - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/ConfReport.txt b/s3/data/SAP_sup/settings/ConfReport.txt index 222b70ca..fe66e804 100644 --- a/s3/data/SAP_sup/settings/ConfReport.txt +++ b/s3/data/SAP_sup/settings/ConfReport.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/GMReport.txt b/s3/data/SAP_sup/settings/GMReport.txt index 56319751..9dc26ca5 100644 --- a/s3/data/SAP_sup/settings/GMReport.txt +++ b/s3/data/SAP_sup/settings/GMReport.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/GRReport.txt b/s3/data/SAP_sup/settings/GRReport.txt index b24d2754..7a7f7543 100644 --- a/s3/data/SAP_sup/settings/GRReport.txt +++ b/s3/data/SAP_sup/settings/GRReport.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/MLCReport.txt b/s3/data/SAP_sup/settings/MLCReport.txt index 6b71aa95..64b54b21 100644 --- a/s3/data/SAP_sup/settings/MLCReport.txt +++ b/s3/data/SAP_sup/settings/MLCReport.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/POReport.txt b/s3/data/SAP_sup/settings/POReport.txt index 89275e42..17fe0c86 100644 --- a/s3/data/SAP_sup/settings/POReport.txt +++ b/s3/data/SAP_sup/settings/POReport.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/QAReport.txt b/s3/data/SAP_sup/settings/QAReport.txt index 0b5d631b..8df02796 100644 --- a/s3/data/SAP_sup/settings/QAReport.txt +++ b/s3/data/SAP_sup/settings/QAReport.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF diff --git a/s3/data/SAP_sup/settings/StockList.txt b/s3/data/SAP_sup/settings/StockList.txt index db4816e5..2734c78b 100644 --- a/s3/data/SAP_sup/settings/StockList.txt +++ b/s3/data/SAP_sup/settings/StockList.txt @@ -1,5 +1,5 @@ SAP_sup - +\t utf-8 　 LF From b227542e087e6a1422f6e9e13203f869ce29af1b Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Mon, 27 Jun 2022 09:55:48 +0900 Subject: [PATCH 06/11] =?UTF-8?q?feat:=E5=9B=B2=E3=81=84=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=81=8C=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF=E5=8D=8A?= =?UTF-8?q?=E8=A7=92=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9=E3=82=92=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_fin/settings/CostReport.txt | 2 +- s3/data/SAP_fin/settings/IOReport.txt | 2 +- s3/data/SAP_fin/settings/Invoice.txt | 2 +- s3/data/SAP_fin/settings/WBSList.txt | 2 +- s3/data/SAP_fin/settings/WBSReport.txt | 2 +- s3/data/SAP_sup/settings/ConfReport.txt | 2 +- s3/data/SAP_sup/settings/GMReport.txt | 4 ++-- s3/data/SAP_sup/settings/GRReport.txt | 2 +- s3/data/SAP_sup/settings/MLCReport.txt | 2 +- s3/data/SAP_sup/settings/POReport.txt | 2 +- s3/data/SAP_sup/settings/QAReport.txt | 2 +- s3/data/SAP_sup/settings/StockList.txt | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/s3/data/SAP_fin/settings/CostReport.txt b/s3/data/SAP_fin/settings/CostReport.txt index c84e21d5..84a193c7 100644 --- a/s3/data/SAP_fin/settings/CostReport.txt +++ b/s3/data/SAP_fin/settings/CostReport.txt @@ -1,7 +1,7 @@ SAP_fin \t utf-8 -　 + LF 1 18 diff --git a/s3/data/SAP_fin/settings/IOReport.txt b/s3/data/SAP_fin/settings/IOReport.txt index 3024832e..918fa363 100644 --- a/s3/data/SAP_fin/settings/IOReport.txt +++ b/s3/data/SAP_fin/settings/IOReport.txt @@ -1,7 +1,7 @@ SAP_fin \t utf-8 -　 + LF 1 17 diff --git a/s3/data/SAP_fin/settings/Invoice.txt b/s3/data/SAP_fin/settings/Invoice.txt index e9fab9b9..9ab7151b 100644 --- a/s3/data/SAP_fin/settings/Invoice.txt +++ b/s3/data/SAP_fin/settings/Invoice.txt @@ -1,7 +1,7 @@ SAP_fin \t utf-8 -　 + LF 1 25 diff --git a/s3/data/SAP_fin/settings/WBSList.txt b/s3/data/SAP_fin/settings/WBSList.txt index e551215c..7007a6f0 100644 --- a/s3/data/SAP_fin/settings/WBSList.txt +++ b/s3/data/SAP_fin/settings/WBSList.txt @@ -1,7 +1,7 @@ SAP_fin \t utf-8 -　 + LF 1 9 diff --git a/s3/data/SAP_fin/settings/WBSReport.txt b/s3/data/SAP_fin/settings/WBSReport.txt index 7f3f5659..9deb0396 100644 --- a/s3/data/SAP_fin/settings/WBSReport.txt +++ b/s3/data/SAP_fin/settings/WBSReport.txt @@ -1,7 +1,7 @@ SAP_fin \t utf-8 -　 + LF 1 17 diff --git a/s3/data/SAP_sup/settings/ConfReport.txt b/s3/data/SAP_sup/settings/ConfReport.txt index fe66e804..9740030b 100644 --- a/s3/data/SAP_sup/settings/ConfReport.txt +++ b/s3/data/SAP_sup/settings/ConfReport.txt @@ -1,7 +1,7 @@ SAP_sup \t utf-8 -　 + LF 1 11 diff --git a/s3/data/SAP_sup/settings/GMReport.txt b/s3/data/SAP_sup/settings/GMReport.txt index 9dc26ca5..2181d12c 100644 --- a/s3/data/SAP_sup/settings/GMReport.txt +++ b/s3/data/SAP_sup/settings/GMReport.txt @@ -1,11 +1,11 @@ SAP_sup \t utf-8 -　 + LF 1 12 Process Order,Material document,Material document item,Material,Material description,Goods movement,Posting date,Movement type,D/C indicator,Storage location,Batch,Qty process_order,material_document,material_document_item,material,material_description,goods_movement,posting_date,movement_type,d_c_indicator,storage_location,batch,qty src04.saps_gmreport -org04.saps_gmreport +org04.saps_gmreport \ No newline at end of file diff --git a/s3/data/SAP_sup/settings/GRReport.txt b/s3/data/SAP_sup/settings/GRReport.txt index 7a7f7543..cdef2b9b 100644 --- a/s3/data/SAP_sup/settings/GRReport.txt +++ b/s3/data/SAP_sup/settings/GRReport.txt @@ -1,7 +1,7 @@ SAP_sup \t utf-8 -　 + LF 1 24 diff --git a/s3/data/SAP_sup/settings/MLCReport.txt b/s3/data/SAP_sup/settings/MLCReport.txt index 64b54b21..3cf6e804 100644 --- a/s3/data/SAP_sup/settings/MLCReport.txt +++ b/s3/data/SAP_sup/settings/MLCReport.txt @@ -1,7 +1,7 @@ SAP_sup \t utf-8 -　 + LF 1 24 diff --git a/s3/data/SAP_sup/settings/POReport.txt b/s3/data/SAP_sup/settings/POReport.txt index 17fe0c86..a129c45f 100644 --- a/s3/data/SAP_sup/settings/POReport.txt +++ b/s3/data/SAP_sup/settings/POReport.txt @@ -1,7 +1,7 @@ SAP_sup \t utf-8 -　 + LF 1 12 diff --git a/s3/data/SAP_sup/settings/QAReport.txt b/s3/data/SAP_sup/settings/QAReport.txt index 8df02796..2a41116a 100644 --- a/s3/data/SAP_sup/settings/QAReport.txt +++ b/s3/data/SAP_sup/settings/QAReport.txt @@ -1,7 +1,7 @@ SAP_sup \t utf-8 -　 + LF 1 24 diff --git a/s3/data/SAP_sup/settings/StockList.txt b/s3/data/SAP_sup/settings/StockList.txt index 2734c78b..6e96f9cf 100644 --- a/s3/data/SAP_sup/settings/StockList.txt +++ b/s3/data/SAP_sup/settings/StockList.txt @@ -1,7 +1,7 @@ SAP_sup \t utf-8 -　 + LF 1 13 From fb7cf53b65d9d77b2d1eb10cf5e84e4049e4c48b Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Tue, 28 Jun 2022 10:41:10 +0900 Subject: [PATCH 07/11] =?UTF-8?q?feat:SAP=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E5=8F=96=E8=BE=BC=E3=81=AE=E3=81=9F=E3=82=81=E3=80=81Stocklist?= =?UTF-8?q?=E3=81=AE=E6=8B=A1=E5=BC=B5SQL=E3=82=92=E4=BD=9C=E6=88=90?= =?UTF-8?q?=E3=81=97=E3=80=81=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E6=8C=87?= =?UTF-8?q?=E6=91=98=E5=AF=BE=E5=BF=9C=E3=82=92=E8=A1=8C=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_sup/settings/StockList_ex.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 s3/data/SAP_sup/settings/StockList_ex.sql diff --git a/s3/data/SAP_sup/settings/StockList_ex.sql b/s3/data/SAP_sup/settings/StockList_ex.sql new file mode 100644 index 00000000..92816fc8 --- /dev/null +++ b/s3/data/SAP_sup/settings/StockList_ex.sql @@ -0,0 +1,4 @@ +/* 蓄積スキーマ */ +/* execute_dateがnullのレコードを抽出し、取込ファイル名のyyyymmdd部分を切り出しセットする */ +update src04.saps_stocklist set +execute_date = REGEXP_SUBSTR(file_name,'[0-9]{8}') where execute_date is null; \ No newline at end of file From 2f41bfd49b7d5b4e0060d58de8aeefd7bb3896a2 Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Tue, 28 Jun 2022 15:23:54 +0900 Subject: [PATCH 08/11] =?UTF-8?q?feat:=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85=E3=82=92=E6=8B=A1=E5=BC=B5?= =?UTF-8?q?SQL=E3=81=AB=E5=8F=8D=E6=98=A0=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_sup/settings/StockList_ex.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/s3/data/SAP_sup/settings/StockList_ex.sql b/s3/data/SAP_sup/settings/StockList_ex.sql index 92816fc8..d3f3d10c 100644 --- a/s3/data/SAP_sup/settings/StockList_ex.sql +++ b/s3/data/SAP_sup/settings/StockList_ex.sql @@ -1,4 +1,7 @@ /* 蓄積スキーマ */ /* execute_dateがnullのレコードを抽出し、取込ファイル名のyyyymmdd部分を切り出しセットする */ -update src04.saps_stocklist set -execute_date = REGEXP_SUBSTR(file_name,'[0-9]{8}') where execute_date is null; \ No newline at end of file +update src04.saps_stocklist +set + execute_date = STR_TO_DATE(SUBSTRING(file_name,11,8),'%Y%m%d') +where + execute_date is null \ No newline at end of file From fb50e497b2dfca7caa2ec181d31218ed3372c199 Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Thu, 30 Jun 2022 16:49:53 +0900 Subject: [PATCH 09/11] =?UTF-8?q?fix:=E5=80=8B=E5=88=A5=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=94=E3=83=B3=E3=82=B0=E3=83=AA=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=81=AE=E6=AD=A3=E8=A6=8F=E8=A1=A8=E7=8F=BE=E3=81=AE?= =?UTF-8?q?=E8=AA=A4=E3=82=8A=E3=81=8C=E3=81=82=E3=82=8A=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_fin/settings/configmap.config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/s3/data/SAP_fin/settings/configmap.config b/s3/data/SAP_fin/settings/configmap.config index 77f4cdba..5d466ebb 100644 --- a/s3/data/SAP_fin/settings/configmap.config +++ b/s3/data/SAP_fin/settings/configmap.config @@ -1,7 +1,7 @@ /* SAPデータ取込:Finance */ -CostReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) CostReport.txt -IOReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) IOReport.txt -WBSReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) WBSReport.txt -WBSList_{0-9}{8}_{0-9}{6}\.(TSV|tsv) WBSList.txt -Invoice_{0-9}{8}_{0-9}{6}\.(TSV|tsv) Invoice.txt +CostReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) CostReport.txt +IOReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) IOReport.txt +WBSReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) WBSReport.txt +WBSList_[0-9]{8}_[0-9]{6}\.(TSV|tsv) WBSList.txt +Invoice_[0-9]{8}_[0-9]{6}\.(TSV|tsv) Invoice.txt From 22955d8dc5aba54a55386d85a64c25629f736eea Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Thu, 30 Jun 2022 17:04:36 +0900 Subject: [PATCH 10/11] =?UTF-8?q?fix:=E5=80=8B=E5=88=A5=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=A7=E5=8C=BA=E5=88=87?= =?UTF-8?q?=E3=82=8A=E6=96=87=E5=AD=97=E3=81=AB=E3=80=8C\t=E3=80=8D?= =?UTF-8?q?=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=A6=E3=82=82=E3=80=81?= =?UTF-8?q?=E3=82=BF=E3=83=96=E5=8C=BA=E5=88=87=E3=82=8A=E3=81=AE=E6=96=87?= =?UTF-8?q?=E5=AD=97=E3=82=92=E5=88=86=E5=89=B2=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=82=81=E3=82=BF=E3=83=96=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_fin/settings/CostReport.txt | 2 +- s3/data/SAP_fin/settings/IOReport.txt | 2 +- s3/data/SAP_fin/settings/Invoice.txt | 2 +- s3/data/SAP_fin/settings/WBSList.txt | 2 +- s3/data/SAP_fin/settings/WBSReport.txt | 2 +- s3/data/SAP_sup/settings/ConfReport.txt | 2 +- s3/data/SAP_sup/settings/GMReport.txt | 2 +- s3/data/SAP_sup/settings/GRReport.txt | 2 +- s3/data/SAP_sup/settings/MLCReport.txt | 2 +- s3/data/SAP_sup/settings/POReport.txt | 2 +- s3/data/SAP_sup/settings/QAReport.txt | 2 +- s3/data/SAP_sup/settings/StockList.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/s3/data/SAP_fin/settings/CostReport.txt b/s3/data/SAP_fin/settings/CostReport.txt index 84a193c7..28877767 100644 --- a/s3/data/SAP_fin/settings/CostReport.txt +++ b/s3/data/SAP_fin/settings/CostReport.txt @@ -1,5 +1,5 @@ SAP_fin -\t + utf-8 LF diff --git a/s3/data/SAP_fin/settings/IOReport.txt b/s3/data/SAP_fin/settings/IOReport.txt index 918fa363..8c09e651 100644 --- a/s3/data/SAP_fin/settings/IOReport.txt +++ b/s3/data/SAP_fin/settings/IOReport.txt @@ -1,5 +1,5 @@ SAP_fin -\t + utf-8 LF diff --git a/s3/data/SAP_fin/settings/Invoice.txt b/s3/data/SAP_fin/settings/Invoice.txt index 9ab7151b..13430d0d 100644 --- a/s3/data/SAP_fin/settings/Invoice.txt +++ b/s3/data/SAP_fin/settings/Invoice.txt @@ -1,5 +1,5 @@ SAP_fin -\t + utf-8 LF diff --git a/s3/data/SAP_fin/settings/WBSList.txt b/s3/data/SAP_fin/settings/WBSList.txt index 7007a6f0..9247ca7f 100644 --- a/s3/data/SAP_fin/settings/WBSList.txt +++ b/s3/data/SAP_fin/settings/WBSList.txt @@ -1,5 +1,5 @@ SAP_fin -\t + utf-8 LF diff --git a/s3/data/SAP_fin/settings/WBSReport.txt b/s3/data/SAP_fin/settings/WBSReport.txt index 9deb0396..000959c5 100644 --- a/s3/data/SAP_fin/settings/WBSReport.txt +++ b/s3/data/SAP_fin/settings/WBSReport.txt @@ -1,5 +1,5 @@ SAP_fin -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/ConfReport.txt b/s3/data/SAP_sup/settings/ConfReport.txt index 9740030b..af59684d 100644 --- a/s3/data/SAP_sup/settings/ConfReport.txt +++ b/s3/data/SAP_sup/settings/ConfReport.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/GMReport.txt b/s3/data/SAP_sup/settings/GMReport.txt index 2181d12c..fe4fec3d 100644 --- a/s3/data/SAP_sup/settings/GMReport.txt +++ b/s3/data/SAP_sup/settings/GMReport.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/GRReport.txt b/s3/data/SAP_sup/settings/GRReport.txt index cdef2b9b..5b9de358 100644 --- a/s3/data/SAP_sup/settings/GRReport.txt +++ b/s3/data/SAP_sup/settings/GRReport.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/MLCReport.txt b/s3/data/SAP_sup/settings/MLCReport.txt index 3cf6e804..0f67ad56 100644 --- a/s3/data/SAP_sup/settings/MLCReport.txt +++ b/s3/data/SAP_sup/settings/MLCReport.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/POReport.txt b/s3/data/SAP_sup/settings/POReport.txt index a129c45f..f6c0ca59 100644 --- a/s3/data/SAP_sup/settings/POReport.txt +++ b/s3/data/SAP_sup/settings/POReport.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/QAReport.txt b/s3/data/SAP_sup/settings/QAReport.txt index 2a41116a..794a23a0 100644 --- a/s3/data/SAP_sup/settings/QAReport.txt +++ b/s3/data/SAP_sup/settings/QAReport.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF diff --git a/s3/data/SAP_sup/settings/StockList.txt b/s3/data/SAP_sup/settings/StockList.txt index 6e96f9cf..338898d8 100644 --- a/s3/data/SAP_sup/settings/StockList.txt +++ b/s3/data/SAP_sup/settings/StockList.txt @@ -1,5 +1,5 @@ SAP_sup -\t + utf-8 LF From edc5637060e03f71a1853d5ac05adcb59e194302 Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Fri, 1 Jul 2022 09:28:29 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix:SupplyChain=E3=81=AE=E5=80=8B?= =?UTF-8?q?=E5=88=A5=E8=A8=AD=E5=AE=9A=E3=83=9E=E3=83=83=E3=83=94=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AE=E6=AD=A3=E8=A6=8F?= =?UTF-8?q?=E8=A1=A8=E7=8F=BE=E3=81=AE=E8=AA=A4=E3=82=8A=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8A=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/SAP_sup/settings/configmap.config | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/s3/data/SAP_sup/settings/configmap.config b/s3/data/SAP_sup/settings/configmap.config index a4216eb9..857e4047 100644 --- a/s3/data/SAP_sup/settings/configmap.config +++ b/s3/data/SAP_sup/settings/configmap.config @@ -1,9 +1,9 @@ /* SAPデータ取込:SupplyChain */ -GRReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) GRReport.txt -QAReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) QAReport.txt -MLCReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) MLCReport.txt -MLCReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) MLCReport.txt -POReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) POReport.txt -StockList_{0-9}{8}_{0-9}{6}\.(TSV|tsv) StockList.txt -ConfReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) ConfReport.txt -GMReport_{0-9}{8}_{0-9}{6}\.(TSV|tsv) GMReport.txt \ No newline at end of file +GRReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) GRReport.txt +QAReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) QAReport.txt +MLCReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) MLCReport.txt +MLCReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) MLCReport.txt +POReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) POReport.txt +StockList_[0-9]{8}_[0-9]{6}\.(TSV|tsv) StockList.txt +ConfReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) ConfReport.txt +GMReport_[0-9]{8}_[0-9]{6}\.(TSV|tsv) GMReport.txt \ No newline at end of file