feat: V卸マスタの対応
This commit is contained in:
shimoda.m@nds-tyo.co.jp
parent
59b2ac98a7
commit
5bc1159fa9
@ -385,12 +385,12 @@ class VjskReceiveFileMapper:
|
||||
t.v_whs_cd
|
||||
,t.sub_num
|
||||
,t.name
|
||||
,t.kn_name
|
||||
,t.abb_name
|
||||
,t.postal_cd
|
||||
,t.addr
|
||||
,t.kn_addr
|
||||
,t.tel_num
|
||||
,medaca_common.convert_empty_to_null(t.kn_name)
|
||||
,medaca_common.convert_empty_to_null(t.abb_name)
|
||||
,medaca_common.convert_empty_to_null(t.postal_cd)
|
||||
,medaca_common.convert_empty_to_null(t.addr)
|
||||
,medaca_common.convert_empty_to_null(t.kn_addr)
|
||||
,medaca_common.convert_empty_to_null(t.tel_num)
|
||||
,t.v_hld_cd
|
||||
,t.start_date
|
||||
,t.end_date
|
||||
@ -401,22 +401,22 @@ class VjskReceiveFileMapper:
|
||||
,SYSDATE()
|
||||
FROM org05.whs_mst_v AS t
|
||||
ON DUPLICATE KEY UPDATE
|
||||
v_whs_cd=t.v_whs_cd
|
||||
,sub_num=t.sub_num
|
||||
,name=t.name
|
||||
,kn_name=t.kn_name
|
||||
,abb_name=t.abb_name
|
||||
,postal_cd=t.postal_cd
|
||||
,addr=t.addr
|
||||
,kn_addr=t.kn_addr
|
||||
,tel_num=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)
|
||||
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)
|
||||
,dwh_upd_dt=SYSDATE()
|
||||
;
|
||||
""")
|
||||
|
||||
@ -422,7 +422,7 @@ class TestImportFileToDb:
|
||||
self.batch_context.is_vjsk_stock_import_day = True
|
||||
self.db.execute(f"truncate table {table_name_src}")
|
||||
|
||||
# assertion1 (insert 4row)
|
||||
# assertion1 (insert 6row)
|
||||
|
||||
# 処理実行
|
||||
target_dict = {
|
||||
@ -438,7 +438,7 @@ class TestImportFileToDb:
|
||||
# 突合から除外する項目
|
||||
ignore_columns = ['dwh_upd_dt']
|
||||
# orgテーブル結果が期待値通りかを突合
|
||||
assert_table_results(result_org, assert_list, ignore_columns)
|
||||
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}")
|
||||
# 突合から除外する項目
|
||||
@ -462,18 +462,18 @@ class TestImportFileToDb:
|
||||
# 突合から除外する項目
|
||||
ignore_columns = ['dwh_upd_dt']
|
||||
# orgテーブル結果が期待値通りかを突合
|
||||
assert_table_results(result_org, assert_list, ignore_columns)
|
||||
assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True)
|
||||
# srcテーブル結果(orgテーブル結果のPK値で一致するもの)を取得
|
||||
result_src = self.db.execute_select(
|
||||
f"select * from {table_name_src} s inner join {table_name_org} o on (s.v_whs_cd = o.v_whs_cd and s.sub_num = o.sub_num)")
|
||||
f"select s.* from {table_name_src} s inner join {table_name_org} o on (s.v_whs_cd = o.v_whs_cd and s.sub_num = o.sub_num)")
|
||||
# 突合から除外する項目
|
||||
ignore_columns = ['dwh_upd_dt']
|
||||
# srcテーブル結果が期待値通りかを突合
|
||||
assert_table_results(result_src, assert_list, ignore_columns)
|
||||
|
||||
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
|
||||
# srcテーブル結果のレコード件数 (insert 6row + update 2row + insert 2row = 8row)
|
||||
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
|
||||
assert result_src_count[0]['count(*)'] == 6
|
||||
assert result_src_count[0]['count(*)'] == 8
|
||||
|
||||
# teardown
|
||||
|
||||
|
||||
@ -3,3 +3,5 @@
|
||||
"200000005" "0" "岩渕薬品株式会社" "カナ02" "岩渕薬品" "1110002" "住所02" "ジュウショ02" "00-0000-0002" "0" "20000101" "99991231" "50" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000009" "0" "株式会社マルタケ" "カナ03" "マルタケ" "1110003" "住所03" "ジュウショ03" "00-0000-0003" "0" "20000101" "99991231" "90" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000010" "0" "株式会社ファイネス" "カナ04" "ファイネス" "1110004" "住所04" "ジュウショ04" "00-0000-0004" "0" "20000101" "99991231" "100" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000011" "0" "鍋林株式会社" "" "" "" "" "" "" "0" "20000101" "99991231" "100" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000012" "0" "岡野薬品株式会社" "カナ06" "岡野薬品" "1110004" "住所04" "ジュウショ04" "00-0000-0004" "0" "20000101" "99991231" "100" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
|
@ -1,5 +1,5 @@
|
||||
"v_whs_cd" "sub_no" "nm" "kn_nm" "sht_nm" "zip_cd" "addr" "kn_addr" "tel_no" "v_hld_cd" "start_dt" "end_dt" "dsp_odr" "rec_sts_kbn" "ins_dt" "upd_dt"
|
||||
"200000009" "0" "株式会社マルタケ" "" "マルタケ" "" "" "" "" "0" "20000101" "99991231" "90" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000010" "0" "株式会社ファイネス" "" "ファイネス" "" "" "" "" "0" "20000101" "99991231" "100" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000011" "0" "鍋林株式会社" "" "鍋林" "" "" "" "" "0" "20000101" "99991231" "110" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000012" "0" "岡野薬品株式会社" "" "岡野薬品" "" "" "" "" "0" "20000101" "99991231" "120" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000011" "0" "鍋林株式会社" "カナ05" "鍋林" "1110004" "住所04" "ジュウショ04" "00-0000-0004" "0" "20000101" "99991231" "100" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000012" "0" "岡野薬品株式会社" "" "" "" "" "" "" "0" "20000101" "99991231" "100" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000013" "0" "株式会社アスティス" "" "アスティス" "" "" "" "" "0" "20000101" "99991231" "110" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
"200000014" "0" "株式会社スズケン岩手" "" "スズケン岩手" "" "" "" "" "0" "20000101" "99991231" "120" "0" "16-04-15 16:25:33" "16-04-15 16:25:33"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user