Commit ac110730 authored by 肖 和生's avatar 肖 和生
Browse files

Merge remote-tracking branch 'remotes/origin/master' into core_flow

parents d54f1117 ee0e23e5
......@@ -110,29 +110,47 @@ def import_goods(hosGoodsId):
# print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
# 获取token和projectCode
token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "importGoods_url")
#查询产品信息===========================================
url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "mcmsBranchGoodsInfo_unBindPage_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
commonFuc().get_business_data(module, "X-APP-CODE"))
# 获取院区id
branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
while True:
# #请求体
request_body = commonFuc().get_business_data(module, "payload35", hosGoodsId, branch_id)
request_body = commonFuc().get_business_data(module, "payload33_1", branch_id,hosGoodsId)
print(request_body)
# # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('导入新增的产品result', result)
code= commonFuc().analysis_json('code',result)
if code==1004:
time.sleep(10)
print('result', result)
total=commonFuc().analysis_json('total',result)
if total==0:
continue
elif code==0:
else:
break
# 查询产品信息=========================================
#导入院区产品
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "importGoods_url")
# 获取请求头信息
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
commonFuc().get_business_data(module, "X-APP-CODE"))
# 获取院区id
branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
# #请求体
request_body = commonFuc().get_business_data(module, "payload35", hosGoodsId, branch_id)
print(request_body)
# # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('导入新增的产品result', result)
def check_import_goods(hosGoodsId):
module = "b2_herp3_bs"
......
......@@ -268,6 +268,9 @@ json_headers2: {
"payload32_1": {"pageNum": 1,"pageSize": 50,"queryObject": {"hosId": "%s","goodsName": "%s","tbStatus": "","goodsSpec": "","purModes": [],"branchId": "%s"}}
"payload33": {"queryObject": {"hosId": "h0347","branchId": "%s","goodsName": "指引导管","goodsMfrsName": "","goodsSpec": ""},"pageNum": 1,"pageSize": 50}
"payload33_1": {"queryObject": {"hosId": "h0347","branchId": "%s","goodsName": "%s","goodsMfrsName": "","goodsSpec": ""},"pageNum": 1,"pageSize": 50}
"payload34": {"hosGoodsIds": ["%s"],"hosId": "h0347","branchId": "h0347-621"}
"payload35": {"hosGoodsIds": ["%s"],"hosId": "h0347","branchId": "%s"}
"payload36": {"hosId": "h0347","branchId": "h0347-621"}
......
......@@ -75,9 +75,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
</tr>
<tr width="600">
<td class='details-col-elapsed'>8</td>
<td class='details-col-elapsed'>8</td>
<td class='details-col-elapsed'>0分3</td>
<td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>1</td>
<td class='details-col-elapsed'>0分2</td>
<td class="details-col-elapsed">100.0%</td>
</tr>
</table>
......@@ -93,58 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
</tr>
<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/r_b6科室管理_科室人员查询_按科室查询人员_设置科室负责人/log.html' target='_blank'>r_b6科室管理_科室人员查询_按科室查询人员_设置科室负责人</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.574</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/外网企业注册-器械注册人-所有输入项填写/log.html' target='_blank'>外网企业注册-器械注册人-所有输入项填写</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.475</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/外网企业注册-器械注册人-有附件/log.html' target='_blank'>外网企业注册-器械注册人-有附件</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.421</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/外网企业注册-器械注册人/log.html' target='_blank'>外网企业注册-器械注册人</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.399</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/外网企业注册提交接口_正常注册/log.html' target='_blank'>外网企业注册提交接口_正常注册</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.379</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/外网企业注册提交接口_注册企业已存在/log.html' target='_blank'>外网企业注册提交接口_注册企业已存在</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.488</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/生产厂商_企业注册提交_正常注册/log.html' target='_blank'>生产厂商_企业注册提交_正常注册</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.464</td>
<td class="details-col-elapsed">xiaohesheng</td>
</tr>
<tr width="600">
<td class="details-col-elapsed"><a href='../log/经销商_企业注册提交_正常注册/log.html' target='_blank'>经销商_企业注册提交_正常注册</a></td>
<td class="success">成功</td>
<td class="details-col-elapsed">0.401</td>
<td class="details-col-elapsed">2.6</td>
<td class="details-col-elapsed">xiaohesheng</td>
</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