优化脚本

air_case/b2_herp3_bs/r_c5库房管理_库区设置_库区查询_查询全部.air/r_c5库房管理_库区设置_库区查询_查询全部.py

@@ -93,7 +93,13 @@ def test2(dept_id='d69a68df361a4289b2262e4ef75b55a5',stockId='c66b6ed38dbb4fbc86
         if shelfName == '自动化测试':
             print(shelfName, 'ccccccccccccccccccccccccccc')
             id1 = commonFuc().analysis_json('id', i)
+            shelfCode= commonFuc().analysis_json('shelfCode', i)
+            areaName= commonFuc().analysis_json('shelfName', i)
             print(id1)
+            info = (id1, shelfCode,areaName)
+            titlename = ('shelfid', 'shelfCode','areaName')
+            # 将库区id写入文件中
+            FileUtils().w_info8(info, module, 'shelfinfo', titlename,'message7')
             return id1
 pro_path = commonFuc().get_pro_path()
 sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\r_b9库房管理_库区设置_库房查询_查询全部.air')

air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air/a_a4_流程四_基础模块设置.py

@@ -6,7 +6,7 @@ __author__ = "xiaohesheng"
 
 """
 case_tag:api,mdm-core,a_a4_流程四_基础模块设置,id2302,id2302-4,sit,on
-主数据平台:a_a3_流程三_产品导入和审批 
+主数据平台:a_a4_流程四_基础模块设置 
 """
 
 from common.common_func import commonFuc
@@ -201,9 +201,9 @@ def grants_user(orgName='d69a68df361a4289b2262e4ef75b55a5', mgrRangeId='feb0cc16
 
 
 try:
-    # test1()
-    # test2()
-    # dept_query_all()
+    test1()
+    test2()
+    dept_query_all()
     grants_user()
 except:
     commonFuc().check_text_exist('1', '2')

air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算.air/a_a5流程五_中心库入库结算_正结算.py

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+from common.run_cmd_script import execute_command
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-core,a_a5流程五_中心库入库结算_正结算,id2302,id2302-5,sit,on
+主数据平台:a_a5流程五_中心库入库结算_正结算 
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+from airtest.core.api import using
+import sys
+import time
+
+module = "b5_spd3_core_business_flow"
+
+
+def login():
+    module = "b2_herp3_bs"
+    # 登录获取用户id等信息，使用创建的用户登录===========开始
+    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    print(info)
+    username1 = info['username1']
+
+    username = username1
+    ## print('医院名称',username)
+    password = commonFuc().get_business_data(module, "password")
+    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    return token, projectCode, uxid, corpId, info
+    # 登录获取用户id等信息，使用创建的用户登录============结束
+
+
+# 采购计划_低值
+def test1():
+    module = "b3_herp3_purchase"
+    # 登录获取用户id等信息，使用创建的用户登录===========开始
+    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    print(info)
+    username1 = info['username1']
+
+    username = username1
+    ## print('医院名称',username)
+    password = commonFuc().get_business_data(module, "password")
+    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # 登录获取用户id等信息，使用创建的用户登录============结束
+    # 获取暂存的单号=======================================
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
+    print(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"))
+    print('headers', headers)
+    hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+    pkgDefId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品包装信息', 'message6')["unitPackageid1"]
+    # 获取院区id
+    branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
+    hosId = branch_id[0:5]
+    deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
+    hospital_name = commonFuc().get_business_data(module, 'hospital_name')
+    areaCode = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["shelfCode"]
+    areaName = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["areaName"]
+    recUser = uxid
+
+    # # 请求体
+    request_body = commonFuc().get_business_data(module, "payload1_1_1", hosGoodsId, pkgDefId, hosId, branch_id,
+                                                 hospital_name, deptid1, deptid1, areaCode, areaName, recUser)
+    print('request_body', request_body)
+    # new_request_body = request_body.replace("'", '"')
+    # new_request_body = new_request_body.replace("None", 'null')
+    # # print(new_request_body)
+    # import json
+    # request_body_json = json.loads(new_request_body)
+    # print('request_body_json', request_body_json)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    pid = commonFuc().analysis_json('data', result)  # 采购计划号
+    # 获取暂存的单号==========================================================
+
+    # 获取采购计划详情中的id
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_listVo_url")
+    print(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"))
+    print('headers', headers)
+    # # 请求体
+    request_body = commonFuc().get_business_data(module, "payload11", pid)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', result)
+    data = commonFuc().analysis_json('data', result)
+    id1 = commonFuc().analysis_json('id', data[0])
+    # =====================================
+
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "herpService_purPlan_submitPurPlan_url")
+    print(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"))
+    print('headers', headers)
+    provId= FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
+    provName= FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"]
+    subProvId=FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
+    subProvName= FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"]
+    # # 请求体
+    request_body = commonFuc().get_business_data(module, "payload12_1_1", pid,id1,provId,provName,subProvId,subProvName,hosGoodsId,pkgDefId)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('resultbbbbbbbbbbbbbbbbbbbb', result)
+    # 断言
+    code = commonFuc().analysis_json('code', result)
+    data = commonFuc().analysis_json('data', result)
+    if code == 0 and data == None:
+        commonFuc().check_text_exist(0, result)
+    else:
+        commonFuc().check_text_exist('error', result)
+
+
+def get_GoodsPkgDef(hosGoodsId):
+    # 获取院区产品id==================开始
+    module = "b2_herp3_bs"
+    # 登录获取用户id等信息，使用创建的用户登录===========开始
+    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    print(info)
+    username1 = info['username1']
+
+    username = username1
+    ## print('医院名称',username)
+    password = commonFuc().get_business_data(module, "password")
+    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # 登录获取用户id等信息，使用创建的用户登录===========结束
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "mcmsBranchGoodsInfo_url")
+    print(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"]
+    hos_id = branch_id[0:5]
+    print(hos_id)
+    # hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+    GoodsId = hosGoodsId.replace(hos_id, '')
+    print(GoodsId)
+    deptid1 = FileUtils().r_info8(module, '所有科室id', 'message6')["deptid1"]
+    # #请求体
+    request_body = commonFuc().get_business_data(module, "payload39_1_1", branch_id, hos_id, GoodsId, deptid1)
+    print(request_body)
+    # # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
+
+    data = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+    branchGoodsId = commonFuc().analysis_json('branchGoodsId', data)
+    hosGoodsId = commonFuc().analysis_json('hosGoodsId', data)
+
+    # 获取院区产品id ===========结束
+
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "branchGoodsPkgDef_url")
+    print(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, "payload42_2", hos_id, branch_id, branchGoodsId)
+    print('request_body', request_body)
+    # # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    # 断言
+    # checkDict=commonFuc().get_business_data(module,'checkDict10')
+    # commonFuc().check_result(checkDict,result)
+    unitPackageid = commonFuc().analysis_json('id', commonFuc().analysis_json('data', result))
+    print('unitPackageid', unitPackageid)
+    info = (unitPackageid, unitPackageid)
+    titlename = ('unitPackageid1', 'unitPackageid2')
+
+    FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '产品包装信息', titlename, 'message6')
+
+
+try:
+    # 获取低值的hosGoodsId
+    hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+    get_GoodsPkgDef(hosGoodsId)  # 获取单元包id
+except:
+    print('流程五获取hosGoodsId出现错误,请检查数据')
+test1()
\ No newline at end of file

data/b2_herp3_bs/data

@@ -268,9 +268,11 @@ json_headers2: {
 "payload37": {"hosId": "h0347","branchId": "%s"}
 "payload38": {"pageNum": 1,"pageSize": 50,"queryObject": {"branchId": "%s","hosId": "h0347","goodsName": "","purModes": [10,60],"notPkg": false,"goodsSpec": "","deptId":"%s"}}
 "payload39": {"pageNum": 1,"pageSize": 50,"queryObject": {"branchId":"%s","hosId": "h0347", "goodsName": "", "purModes": [ 10,60],"notPkg": true,"goodsSpec": ""}}
+"payload39_1_1": {"pageNum":1,"pageSize":50,"queryObject":{"branchId":"%s","hosId":"%s","goodsName":"%s","purModes":[10,60],"notPkg":false,"goodsSpec":"","deptId":"%s"}}
 "payload40": {"hosId": "h0347","branchId": "%s","branchGoodsId": "%s"}
 "payload41": {"levelName": "包1","qty": "444","pkgLowQty": "0","pkgUperQty": "0","diType": "gs1","effFlag": 1,"hosId": "h0347","branchGoodsId": "%s","branchId": "%s","hosGoodsId": "%s"}
 "payload42": {"hosId": "h0347",branchId": "%s", "branchGoodsId": "%s"}
+"payload42_2": {"hosId": "%s",branchId": "%s", "branchGoodsId": "%s"}
 "payload43": {"id": "%s","effFlag": 1,"pkgLowQty": "555","pkgUperQty": 555,"hosGoodsId": "%s","branchGoodsId": "%s","branchId": "%s"}
 "payload44": {"id": "%s","effFlag": 1,"pkgLowQty": "555","pkgUperQty": 554,"hosGoodsId": "%s","branchGoodsId": "%s","branchId": "%s"}
 "payload45": {"queryObject": {"goodsName": "","goodsMfrsName": "","purModes": [],"hosId": "h0347","branchId": "%s","grantRule": 1,"goodsSpec": ""},"pageNum": 1, "pageSize": 50}

data/b2_herp3_bs/message

@@ -2,5 +2,5 @@
   branch_id: h0347-3498
   branch_name: 东土城路院区i&FY9
 科室信息:
-  dept2_id: 522d4b2c90f84d799a706943852ce157
+  dept2_id: 27d8aecb78a04194a91cb3f9c70425e6
   dept2_name: 二级检验科002

data/b3_herp3_purchase/data

@@ -54,6 +54,7 @@ status3: "10,20,30,70"
 "X-APP-CODE": "herp.pc"
 "branchId": "h0347-2011"
 "hospitalId": "h0347"
+"hospital_name": "邹城市人民医院(test)"
 "targetOrgId": "d69a68df361a4289b2262e4ef75b55a5"
 "targetAreaId": "areah03470414"
 "lc_name": "自动化测试22"
@@ -70,6 +71,7 @@ json_headers2: {
   "X-APP-CODE":"%s"
 }
 "payload": '{"purPlanDetail":[{"hosGoodsId":"h034700001977","pkgDefId":"22513b84dad7418fb445e5de02fa88f0","pkgDefName":"大包","pkgDefQty":20,"planPkgQty":0},{"hosGoodsId":"h034700001977","pkgDefId":"3c2b4432415e46c4aebb018969c3dcc0","pkgDefName":"小包","pkgDefQty":15,"planPkgQty":0},{"hosGoodsId":"h034700001977","pkgDefId":"56b010aba2e04f978e3038c0f53d910c","pkgDefName":" 包","pkgDefQty":33,"planPkgQty":800},{"hosGoodsId":"h034700001977","pkgDefId":"f8ad68aae4a5406ab04316e46bbf38bd","pkgDefName":"包2","pkgDefQty":66,"planPkgQty":0}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}'
+"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
 "payload_1": '{"purPlanDetail":[{"hosGoodsId":"h034700001947","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":888}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}'
 "payload_2": '{"purPlanDetail":[{"hosGoodsId":"h034700001859","pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","pkgDefName":"盒","pkgDefQty":1,"planPkgQty":888}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":false}'
 "payload_3": {"pageNum": 1,"pageSize": 50,"queryObject": {"orderNo": "","hosId": "h0347","startTime": null,"endTime": null}}
@@ -88,6 +90,8 @@ json_headers2: {
 "payload10": '{"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":999,"pkgDefQty":1,"provId":"p00001603","provName":"北京中杉金桥生物技术有限公司(test)","subProvId":"p56a4","subProvName":"国药集团浙江医疗器材有限公司","hosGoodsId":"h034700001757","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}'
 "payload11": {"pid":"%s","hosGoodsName":"","hosGoodsSpec":"","provName":"","purModes":[],"subProvName":""}
 "payload12": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":800,"pkgDefQty":33,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001977","purMode":10,"version":0,"pkgDefId":"56b010aba2e04f978e3038c0f53d910c","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+
 "payload13": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":3,"planPkgQty":888,"pkgDefQty":1,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001947","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 "payload14": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":888,"pkgDefQty":1,"provId":"p000029d8","provName":"国药集团湖南分公司mkcQNd","subProvId":"p000029d7","subProvName":"国药集团湖北分公司mQDwR7","hosGoodsId":"h034700001859","purMode":60,"version":0,"pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","purTaskId":"5c85573c049141ff8df808dabc30d2b1","sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":false}
 "payload15": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":5,"planPkgQty":33,"pkgDefQty":333,"provId":"p000029d7","provName":"国药集团湖北分公司mQDwR7","subProvId":"p000029d7","subProvName":"国药集团湖北分公司mQDwR7","hosGoodsId":"h034700001761","purMode":10,"version":0,"pkgDefId":"0b4451f1086f4c25b5eac5bf22f45c0b","purTaskId":"7b6cf1ab43ab44fc9c1a1c81d85c5542","sourceId":null},{"closeStatus":0,"id":"%s","inSettlement":2,"planPkgQty":33,"pkgDefQty":1,"provId":"p56a4","provName":"国药集团浙江医疗器材有限公司","subProvId":"p56a4","subProvName":"国药集团浙江医疗器材有限公司","hosGoodsId":"h034700001771","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null},{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":33,"pkgDefQty":1,"provId":"p000029d8","provName":"国药集团湖南分公司mkcQNd","subProvId":"p000029d7","subProvName":"国药集团湖北分公司mQDwR7","hosGoodsId":"h034700001859","purMode":60,"version":0,"pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","purTaskId":"5c85573c049141ff8df808dabc30d2b1","sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":false}

report/summary.html

@@ -56,7 +56,7 @@
         <tr width="600">
             <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'>0分6秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_a4_流程四_基础模块设置/log.html' target='_blank'>a_a4_流程四_基础模块设置</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_a5流程五_中心库入库结算_正结算/log.html' target='_blank'>a_a5流程五_中心库入库结算_正结算</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">2.562</td>
+            <td class="details-col-elapsed">5.875</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>