优化脚本

air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air/a_a2_流程二供货关系申请提交审批.py

@@ -15,22 +15,6 @@ import sys
 module = "b5_spd3_core_business_flow"
 def h_login():
 
-    # pro_path=commonFuc().get_pro_path()
-    # sys.path.append(pro_path+r'\\air_case\\mdm3_hs\\注册医院审核通过.air')
-    # using(pro_path+r'\\air_case\\mdm3_hs\\注册医院审核通过.air')
-    # from 注册医院审核通过 import reg_and_audit_hospital
-    # h_name=reg_and_audit_hospital()
-
-    # info = FileUtils().r_info("a3_mdm3_hs", "医院信息")
-    # print(info)
-    # h_name = info['h_name']
-    # print(h_name)
-    """
-     场景:a1供货关系申请_客户类型_医院_登录_医院登录获取医院id
-     用例名称：a1供货关系申请_客户类型_医院_登录_医院登录获取医院id
-     输入：用户名,密码
-     输出："rtn_msg": token,projectCode,uxid,corpId,h_name
-    """
     #供货关系申请_客户类型_医院_登录_医院登录获取医院id
     module = "a4_mdm3_cm"
     #如果需要h0347医院账号登录,这里就从data文件获取登录医院的用户名

air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.py

@@ -336,10 +336,8 @@ def settle():#结算相关
     info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
     # print(info)
     username = info['username1']
-
     password = commonFuc().get_business_data("b2_herp3_bs", "password")
-    # username = '001f90380'
-    # password='1qaz!QAZ'
+
     print('username,password', username, password)
     # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
     # # 获取token和projectCode
@@ -376,17 +374,19 @@ def settle():#结算相关
     # ================== 生成结算单==============================
 
 try:
-    # check_accept_order(1)#低值
-    # check_accept_order(2)#高值
-    # check_accept_order(3)#试剂
-    # putaway()
-    # putaway()
-    # putaway()
-    settle()
+    #验收
+    check_accept_order(1)#低值
+    check_accept_order(2)#高值
+    check_accept_order(3)#试剂
+    #入库上架
+    putaway()
+    putaway()
+    putaway()
+    settle()#生成结算单
     #调用审批结算单
     approval_center()
 except Exception as e:
-    print('验收入库上架脚本出现异常，请检查脚本或者数据')
+    print('脚本出现异常，请检查脚本或者数据')
     print("发生异常：", str(e))
     traceback.print_exc()
 else:

air_case/b5_spd3_core_business_flow/a_a8流程五_中心库入库结算_正结算3_外网开票.air/a_a8流程五_中心库入库结算_正结算3_外网开票.py

