Commit b87632bb authored by xiao-hesheng's avatar xiao-hesheng
Browse files

流程十四脚本优化

parent 996ee3b4
...@@ -23,6 +23,8 @@ actual_value=delData().check_goods_info(hos_goods_id) ...@@ -23,6 +23,8 @@ actual_value=delData().check_goods_info(hos_goods_id)
print('actual_value',actual_value) print('actual_value',actual_value)
expected_value=commonFuc().get_business_data('b5_spd3_core_business_flow','expected_value') expected_value=commonFuc().get_business_data('b5_spd3_core_business_flow','expected_value')
print('expected_value',expected_value) print('expected_value',expected_value)
actual_value = actual_value.replace(" ", "")
expected_value = expected_value.replace(" ", "")
if actual_value==expected_value: if actual_value==expected_value:
print('ok') print('ok')
commonFuc().check_text_exist_result_text('succees', 'succees') commonFuc().check_text_exist_result_text('succees', 'succees')
......
企业信息: 企业信息:
e_id: CR202406250038 e_id: CR202406260038
cname: 国药集团公司YG6X1 cname: 国药集团公司Jv4ye
医院信息: 医院信息:
h_id: 湖南省人民医院HYZpM h_id: 湖南省人民医院E1Q@V
h_name: 湖南省人民医院HYZpM h_name: 湖南省人民医院E1Q@V
产品审核信息: 产品审核信息:
MSPid: MSP2406250011_1 MSPid: MSP2406260011_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004252 hosGoodsId: h034700004263
provGoodsid: provGood-99221440 provGoodsid: provGood-99221451
goodsAuditBillId: MSP2406250011 goodsAuditBillId: MSP2406260011
targetId: MSP2406250011_1 targetId: MSP2406260011_1
院区新增: 院区新增:
branch_id: h0347-3695 branch_id: h0347-3697
branch_name: 东土城路院区W!1gh branch_name: 东土城路院区%26hq
科室信息: 科室信息:
dept2_id: e74d518c952741f388a2ceb6560c550c dept2_id: db722946845b45f1b8f820fda2d9aed1
dept2_name: 二级检验科002 dept2_name: 二级检验科002
用户名信息: 用户名信息:
username1: 自动化测试IijzK username1: 自动化测试JbsuQ
username2: 自动化测试IijzK username2: 自动化测试JbsuQ
一级科室信息: 一级科室信息:
dept1_id: ddab2a8e526b415092dd22527c326c0d dept1_id: 26d972976f684788a88deff5bf2b92a0
dept1_name: 设备科001 dept1_name: 设备科001
所有科室id: 所有科室id:
deptid1: ddab2a8e526b415092dd22527c326c0d deptid1: 26d972976f684788a88deff5bf2b92a0
deptid2: e74d518c952741f388a2ceb6560c550c deptid2: db722946845b45f1b8f820fda2d9aed1
deptid3: 50c6790d9ae1490ba79b6a4a3933eea3 deptid3: 945889fd62784fb88049f25fd7287cb4
deptid4: 31a92cba5f974eddb4915b439f53c765 deptid4: 0db30c6d5f9f43588aeed39ca951f874
deptid5: e51845f23f93497c8b4ee9486576de64
所有科室name: 所有科室name:
deptid1: 设备科001 deptid1: 设备科001
deptid2: 二级检验科002 deptid2: 二级检验科002
deptid3: 三级检测组003 deptid3: 三级检测组003
deptid4: 科室004 deptid4: 科室004
deptid5: 二级科室005
shelfinfo: shelfinfo:
shelfid: e3d85ed952964429a187eba7de8eee31 shelfid: 24c21febdad14914b784c63eefb895ae
shelfCode: areah03472460 shelfCode: areah03472472
areaName: 自动化测试 areaName: 自动化测试
...@@ -444,5 +444,5 @@ json_headers2: { ...@@ -444,5 +444,5 @@ json_headers2: {
"pickType": "TH" "pickType": "TH"
} }
"expected_value": "('00004249', 'h0347', 'p1e2c6', '8d6273b7bca84dd8aace12b9422d7fd6', None, '11661197', '11661197', '11661197', '一次性注射器_低值qPW6a', '一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzqPW6a', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2c6:UID-051946', datetime.datetime(2024, 6, 25, 7, 1, 34), 'p1e2c6:UID-051946', 0, 0, 1, None)" "expected_value": "('00004260', 'h0347', 'p1e2ca', '177df1fadf39415ea5ce40e64edf449d', None, '11661208', '11661208', '11661208', '一次性注射器_低值hMY2F','一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzhMY2F', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2ca:UID-051951', datetime.datetime(2024, 6, 26, 7, 1, 39), 'p1e2ca:UID-051951', 0, 0, 1, None)"
"expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}' "expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}'
供货关系申请2: 供货关系申请2:
e_corpId: p1e2c6 e_corpId: p1e2ca
h_corpId: h0347 h_corpId: h0347
e_username: 国药集团公司YG6X1 e_username: 国药集团公司Jv4ye
h_name: test001 h_name: test001
产品审核信息: 产品审核信息:
MSPid: MSP2406250007_1 MSPid: MSP2406260007_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004248 hosGoodsId: h034700004259
provGoodsid: provGood-99221436 provGoodsid: provGood-99221447
goodsAuditBillId: MSP2406250007 goodsAuditBillId: MSP2406260007
targetId: MSP2406250007_1 targetId: MSP2406260007_1
产品审核信息: 产品审核信息:
MSPid: MSP2406250008_1 MSPid: MSP2406260008_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004249 hosGoodsId: h034700004260
provGoodsid: provGood-99221437 provGoodsid: provGood-99221448
goodsAuditBillId: MSP2406250008 goodsAuditBillId: MSP2406260008
targetId: MSP2406250008_1 targetId: MSP2406260008_1
产品审核信息: 产品审核信息:
MSPid: MSP2406250009_1 MSPid: MSP2406260009_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004250 hosGoodsId: h034700004261
provGoodsid: provGood-99221438 provGoodsid: provGood-99221449
goodsAuditBillId: MSP2406250009 goodsAuditBillId: MSP2406260009
targetId: MSP2406250009_1 targetId: MSP2406260009_1
产品审核信息: 产品审核信息:
MSPid: MSP2406250010_1 MSPid: MSP2406260010_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004251 hosGoodsId: h034700004262
provGoodsid: provGood-99221439 provGoodsid: provGood-99221450
goodsAuditBillId: MSP2406250010 goodsAuditBillId: MSP2406260010
targetId: MSP2406250010_1 targetId: MSP2406260010_1
产品审核信息: 产品审核信息:
MSPid: MSP2406250011_1 MSPid: MSP2406260011_1
hosId: h0347 hosId: h0347
hosGoodsId: h034700004252 hosGoodsId: h034700004263
provGoodsid: provGood-99221440 provGoodsid: provGood-99221451
goodsAuditBillId: MSP2406250011 goodsAuditBillId: MSP2406260011
targetId: MSP2406250011_1 targetId: MSP2406260011_1
产品包装信息: 产品包装信息:
unitPackageid1: f121128ac98c4403a42071377783f2f5 unitPackageid1: 6dad798e9d6246b7a669cd851d575a76
unitPackageid2: f121128ac98c4403a42071377783f2f5 unitPackageid2: 6dad798e9d6246b7a669cd851d575a76
...@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 ...@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
<tr width="600"> <tr width="600">
<td class="details-col-elapsed"><a href='../log/产品检查/log.html' target='_blank'>产品检查</a></td> <td class="details-col-elapsed"><a href='../log/产品检查/log.html' target='_blank'>产品检查</a></td>
<td class="success">成功</td> <td class="success">成功</td>
<td class="details-col-elapsed">0.347</td> <td class="details-col-elapsed">0.345</td>
<td class="details-col-elapsed">xiaohesheng</td> <td class="details-col-elapsed">xiaohesheng</td>
</tr> </tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment