nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 製造ロット番号マスタの対応

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-09-16 15:40:50 +09:00
parent 568c841770
commit 92dcd97021
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py
View File

@ -1469,16 +1469,16 @@ class VjskReceiveFileMapper:
,t.expr_dt ,t.expr_dt
,t.frst_mov_dt ,t.frst_mov_dt
,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する
,t.ins_usr ,medaca_common.convert_empty_to_null(t.ins_usr)
,SYSDATE() ,SYSDATE()
FROM org05.lot_num_mst AS t FROM org05.lot_num_mst AS t
ON DUPLICATE KEY UPDATE ON DUPLICATE KEY UPDATE
ser_num=t.ser_num ser_num=VALUES(ser_num)
,lot_num=t.lot_num ,lot_num=VALUES(lot_num)
,expr_dt=t.expr_dt ,expr_dt=VALUES(expr_dt)
,frst_mov_dt=t.frst_mov_dt ,frst_mov_dt=VALUES(frst_mov_dt)
,ins_dt=nullif(t.ins_dt, 0) ,ins_dt=VALUES(ins_dt)
,ins_usr=t.ins_usr ,ins_usr=VALUES(ins_usr)
,dwh_upd_dt=SYSDATE() ,dwh_upd_dt=SYSDATE()
; ;
""") """)

10
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py
View File

@ -1063,7 +1063,7 @@ class TestImportFileToDb:
self.batch_context.is_vjsk_stock_import_day = True self.batch_context.is_vjsk_stock_import_day = True
self.db.execute(f"truncate table {table_name_src}") self.db.execute(f"truncate table {table_name_src}")
# assertion1 (insert 4row) # assertion1 (insert 6row)
# 処理実行 # 処理実行
target_dict = { target_dict = {
@ -1079,7 +1079,7 @@ class TestImportFileToDb:
# 突合から除外する項目 # 突合から除外する項目
ignore_columns = ['dwh_upd_dt'] ignore_columns = ['dwh_upd_dt']
# orgテーブル結果が期待値通りかを突合 # orgテーブル結果が期待値通りかを突合
assert_table_results(result_org, assert_list, ignore_columns) assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True)
# srcテーブル結果を取得 # 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}")
# 突合から除外する項目 # 突合から除外する項目
@ -1103,10 +1103,10 @@ class TestImportFileToDb:
# 突合から除外する項目 # 突合から除外する項目
ignore_columns = ['dwh_upd_dt'] ignore_columns = ['dwh_upd_dt']
# orgテーブル結果が期待値通りかを突合 # 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値で一致するもの)を取得 # srcテーブル結果(orgテーブル結果のPK値で一致するもの)を取得
result_src = self.db.execute_select( result_src = self.db.execute_select(
f"select * from {table_name_src} s inner join {table_name_org} o on (s.ser_num = o.ser_num and s.lot_num = o.lot_num)") f"select s.* from {table_name_src} s inner join {table_name_org} o on (s.ser_num = o.ser_num and s.lot_num = o.lot_num)")
# 突合から除外する項目 # 突合から除外する項目
ignore_columns = ['dwh_upd_dt'] ignore_columns = ['dwh_upd_dt']
# srcテーブル結果が期待値通りかを突合 # srcテーブル結果が期待値通りかを突合
@ -1114,7 +1114,7 @@ class TestImportFileToDb:
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row) # srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ") 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 # teardown

2
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304280000.tsv vendored
View File

@ -3,3 +3,5 @@
"F0110601" "BAVA002" "20230331" "20210615" "23-05-08 20:40:41" "batch" "F0110601" "BAVA002" "20230331" "20210615" "23-05-08 20:40:41" "batch"
"F0110601" "BAVA003" "20231031" "20210719" "23-05-08 20:40:41" "batch" "F0110601" "BAVA003" "20231031" "20210719" "23-05-08 20:40:41" "batch"
"F0110601" "BAVA004" "20231031" "20210823" "23-05-08 20:40:41" "batch" "F0110601" "BAVA004" "20231031" "20210823" "23-05-08 20:40:41" "batch"
"F0110602" "BAVA001" "20231031" "20210823" "23-05-08 20:40:41" ""
"F0110602" "BAVA002" "20231031" "20210823" "23-05-08 20:40:41" "batch"

1 ser_no lot_num expr_dt frst_mov_dt ins_dt ins_usr
3 F0110601 BAVA002 20230331 20210615 23-05-08 20:40:41 batch
4 F0110601 BAVA003 20231031 20210719 23-05-08 20:40:41 batch
5 F0110601 BAVA004 20231031 20210823 23-05-08 20:40:41 batch
6 F0110602 BAVA001 20231031 20210823 23-05-08 20:40:41
7 F0110602 BAVA002 20231031 20210823 23-05-08 20:40:41 batch

4
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/lot_num_mst_202304290000.tsv vendored
View File

@ -1,5 +1,5 @@
"ser_no" "lot_num" "expr_dt" "frst_mov_dt" "ins_dt" "ins_usr" "ser_no" "lot_num" "expr_dt" "frst_mov_dt" "ins_dt" "ins_usr"
"F0110601" "BAVA003" "20231031" "20210719" "23-05-08 20:40:41" "batch" "F0110602" "BAVA001" "20231031" "20210719" "23-05-08 20:40:41" "batch"
"F0110601" "BAVA004" "20231031" "20210823" "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" "BAVA005" "20231031" "20210927" "23-05-08 20:40:41" "batch"
"F0110601" "BAVA006" "20240131" "20211025" "23-05-08 20:40:41" "batch" "F0110601" "BAVA006" "20240131" "20211025" "23-05-08 20:40:41" "batch"

1 ser_no lot_num expr_dt frst_mov_dt ins_dt ins_usr
2 F0110601 F0110602 BAVA003 BAVA001 20231031 20210719 23-05-08 20:40:41 batch
3 F0110601 F0110602 BAVA004 BAVA002 20231031 20210823 23-05-08 20:40:41 batch
4 F0110601 BAVA005 20231031 20210927 23-05-08 20:40:41 batch
5 F0110601 BAVA006 20240131 20211025 23-05-08 20:40:41 batch