From f85274942c1479cf94ab1435dd950e39a388fa7b Mon Sep 17 00:00:00 2001 From: "x.azuma.m@nds-tyo.co.jp" Date: Fri, 29 Sep 2023 09:57:09 +0900 Subject: [PATCH 1/4] =?UTF-8?q?V=E6=96=BD=E8=A8=AD=E3=83=9E=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=81=AEins=5Fdt,=20upd=5Fdt=E3=81=AFdatetime?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8Fvarchar=E3=81=AA=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E3=80=81nullif=E3=82=92=E3=81=AF=E3=81=8C=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/vjsk/vjsk_recv_file_mapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py index 905691a2..a3377b40 100644 --- a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py @@ -743,8 +743,8 @@ class VjskReceiveFileMapper: ,medaca_common.convert_empty_to_null(t.admin_kbn) ,medaca_common.convert_empty_to_null(t.fcl_type) ,t.rec_sts_kbn - ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する + ,medaca_common.convert_empty_to_null(t.ins_dt) -- (留意)fcm_mst_vではvarchar型 + ,medaca_common.convert_empty_to_null(t.upd_dt) -- (留意)fcm_mst_vではvarchar型 ,SYSDATE() FROM org05.fcl_mst_v AS t ON DUPLICATE KEY UPDATE From cb9c19d58d20ea46ebadaf2db26a8a7d81fddf42 Mon Sep 17 00:00:00 2001 From: "x.azuma.m@nds-tyo.co.jp" Date: Fri, 29 Sep 2023 11:49:11 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fcl=5Fmst=5Fv.ins=5Fdt=E3=80=81fcl=5Fmst=5F?= =?UTF-8?q?v.upd=5Fdt=E3=80=81=E3=81=AB=E5=80=A4=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8B=E3=83=90=E3=83=AA=E3=82=A8=E3=83=BC=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E3=83=86=E3=82=B9=E3=83=88=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/batch/vjsk/vjsk_load/test_vjsk_load.py | 4 ++-- .../batch/vjsk/vjsk_load/testdata/fcl_mst_202304280000.tsv | 2 +- ecs/jskult-batch-daily/tests/testing_vjsk_utility.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py index d40550ce..cdb77970 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py @@ -564,7 +564,7 @@ class TestImportFileToDb: # 突合から除外する項目 ignore_columns = ['dwh_upd_dt'] # 日付型に変換して比較する項目 - force_cast_to_str_columns = ['closed_dt'] + force_cast_to_str_columns = ['closed_dt', 'ins_dt', 'upd_dt'] # orgテーブル結果が期待値通りかを突合 assert_table_results(result_org, assert_list, ignore_columns, force_cast_to_str_columns, is_loaddata=True) # srcテーブル結果を取得 @@ -572,7 +572,7 @@ class TestImportFileToDb: # 突合から除外する項目 ignore_columns = ['dwh_upd_dt'] # 日付型に変換して比較する項目 - force_cast_to_str_columns = ['closed_dt'] + force_cast_to_str_columns = ['closed_dt', 'ins_dt', 'upd_dt'] # srcテーブル結果が期待値通りかを突合 assert_table_results(result_src, assert_list, ignore_columns, force_cast_to_str_columns) diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/fcl_mst_202304280000.tsv b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/fcl_mst_202304280000.tsv index 705bfe65..0d97de4d 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/fcl_mst_202304280000.tsv +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/fcl_mst_202304280000.tsv @@ -1,5 +1,5 @@ "fcl_cd" "sub_no" "start_dt" "end_dt" "closed_dt" "nm" "kn_nm" "sht_nm" "sht_kn_nm" "mkr_cd" "jsk_proc_kbn" "fmt_addr" "fmt_kn_addr" "post_cd" "prft_cd" "prft_nm" "city_nm" "addr_line_1" "tel_no" "admin_kbn" "fcl_type" "rec_sts_kbn" "ins_dt" "upd_dt" -"670229430760653825" "0" "20000101" "99991231" "" "駅前町歯科診療所" "ｴｷﾏｴﾁｮｳｼｶｼﾝﾘｮｳｼﾞｮ" "駅前町歯科診療所" "ｴｷﾏｴﾁｮｳｼｶｼﾝﾘｮｳｼﾞｮ" "" "0" "700-0023 岡山県岡山市北区駅前町１−６−２０" "ｵｶﾔﾏｹﾝ ｵｶﾔﾏｼｷﾀｸ ｴｷﾏｴﾁｮｳ1-6-20" "700-0023" "33" "岡山県" "岡山市北区" "駅前町１−６−２０" "0862236468" "33101" "30" "1" "" "" +"670229430760653825" "0" "20000101" "99991231" "" "駅前町歯科診療所" "ｴｷﾏｴﾁｮｳｼｶｼﾝﾘｮｳｼﾞｮ" "駅前町歯科診療所" "ｴｷﾏｴﾁｮｳｼｶｼﾝﾘｮｳｼﾞｮ" "" "0" "700-0023 岡山県岡山市北区駅前町１−６−２０" "ｵｶﾔﾏｹﾝ ｵｶﾔﾏｼｷﾀｸ ｴｷﾏｴﾁｮｳ1-6-20" "700-0023" "33" "岡山県" "岡山市北区" "駅前町１−６−２０" "0862236468" "33101" "30" "1" "2023-09-29 09:43:55" "2023-09-29 09:48:44" "670229435466662922" "0" "20000101" "99991231" "" "医療法人社団仁卓会　ほりかわ歯科クリニック" "ｲﾘｮｳﾎｳｼﾞﾝｼｬﾀﾞﾝｼﾞﾝﾀｸｶｲ ﾎﾘｶﾜｼｶｸﾘﾆｯｸ" "ほりかわ歯科クリニック　（医社）" "ﾎﾘｶﾜｼｶｸﾘﾆｯｸ (ｲｼｬ)" "" "0" "675-0101 兵庫県加古川市平岡町新在家１５７３−１−４Ｆ" "ﾋｮｳｺﾞｹﾝ ｶｺｶﾞﾜｼ ﾋﾗｵｶﾁｮｳｼﾝｻﾞｲｹ1573-1-4F" "675-0101" "28" "兵庫県" "加古川市" "平岡町新在家１５７３−１−４Ｆ" "0794244617" "28210" "30" "1" "" "" "670229435785430019" "0" "20000101" "99991231" "" "株式会社コミュニティメディカル　なつめ薬局　千歳船橋店" "ｶﾌﾞｼｷｶﾞｲｼｬｺﾐｭﾆﾃｨﾒﾃﾞｨｶﾙ ﾅﾂﾒﾔｯｷｮｸ ﾁﾄｾﾌﾅﾊﾞｼﾃﾝ" "なつめ薬局　千歳船橋店　（株）" "ﾅﾂﾒﾔｯｷｮｸ ﾁﾄｾﾌﾅﾊﾞｼﾃﾝ (ｶ)" "" "0" "156-0054 東京都世田谷区桜丘２−２４−２" "ﾄｳｷｮｳﾄ ｾﾀｶﾞﾔｸ ｻｸﾗｶﾞｵｶ2-24-2" "156-0054" "13" "東京都" "世田谷区" "桜丘２−２４−２" "0364136189" "13112" "20" "1" "" "" "670229447437206529" "0" "20000101" "20230407" "2023-04-07" "ヒカリ薬局" "ﾋｶﾘﾔｯｷｮｸ" "ヒカリ薬局" "ﾋｶﾘﾔｯｷｮｸ" "" "0" "670-0955 兵庫県姫路市安田４−４７−８−１Ｆ" "ﾋｮｳｺﾞｹﾝ ﾋﾒｼﾞｼ ﾔｽﾀﾞ4-47-8-1F" "670-0955" "28" "兵庫県" "姫路市" "安田４−４７−８−１Ｆ" "0792846396" "28201" "20" "1" "" "" diff --git a/ecs/jskult-batch-daily/tests/testing_vjsk_utility.py b/ecs/jskult-batch-daily/tests/testing_vjsk_utility.py index c93ba52d..dbbeb1c2 100644 --- a/ecs/jskult-batch-daily/tests/testing_vjsk_utility.py +++ b/ecs/jskult-batch-daily/tests/testing_vjsk_utility.py @@ -93,6 +93,8 @@ def assert_table_results(actual_rows: list[dict], expect_rows: list[dict], ignor # DB項目(varchar)に日付型としてキャスト可能な値が期待値である場合、force_cast_to_str_columnsに基づいて強制的に文字列キャストする if type(expect_value).__name__ == 'date': expect_value = expect_value.strftime('%Y-%m-%d') + elif type(expect_value).__name__ == 'datetime': + expect_value = expect_value.strftime('%Y-%m-%d %H:%M:%S') elif not is_loaddata and expect_value == "": expect_value = None elif isinstance(actual_value, (int)): From c5ecf3b3204883f9f004ade287187c7f97e8fcca Mon Sep 17 00:00:00 2001 From: "x.azuma.m@nds-tyo.co.jp" Date: Fri, 29 Sep 2023 13:14:31 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Asert=E3=81=99=E3=82=8B=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=81=AE=E4=B8=A6=E3=81=B3=E9=A0=86=E3=81=8C=E3=81=9A?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E6=AD=A3=E3=81=97=E3=81=8F=E5=8B=95=E4=BD=9C?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E3=80=81=E4=B8=A6?= =?UTF-8?q?=E3=81=B3=E9=A0=86=E3=82=92=E5=9B=BA=E5=AE=9A=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/batch/vjsk/vjsk_load/test_vjsk_load.py | 4 ++-- .../vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv | 4 ++-- .../vjsk/vjsk_load/testdata/whs_customer_mst_202304290000.tsv | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py index cdb77970..de7ddcb3 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py @@ -895,7 +895,7 @@ class TestImportFileToDb: # orgテーブル結果が期待値通りかを突合 assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True) # srcテーブル結果を取得 - result_src = self.db.execute_select(f"select * from {table_name_src}") + result_src = self.db.execute_select(f"select * from {table_name_src} order by customer_cd") # 突合から除外する項目 ignore_columns = ['dwh_upd_dt'] # srcテーブル結果が期待値通りかを突合 @@ -1085,7 +1085,7 @@ class TestImportFileToDb: # orgテーブル結果が期待値通りかを突合 assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True) # srcテーブル結果を取得 - result_src = self.db.execute_select(f"select * from {table_name_src}") + result_src = self.db.execute_select(f"select * from {table_name_src} order by ser_num, lot_num") # 突合から除外する項目 ignore_columns = ['dwh_upd_dt'] # srcテーブル結果が期待値通りかを突合 diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv index bdcbd308..da441c96 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv @@ -1,5 +1,5 @@ "ser_no" "lot_num" "expr_dt" "frst_mov_dt" "ins_dt" "ins_usr" -"F0110602" "BAVA001" "20231031" "20210719" "23-05-08 20:40:41" "batch" -"F0110602" "BAVA002" "20231031" "20210823" "23-05-08 20:40:41" "" "F0110601" "BAVA005" "20231031" "20210927" "23-05-08 20:40:41" "batch" "F0110601" "BAVA006" "20240131" "20211025" "23-05-08 20:40:41" "batch" +"F0110602" "BAVA001" "20231031" "20210719" "23-05-08 20:40:41" "batch" +"F0110602" "BAVA002" "20231031" "20210823" "23-05-08 20:40:41" "" diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/whs_customer_mst_202304290000.tsv b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/whs_customer_mst_202304290000.tsv index 3b15a520..e31cf296 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/whs_customer_mst_202304290000.tsv +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/whs_customer_mst_202304290000.tsv @@ -1,5 +1,5 @@ "whs_cd" "whs_sub_cd" "customer_cd" "sub_no" "start_dt" "end_dt" "org_cd" "src_org_cd" "nm" "kn_nm" "addr" "kn_addr" "zip_cd" "tel_no" "rec_sts_kbn" "ins_dt" "upd_dt" -"006" "01" "1009200000" "0" "20000101" "99991231" "11" "1121A2224212" "山口医院２　　　　　　　　　　　　　　　　　　" "ﾔﾏｸﾞﾁｲｲﾝ" "長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14" "8570011" "0956228610" "0" "23-04-14 11:53:14" "23-04-14 11:53:14" -"006" "01" "1009300000" "0" "20000101" "99991231" "" "" "" "" "" "" "" "" "0" "23-04-14 11:53:14" "23-04-14 11:53:14" "006" "01" "1008000000" "0" "20000101" "99991231" "11" "1131A2283316" "北原整形外科医院２　　　　　　　　　　　　　　" "ｷﾀﾊﾗｾｲｹｲｹﾞｶ ｲｲﾝ" "長崎県　佐世保市瀬戸越町４丁目１２９８−１　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｾﾄｺﾞｼﾁﾖｳ 1298-1" "8570135" "0956497773" "0" "23-04-14 11:53:14" "23-04-14 11:53:14" "006" "01" "1009100000" "0" "20000101" "99991231" "11" "1121A2224212" "山口医院２　　　　　　　　　　　　　　　　　　" "ﾔﾏｸﾞﾁｲｲﾝ" "長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14" "8570011" "0956228610" "0" "23-04-14 11:53:14" "23-04-14 11:53:14" +"006" "01" "1009200000" "0" "20000101" "99991231" "11" "1121A2224212" "山口医院２　　　　　　　　　　　　　　　　　　" "ﾔﾏｸﾞﾁｲｲﾝ" "長崎県　佐世保市春日町２９−１４　　　　　　　　　　　　　　　　" "ﾅｶﾞｻｷｹﾝ ｻｾﾎﾞｼｶｽｶﾞﾁﾖｳ29-14" "8570011" "0956228610" "0" "23-04-14 11:53:14" "23-04-14 11:53:14" +"006" "01" "1009300000" "0" "20000101" "99991231" "" "" "" "" "" "" "" "" "0" "23-04-14 11:53:14" "23-04-14 11:53:14" From 2c77230215307bc8b4c1b4c7512abb17c5f064bb Mon Sep 17 00:00:00 2001 From: "x.azuma.m@nds-tyo.co.jp" Date: Fri, 29 Sep 2023 13:41:51 +0900 Subject: [PATCH 4/4] =?UTF-8?q?MySQL8.0.20=E4=BB=A5=E9=99=8D=E3=80=81?= =?UTF-8?q?=E9=9D=9E=E6=8E=A8=E5=A5=A8=E3=81=A8=E3=81=AA=E3=81=A3=E3=81=9F?= =?UTF-8?q?=20VALUES()=20=E3=81=AE=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/vjsk/vjsk_recv_file_mapper.py | 694 +++++++++--------- 1 file changed, 347 insertions(+), 347 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py index a3377b40..5087eae9 100644 --- a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py @@ -211,89 +211,89 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.sales AS t ON DUPLICATE KEY UPDATE - rec_data=VALUES(rec_data) - ,rec_whs_cd=VALUES(rec_whs_cd) - ,rec_whs_sub_cd=VALUES(rec_whs_sub_cd) - ,rec_whs_org_cd=VALUES(rec_whs_org_cd) - ,rec_cust_cd=VALUES(rec_cust_cd) - ,rec_comm_cd=VALUES(rec_comm_cd) - ,rec_tran_kbn=VALUES(rec_tran_kbn) - ,rev_hsdnymd_wrk=VALUES(rev_hsdnymd_wrk) - ,rev_hsdnymd_srk=VALUES(rev_hsdnymd_srk) - ,rec_urag_num=VALUES(rec_urag_num) - ,rec_qty=VALUES(rec_qty) - ,rec_nonyu_price=VALUES(rec_nonyu_price) - ,rec_nonyu_amt=VALUES(rec_nonyu_amt) - ,rec_comm_name=VALUES(rec_comm_name) - ,rec_nonyu_fcl_name=VALUES(rec_nonyu_fcl_name) - ,free_item=VALUES(free_item) - ,rec_nonyu_fcl_addr=VALUES(rec_nonyu_fcl_addr) - ,rec_nonyu_fcl_post=VALUES(rec_nonyu_fcl_post) - ,rec_nonyu_fcl_tel=VALUES(rec_nonyu_fcl_tel) - ,rec_bef_hsdn_ymd=VALUES(rec_bef_hsdn_ymd) - ,rec_bef_slip_num=VALUES(rec_bef_slip_num) - ,rec_ymd=VALUES(rec_ymd) - ,sale_data_cat=VALUES(sale_data_cat) - ,slip_file_name=VALUES(slip_file_name) - ,slip_mgt_num=VALUES(slip_mgt_num) - ,row_num=VALUES(row_num) - ,hsdn_ymd=VALUES(hsdn_ymd) - ,exec_dt=VALUES(exec_dt) - ,v_tran_cd=VALUES(v_tran_cd) - ,tran_kbn_name=VALUES(tran_kbn_name) - ,whs_org_cd=VALUES(whs_org_cd) - ,v_whsorg_cd=VALUES(v_whsorg_cd) - ,whs_org_name=VALUES(whs_org_name) - ,whs_org_kn=VALUES(whs_org_kn) - ,v_whs_cd=VALUES(v_whs_cd) - ,whs_name=VALUES(whs_name) - ,nonyu_fcl_cd=VALUES(nonyu_fcl_cd) - ,v_inst_cd=VALUES(v_inst_cd) - ,v_inst_kn=VALUES(v_inst_kn) - ,v_inst_name=VALUES(v_inst_name) - ,v_inst_addr=VALUES(v_inst_addr) - ,comm_cd=VALUES(comm_cd) - ,comm_name=VALUES(comm_name) - ,nonyu_qty=VALUES(nonyu_qty) - ,nonyu_price=VALUES(nonyu_price) - ,nonyu_amt=VALUES(nonyu_amt) - ,shikiri_price=VALUES(shikiri_price) - ,shikiri_amt=VALUES(shikiri_amt) - ,nhi_price=VALUES(nhi_price) - ,nhi_amt=VALUES(nhi_amt) - ,whspos_err_kbn=VALUES(whspos_err_kbn) - ,htdnymd_err_kbn=VALUES(htdnymd_err_kbn) - ,prd_exis_kbn=VALUES(prd_exis_kbn) - ,fcl_exis_kbn=VALUES(fcl_exis_kbn) - ,bef_hsdn_ymd=VALUES(bef_hsdn_ymd) - ,bef_slip_num=VALUES(bef_slip_num) - ,slip_org_kbn=VALUES(slip_org_kbn) - ,err_flg1=VALUES(err_flg1) - ,err_flg2=VALUES(err_flg2) - ,err_flg3=VALUES(err_flg3) - ,err_flg4=VALUES(err_flg4) - ,err_flg5=VALUES(err_flg5) - ,err_flg6=VALUES(err_flg6) - ,err_flg7=VALUES(err_flg7) - ,err_flg8=VALUES(err_flg8) - ,err_flg9=VALUES(err_flg9) - ,err_flg10=VALUES(err_flg10) - ,err_flg11=VALUES(err_flg11) - ,err_flg12=VALUES(err_flg12) - ,err_flg13=VALUES(err_flg13) - ,err_flg14=VALUES(err_flg14) - ,err_flg15=VALUES(err_flg15) - ,err_flg16=VALUES(err_flg16) - ,err_flg17=VALUES(err_flg17) - ,err_flg18=VALUES(err_flg18) - ,err_flg19=VALUES(err_flg19) - ,err_flg20=VALUES(err_flg20) - ,kjyo_ym=VALUES(kjyo_ym) - ,tksnbk_kbn=VALUES(tksnbk_kbn) - ,fcl_exec_kbn=VALUES(fcl_exec_kbn) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,ins_usr=VALUES(ins_usr) + rec_data=medaca_common.convert_empty_to_null(t.rec_data) + ,rec_whs_cd=medaca_common.convert_empty_to_null(t.rec_whs_cd) + ,rec_whs_sub_cd=medaca_common.convert_empty_to_null(t.rec_whs_sub_cd) + ,rec_whs_org_cd=medaca_common.convert_empty_to_null(t.rec_whs_org_cd) + ,rec_cust_cd=medaca_common.convert_empty_to_null(t.rec_cust_cd) + ,rec_comm_cd=medaca_common.convert_empty_to_null(t.rec_comm_cd) + ,rec_tran_kbn=medaca_common.convert_empty_to_null(t.rec_tran_kbn) + ,rev_hsdnymd_wrk=medaca_common.convert_empty_to_null(t.rev_hsdnymd_wrk) + ,rev_hsdnymd_srk=medaca_common.convert_empty_to_null(t.rev_hsdnymd_srk) + ,rec_urag_num=medaca_common.convert_empty_to_null(t.rec_urag_num) + ,rec_qty=medaca_common.convert_empty_to_null(t.rec_qty) + ,rec_nonyu_price=medaca_common.convert_empty_to_null(t.rec_nonyu_price) + ,rec_nonyu_amt=medaca_common.convert_empty_to_null(t.rec_nonyu_amt) + ,rec_comm_name=medaca_common.convert_empty_to_null(t.rec_comm_name) + ,rec_nonyu_fcl_name=medaca_common.convert_empty_to_null(t.rec_nonyu_fcl_name) + ,free_item=medaca_common.convert_empty_to_null(t.free_item) + ,rec_nonyu_fcl_addr=medaca_common.convert_empty_to_null(t.rec_nonyu_fcl_addr) + ,rec_nonyu_fcl_post=medaca_common.convert_empty_to_null(t.rec_nonyu_fcl_post) + ,rec_nonyu_fcl_tel=medaca_common.convert_empty_to_null(t.rec_nonyu_fcl_tel) + ,rec_bef_hsdn_ymd=medaca_common.convert_empty_to_null(t.rec_bef_hsdn_ymd) + ,rec_bef_slip_num=medaca_common.convert_empty_to_null(t.rec_bef_slip_num) + ,rec_ymd=medaca_common.convert_empty_to_null(t.rec_ymd) + ,sale_data_cat=medaca_common.convert_empty_to_null(t.sale_data_cat) + ,slip_file_name=medaca_common.convert_empty_to_null(t.slip_file_name) + ,slip_mgt_num=t.slip_mgt_num + ,row_num=t.row_num + ,hsdn_ymd=medaca_common.convert_empty_to_null(t.hsdn_ymd) + ,exec_dt=medaca_common.convert_empty_to_null(t.exec_dt) + ,v_tran_cd=t.v_tran_cd + ,tran_kbn_name=medaca_common.convert_empty_to_null(t.tran_kbn_name) + ,whs_org_cd=medaca_common.convert_empty_to_null(t.whs_org_cd) + ,v_whsorg_cd=t.v_whsorg_cd + ,whs_org_name=medaca_common.convert_empty_to_null(t.whs_org_name) + ,whs_org_kn=medaca_common.convert_empty_to_null(t.whs_org_kn) + ,v_whs_cd=t.v_whs_cd + ,whs_name=medaca_common.convert_empty_to_null(t.whs_name) + ,nonyu_fcl_cd=medaca_common.convert_empty_to_null(t.nonyu_fcl_cd) + ,v_inst_cd=medaca_common.convert_empty_to_null(t.v_inst_cd) + ,v_inst_kn=medaca_common.convert_empty_to_null(t.v_inst_kn) + ,v_inst_name=medaca_common.convert_empty_to_null(t.v_inst_name) + ,v_inst_addr=medaca_common.convert_empty_to_null(t.v_inst_addr) + ,comm_cd=medaca_common.convert_empty_to_null(t.comm_cd) + ,comm_name=medaca_common.convert_empty_to_null(t.comm_name) + ,nonyu_qty=t.nonyu_qty + ,nonyu_price=t.nonyu_price + ,nonyu_amt=t.nonyu_amt + ,shikiri_price=t.shikiri_price + ,shikiri_amt=t.shikiri_amt + ,nhi_price=t.nhi_price + ,nhi_amt=t.nhi_amt + ,whspos_err_kbn=medaca_common.convert_empty_to_null(t.whspos_err_kbn) + ,htdnymd_err_kbn=medaca_common.convert_empty_to_null(t.htdnymd_err_kbn) + ,prd_exis_kbn=medaca_common.convert_empty_to_null(t.prd_exis_kbn) + ,fcl_exis_kbn=medaca_common.convert_empty_to_null(t.fcl_exis_kbn) + ,bef_hsdn_ymd=medaca_common.convert_empty_to_null(t.bef_hsdn_ymd) + ,bef_slip_num=medaca_common.convert_empty_to_null(t.bef_slip_num) + ,slip_org_kbn=t.slip_org_kbn + ,err_flg1=medaca_common.convert_empty_to_null(t.err_flg1) + ,err_flg2=medaca_common.convert_empty_to_null(t.err_flg2) + ,err_flg3=medaca_common.convert_empty_to_null(t.err_flg3) + ,err_flg4=medaca_common.convert_empty_to_null(t.err_flg4) + ,err_flg5=medaca_common.convert_empty_to_null(t.err_flg5) + ,err_flg6=medaca_common.convert_empty_to_null(t.err_flg6) + ,err_flg7=medaca_common.convert_empty_to_null(t.err_flg7) + ,err_flg8=medaca_common.convert_empty_to_null(t.err_flg8) + ,err_flg9=medaca_common.convert_empty_to_null(t.err_flg9) + ,err_flg10=medaca_common.convert_empty_to_null(t.err_flg10) + ,err_flg11=medaca_common.convert_empty_to_null(t.err_flg11) + ,err_flg12=medaca_common.convert_empty_to_null(t.err_flg12) + ,err_flg13=medaca_common.convert_empty_to_null(t.err_flg13) + ,err_flg14=medaca_common.convert_empty_to_null(t.err_flg14) + ,err_flg15=medaca_common.convert_empty_to_null(t.err_flg15) + ,err_flg16=medaca_common.convert_empty_to_null(t.err_flg16) + ,err_flg17=medaca_common.convert_empty_to_null(t.err_flg17) + ,err_flg18=medaca_common.convert_empty_to_null(t.err_flg18) + ,err_flg19=medaca_common.convert_empty_to_null(t.err_flg19) + ,err_flg20=medaca_common.convert_empty_to_null(t.err_flg20) + ,kjyo_ym=medaca_common.convert_empty_to_null(t.kjyo_ym) + ,tksnbk_kbn=medaca_common.convert_empty_to_null(t.tksnbk_kbn) + ,fcl_exec_kbn=medaca_common.convert_empty_to_null(t.fcl_exec_kbn) + ,rec_sts_kbn=medaca_common.convert_empty_to_null(t.rec_sts_kbn) + ,ins_dt=nullif(t.ins_dt, 0) + ,ins_usr=medaca_common.convert_empty_to_null(t.ins_usr) ,dwh_upd_dT=SYSDATE() ; """) @@ -337,17 +337,17 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.hld_mst_v AS t ON DUPLICATE KEY UPDATE - v_hld_cd=VALUES(v_hld_cd) - ,sub_num=VALUES(sub_num) - ,name=VALUES(name) - ,kn_name=VALUES(kn_name) - ,abb_name=VALUES(abb_name) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,dsp_odr=VALUES(dsp_odr) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + v_hld_cd=t.v_hld_cd + ,sub_num=t.sub_num + ,name=t.name + ,kn_name=medaca_common.convert_empty_to_null(t.kn_name) + ,abb_name=medaca_common.convert_empty_to_null(t.abb_name) + ,start_date=t.start_date + ,end_date=t.end_date + ,dsp_odr=t.dsp_odr + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=nullif(t.ins_dt, 0) + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -401,22 +401,22 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.whs_mst_v AS t ON DUPLICATE KEY UPDATE - v_whs_cd=VALUES(v_whs_cd) - ,sub_num=VALUES(sub_num) - ,name=VALUES(name) - ,kn_name=VALUES(kn_name) - ,abb_name=VALUES(abb_name) - ,postal_cd=VALUES(postal_cd) - ,addr=VALUES(addr) - ,kn_addr=VALUES(kn_addr) - ,tel_num=VALUES(tel_num) - ,v_hld_cd=VALUES(v_hld_cd) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,dsp_odr=VALUES(dsp_odr) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + v_whs_cd=t.v_whs_cd + ,sub_num=t.sub_num + ,name=t.name + ,kn_name=medaca_common.convert_empty_to_null(t.kn_name) + ,abb_name=medaca_common.convert_empty_to_null(t.abb_name) + ,postal_cd=medaca_common.convert_empty_to_null(t.postal_cd) + ,addr=medaca_common.convert_empty_to_null(t.addr) + ,kn_addr=medaca_common.convert_empty_to_null(t.kn_addr) + ,tel_num=medaca_common.convert_empty_to_null(t.tel_num) + ,v_hld_cd=t.v_hld_cd + ,start_date=t.start_date + ,end_date=t.end_date + ,dsp_odr=t.dsp_odr + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=nullif(t.ins_dt, 0) + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -530,52 +530,52 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.mkr_org_horizon_v AS t ON DUPLICATE KEY UPDATE - vid_kind_1=VALUES(vid_kind_1) - ,v_cd_1=VALUES(v_cd_1) - ,name_1=VALUES(name_1) - ,dsp_odr_1=VALUES(dsp_odr_1) - ,vid_kind_2=VALUES(vid_kind_2) - ,v_cd_2=VALUES(v_cd_2) - ,name_2=VALUES(name_2) - ,dsp_odr_2=VALUES(dsp_odr_2) - ,vid_kind_3=VALUES(vid_kind_3) - ,v_cd_3=VALUES(v_cd_3) - ,name_3=VALUES(name_3) - ,dsp_odr_3=VALUES(dsp_odr_3) - ,vid_kind_4=VALUES(vid_kind_4) - ,v_cd_4=VALUES(v_cd_4) - ,name_4=VALUES(name_4) - ,dsp_odr_4=VALUES(dsp_odr_4) - ,vid_kind_5=VALUES(vid_kind_5) - ,v_cd_5=VALUES(v_cd_5) - ,name_5=VALUES(name_5) - ,dsp_odr_5=VALUES(dsp_odr_5) - ,vid_kind_6=VALUES(vid_kind_6) - ,v_cd_6=VALUES(v_cd_6) - ,name_6=VALUES(name_6) - ,dsp_odr_6=VALUES(dsp_odr_6) - ,vid_kind_7=VALUES(vid_kind_7) - ,v_cd_7=VALUES(v_cd_7) - ,name_7=VALUES(name_7) - ,dsp_odr_7=VALUES(dsp_odr_7) - ,vid_kind_8=VALUES(vid_kind_8) - ,v_cd_8=VALUES(v_cd_8) - ,name_8=VALUES(name_8) - ,dsp_odr_8=VALUES(dsp_odr_8) - ,vid_kind_9=VALUES(vid_kind_9) - ,v_cd_9=VALUES(v_cd_9) - ,name_9=VALUES(name_9) - ,dsp_odr_9=VALUES(dsp_odr_9) - ,vid_kind_10=VALUES(vid_kind_10) - ,v_cd_10=VALUES(v_cd_10) - ,name_10=VALUES(name_10) - ,dsp_odr_10=VALUES(dsp_odr_10) - ,v_whs_cd=VALUES(v_whs_cd) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + vid_kind_1=t.vid_kind_1 + ,v_cd_1=t.v_cd_1 + ,name_1=medaca_common.convert_empty_to_null(t.name_1) + ,dsp_odr_1=t.dsp_odr_1 + ,vid_kind_2=t.vid_kind_2 + ,v_cd_2=t.v_cd_2 + ,name_2=medaca_common.convert_empty_to_null(t.name_2) + ,dsp_odr_2=t.dsp_odr_2 + ,vid_kind_3=t.vid_kind_3 + ,v_cd_3=t.v_cd_3 + ,name_3=medaca_common.convert_empty_to_null(t.name_3) + ,dsp_odr_3=t.dsp_odr_3 + ,vid_kind_4=t.vid_kind_4 + ,v_cd_4=t.v_cd_4 + ,name_4=medaca_common.convert_empty_to_null(t.name_4) + ,dsp_odr_4=t.dsp_odr_4 + ,vid_kind_5=t.vid_kind_5 + ,v_cd_5=t.v_cd_5 + ,name_5=medaca_common.convert_empty_to_null(t.name_5) + ,dsp_odr_5=t.dsp_odr_5 + ,vid_kind_6=t.vid_kind_6 + ,v_cd_6=t.v_cd_6 + ,name_6=medaca_common.convert_empty_to_null(t.name_6) + ,dsp_odr_6=t.dsp_odr_6 + ,vid_kind_7=t.vid_kind_7 + ,v_cd_7=t.v_cd_7 + ,name_7=medaca_common.convert_empty_to_null(t.name_7) + ,dsp_odr_7=t.dsp_odr_7 + ,vid_kind_8=t.vid_kind_8 + ,v_cd_8=t.v_cd_8 + ,name_8=medaca_common.convert_empty_to_null(t.name_8) + ,dsp_odr_8=t.dsp_odr_8 + ,vid_kind_9=t.vid_kind_9 + ,v_cd_9=t.v_cd_9 + ,name_9=medaca_common.convert_empty_to_null(t.name_9) + ,dsp_odr_9=t.dsp_odr_9 + ,vid_kind_10=t.vid_kind_10 + ,v_cd_10=t.v_cd_10 + ,name_10=medaca_common.convert_empty_to_null(t.name_10) + ,dsp_odr_10=t.dsp_odr_10 + ,v_whs_cd=t.v_whs_cd + ,start_date=t.start_date + ,end_date=t.end_date + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=nullif(t.ins_dt, 0) + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -670,15 +670,15 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.tran_kbn_mst_v AS t ON DUPLICATE KEY UPDATE - v_tran_cd=VALUES(v_tran_cd) - ,sub_num=VALUES(sub_num) - ,name=VALUES(name) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,dsp_odr=VALUES(dsp_odr) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + v_tran_cd=t.v_tran_cd + ,sub_num=t.sub_num + ,name=medaca_common.convert_empty_to_null(t.name) + ,start_date=t.start_date + ,end_date=t.end_date + ,dsp_odr=t.dsp_odr + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=nullif(t.ins_dt, 0) + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -748,30 +748,30 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.fcl_mst_v AS t ON DUPLICATE KEY UPDATE - v_inst_cd=VALUES(v_inst_cd) - ,sub_num=VALUES(sub_num) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,closed_dt=VALUES(closed_dt) - ,fcl_name=VALUES(fcl_name) - ,fcl_kn_name=VALUES(fcl_kn_name) - ,fcl_abb_name=VALUES(fcl_abb_name) - ,fcl_abb_kn_name=VALUES(fcl_abb_kn_name) - ,mkr_cd=VALUES(mkr_cd) - ,jsk_proc_kbn=VALUES(jsk_proc_kbn) - ,fmt_addr=VALUES(fmt_addr) - ,fmt_kn_addr=VALUES(fmt_kn_addr) - ,postal_cd=VALUES(postal_cd) - ,prft_cd=VALUES(prft_cd) - ,prft_name=VALUES(prft_name) - ,city_name=VALUES(city_name) - ,addr_line_1=VALUES(addr_line_1) - ,tel_num=VALUES(tel_num) - ,admin_kbn=VALUES(admin_kbn) - ,fcl_type=VALUES(fcl_type) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + v_inst_cd=t.v_inst_cd + ,sub_num=t.sub_num + ,start_date=t.start_date + ,end_date=t.end_date + ,closed_dt=medaca_common.convert_empty_to_null(t.closed_dt) + ,fcl_name=medaca_common.convert_empty_to_null(t.fcl_name) + ,fcl_kn_name=medaca_common.convert_empty_to_null(t.fcl_kn_name) + ,fcl_abb_name=medaca_common.convert_empty_to_null(t.fcl_abb_name) + ,fcl_abb_kn_name=medaca_common.convert_empty_to_null(t.fcl_abb_kn_name) + ,mkr_cd=medaca_common.convert_empty_to_null(t.mkr_cd) + ,jsk_proc_kbn=t.jsk_proc_kbn + ,fmt_addr=medaca_common.convert_empty_to_null(t.fmt_addr) + ,fmt_kn_addr=medaca_common.convert_empty_to_null(t.fmt_kn_addr) + ,postal_cd=medaca_common.convert_empty_to_null(t.postal_cd) + ,prft_cd=medaca_common.convert_empty_to_null(t.prft_cd) + ,prft_name=medaca_common.convert_empty_to_null(t.prft_name) + ,city_name=medaca_common.convert_empty_to_null(t.city_name) + ,addr_line_1=medaca_common.convert_empty_to_null(t.addr_line_1) + ,tel_num=medaca_common.convert_empty_to_null(t.tel_num) + ,admin_kbn=medaca_common.convert_empty_to_null(t.admin_kbn) + ,fcl_type=medaca_common.convert_empty_to_null(t.fcl_type) + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=medaca_common.convert_empty_to_null(t.ins_dt) + ,upd_dt=medaca_common.convert_empty_to_null(t.upd_dt) ,dwh_upd_dt=SYSDATE() ; """) @@ -849,34 +849,34 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.phm_prd_mst_v AS t ON DUPLICATE KEY UPDATE - prd_cd=VALUES(prd_cd) - ,sub_num=VALUES(sub_num) - ,prd_name=VALUES(prd_name) - ,prd_e_name=VALUES(prd_e_name) - ,mkr_cd=VALUES(mkr_cd) - ,mkr_inf_1=VALUES(mkr_inf_1) - ,mkr_inf_2=VALUES(mkr_inf_2) - ,phm_itm_cd=VALUES(phm_itm_cd) - ,itm_name=VALUES(itm_name) - ,itm_abb_name=VALUES(itm_abb_name) - ,form_cd=VALUES(form_cd) - ,form_name=VALUES(form_name) - ,vol_cd=VALUES(vol_cd) - ,vol_name=VALUES(vol_name) - ,cont_cd=VALUES(cont_cd) - ,cont_name=VALUES(cont_name) - ,pkg_cd=VALUES(pkg_cd) - ,pkg_name=VALUES(pkg_name) - ,cnv_num=VALUES(cnv_num) - ,jsk_start_dt=VALUES(jsk_start_dt) - ,prd_sale_kbn=VALUES(prd_sale_kbn) - ,jsk_proc_kbn=VALUES(jsk_proc_kbn) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,dsp_odr=VALUES(dsp_odr) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + prd_cd=t.prd_cd + ,sub_num=t.sub_num + ,prd_name=t.prd_name + ,prd_e_name=medaca_common.convert_empty_to_null(t.prd_e_name) + ,mkr_cd=medaca_common.convert_empty_to_null(t.mkr_cd) + ,mkr_inf_1=medaca_common.convert_empty_to_null(t.mkr_inf_1) + ,mkr_inf_2=medaca_common.convert_empty_to_null(t.mkr_inf_2) + ,phm_itm_cd=medaca_common.convert_empty_to_null(t.phm_itm_cd) + ,itm_name=medaca_common.convert_empty_to_null(t.itm_name) + ,itm_abb_name=medaca_common.convert_empty_to_null(t.itm_abb_name) + ,form_cd=medaca_common.convert_empty_to_null(t.form_cd) + ,form_name=medaca_common.convert_empty_to_null(t.form_name) + ,vol_cd=medaca_common.convert_empty_to_null(t.vol_cd) + ,vol_name=medaca_common.convert_empty_to_null(t.vol_name) + ,cont_cd=medaca_common.convert_empty_to_null(t.cont_cd) + ,cont_name=medaca_common.convert_empty_to_null(t.cont_name) + ,pkg_cd=medaca_common.convert_empty_to_null(t.pkg_cd) + ,pkg_name=medaca_common.convert_empty_to_null(t.pkg_name) + ,cnv_num=t.cnv_num + ,jsk_start_dt=nullif(t.jsk_start_dt, 0) + ,prd_sale_kbn=t.prd_sale_kbn + ,jsk_proc_kbn=t.jsk_proc_kbn + ,start_date=t.start_date + ,end_date=t.end_date + ,dsp_odr=t.dsp_odr + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=nullif(t.ins_dt, 0) + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -1018,23 +1018,23 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.whs_customer_mst_v AS t ON DUPLICATE KEY UPDATE - whs_cd=VALUES(whs_cd) - ,whs_sub_cd=VALUES(whs_sub_cd) - ,customer_cd=VALUES(customer_cd) - ,sub_num=VALUES(sub_num) - ,start_date=VALUES(start_date) - ,end_date=VALUES(end_date) - ,whs_org_cd=VALUES(whs_org_cd) - ,src_org_cd=VALUES(src_org_cd) - ,name=VALUES(name) - ,kn_name=VALUES(kn_name) - ,addr=VALUES(addr) - ,kn_addr=VALUES(kn_addr) - ,postal_cd=VALUES(postal_cd) - ,tel_num=VALUES(tel_num) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,upd_dt=VALUES(upd_dt) + whs_cd=t.whs_cd + ,whs_sub_cd=t.whs_sub_cd + ,customer_cd=t.customer_cd + ,sub_num=t.sub_num + ,start_date=t.start_date + ,end_date=t.end_date + ,whs_org_cd=medaca_common.convert_empty_to_null(t.whs_org_cd) + ,src_org_cd=medaca_common.convert_empty_to_null(t.src_org_cd) + ,name=medaca_common.convert_empty_to_null(t.name) + ,kn_name=medaca_common.convert_empty_to_null(t.kn_name) + ,addr=medaca_common.convert_empty_to_null(t.addr) + ,kn_addr=medaca_common.convert_empty_to_null(t.kn_addr) + ,postal_cd=medaca_common.convert_empty_to_null(t.postal_cd) + ,tel_num=medaca_common.convert_empty_to_null(t.tel_num) + ,rec_sts_kbn=t.rec_sts_kbn + ,ins_dt=nullif(t.ins_dt, 0) + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -1160,35 +1160,35 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.whole_stock AS t ON DUPLICATE KEY UPDATE - rec_data=VALUES(rec_data) - ,rec_whs_cd=VALUES(rec_whs_cd) - ,rec_whs_sub_cd=VALUES(rec_whs_sub_cd) - ,rec_sto_place=VALUES(rec_sto_place) - ,rec_stock_ymd=VALUES(rec_stock_ymd) - ,rec_comm_cd=VALUES(rec_comm_cd) - ,rec_qty=VALUES(rec_qty) - ,rec_stock_no_sign=VALUES(rec_stock_no_sign) - ,rec_jan_cd=VALUES(rec_jan_cd) - ,free_item=VALUES(free_item) - ,rec_ymd=VALUES(rec_ymd) - ,sale_data_cat=VALUES(sale_data_cat) - ,slip_file_name=VALUES(slip_file_name) - ,slip_mgt_num=VALUES(slip_mgt_num) - ,row_num=VALUES(row_num) - ,exec_dt=VALUES(exec_dt) - ,err_flg1=VALUES(err_flg1) - ,err_flg2=VALUES(err_flg2) - ,err_flg3=VALUES(err_flg3) - ,err_flg4=VALUES(err_flg4) - ,err_flg5=VALUES(err_flg5) - ,err_flg6=VALUES(err_flg6) - ,err_flg7=VALUES(err_flg7) - ,err_flg8=VALUES(err_flg8) - ,err_flg9=VALUES(err_flg9) - ,err_flg10=VALUES(err_flg10) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,ins_usr=VALUES(ins_usr) + rec_data=medaca_common.convert_empty_to_null(t.rec_data) + ,rec_whs_cd=medaca_common.convert_empty_to_null(t.rec_whs_cd) + ,rec_whs_sub_cd=medaca_common.convert_empty_to_null(t.rec_whs_sub_cd) + ,rec_sto_place=medaca_common.convert_empty_to_null(t.rec_sto_place) + ,rec_stock_ymd=medaca_common.convert_empty_to_null(t.rec_stock_ymd) + ,rec_comm_cd=medaca_common.convert_empty_to_null(t.rec_comm_cd) + ,rec_qty=medaca_common.convert_empty_to_null(t.rec_qty) + ,rec_stock_no_sign=medaca_common.convert_empty_to_null(t.rec_stock_no_sign) + ,rec_jan_cd=medaca_common.convert_empty_to_null(t.rec_jan_cd) + ,free_item=medaca_common.convert_empty_to_null(t.free_item) + ,rec_ymd=medaca_common.convert_empty_to_null(t.rec_ymd) + ,sale_data_cat=medaca_common.convert_empty_to_null(t.sale_data_cat) + ,slip_file_name=medaca_common.convert_empty_to_null(t.slip_file_name) + ,slip_mgt_num=t.slip_mgt_num + ,row_num=t.row_num + ,exec_dt=medaca_common.convert_empty_to_null(t.exec_dt) + ,err_flg1=medaca_common.convert_empty_to_null(t.err_flg1) + ,err_flg2=medaca_common.convert_empty_to_null(t.err_flg2) + ,err_flg3=medaca_common.convert_empty_to_null(t.err_flg3) + ,err_flg4=medaca_common.convert_empty_to_null(t.err_flg4) + ,err_flg5=medaca_common.convert_empty_to_null(t.err_flg5) + ,err_flg6=medaca_common.convert_empty_to_null(t.err_flg6) + ,err_flg7=medaca_common.convert_empty_to_null(t.err_flg7) + ,err_flg8=medaca_common.convert_empty_to_null(t.err_flg8) + ,err_flg9=medaca_common.convert_empty_to_null(t.err_flg9) + ,err_flg10=medaca_common.convert_empty_to_null(t.err_flg10) + ,rec_sts_kbn=medaca_common.convert_empty_to_null(t.rec_sts_kbn) + ,ins_dt=nullif(t.ins_dt, 0) + ,ins_usr=medaca_common.convert_empty_to_null(t.ins_usr) ,dwh_upd_dt=SYSDATE() ; """) @@ -1366,84 +1366,84 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.bio_sales AS t ON DUPLICATE KEY UPDATE - rec_data=VALUES(rec_data) - ,rec_whs_cd=VALUES(rec_whs_cd) - ,rec_whs_sub_cd=VALUES(rec_whs_sub_cd) - ,rec_whs_org_cd=VALUES(rec_whs_org_cd) - ,rec_cust_cd=VALUES(rec_cust_cd) - ,rec_comm_cd=VALUES(rec_comm_cd) - ,rec_tran_kbn=VALUES(rec_tran_kbn) - ,rev_hsdnymd_wrk=VALUES(rev_hsdnymd_wrk) - ,rev_hsdnymd_srk=VALUES(rev_hsdnymd_srk) - ,rec_urag_num=VALUES(rec_urag_num) - ,rec_comm_name=VALUES(rec_comm_name) - ,rec_nonyu_fcl_name=VALUES(rec_nonyu_fcl_name) - ,rec_nonyu_fcl_addr=VALUES(rec_nonyu_fcl_addr) - ,rec_lot_num1=VALUES(rec_lot_num1) - ,rec_qty1=VALUES(rec_qty1) - ,rec_lot_num2=VALUES(rec_lot_num2) - ,rec_qty2=VALUES(rec_qty2) - ,rec_lot_num3=VALUES(rec_lot_num3) - ,rec_qty3=VALUES(rec_qty3) - ,rec_ymd=VALUES(rec_ymd) - ,sale_data_cat=VALUES(sale_data_cat) - ,slip_file_name=VALUES(slip_file_name) - ,slip_mgt_num=VALUES(slip_mgt_num) - ,row_num=VALUES(row_num) - ,hsdn_ymd=VALUES(hsdn_ymd) - ,exec_dt=VALUES(exec_dt) - ,v_tran_cd=VALUES(v_tran_cd) - ,tran_kbn_name=VALUES(tran_kbn_name) - ,whs_org_cd=VALUES(whs_org_cd) - ,v_whsorg_cd=VALUES(v_whsorg_cd) - ,whs_org_name=VALUES(whs_org_name) - ,whs_org_kn=VALUES(whs_org_kn) - ,v_whs_cd=VALUES(v_whs_cd) - ,whs_name=VALUES(whs_name) - ,nonyu_fcl_cd=VALUES(nonyu_fcl_cd) - ,v_inst_cd=VALUES(v_inst_cd) - ,v_inst_name=VALUES(v_inst_name) - ,v_inst_kn=VALUES(v_inst_kn) - ,v_inst_addr=VALUES(v_inst_addr) - ,comm_cd=VALUES(comm_cd) - ,product_name=VALUES(product_name) - ,htdnymd_err_kbn=VALUES(htdnymd_err_kbn) - ,prd_exis_kbn=VALUES(prd_exis_kbn) - ,fcl_exis_kbn=VALUES(fcl_exis_kbn) - ,qty1=VALUES(qty1) - ,qty2=VALUES(qty2) - ,qty3=VALUES(qty3) - ,slip_org_kbn=VALUES(slip_org_kbn) - ,bef_slip_mgt_num=VALUES(bef_slip_mgt_num) - ,whs_rep_comm_name=VALUES(whs_rep_comm_name) - ,whs_rep_nonyu_fcl_name=VALUES(whs_rep_nonyu_fcl_name) - ,whs_rep_nonyu_fcl_addr=VALUES(whs_rep_nonyu_fcl_addr) - ,err_flg1=VALUES(err_flg1) - ,err_flg2=VALUES(err_flg2) - ,err_flg3=VALUES(err_flg3) - ,err_flg4=VALUES(err_flg4) - ,err_flg5=VALUES(err_flg5) - ,err_flg6=VALUES(err_flg6) - ,err_flg7=VALUES(err_flg7) - ,err_flg8=VALUES(err_flg8) - ,err_flg9=VALUES(err_flg9) - ,err_flg10=VALUES(err_flg10) - ,err_flg11=VALUES(err_flg11) - ,err_flg12=VALUES(err_flg12) - ,err_flg13=VALUES(err_flg13) - ,err_flg14=VALUES(err_flg14) - ,err_flg15=VALUES(err_flg15) - ,err_flg16=VALUES(err_flg16) - ,err_flg17=VALUES(err_flg17) - ,err_flg18=VALUES(err_flg18) - ,err_flg19=VALUES(err_flg19) - ,err_flg20=VALUES(err_flg20) - ,kjyo_ym=VALUES(kjyo_ym) - ,tksnbk_kbn=VALUES(tksnbk_kbn) - ,fcl_exec_kbn=VALUES(fcl_exec_kbn) - ,rec_sts_kbn=VALUES(rec_sts_kbn) - ,ins_dt=VALUES(ins_dt) - ,ins_usr=VALUES(ins_usr) + rec_data=medaca_common.convert_empty_to_null(t.rec_data) + ,rec_whs_cd=medaca_common.convert_empty_to_null(t.rec_whs_cd) + ,rec_whs_sub_cd=medaca_common.convert_empty_to_null(t.rec_whs_sub_cd) + ,rec_whs_org_cd=medaca_common.convert_empty_to_null(t.rec_whs_org_cd) + ,rec_cust_cd=medaca_common.convert_empty_to_null(t.rec_cust_cd) + ,rec_comm_cd=medaca_common.convert_empty_to_null(t.rec_comm_cd) + ,rec_tran_kbn=medaca_common.convert_empty_to_null(t.rec_tran_kbn) + ,rev_hsdnymd_wrk=medaca_common.convert_empty_to_null(t.rev_hsdnymd_wrk) + ,rev_hsdnymd_srk=medaca_common.convert_empty_to_null(t.rev_hsdnymd_srk) + ,rec_urag_num=medaca_common.convert_empty_to_null(t.rec_urag_num) + ,rec_comm_name=medaca_common.convert_empty_to_null(t.rec_comm_name) + ,rec_nonyu_fcl_name=medaca_common.convert_empty_to_null(t.rec_nonyu_fcl_name) + ,rec_nonyu_fcl_addr=medaca_common.convert_empty_to_null(t.rec_nonyu_fcl_addr) + ,rec_lot_num1=medaca_common.convert_empty_to_null(t.rec_lot_num1) + ,rec_qty1=medaca_common.convert_empty_to_null(t.rec_qty1) + ,rec_lot_num2=medaca_common.convert_empty_to_null(t.rec_lot_num2) + ,rec_qty2=medaca_common.convert_empty_to_null(t.rec_qty2) + ,rec_lot_num3=medaca_common.convert_empty_to_null(t.rec_lot_num3) + ,rec_qty3=medaca_common.convert_empty_to_null(t.rec_qty3) + ,rec_ymd=medaca_common.convert_empty_to_null(t.rec_ymd) + ,sale_data_cat=medaca_common.convert_empty_to_null(t.sale_data_cat) + ,slip_file_name=medaca_common.convert_empty_to_null(t.slip_file_name) + ,slip_mgt_num=t.slip_mgt_num + ,row_num=t.row_num + ,hsdn_ymd=medaca_common.convert_empty_to_null(t.hsdn_ymd) + ,exec_dt=medaca_common.convert_empty_to_null(t.exec_dt) + ,v_tran_cd=t.v_tran_cd + ,tran_kbn_name=medaca_common.convert_empty_to_null(t.tran_kbn_name) + ,whs_org_cd=medaca_common.convert_empty_to_null(t.whs_org_cd) + ,v_whsorg_cd=t.v_whsorg_cd + ,whs_org_name=medaca_common.convert_empty_to_null(t.whs_org_name) + ,whs_org_kn=medaca_common.convert_empty_to_null(t.whs_org_kn) + ,v_whs_cd=t.v_whs_cd + ,whs_name=medaca_common.convert_empty_to_null(t.whs_name) + ,nonyu_fcl_cd=medaca_common.convert_empty_to_null(t.nonyu_fcl_cd) + ,v_inst_cd=nullif(t.v_inst_cd,'') + ,v_inst_name=nullif(t.v_inst_name,'') + ,v_inst_kn=nullif(t.v_inst_kn,'') + ,v_inst_addr=nullif(t.v_inst_addr,'') + ,comm_cd=nullif(t.comm_cd,'') + ,product_name=nullif(t.product_name,'') + ,htdnymd_err_kbn=nullif(t.htdnymd_err_kbn,'') + ,prd_exis_kbn=nullif(t.prd_exis_kbn,'') + ,fcl_exis_kbn=nullif(t.fcl_exis_kbn,'') + ,qty1=t.qty1 + ,qty2=t.qty2 + ,qty3=t.qty3 + ,slip_org_kbn=t.slip_org_kbn + ,bef_slip_mgt_num=medaca_common.convert_empty_to_null(t.bef_slip_mgt_num) + ,whs_rep_comm_name=medaca_common.convert_empty_to_null(t.whs_rep_comm_name) + ,whs_rep_nonyu_fcl_name=medaca_common.convert_empty_to_null(t.whs_rep_nonyu_fcl_name) + ,whs_rep_nonyu_fcl_addr=medaca_common.convert_empty_to_null(t.whs_rep_nonyu_fcl_addr) + ,err_flg1=medaca_common.convert_empty_to_null(t.err_flg1) + ,err_flg2=medaca_common.convert_empty_to_null(t.err_flg2) + ,err_flg3=medaca_common.convert_empty_to_null(t.err_flg3) + ,err_flg4=medaca_common.convert_empty_to_null(t.err_flg4) + ,err_flg5=medaca_common.convert_empty_to_null(t.err_flg5) + ,err_flg6=medaca_common.convert_empty_to_null(t.err_flg6) + ,err_flg7=medaca_common.convert_empty_to_null(t.err_flg7) + ,err_flg8=medaca_common.convert_empty_to_null(t.err_flg8) + ,err_flg9=medaca_common.convert_empty_to_null(t.err_flg9) + ,err_flg10=medaca_common.convert_empty_to_null(t.err_flg10) + ,err_flg11=medaca_common.convert_empty_to_null(t.err_flg11) + ,err_flg12=medaca_common.convert_empty_to_null(t.err_flg12) + ,err_flg13=medaca_common.convert_empty_to_null(t.err_flg13) + ,err_flg14=medaca_common.convert_empty_to_null(t.err_flg14) + ,err_flg15=medaca_common.convert_empty_to_null(t.err_flg15) + ,err_flg16=medaca_common.convert_empty_to_null(t.err_flg16) + ,err_flg17=medaca_common.convert_empty_to_null(t.err_flg17) + ,err_flg18=medaca_common.convert_empty_to_null(t.err_flg18) + ,err_flg19=medaca_common.convert_empty_to_null(t.err_flg19) + ,err_flg20=medaca_common.convert_empty_to_null(t.err_flg20) + ,kjyo_ym=medaca_common.convert_empty_to_null(t.kjyo_ym) + ,tksnbk_kbn=medaca_common.convert_empty_to_null(t.tksnbk_kbn) + ,fcl_exec_kbn=medaca_common.convert_empty_to_null(t.fcl_exec_kbn) + ,rec_sts_kbn=medaca_common.convert_empty_to_null(t.rec_sts_kbn) + ,ins_dt=nullif(t.ins_dt, 0) + ,ins_usr=medaca_common.convert_empty_to_null(t.ins_usr) ,dwh_upd_dt=SYSDATE() ; """) @@ -1477,12 +1477,12 @@ class VjskReceiveFileMapper: ,SYSDATE() FROM org05.lot_num_mst AS t ON DUPLICATE KEY UPDATE - ser_num=VALUES(ser_num) - ,lot_num=VALUES(lot_num) - ,expr_dt=VALUES(expr_dt) - ,frst_mov_dt=VALUES(frst_mov_dt) - ,ins_dt=VALUES(ins_dt) - ,ins_usr=VALUES(ins_usr) + ser_num=t.ser_num + ,lot_num=t.lot_num + ,expr_dt=t.expr_dt + ,frst_mov_dt=t.frst_mov_dt + ,ins_dt=nullif(t.ins_dt, 0) + ,ins_usr=medaca_common.convert_empty_to_null(t.ins_usr) ,dwh_upd_dt=SYSDATE() ; """)