+# -*- encoding=utf8 -*-
+import json
+import traceback
+
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+from air_case.public1.public1.public1 import *
+
+from common.fileUtls import FileUtils
+from common.run_cmd_script import execute_command
+from common.timeUtils import timeUtils
+from airtest.core.api import using
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,spd_core,a_a8流程五_中心库入库结算_正结算3_外网开票,id2302,id2302-8,sit,on
+主数据平台:a_a8流程五_中心库入库结算_正结算3_外网开票
+python runner_test.py tag id2302-8 debug mdm3
+"""
+
+from common.common_func import commonFuc
+from airtest.core.api import using
+import sys
+import time
+
+module = "b5_spd3_core_business_flow"
+
+
+def invoice():
+    # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
+    # print(info)
+    username = info['e_username']
+    password = commonFuc().get_business_data("b2_herp3_bs", "password1")
+    token, projectCode, uxid, corpId, info = login(username, password)
+    # print(token, projectCode, uxid, corpId, info)
+    # 登录获取用户id等信息，使用创建的用户登录============结束
+    module = "a6_mdm3_si"
+    # 发票录入列表查询=================================================
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listGoodsPage_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+
+    request_body = commonFuc().get_business_data(module, "payload2_1_1", get_hosid(), get_branch_id())
+
+    # print('request_body',request_body)
+    # 发送请求
+    while True:
+        time.sleep(3)
+        result = commonFuc().http_post(url, request_body, headers)
+        print('result', result)
+        try:
+            data = commonFuc().analysis_json('data', result)
+            data1 = commonFuc().analysis_json('data', data)
+            pid = commonFuc().analysis_json('pid', data1[0])
+        except:
+            continue
+        else:
+            break
+    # 将发票信息写入文件
+    data = commonFuc().analysis_json('data', result)
+    data1 = commonFuc().analysis_json('data', data)
+    list_a = []
+    list_b = []
+    list_c = []
+    list_a.append(data1[0])
+    list_b.append(data1[0])
+    list_c.append(data1[0])
+    # print('list_a', len(list_a), list_a)
+    info = (list_a, list_b, list_c)
+    titlename = ('list_a', 'list_b', 'list_c')
+    # 将验收单详细信息写入到文件中"a6_mdm3_si"
+    FileUtils().w_info8(info, module, '结算开票信息', titlename, 'message')
+    # 发票录入列表查询=================================================
+    # ===========发票暂存=======================================
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "saveCacheBatch_url")
+    print(url)
+    # 从文件中获取必要信息
+    info = FileUtils().r_info8(module, "结算开票信息", 'message')
+    # print('info', info)
+    list_a = info['list_a']
+    print('list_a', list_a,type(list_a),len(list_a))
+    pid='pid'
+    settleMonth = "settleMonth"
+    hosGoodsId = 'hosGoodsId'
+    batchCode = 'batchCode'
+    distrDetailId = 'distrDetailId'
+    distrId='distrId'
+    distrOrderNo='distrOrderNo';settlePrice='settlePrice';maxSettleQty='maxSettleQty'
+    maxSettleAmount='maxSettleAmount';curSettleQty='curSettleQty';curSettleAmount='curSettleAmount'
+    leftSettleQty='leftSettleQty';leftSettleAmount='leftSettleAmount';hosId='hosId';provId='provId'
+    branchId='branchId'; balanceDetId='balanceDetId'; purMode='purMode';barCode='barCode';viewId='viewId'
+    for i in list_a:
+        pid = i['pid']
+        settleMonth = i['settleMonth']
+        hosGoodsId = i['hosGoodsId']
+        detailList = i['detailList']
+        for j in detailList:
+            batchCode = j['batchCode']
+            distrDetailId=j['distrDetailId']
+            distrId = j['distrId']
+            distrOrderNo = j['distrOrderNo']
+            settlePrice = j['settlePrice']
+            # maxSettleQty = j['leftSettleQty']
+            # maxSettleAmount = j['leftSettleAmount']
+            # curSettleQty = j['curSettleQty']
+            # curSettleAmount = j['curSettleAmount']
+            # leftSettleQty = j['leftSettleQty']
+            leftSettleAmount = j['leftSettleAmount']
+            hosId = j['hosId']
+            provId = j['provId']
+            branchId = j['branchId']
+            balanceDetId = j['balanceDetId']
+            purMode = j['purMode']
+            barCode = j['barCode']
+            viewId=j['viewId']
+            break
+    list2=[]
+    for i in list_a:
+        detailList = i['detailList']
+    list2=detailList
+    for k in list2:
+        maxSettleQty = k['leftSettleQty']
+        maxSettleAmount= k['settlePrice']
+        curSettleQty= k['curSettleQty']
+        curSettleAmount=k['curSettleAmount']
+        leftSettleQty=k['leftSettleQty']
+
+    request_body = commonFuc().get_business_data(module, "payload3_1_1_1", pid, settleMonth, hosGoodsId, batchCode,
+                                                 distrDetailId, distrId, distrOrderNo, settlePrice, maxSettleQty,
+                                                 maxSettleAmount, curSettleQty, curSettleAmount, leftSettleQty,leftSettleAmount, hosId,
+                                                 provId,
+                                                 branchId, balanceDetId,purMode, barCode,viewId)
+    print('request_body', request_body)
+    # request_body = "[" + str(request_body) + "]"
+    # print('request_body', request_body)
+    # # string = "这是一段包含'单引号'的文本"
+    # new_request_body = request_body.replace("'", '"')
+    # new_request_body1 = new_request_body.replace("\\", '\\\\')
+    # new_request_body2=new_request_body1.replace("None", 'null')
+    # print(new_request_body2)
+    # request_body_json = json.loads(new_request_body2,encoding='utf-8')
+    request_body_json=get_process_list(request_body)
+    result = commonFuc().http_post(url, request_body_json, headers)
+    print('result',result)
+    # ===========发票暂存===============================================
+    #==============发票提交===========================================
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submitCache_url")
+    hosVersion=3
+    hosName=commonFuc().get_business_data(module,'hosName')
+    invoiceQty=leftSettleQty
+    invoiceAmount=leftSettleAmount
+    invoiceDate=timeUtils().get_time_hms(5)
+    request_body = commonFuc().get_business_data(module, "payload3_2_2_2",hosName,invoiceQty,invoiceAmount,invoiceDate,hosId,hosVersion)
+    print('request_body',request_body)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    #==============发票提交===========================================
+    #===============发票确认列表查询
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url1")
+
+    request_body = commonFuc().get_business_data(module, "payload3_3")
+
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    data=commonFuc().analysis_json('data', result)
+    data1=commonFuc().analysis_json('data', data)
+    id1 = commonFuc().analysis_json('id', data1[0])
+    print(id1)
+    #===============发票确认列表查询
+    #===============发票确认
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "invoiceUpdateStatus_url")
+
+    request_body = commonFuc().get_business_data(module, "payload3_4", id1)
+
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    #===============发票确认
+
+try:
+    invoice()
+except Exception as e:
+    print('脚本出现异常，请检查脚本或者数据')
+    print("发生异常：", str(e))
+    traceback.print_exc()
+else:
+    commonFuc().check_text_exist_result_text('succees', 'succees')

air_case/public1/public1/public1.py

 from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
 from common.common_func import commonFuc
 from common.fileUtls import FileUtils
+import json
 
-
+#添加[]
+def get_process_list(request_body):
+    request_body = "[" + str(request_body) + "]"
+    print('request_body', request_body)
+    new_request_body = request_body.replace("'", '"')
+    new_request_body1 = new_request_body.replace("\\", '\\\\')
+    new_request_body2 = new_request_body1.replace("None", 'null')
+    print(new_request_body2)
+    request_body_json = json.loads(new_request_body2, encoding='utf-8')
+    return request_body_json
+def get_branch_id():
+    return FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
+def get_hosid():
+    branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
+    hosId = branch_id[0:5]
+    return hosId
 def approval_center():
     module = "b2_herp3_bs"
     # 登录获取用户id等信息，使用创建的用户登录===========开始
@@ -60,3 +76,18 @@ def approval_center():
         commonFuc().check_text_exist(0, result)
     else:
         commonFuc().check_text_exist('error', result)
+def login(username,password,type=1):
+    print('username,password', username, password)
+    #外网登录
+    if type==1:
+        from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+        # # 获取token和projectCode
+        token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # 内网登录
+    elif type==2:
+        from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+        token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    else:
+        from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+        token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    return token, projectCode, uxid, corpId, info
\ No newline at end of file

common/common_func.py

@@ -25,7 +25,7 @@ class commonFuc(object):
         data_list = confOP().getBusiYamlValue(self.find_path(module), "data")
         if args is not None and len(args) > 0:
             if isinstance(data_list[key], dict):
-                result = json.loads(json.dumps(data_list[key]) % args)
+                result = json.loads(json.dumps(data_list[key]) % args,strict=False)
             else:
                 if str(data_list[key]) == "":
                     result = data_list[key]

data/a4_mdm3_cm2/data

-"username": "test001"
-"password": "a123456!"
-"password1": "1qaz!QAZ"
-
-
-"submitSupplyRelation_url": "/api/hdiFusion/supplyRelation/submitSupplyRelation"
-"listVoPage_url": "/api/hdiFusion/supplyRelation/listVoPage/"
-"editSupplyRelation_url": "/api/mdmService/supplyRelation/editSupplyRelation/"
-"auditSupplyRelation_url": "/api/hdiFusion/supplyRelation/auditSupplyRelation/"
-"listProvInfoBySubProv_url": "/api/mdmService/supplyRelation/listProvInfoBySubProv/"
-"listVo_url": "/api/mdmService/provGoodsInfo/listVo/"
-"addGoodsHandleInfos_url": "/api/hdiFusion/import/goods/addGoodsHandleInfos?flag=true"
-"getSupplyHosList_url": "/api/hdiFusion/supplyRelation/getSupplyHosList"
-"listHosInfoVoPage_url": "/api/hdiFusion/supplyRelation/listHosInfoVoPage"
-json_contentType: "application/json"
-json_headers: {
-  "Content-Type": "%s"
-}
-
-json_headers2: {
-  "Content-Type": "%s",
-  "token": "%s",
-  "X-APP-CODE":"%s"
-}
-json_headers2_2: {
-  "Content-Type": "%s",
-  "token": "%s",
-  "X-APP-CODE":"%s",
-  "X-SESSION-ID":"%s"
-}
-"payload": {
-    "id": "",
-    "provName": "",
-    "hosName": "",
-    "invitationCode": "",
-    "hosId": "%s",
-    "clientType": "1",
-    "provId": "",
-    "contactUser": "%s",
-    "contactWay": "%s",
-    "version": ""
-}
-"payload_1": {"id":"","subProvName":"","hosName":"","invitationCode":"","hosId":"%s","clientType":"1","provId":"","contactUser":"%s","contactWay":"%s","version":""}
-"payload_2": {"id":"","subProvName":"","hosName":"","invitationCode":"","hosId":"%s","clientType":"2","provId":"p10d95","contactUser":"%s","contactWay":"%s","version":""}
-
-"payload1": {
-    "pageNum": 1,
-    "pageSize": 10,
-    "queryObject": {
-        "provName": "",
-        "clientType": "",
-        "tbStatus": "",
-        "subProvId": "%s"
-    },
-    "orderBy": "sr.create_time desc"
-}
-
-
-"payload2": {
-    "pageNum": 1,
-    "pageSize": 20,
-    "queryObject": {
-        "provName": "",
-        "clientType": "",
-        "tbStatus": "",
-        "subProvId": "%s"
-    },
-    "orderBy": "sr.create_time desc"
-}
-"payload3": {
-    "pageNum": 1,
-    "pageSize": 50,
-    "queryObject": {
-        "provName": "",
-        "clientType": "",
-        "tbStatus": "",
-        "subProvId": "%s"
-    },
-    "orderBy": "sr.create_time desc"
-}
-"payload4": {
-    "pageNum": 1,
-    "pageSize": 100,
-    "queryObject": {
-        "provName": "",
-        "clientType": "",
-        "tbStatus": "",
-        "subProvId": "%s"
-    },
-    "orderBy": "sr.create_time desc"
-}
-"payload5": {
-    "id": "",
-    "provName": "",
-    "hosName": "",
-    "invitationCode": "",
-    "hosId": "%s",
-    "clientType": "1",
-    "provId": "",
-    "contactUser": "%s",
-    "contactWay": "%s",
-    "version": ""
-}
-"payload6": {
-    "pageNum": 1,
-    "pageSize": 10,
-    "queryObject": {
-        "provName": "",
-        "clientType": "",
-        "tbStatus": 10,
-        "hosId": "%s"
-    },
-    "orderBy": "sr.create_time desc"
-}
-"payload7": {
-    "id": "%s",
-    "contactUser": "%s",
-    "contactWay": "%s",
-    "tbStatus": 30,
-    "auditComment": "驳回",
-    "activeFlag": "",
-    "version": 0
-}
-"payload7_2": {
-    "id": "%s",
-    "contactUser": "%s",
-    "contactWay": "%s",
-    "tbStatus": 20,
-    "activeFlag": "1",
-    "version": 0
-}
-"payload8": {
-    "provId": "%s",
-    "hosId": "%s",
-    "tbStatus": 20,
-    "activeFlag": 1
-}
-"payload9": {
-    "searchMdmGoodsCode": "MG",
-    "hosId": "%s",
-    "provId": "%s"
-}
-"payload10_1": {"hosId":"h277b","hosName":"湖南省人民医院6)sJI","hosVersion":3,"collectorId":"p1df18","collectorName":"国药集团公司*&Xer","goodsName":"一次性注射器1206","goodsGg":"G-31891","made":"德国","unit":"套","mfrsName":"德国歌德公司 Geuder AG","mfrsId":"mfrs-11229","purMode":"10","provGoodsJDECode":"","salePrice":99.9999,"purPrice":99.9999,"taxRate":0.13,"unitRate":1,"miCode":"","hisPrice":"0","sendPackage":100,"hitCode":"12","hitPrice":99.9999,"hosGoodsCode":"","xvmecCode":"123456789","xvmecPrice":99.9999,"hitId":"123456789","ygptPrimaryCode":"123456789","isDistrRel":"0","isOnline":"0","onlineKind":"dictOnlineKind:1","hosFactId":"","hosFcatKind":0,"remark":"无 ","storageConditions":"","hrpInfo":{"store":"","trans":"","cla":""},"ext1":"","ext2":"","cla":"","errorDesc":"","generalName":"一次性注射器","hosGoodsErpCode":"","provName":"国药集团公司*&Xer","provId":"p1df18","subProvErpCode":"","hosLbsx":"","hosKindLevelCode":"","certificateCode":"","brand":"","hosUnit":"支","mfrsCode":"","masterCode":"","goodsDesc":"","hwDesc":"1","packeage":"1","icdCode":"","icd20Code":"","icdName":"","ext3":"{\"store\":\"\",\"trans\":\"\",\"cla\":\"\"}","ext4":"","ext5":"","ext6":"","tempPurchase":"0","charging":"1","isMetering":"1","isSubprov":"0","midPackageUnit":"","useUnit":"","useUnitCount":"1","hosUnitCount":"1","provUnitCount":"1","functional":"","material":"","keySupervision":"0","handleStatus":"0","dataSource":"2","errorFlag":"","userId":""}
-"payload10": {
-    "hosId": "%s",
-    "hosName": "%s",
-    "hosVersion": 3,
-    "collectorId": "%s",
-    "collectorName": "%s",
-    "goodsName": "一次性注射器%s",
-    "goodsGg": "G-31891",
-    "made": "德国",
-    "unit": "套",
-    "mfrsName": "德国歌德公司 Geuder AG",
-    "mfrsId": "mfrs-11229",
-    "purMode": "10",
-    "provGoodsJDECode": "",
-    "salePrice": 99.9999,
-    "purPrice": 99.9999,
-    "taxRate": 0.13,
-    "unitRate": 1,
-    "miCode": "",
-    "hisPrice": "0",
-    "sendPackage": 100,
-    "hitCode": "12",
-    "hitPrice": 99.9999,
-    "hosGoodsCode": "",
-    "xvmecCode": "123456789",
-    "xvmecPrice": 99.9999,
-    "hitId": "123456789",
-    "ygptPrimaryCode": "123456789",
-    "isDistrRel": "0",
-    "isOnline": "0",
-    "onlineKind": "dictOnlineKind:1",
-    "hosFactId": "",
-    "hosFcatKind": 0,
-    "remark": "无 ",
-    "storageConditions": "",
-    "hrpInfo": {
-        "store": "",
-        "trans": "",
-        "cla": ""
-    },
-    "ext1": "",
-    "ext2": "",
-    "cla": "",
-    "errorDesc": "",
-    "generalName": "一次性注射器",
-    "hosGoodsErpCode": "",
-    "provName": "%s",
-    "provId": "p1df18",
-    "subProvErpCode": "",
-    "hosLbsx": "",
-    "hosKindLevelCode": "",
-    "certificateCode": "",
-    "brand": "",
-    "hosUnit": "支",
-    "mfrsCode": "",
-    "masterCode": "",
-    "goodsDesc": "",
-    "hwDesc": "1",
-    "packeage": "1",
-    "icdCode": "",
-    "icd20Code": "",
-    "icdName": "",
-    "ext3": "{\"store\":\"\",\"trans\":\"\",\"cla\":\"\"}",
-    "ext4": "",
-    "ext5": "",
-    "ext6": "",
-    "tempPurchase": "0",
-    "charging": "1",
-    "isMetering": "1",
-    "isSubprov": "0",
-    "midPackageUnit": "",
-    "useUnit": "",
-    "useUnitCount": "1",
-    "hosUnitCount": "1",
-    "provUnitCount": "1",
-    "functional": "",
-    "material": "",
-    "keySupervision": "0",
-    "handleStatus": "0",
-    "dataSource": "2",
-    "errorFlag": "",
-    "userId": ""
-}
-
-"payload11": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","clientType":"","tbStatus":"","provId":"p1df18"},"orderBy":"sr.create_time desc"}
-"payload12": {"provId":"p1df18","subProvId":"","clientType":"","hosName":"","tbStatus":20,"activeFlag":1}
-"payload13": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","provId":"p1df18","clientType":"","hosName":"","hosCustomerQuery":1}}
-
-checkDict: {"code": 0,'msg': None,'data':1}
-checkDict1: {"code": 400,'msg': '供销关系已存在！请勿重复添加','data':None}
-checkDict2: {"code": 400,'msg': None,'data':None}
-checkDict3: {'code': 400, 'msg': '数据更新不成功，可能数据的版本不一致！请刷新页面重试', 'data': None}
-checkDict4: {'code': 0, 'msg': None, 'data': []}
-checkDict5: {'code': 0, 'msg': None, 'tag': None, 'data': 1}
\ No newline at end of file

data/a4_mdm3_cm2/message

-供货关系申请:
-  e_corpId: p1e0f3
-  h_corpId: h0347
-  e_username: 国药集团公司@KufG
-  h_name: test001

data/a6_mdm3_si/data

@@ -21,13 +21,20 @@ json_headers2: {
   "token": "%s",
   "X-APP-CODE":"%s"
 }
+"hosName": "邹城市人民医院(test)"
 
 "payload": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"","settleDateStart":"","settleDateEnd":""}}
 "payload1": {"pageNum":1,"pageSize":50,"queryObject":{"id":"%s","hosVersion":3}}
 "payload2": {"pageNum":1,"pageSize":50,"queryObject":{"hosId":"h0347","branchId":"h0347-2011","pid":"","hosVersion":"3"}}
+"payload2_1_1": {"pageNum":1,"pageSize":50,"queryObject":{"hosId":"%s","branchId":"%s","pid":"","hosVersion":"3"}}
+
 "payload3": {"settleMonth":"%s","hosGoodsId":"%s","batchCode":"%s","distrDetailId":"%s","distrId":"%s","distrOrderNo":"%s","settlePrice":2.3,"maxSettleQty":0.0,"maxSettleAmount":0.0,"curSettleQty":0.0,"curSettleAmount":0.0,"leftSettleQty":33,"leftSettleAmount":"%s","hosId":"%s","provId":"%s","branchId":"%s","balanceDetId":"%s","purMode":"%s","barCode":"%s","batchId":null,"price":null,"maxQty":null,"settleQty":null,"id":null,"hosVersion":null,"jsonData":null}
 "payload3_1": {"settleMonth":"%s","hosGoodsId":"%s","batchCode":"%s","distrDetailId":"%s","distrId":"%s","distrOrderNo":"%s","settlePrice":2.3,"maxSettleQty":33,"maxSettleAmount":75.9,"curSettleQty":33,"curSettleAmount":75.89999999999999,"leftSettleQty":33,"leftSettleAmount":75.9,"hosId":"%s","provId":"%s","branchId":"%s","balanceDetId":"%s","purMode":10,"barCode":"%s","batchId":null,"price":null,"maxQty":null,"settleQty":null,"id":null,"hosVersion":null,"jsonData":null}
+"payload3_1_1_1": {"pid":"%s","settleMonth":"%s","hosGoodsId":"%s","batchCode":"%s","distrDetailId":"%s","distrId":"%s","distrOrderNo":"%s","settlePrice":"%s","maxSettleQty":"%s","maxSettleAmount":"%s","curSettleQty":"%s","curSettleAmount":"%s","leftSettleQty":"%s","leftSettleAmount":"%s","hosId":"%s","provId":"%s","branchId":"%s","balanceDetId":"%s","purMode":"%s","barCode":"%s","batchId":null,"price":null,"maxQty":null,"settleQty":null,"id":null,"hosVersion":null,"jsonData":null,"viewId":"%s"}
+
 "payload3_2": {"hosName":"邹城市人民医院(test)","invoiceQty":33,"invoiceAmount":"75.9000","invoiceNumber":"1","invoiceCode":"1","invoiceNum":1,"remarks":"","invoiceTagList":[],"attachmentList":[],"hosId":"h0347","provId":null,"hosVersion":"3"}
+"payload3_2_2_2": {"hosName":"%s","invoiceQty":"%s","invoiceAmount":"%s","invoiceNumber":"test","invoiceCode":"test","invoiceNum":1,"remarks":"","invoiceDate":"%sT08:23:22.467Z","invoiceTagList":[],"attachmentList":[],"hosId":"%s","hosVersion":"%s"}
+
 "payload3_3": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"","invoiceDate2":"","tbStatus":0}}
 "payload3_4": {"id":"%s","tbStatus":"10","hosVersion":3}
 "payload3_5": {"id":"%s","hosVersion":3,"tbStatus":6}

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分8秒</td>
+            <td class='details-col-elapsed'>0分7秒</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_a7流程五_中心库入库结算_正结算3_内网验收入库结算/log.html' target='_blank'>a_a7流程五_中心库入库结算_正结算3_内网验收入库结算</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_a8流程五_中心库入库结算_正结算3_外网开票/log.html' target='_blank'>a_a8流程五_中心库入库结算_正结算3_外网开票</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">7.866</td>
+            <td class="details-col-elapsed">6.979</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>