From 3266241ec3afbae758dda907d81b7611031e18f2 Mon Sep 17 00:00:00 2001 From: yono Date: Fri, 27 Jun 2025 14:38:12 +0900 Subject: [PATCH] =?UTF-8?q?fix:=E5=8D=B8=E3=83=97=E3=83=AB=E3=83=80?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=81=AB=E5=8D=B8=E5=90=8D=E3=81=8C=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/model/db/wholesaler_master.py | 1 - .../src/repositories/wholesaler_master_repository.py | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) 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 """