diff --git a/ecs/jskult-webapp/src/data/BioData_template.xlsx b/ecs/jskult-webapp/src/data/BioData_template.xlsx index 3b9fb03a..1c90ba82 100644 Binary files a/ecs/jskult-webapp/src/data/BioData_template.xlsx and b/ecs/jskult-webapp/src/data/BioData_template.xlsx differ diff --git a/ecs/jskult-webapp/src/model/db/trn_result_data_bio_lot.py b/ecs/jskult-webapp/src/model/db/trn_result_data_bio_lot.py index 2c96429f..9e6f5e7c 100644 --- a/ecs/jskult-webapp/src/model/db/trn_result_data_bio_lot.py +++ b/ecs/jskult-webapp/src/model/db/trn_result_data_bio_lot.py @@ -8,13 +8,13 @@ class TrnResultDataBioLotDBModel(BaseDBModel): if_kind: Optional[str] account_ym: Optional[str] seq_no: Optional[int] - load_dt: Optional[datetime] + load_dt: Optional[date] orig_whlslr_cd: Optional[str] orig_whlslr_sub_cd: Optional[str] cls_whlslr_nm: Optional[str] edit_whlslr_org_cd: Optional[str] orig_slip_no: Optional[str] - cnvs_sales_dt: Optional[datetime] + cnvs_sales_dt: Optional[date] edit_deal_div_cd: Optional[str] cls_deal_div_nm: Optional[str] cnvs_prod_cd: Optional[str] diff --git a/ecs/jskult-webapp/src/model/request/bio.py b/ecs/jskult-webapp/src/model/request/bio.py index c79ac2b0..d898c620 100644 --- a/ecs/jskult-webapp/src/model/request/bio.py +++ b/ecs/jskult-webapp/src/model/request/bio.py @@ -16,7 +16,7 @@ class BioModel(BaseModel): load_dt_from: Optional[str] load_dt_to: Optional[str] cnvs_lot_no: Optional[str] - result_cd: Optional[str] + data_kbn: Optional[str] cnvs_prod_cd: Optional[str] cnvs_sales_dt_from: Optional[str] cnvs_sales_dt_to: Optional[str] @@ -31,7 +31,7 @@ class BioModel(BaseModel): ctrl_load_dt_from: str = Form(None), ctrl_load_dt_to: str = Form(None), ctrl_cnvs_lot_no: str = Form(None), - ctrl_result_cd: str = Form(None), + ctrl_data_kbn: str = Form(None), ctrl_maker_cd: str = Form(None), ctrl_cnvs_sales_dt_from: str = Form(None), ctrl_cnvs_sales_dt_to: str = Form(None), @@ -46,7 +46,7 @@ class BioModel(BaseModel): ctrl_load_dt_from, ctrl_load_dt_to, ctrl_cnvs_lot_no, - ctrl_result_cd, + ctrl_data_kbn, ctrl_maker_cd, ctrl_cnvs_sales_dt_from, ctrl_cnvs_sales_dt_to, @@ -62,7 +62,7 @@ class BioModel(BaseModel): ctrl_load_dt_from: str = Body(None), ctrl_load_dt_to: str = Body(None), ctrl_cnvs_lot_no: str = Body(None), - ctrl_result_cd: str = Body(None), + ctrl_data_kbn: str = Body(None), ctrl_maker_cd: str = Body(None), ctrl_cnvs_sales_dt_from: str = Body(None), ctrl_cnvs_sales_dt_to: str = Body(None) @@ -75,7 +75,7 @@ class BioModel(BaseModel): ctrl_load_dt_from, ctrl_load_dt_to, ctrl_cnvs_lot_no, - ctrl_result_cd, + ctrl_data_kbn, ctrl_maker_cd, ctrl_cnvs_sales_dt_from, ctrl_cnvs_sales_dt_to @@ -88,7 +88,7 @@ class BioModel(BaseModel): ctrl_load_dt_from: str, ctrl_load_dt_to: str, ctrl_cnvs_lot_no: str, - ctrl_result_cd: str, + ctrl_data_kbn: str, ctrl_maker_cd: str, ctrl_cnvs_sales_dt_from: str, ctrl_cnvs_sales_dt_to: str, @@ -130,7 +130,7 @@ class BioModel(BaseModel): load_dt_from=load_dt_from, load_dt_to=load_dt_to, cnvs_lot_no=ctrl_cnvs_lot_no, - result_cd=ctrl_result_cd, + data_kbn=ctrl_data_kbn, cnvs_prod_cd=ctrl_maker_cd, cnvs_sales_dt_from=cnvs_sales_dt_from, cnvs_sales_dt_to=cnvs_sales_dt_to, diff --git a/ecs/jskult-webapp/src/model/view/bio_view_model.py b/ecs/jskult-webapp/src/model/view/bio_view_model.py index 0600cabd..52d91f1e 100644 --- a/ecs/jskult-webapp/src/model/view/bio_view_model.py +++ b/ecs/jskult-webapp/src/model/view/bio_view_model.py @@ -38,7 +38,7 @@ class BioViewModel(BaseModel): { '': '', '1':'正常', - '2':'卸間転送除外対象データ', + '2':'卸間転送除外対象', 'E':'エラー', 'D':'エラー（重複）', 'Z':'エラー（想定外）' diff --git a/ecs/jskult-webapp/src/repositories/trn_result_data_bio_lot_repository.py b/ecs/jskult-webapp/src/repositories/trn_result_data_bio_lot_repository.py index 9dc7c66b..2613c958 100644 --- a/ecs/jskult-webapp/src/repositories/trn_result_data_bio_lot_repository.py +++ b/ecs/jskult-webapp/src/repositories/trn_result_data_bio_lot_repository.py @@ -141,8 +141,8 @@ class BioSalesLotRepository(BaseRepository): cnvs_lot_no_comparator = condition.LIKE if '%' in cnvs_lot_no else condition.EQ where_clauses.append(SQLCondition('TRIM(cnvs_lot_no)', cnvs_lot_no_comparator, 'cnvs_lot_no')) # データ区分 - if is_not_empty(parameter.result_cd): - where_clauses.append(SQLCondition('result_cd', condition.EQ, 'result_cd')) + if is_not_empty(parameter.data_kbn): + where_clauses.append(SQLCondition('data_kbn', condition.EQ, 'data_kbn')) # 製品 if is_not_empty(parameter.cnvs_prod_cd): where_clauses.append(SQLCondition('cnvs_prod_cd', condition.EQ, 'cnvs_prod_cd')) diff --git a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py index a3e31235..7b474a23 100644 --- a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py @@ -13,7 +13,7 @@ class WholesalerMasterRepository(BaseRepository): b.orig_whlslr_sub_cd as rec_whs_sub_cd, v2.ws_nm_kj as name, b.cls_whlslr_nm as whs_name - FROM src07.trn_result_data_bio b + FROM src07.trn_result_data_bio_lot b LEFT OUTER JOIN ( SELECT diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index 6a26b065..9135bd24 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -17,8 +17,9 @@ BIO_TEMPORARY_FILE_DIR_PATH = path.join(path.curdir, 'src', 'data') BIO_EXCEL_TEMPLATE_FILE_PATH = path.join(BIO_TEMPORARY_FILE_DIR_PATH, 'BioData_template.xlsx') BIO_CSV_HEADER = [ - 'データ種別', - '伝票管理NO', + '連携種別', + '計上年月', + '管理番号', '処理日', '卸コード', '卸サブコード', @@ -31,29 +32,21 @@ BIO_CSV_HEADER = [ '製品コード', '統一商品コード', '商品名', - '卸報告商品名', '納入先コード', '納入先名', - '卸報告納入先名', '納入先住所', - '卸報告納入先住所', 'ロット番号', '数量', '有効期限', 'データ区分', - 'エラー詳細種別', - '訂正前伝票管理NO', - '修正者', - '修正日時', '施設コード', '施設名', '施設住所', '施設電話番号', - 'Veeva卸コード', - 'Veeva卸組織コード', - '卸組織名', - 'Veeva取引区分コード', - '2017年11月以前データ' + 'tebra卸コード', + 'tebraデポコード', + 'デポ名', + 'tebra取引区分コード' ] LOGOUT_REASON_DO_LOGOUT = 'do_logout' diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index 65159f1e..8ba332f9 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -47,7 +47,7 @@ + - + @@ -185,7 +185,7 @@ - +