From 136fe6f602ef3ad38a2f4468dc9ffe84a7f3edde Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Tue, 16 Jul 2024 09:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E4=B8=80=E8=84=9A=E6=9C=AC=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...21\344\272\214\347\272\247\345\272\223.py" | 22 +++++++++---------- ...21\344\272\214\347\272\247\345\272\223.py" | 6 ++++- data/b2_herp3_bs/message | 6 ++--- report/summary.html | 12 +++++----- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" index da6edbbf..2a0f1435 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" @@ -139,19 +139,19 @@ def second_dept_Request(hosGoodsId, type): print('添加到请领车', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) print('添加到请领车,result', result) - return token + # 添加到请领车============================================= -def BuyCarSubmit(token): +def BuyCarSubmit(): module = "b5_spd3_core_business_flow" # # # 登录获取用户id等信息，使用创建的用户登录===========开始 - # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - # username = info['username1'] - # password = commonFuc().get_business_data("b2_herp3_bs", "password") - # print('username,password', username, password) - # # # 获取token和projectCode - # token, projectCode, uxid, corpId, info = login(username, password, 2) + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + username = info['username1'] + password = commonFuc().get_business_data("b2_herp3_bs", "password") + print('username,password', username, password) + # # 获取token和projectCode + token, projectCode, uxid, corpId, info = login(username, password, 2) # # 登录获取用户id等信息，使用创建的用户登录============结束 # 我要请领_手工请领_列表查询=========================== headers = commonFuc().get_business_data(module, "json_headers2", @@ -163,7 +163,7 @@ def BuyCarSubmit(token): print('请领车查询=================', url) deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] - areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + areaCode = get_stockAreaId_new_fromDb(deptname2, 2) request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2) print('请领车查询', 'request_body', request_body) @@ -448,8 +448,8 @@ def main(): # # # 高值 second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2) # # # 试剂 - token=second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) - BuyCarSubmit(token) # 请领车提交 + second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) + BuyCarSubmit() # 请领车提交 for i in range(6): # 三个单据共审批6次 approval_center() updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 diff --git "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" index 2cd6e2cc..a5720b1e 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" @@ -344,7 +344,11 @@ def main(): set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"]) # 设置二级科室负责人 get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'], FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3) - set_stockShelf_Linkman() # 设置库区联系人 + deptName3 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'] + # 设置库区联系人 + set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"], + get_stockAreaId2_new_fromDb(deptName3, 2)) # 设置库区联系人 + #三级科室产品分配 dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3']) diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 49304c80..525715a2 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3754 - branch_name: 东土城路院区)2Fs3 + branch_id: h0347-3755 + branch_name: 东土城路院区7R4&E 科室信息: - dept2_id: b03e85ab45a24d1282eb7692dd2ad9d5 + dept2_id: b12c7c6ca56e4b46b418b319cbadbea5 dept2_name: 二级检验科002 diff --git a/report/summary.html b/report/summary.html index b31bce93..ff747f05 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 0 - 0分2秒 - 0.0% + 1 + 0分8秒 + 100.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - a_b4流程十一请领业务流_二级库向直送_数据库验证 - 失败 - 2.192 + r_b8库房管理_库区设置_同步库房信息 + 成功 + 8.451 xiaohesheng -- GitLab