diff --git a/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py b/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py index 3dd1a7bb..8d4a921a 100644 --- a/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py +++ b/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py @@ -165,7 +165,7 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): bio.cnvs_whlslr_cd AS cnvs_whlslr_cd, bio.cls_whlslr_nm AS cls_whlslr_nm, bio.cls_prod_nm AS cls_prod_nm, - bio.cnvs_prod_cd AS nvs_prod_cd, + bio.cnvs_prod_cd AS cnvs_prod_cd, bio.cnvs_lot_sales_qty_1 AS cnvs_lot_sales_qty_1, bio.cnvs_inst_cd AS cnvs_inst_cd, bio.cls_inst_nm AS cls_inst_nm, @@ -177,24 +177,24 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): CASE LEFT(bio.cnvs_inst_cd, 2) WHEN '00' THEN src05.com_inst.inst_phone_number WHEN '03' THEN src05.com_pharm.inst_phone_number - WHEN src07.mst_inst_merck.tel_no + ELSE src07.mst_inst_merck.tel_no END AS inst_tel AS inst_tel, bio.result_cd AS result_cd, bio.src_cd AS src_cd, -- 判定結果CDより値を設定する CASE bio.result_cd - WHEN '1:正常' THEN '正常' - WHEN '2:卸間転送除外対象データ' THEN '卸間転送除外対象' - WHEN 'E:事前想定したエラーが発生したデータ' THEN 'エラー' - WHEN 'D:レコード重複エラーが発生したデータ' THEN 'エラー(重複)' - WHEN 'Z:想定外のエラーが発生したデータ' THEN 'エラー(想定外)' + WHEN '1' THEN '正常' + WHEN '2' THEN '卸間転送除外対象' + WHEN 'E' THEN 'エラー' + WHEN 'D' THEN 'エラー(重複)' + WHEN 'Z' THEN 'エラー(想定外)' END AS data_kbn, -- SRC_種類より値を設定する CASE bio.result_cd - WHEN '1:VAN' THEN 'VAN' - WHEN '2:手入力' THEN '手入力' - WHEN '3:VAN-Web' THEN 'VAN-Web' - WHEN 'S:SCSK-VAN' THEN 'SCSK-VAN' + WHEN '1' THEN 'VAN' + WHEN '2' THEN '手入力' + WHEN '3' THEN 'VAN-Web' + WHEN 'S' THEN 'SCSK-VAN' END AS if_kind, -- 製品コード、ロット番号でロットマスタよりセット bio.ck_last_dt_txt AS ck_last_dt_txt @@ -202,10 +202,24 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): src07.trn_result_data_bio bio -- 生物由来変換マスタ CROSS JOIN src07.bio_conv conv + LEFT OUTER JOIN src07.customer_lotno_all cla + ON bio.cnvs_prod_cd = cla.material_cd + AND bio.cnvs_lot_no_1 = cla.lot_no_txt + AND bio.cnvs_lot_no_2 = cla.lot_no_txt + AND bio.cnvs_lot_no_3 = cla.lot_no_txt + -- COM_施設 + LEFT OUTER JOIN src05.com_inst ci + ON bio.cnvs_inst_cd = ci.dcf_dsf_inst_cd + -- COM_薬局 + LEFT OUTER JOIN src05.com_pharm cp + ON bio.cnvs_inst_cd = cp.dcf_dsf_inst_cd + -- 独自施設マスタ + LEFT OUTER JOIN src05.mst_inst_merck mim + ON bio.cnvs_inst_cd = mim.inst_cd WHERE DATE(bio.last_upd_dtt) >= src07.get_syor_date() """ - res = db.execute(sql) + db.execute(sql) except Exception as e: logger.info('生物由来ロット分解データの作成に失敗')