新增期初录入脚本

air_case/b4_herp3_InitStock/a_a4_期初录入_低值_录入_获取单据信息.air/a_a4_期初录入_低值_录入_获取单据信息.py

@@ -16,7 +16,7 @@ from airtest.core.api import using
 import sys
 
 
-def test1(QCid='QCh034720240408000216'):
+def test1(QCid='QCh034720240409000239'):
     module = "b4_herp3_InitStock"
     """
      场景:a_a4_期初录入_低值_录入_获取单据信息
@@ -87,7 +87,9 @@ def test1(QCid='QCh034720240408000216'):
     titlename = ('list_a', 'list_b', 'list_c')
     # 将产品信息写入到文件中
     FileUtils().w_info8(info, module, '期初单号信息', titlename, 'message1')
-
-test1()
+try:
+    test1()
+except:
+    print('期初单号不存在,请检查脚本或者数据')
 # if __name__ == '__main__':
 #     test1()
\ No newline at end of file

air_case/b4_herp3_InitStock/a_b0_期初录入_高值_暂存.air/a_b0_期初录入_高值_暂存.py

@@ -64,7 +64,9 @@ def test1():
         id = i['id']
         orderNo = i['orderNo']
         break
-    # 从message2文件中获取详情信息
+
+    # 从message4'文件中获取详情信息
+
     info = FileUtils().r_info8(module, "期初高值产品信息", 'message4')
     # print('info', info)
     list_a = info['list_a']

air_case/b4_herp3_InitStock/a_b1_期初录入_高值_生成.air/a_b1_期初录入_高值_生成.py

@@ -6,7 +6,7 @@ from common.timeUtils import timeUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,herp-web,a_b5_期初录入_高值_生成,id2301,id2301-15,sit,on
+case_tag:api,herp-web,a_b5_期初录入_高值_生成,id2301,id2301-11,sit,on
 内网:a_b5_期初录入_高值_生成
 """
 
@@ -113,42 +113,15 @@ def test1():
     # # #获取日期
     productDate = timeUtils().get_time_hms(5)
     expdtDate = timeUtils().get_time_add(30, 2)
-    # 获取单元包信息,先调用a_a7_期初录入_低值_查询单元含量信息.air
-    pro_path = commonFuc().get_pro_path()
-    sys.path.append(pro_path + r'\\air_case\\b4_herp3_InitStock\\a_a8_期初录入_低值_查询单元含量信息.air')
-    using(pro_path + r'\\air_case\\b4_herp3_InitStock\\a_a8_期初录入_低值_查询单元含量信息.air')
-    from a_a8_期初录入_低值_查询单元含量信息 import test1
-    print('hosGoodsId', hosGoodsId)
-    test1(hosGoodsId)
-    # 从message3文件中读取单元包信息
-    info = FileUtils().r_info8(module, "产品单元包信息", 'message3')
-    # print('info', info)
-    list_a = info['list_a']
-    list_a = ','.join(map(str, list_a))
-    print(list_a)  # 输出:
-    print('list_a不不不不不不不不不不不不不不不不不不不不不不不不不', list_a, type(list_a))
-    import json
-    new_request_body = list_a.replace("'", '"')
-    new_request_body1 = new_request_body.replace("None", 'null')
-    print(new_request_body1)
-    list_a2 = json.loads(new_request_body1)
 
-    print('list_a2不不不不不不不不不不不不不不不不不不不不不不不不不', list_a2, type(list_a2))
-
-    pkgDefId = 'pkgDefId'
-    for i in list_a2:
-        pkgDefId = i['id']
-        pkgDefName = i['pkgDefName']
-        pkgDefQty = i['pkgDefQty']
-        break
     # # 请求体
     hospitalId = commonFuc().get_business_data(module, "hospitalId")
     branchId = commonFuc().get_business_data(module, "branchId")
 
     sys.path.append(pro_path + r'\\air_case\\b4_herp3_InitStock\\a_b5_期初录入_生成_获取详细信息.air')
     using(pro_path + r'\\air_case\\b4_herp3_InitStock\\a_b5_期初录入_生成_获取详细信息.air')
-    from a_b3_期初录入_生成_获取详细信息 import test1
-    #参数为2为高值
+    from a_b5_期初录入_生成_获取详细信息 import test1
+    # 参数为2为高值
     test1(2)
     # 从message5文件中读取期初子表id
     info = FileUtils().r_info8(module, "期初单子表信息", 'message5')
