diff --git a/ecs/jskult-webapp/src/model/db/wholesaler_master.py b/ecs/jskult-webapp/src/model/db/wholesaler_master.py index b24f58b7..b4968383 100644 --- a/ecs/jskult-webapp/src/model/db/wholesaler_master.py +++ b/ecs/jskult-webapp/src/model/db/wholesaler_master.py @@ -7,4 +7,3 @@ class WholesalerMasterModel(BaseDBModel): rec_whs_cd: Optional[str] rec_whs_sub_cd: Optional[str] name: Optional[str] - whs_name: Optional[str] diff --git a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py index 7b474a23..4100fa74 100644 --- a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py @@ -11,8 +11,7 @@ class WholesalerMasterRepository(BaseRepository): SELECT DISTINCT b.orig_whlslr_cd as rec_whs_cd, b.orig_whlslr_sub_cd as rec_whs_sub_cd, - v2.ws_nm_kj as name, - b.cls_whlslr_nm as whs_name + v2.ws_nm_kj as name FROM src07.trn_result_data_bio_lot b LEFT OUTER JOIN ( @@ -22,7 +21,7 @@ class WholesalerMasterRepository(BaseRepository): FROM src07.mst_whlslr WHERE src07.get_syor_date() BETWEEN str_to_date(concat(eff_start_ym, '01'), '%Y%m%d') AND str_to_date(concat(eff_end_ym, '01'), '%Y%m%d') ) v2 - ON b.orig_whlslr_cd = v2.ws_cd + ON b.cnvs_whlslr_cd = v2.ws_cd ORDER BY b.orig_whlslr_cd, b.orig_whlslr_sub_cd , b.cls_whlslr_nm DESC """