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

Merge pull request #515 feature-NEWDWH2021-1932 into develop

Browse Source
This commit is contained in:
朝倉 明日香 2025-06-30 09:04:57 +09:00
commit 19f348ee2a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ecs/jskult-webapp/src/model/db/wholesaler_master.py
View File

@ -7,4 +7,3 @@ class WholesalerMasterModel(BaseDBModel):
rec_whs_cd: Optional[str] rec_whs_cd: Optional[str]
rec_whs_sub_cd: Optional[str] rec_whs_sub_cd: Optional[str]
name: Optional[str] name: Optional[str]
whs_name: Optional[str]

5
ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py
View File

@ -11,8 +11,7 @@ class WholesalerMasterRepository(BaseRepository):
SELECT DISTINCT SELECT DISTINCT
b.orig_whlslr_cd as rec_whs_cd, b.orig_whlslr_cd as rec_whs_cd,
b.orig_whlslr_sub_cd as rec_whs_sub_cd, b.orig_whlslr_sub_cd as rec_whs_sub_cd,
v2.ws_nm_kj as name, v2.ws_nm_kj as name
b.cls_whlslr_nm as whs_name
FROM src07.trn_result_data_bio_lot b FROM src07.trn_result_data_bio_lot b
LEFT OUTER JOIN LEFT OUTER JOIN
( (
@ -22,7 +21,7 @@ class WholesalerMasterRepository(BaseRepository):
FROM src07.mst_whlslr 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') 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 ) 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 ORDER BY b.orig_whlslr_cd, b.orig_whlslr_sub_cd , b.cls_whlslr_nm DESC
""" """