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

feat: 生物由来照会画面のv2対応

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-08-03 14:06:21 +09:00
parent 7898d7e5fc
commit bda429a0ad
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ecs/jskult-webapp/src/model/db/bio_sales_lot.py
View File

@ -6,7 +6,6 @@ from src.model.db.base_db_model import BaseDBModel
class BioSalesLotDBModel(BaseDBModel):
slip_mgt_num: Optional[str]
conv_cd: Optional[int]
rec_whs_cd: Optional[str]
rec_whs_sub_cd: Optional[str]
rec_whs_org_cd: Optional[str]
@ -14,39 +13,27 @@ class BioSalesLotDBModel(BaseDBModel):
rec_tran_kbn: Optional[str]
rev_hsdnymd_srk: Optional[str]
rec_urag_num: Optional[str]
rec_comm_name: Optional[str]
rec_nonyu_fcl_name: Optional[str]
rec_nonyu_fcl_addr: Optional[str]
rec_lot_num: Optional[str]
rec_ymd: Optional[str]
v_tran_cd: Optional[int]
tran_kbn_name: Optional[str]
whs_org_cd: Optional[str]
v_whsorg_cd: Optional[int]
whs_org_name: Optional[str]
v_whs_cd: Optional[int]
whs_name: Optional[str]
nonyu_fcl_cd: Optional[str]
v_inst_cd: Optional[str]
v_inst_kn: Optional[str]
v_inst_name: Optional[str]
v_inst_addr: Optional[str]
comm_cd: Optional[str]
product_name: Optional[str]
whs_rep_comm_name: Optional[str]
whs_rep_nonyu_fcl_name: Optional[str]
whs_rep_nonyu_fcl_addr: Optional[str]
mkr_inf_1: Optional[str]
mkr_cd: Optional[str]
qty: Optional[int]
slip_org_kbn: Optional[str]
bef_slip_mgt_num: Optional[str]
lot_no_err_flg: Optional[str]
iko_flg: Optional[str]
rec_sts_kbn: Optional[str]
ins_dt: Optional[datetime]
ins_usr: Optional[str]
dwh_upd_dt: Optional[datetime]
inst_cd: Optional[str]
inst_name_form: Optional[str]
address: Optional[str]

11
ecs/jskult-webapp/src/model/view/bio_view_model.py
View File

@ -14,12 +14,11 @@ from src.system_var import environment
class BioViewModel(BaseModel):
subtitle: str = '生物由来検索一覧'
user_id: Optional[str]
batch_status: Optional[str]
user_id: str
whs_models: list[WholesalerMasterModel]
phm_models: list[PharmacyProductMasterModel]
bio_data: Optional[list[BisDisplayModel]] = []
form_data: Optional[BioModel]
bio_data: Optional[list[BisDisplayModel]] = None
form_data: BioModel = None
def display_wholesaler_names(self):
display_names = [
@ -147,10 +146,10 @@ class BioViewModel(BaseModel):
return self.form_data is not None
def is_data_empty(self):
return len(self.bio_data) == 0
return self.bio_data is None or len(self.bio_data) == 0
def is_data_overflow_max_length(self):
return len(self.bio_data) > environment.BIO_SEARCH_RESULT_MAX_COUNT
return self.bio_data is None or len(self.bio_data) > environment.BIO_SEARCH_RESULT_MAX_COUNT
def _format_date_string(self, date_string):
if date_string is None: