単体試験不具合対応
This commit is contained in:
野間
parent
7a15f4a2b9
commit
4cf9b02833
@ -44,7 +44,7 @@ class BioSalesLotDBModel(BaseDBModel):
|
||||
lot_no_err_flg: Optional[str]
|
||||
iko_flg: Optional[str]
|
||||
rec_sts_kbn: Optional[str]
|
||||
ins_dt: Optional[str]
|
||||
ins_dt: Optional[datetime]
|
||||
ins_usr: Optional[str]
|
||||
dwh_upd_dt: Optional[datetime]
|
||||
inst_cd: Optional[str]
|
||||
|
||||
@ -4,4 +4,5 @@ from src.model.db.base_db_model import BaseDBModel
|
||||
|
||||
|
||||
class PharmacyProductMasterModel(BaseDBModel):
|
||||
mkr_cd: Optional[str]
|
||||
mkr_cd_name: Optional[str]
|
||||
|
||||
@ -45,7 +45,7 @@ class BioViewModel(BaseModel):
|
||||
'0': '正常',
|
||||
'1': 'ロットエラー',
|
||||
'3': 'ロット不明',
|
||||
'9': 'エラー（解消済）',
|
||||
'9': 'エラー（解消済み）',
|
||||
'2': '除外'
|
||||
}
|
||||
)
|
||||
|
||||
@ -31,7 +31,6 @@ class BioSalesLotRepository(BaseRepository):
|
||||
v_whs_cd,
|
||||
whs_name,
|
||||
nonyu_fcl_cd,
|
||||
v_inst_cd,
|
||||
product_name,
|
||||
whs_rep_comm_name,
|
||||
whs_rep_nonyu_fcl_name,
|
||||
@ -42,6 +41,7 @@ class BioSalesLotRepository(BaseRepository):
|
||||
iko_flg,
|
||||
ins_dt,
|
||||
ins_usr,
|
||||
inst_cd,
|
||||
inst_name_form,
|
||||
address,
|
||||
tel_num,
|
||||
@ -115,7 +115,7 @@ class BioSalesLotRepository(BaseRepository):
|
||||
if is_not_empty(parameter.rec_lot_num):
|
||||
rec_lot_num = parameter.rec_lot_num
|
||||
# あいまい検索文字列('%')が含まれる場合は'LIKE'、でなければ'='で検索
|
||||
rec_lot_num_comparator = condition.LIKE if rec_lot_num in '%' else condition.EQ
|
||||
rec_lot_num_comparator = condition.LIKE if '%' in rec_lot_num else condition.EQ
|
||||
where_clauses.append(SQLCondition('rec_lot_num', rec_lot_num_comparator, 'rec_lot_num'))
|
||||
# データ区分
|
||||
if is_not_empty(parameter.data_kbn):
|
||||
|
||||
@ -9,6 +9,7 @@ class PharmacyProductMasterRepository(BaseRepository):
|
||||
|
||||
FETCH_SQL = """\
|
||||
SELECT
|
||||
t1.mkr_cd,
|
||||
CONCAT(IFNULL(t1.mkr_cd, ''), ' ', IFNULL(t1.mkr_inf_1, '')) AS mkr_cd_name
|
||||
FROM
|
||||
src05.phm_prd_mst_v t1
|
||||
|
||||
@ -156,7 +156,7 @@ class BioViewService(BaseService):
|
||||
header_df = pd.DataFrame([header_data], index=None)
|
||||
output_df = pd.concat([header_df, data_frame])
|
||||
# ヘッダー行としてではなく、1レコードとして出力する
|
||||
output_df.to_csv(output_file_path, index=False, header=False)
|
||||
output_df.to_csv(output_file_path, index=False, header=False, encoding="utf-8_sig")
|
||||
|
||||
return output_file_path
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ BIO_CSV_HEADER = [
|
||||
'Veeva卸組織コード',
|
||||
'卸組織名',
|
||||
'Veeva取引区分コード',
|
||||
'移行'
|
||||
'2017年11月以前データ'
|
||||
]
|
||||
|
||||
SLIP_ORG_KBN_FULL_NAME = {
|
||||
|
||||
@ -52,12 +52,12 @@
|
||||
</td>
|
||||
<td>処理日：</td>
|
||||
<td colspan="2">
|
||||
<input type="text" id="shoribi_start" class="date_picker" name="ctrl_rec_ymd_from"
|
||||
<input type="text" id="shoribi_start" class="date_picker" name="ctrl_rec_ymd_from" maxlength="10"
|
||||
value="{{bio.is_input_rec_ymd_from()}}"
|
||||
onchange="formBtDisabled()"
|
||||
>
|
||||
～
|
||||
<input type="text" id="shoribi_end" class="date_picker" name="ctrl_rec_ymd_to"
|
||||
<input type="text" id="shoribi_end" class="date_picker" name="ctrl_rec_ymd_to" maxlength="10"
|
||||
value="{{bio.is_input_rec_ymd_to()}}"
|
||||
onchange="formBtDisabled()"
|
||||
>
|
||||
@ -74,7 +74,7 @@
|
||||
<td class="search_tb">
|
||||
<select class="text search_dropdown" name="ctrl_data_kbn" onchange="formBtDisabled()">
|
||||
{% for data_kbn_code, data_kbn_value in bio.display_data_kbn().items() %}
|
||||
<option value="{{data_kbn_code}}" {{bio.is_selected_data_kbn(data_kbn_code)}} >{{data_kbn_value}}</option>
|
||||
<option value="{{data_kbn_value}}" {{bio.is_selected_data_kbn(data_kbn_value)}} >{{data_kbn_value}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</td>
|
||||
@ -84,7 +84,7 @@
|
||||
<option value=""></option>
|
||||
{% for phm in bio.phm_models %}
|
||||
<option
|
||||
value="{{phm['mkr_cd_name']}}" {{bio.is_selected_maker_cd(phm['mkr_cd_name'])}}>
|
||||
value="{{phm['mkr_cd']}}" {{bio.is_selected_maker_cd(phm['mkr_cd'])}}>
|
||||
{{phm['mkr_cd_name']}}
|
||||
</option>
|
||||
{% endfor %}
|
||||
@ -94,12 +94,12 @@
|
||||
<tr>
|
||||
<td>発伝年月日：</td>
|
||||
<td colspan="3">
|
||||
<input type="text" id="hsdnymd_start" class="date_picker" name="ctrl_rev_hsdnymd_srk_from"
|
||||
<input type="text" id="hsdnymd_start" class="date_picker" name="ctrl_rev_hsdnymd_srk_from" maxlength="10"
|
||||
value="{{bio.is_input_rev_hsdnymd_srk_from()}}"
|
||||
onchange="formBtDisabled()"
|
||||
>
|
||||
～
|
||||
<input type="text" id="hsdnymd_end" class="date_picker" name="ctrl_rev_hsdnymd_srk_to"
|
||||
<input type="text" id="hsdnymd_end" class="date_picker" name="ctrl_rev_hsdnymd_srk_to" maxlength="10"
|
||||
value="{{bio.is_input_rev_hsdnymd_srk_to()}}"
|
||||
onchange="formBtDisabled()"
|
||||
>
|
||||
@ -165,7 +165,7 @@
|
||||
<th>Veeva卸組織コード</th>
|
||||
<th>卸組織名</th>
|
||||
<th>Veeva取引区分コード</th>
|
||||
<th>移行</th>
|
||||
<th>2017年11月以前データ</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="result_data" class="result_data"></tbody>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user