@@ -179,31 +152,30 @@ def test1():
     batchVORepeatKey = 'batchVORepeatKey'
     inSettlement = 'inSettlement'
     supplyId = 'supplyId'
-    initStockBatchVOS='initStockBatchVOS'
+    initStockBatchVOS = 'initStockBatchVOS'
     for i in list_a2:
         initStockBatchVOS = i['initStockBatchVOS']
         inSettlement = i['inSettlement']
         supplyId = i['supplyId']
+        id = i['id']
+        provName = i['provName']
+        subProvName = i['subProvName']
+        mfrCode = i['mfrCode']
         break
     for i in initStockBatchVOS:
         initStockBatchVOS_id = i['id']
         lastModified = i['lastModified']
-        version = i['version']
-        createTime = i['createTime']
-        createUser = i['createUser']
+
         lastModifiedUser = i['lastModifiedUser']
         pid = i['pid']
-        detailId = i['detailId']
-        unit = i['unit']
-        purMode = i['purMode']
-        unitName = i['unitName']
-        batchVORepeatKey = i['batchVORepeatKey']
+
+        initStockBatchVOS_batchCode = i['batchCode']
+        snCode = i['snCode']
         break
-    request_body = commonFuc().get_business_data(module, "payload_9", id, orderNo, hosGoodsId, hosGoodsCode, provId,
-                                                 subProvId, inSettlement, supplyId, initStockBatchVOS_id, lastModified,
-                                                 version, createTime, createUser, lastModifiedUser, pid, detailId,
-                                                 batchCode, productDate, expdtDate, stockQty, pkgDefId, pkgDefName,
-                                                 pkgDefQty, unit, purMode, unitName, batchVORepeatKey)
+    request_body = commonFuc().get_business_data(module, "payload_11", hosGoodsCode, id, inSettlement, hosGoodsId,
+                                                 provId,subProvId, provName, subProvName, supplyId, mfrCode, mfrCode,
+                                                 initStockBatchVOS_batchCode, expdtDate,initStockBatchVOS_id, lastModified, lastModifiedUser, pid, productDate,
+                                                 stockQty, snCode, pid, orderNo)
     print('request_body', request_body)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)

air_case/b4_herp3_InitStock/a_b2_期初录入_试剂_新增产品页面列表_查询全部.air/a_b1_期初录入_试剂_新增产品页面列表_查询全部.py → air_case/b4_herp3_InitStock/a_b2_期初录入_试剂_新增产品页面列表_查询全部.air/a_b2_期初录入_试剂_新增产品页面列表_查询全部.py

@@ -6,7 +6,7 @@ from common.timeUtils import timeUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,herp-web,a_b1_期初录入_试剂_新增产品页面列表_查询全部,id2301,id2301-11,sit,on
+case_tag:api,herp-web,a_b1_期初录入_试剂_新增产品页面列表_查询全部,id2301,id2301-12,sit,on
 内网:a_b1_期初录入_试剂_新增产品页面列表_查询全部
 """
 

air_case/b4_herp3_InitStock/a_b3_期初录入_试剂_暂存.air/a_b2_期初录入_试剂_暂存.py → air_case/b4_herp3_InitStock/a_b3_期初录入_试剂_暂存.air/a_b3_期初录入_试剂_暂存.py

@@ -6,7 +6,7 @@ from common.timeUtils import timeUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,herp-web,a_b2_期初录入_试剂_暂存,id2301,id2301-12,sit,on
+case_tag:api,herp-web,a_b2_期初录入_试剂_暂存,id2301,id2301-13,sit,on
 内网:a_b2_期初录入_试剂_暂存
 """
 

air_case/b4_herp3_InitStock/a_b5_期初录入_生成_获取详细信息.air/a_b5_期初录入_生成_获取详细信息.py

@@ -6,7 +6,7 @@ from common.timeUtils import timeUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,herp-web,a_b3_期初录入_生成_获取详细信息,id2301,id2301-13,sit,on
+case_tag:api,herp-web,a_b3_期初录入_生成_获取详细信息,id2301,id2301-15,sit,on
 内网:a_b3_期初录入_生成_获取详细信息
 """
 
@@ -19,8 +19,8 @@ import sys
 def test1(type=1):
     module = "b4_herp3_InitStock"
     """
