优化脚本

air_case/b2_herp3_bs/g2_14添加产品列表_确定添加产品.air/g2_14添加产品列表_确定添加产品.py

@@ -45,7 +45,7 @@ def test1():
     pro_path = commonFuc().get_pro_path()
     sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
     using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
-    from g8_6添加产品列表_查询 import select1
+    from g2_13添加产品列表_查询 import select1
     hosGoodsId,provGoodsId = select1()
     # #请求体
     request_body = commonFuc().get_business_data(module, "payload50_2",hosGoodsId)

air_case/b2_herp3_bs/g2_15修改产品价格_暂存.air/g2_15修改产品价格_暂存.py

@@ -46,7 +46,7 @@ def test1():
     pro_path = commonFuc().get_pro_path()
     sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
     using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
-    from g8_6添加产品列表_查询 import select1
+    from g2_13添加产品列表_查询 import select1
     hosGoodsId,provGoodsId = select1()
     #获取日期
     currentdate=dateUtils().get_current_date()

air_case/b2_herp3_bs/g2_17修改产品价格_提交.air/g2_17修改产品价格_提交.py

@@ -46,12 +46,12 @@ def test1():
     pro_path = commonFuc().get_pro_path()
     sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
     using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
-    from g8_6添加产品列表_查询 import select1
+    from g2_13添加产品列表_查询 import select1
     hosGoodsId,provGoodsId = select1()
     #获取GChid
     sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_16调价管理列表_查询_暂存状态数据.air')
     using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_16调价管理列表_查询_暂存状态数据.air')
-    from g8_9调价管理列表_查询_暂存状态数据 import test1
+    from g2_16调价管理列表_查询_暂存状态数据 import test1
     GChid,orderNo = test1()
     #获取日期
     currentdate=dateUtils().get_current_date()

air_case/b2_herp3_bs/g2_18审批中心_列表查询.air/g2_18审批中心_列表查询.py

@@ -13,7 +13,7 @@ from common.timeUtils import timeUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,herp-web,g9_2审批中心_列表查询,id2263,id2263-78,sit,on
+case_tag:api,herp-web,g9_2审批中心_列表查询,id2263,id2263-79,sit,on
 内网:g9_2审批中心_列表查询 
 """
 
@@ -22,8 +22,8 @@ from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_
 module = "b2_herp3_bs"
 def test1():
     """
-     场景:g8_8修改产品价格_暂存
-     用例名称：g8_8修改产品价格_暂存
+     场景:g9_2审批中心_列表查询
+     用例名称：g9_2审批中心_列表查询
      输入：无
      输出："rtn_msg": {"code": 0, "msg": null,    "data": 1}
     """
@@ -35,29 +35,29 @@ def test1():
     # 获取token和projectCode
     token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
     # print( token,projectCode,uxid,corpId,info)
-    #g8_8修改产品价格_暂存
-    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "goodsChgMain_insert_url")
+    #g9_2审批中心_列表查询
+    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "apprCenter_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"))
-    # # 获取hosGoodsId
+    # # # 获取hosGoodsId
     pro_path = commonFuc().get_pro_path()
-    sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
-    using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
-    from g8_6添加产品列表_查询 import select1
-    hosGoodsId,provGoodsId = select1()
-    #获取GChid
+    # sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
+    # using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_13添加产品列表_查询.air')
+    # from g8_6添加产品列表_查询 import select1
+    # hosGoodsId,provGoodsId = select1()
+    #获取orderNo
     sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g2_16调价管理列表_查询_暂存状态数据.air')
     using(pro_path + r'\\air_case\\b2_herp3_bs\\g2_16调价管理列表_查询_暂存状态数据.air')
-    from g8_9调价管理列表_查询_暂存状态数据 import test1
+    from g2_16调价管理列表_查询_暂存状态数据 import test1
     GChid,orderNo = test1()
     #获取日期
-    currentdate=dateUtils().get_current_date()
+    # currentdate=dateUtils().get_current_date()
     # print(currentdate)
     #请求体
-    request_body = commonFuc().get_business_data(module, "payload50_5",hosGoodsId,provGoodsId,currentdate,GChid)
+    request_body = commonFuc().get_business_data(module, "payload50_6",orderNo)
     print(request_body)
     # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)

data/b2_herp3_bs/data

@@ -34,6 +34,8 @@
 "supplyHosGoodsPage_url": "/hospitaltest2api/herpService/goodsChgMain/supplyHosGoodsPage"
 "queryInSettlementStockQty_url": "/hospitaltest2api/herpService/goodsChgSub/queryInSettlementStockQty"
 "goodsChgMain_insert_url": "/hospitaltest2api/herpService/goodsChgMain/insert"
+"apprCenter_url": "/hospitaltest2api/herpService/apprCenter/waitPage"
+
 
 "username": "xhs1009"
 "password": "1qaz!QAZ"
@@ -240,7 +242,7 @@ json_headers2: {
 "payload50_3": {"attachments":[{"fileName":"","filePath":""}],"changeDetails":[{"hosGoodsId":"%s","newValue":2659,"oldValue":2658,"supplyProvId":"%s"}],"chgType":"GOODS_COLLECT_CHANGE_PRICE","provId":"p10d95","subProvId":"p10d95","hosId":"h0347","planEffectiveDate":"%s 00:00:00","remark":"","id":"","submit":false}
 "payload50_4": {"pageNum":1,"pageSize":50,"orderBy":"mgcm.create_time desc","queryObject":{"startDate":null,"endDate":null,"goodsName":"","hosId":"h0347", "tbStatus":"0"}}
 "payload50_5": {"attachments":[{"fileName": "","filePath": ""}],"changeDetails": [{"hosGoodsId": "%s","newValue": 2659,"oldValue": 2658,"supplyProvId": "%s"}],"chgType": "GOODS_COLLECT_CHANGE_PRICE","provId": "p10d95","subProvId":"p10d95","hosId": "h0347","planEffectiveDate": "%s 00:00:00","remark": "","id": "%s","submit": true}
-
+"payload50_6": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"%s","createOrderTimeStart":"","createOrderTimeEnd":""}}
 
 checkDict: {"code": 0,'msg': None,'data': True}
 checkDict1: {

report/summary.html

@@ -55,9 +55,9 @@
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分3秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>0分1秒</td>
+            <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
 
@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/g9_1修改产品价格_提交/log.html' target='_blank'>g9_1修改产品价格_提交</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">3.625</td>
+            <td class="details-col-elapsed"><a href='../log/g2_18审批中心_列表查询/log.html' target='_blank'>g2_18审批中心_列表查询</a></td>
+            <td class="fail">失败</td>
+            <td class="details-col-elapsed">1.431</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>