-     场景:a_b2_期初录入_试剂_暂存
-     用例名称：a_b2_期初录入_试剂_暂存
+     场景:a_b3_期初录入_生成_获取详细信息
+     用例名称：a_b3_期初录入_生成_获取详细信息
      输入：无
      输出："rtn_msg": {"code": 0, "msg": null,    "data": true}
     """
@@ -65,17 +65,20 @@ def test1(type=1):
     using(pro_path + r'\\air_case\\b4_herp3_InitStock\\a_a4_期初录入_低值_录入_获取单据信息.air')
     from a_a4_期初录入_低值_录入_获取单据信息 import test1
     # 从文件读取期初单号_低值
-    if type==1:
-        info = FileUtils().r_info8(module, "期初单号低值", 'message')
-    elif type==2:
-        info = FileUtils().r_info8(module, "期初单号高值", 'message')
-    elif type==3:
-        info = FileUtils().r_info8(module, "期初单号试剂", 'message')
-    list2 = info['list_a']
-    QCID = ' '.join(list2)
-    # print('bbbb', QCID, type(QCID))
-    # test1(QCID)
+    try:
+        if type==1:
+            info = FileUtils().r_info8(module, "期初单号低值", 'message')
+        elif type==2:
+            info = FileUtils().r_info8(module, "期初单号高值", 'message')
+        elif type==3:
+            info = FileUtils().r_info8(module, "期初单号试剂", 'message')
 
+        list2 = info['list_a']
+        QCID = ' '.join(list2)
+        # print('bbbb', QCID, type(QCID))
+        test1(QCID)
+    except:
+        print('期初单号读取文件错误,请检查message文件单号内容')
     # # 请求体
     hospitalId = commonFuc().get_business_data(module, "hospitalId")
     branchId = commonFuc().get_business_data(module, "branchId")
@@ -89,6 +92,8 @@ def test1(type=1):
     data = commonFuc().analysis_json('data', result)
     if code == 0 and len(data) >= 1 :
         commonFuc().check_text_exist(0, result)
+    elif code == 0 and len(data)==0 :
+        print('没有子表信息')
     else:
         commonFuc().check_text_exist('error', result)
 

data/b4_herp3_InitStock/data

@@ -54,6 +54,7 @@ json_headers2: {
 "payload_8": {"initStockId":"%s","orderNo":"%s","initStockDetailDTOList":[{"hosGoodsId":"%s","hosGoodsCode":"%s","provId":"%s","subProvId":"%s","inSettlement":"%s","supplyId":"%s","initStockBatchVOS":[{"batchCode":"%s","productDate":"%s","expdtDate":"%s","stockQty":"%s","pkgDefId":"%s","pkgDefName":" %s","pkgDefQty":"%s"}]}]}
 "payload_9": {"initStockId":"%s","orderNo":"%s","initStockDetailDTOList":[{"hosGoodsId":"%s","hosGoodsCode":"%s","provId":"%s","subProvId":"%s","inSettlement":"%s","supplyId":"%s","initStockBatchVOS":[{"id":"%s","lastModified":"%s","version":"%s","createTime":"%s","createUser":"%s","lastModifiedUser":"%s","pid":"%s","detailId":"%s","batchCode":"%s","productDate":"%s","expdtDate":"%s","stockQty":"%s","pkgDefId":"%s","pkgDefName":"%s","pkgDefQty":"%s","snCode":null,"unit":"%s","purMode":"%s","unitName":"%s","batchVORepeatKey":"%s"}]}]}
 "payload_10": {"pid":"%s"}
+"payload_11": {"initStockDetailDTOList":[{"hosGoodsCode":"%s","id":"%s","inSettlement":"%s","hosGoodsId":"%s","provId":"%s","subProvId":"%s","provName":"%s","subProvName":"%s","supplyId":"%s","mfrCode":"%s","pkgCodeSee":"%s","initStockBatchVOS":[{"batchCode":"%s","expdtDate":"%s","id":"%s","lastModified":"%s","lastModifiedUser":"%s","pid":"%s","productDate":"%s","stockQty":"%s","snCode":"1"}]}],"initStockId":"%s","orderNo":"%s"}
 
 
 checkDict2: {"code": 0,'msg': None,'data':1}

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分5秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>0分3秒</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/a_b5_期初录入_高值_生成/log.html' target='_blank'>a_b5_期初录入_高值_生成</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">5.257</td>
+            <td class="details-col-elapsed"><a href='../log/a_b1_期初录入_高值_生成/log.html' target='_blank'>a_b1_期初录入_高值_生成</a></td>
+            <td class="fail">失败</td>
+            <td class="details-col-elapsed">2.849</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>