流程五脚本编写

air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air/a_a9流程六_中心库入库结算_负结算.py

@@ -204,9 +204,9 @@ try:
     set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
     set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
     center_warehouse_return()#中心库退货
-    center_warehouse_return()#中心库退货
+    # center_warehouse_return()#中心库退货
     OBh_ID=settle()  # 生成结算单
-    print(OBh_ID)
+    # print(OBh_ID)
     # 调用审批结算单
     approval_center(OBh_ID)
     invoice(2,OBh_ID)#type=2 传递结算单号，外网查询开票

air_case/public1/public1/public1.py

@@ -136,7 +136,8 @@ def settle():  # 结算相关
     print(url)
     branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
     hosId = branch_id[0:5]
-    request_body = commonFuc().get_business_data(module, "payload7", hosId, hosId)
+    provId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2','message')["e_corpId"]
+    request_body = commonFuc().get_business_data(module, "payload7",provId,hosId,hosId)
     result = commonFuc().http_post(url, request_body, headers)
     print('result', result)
     data = commonFuc().analysis_json('data', result)
@@ -581,18 +582,18 @@ def invoice(type=1,OBh_ID='OBhxxxxxxxxxxxxxxx'):
             barCode = j['barCode']
             viewId=j['viewId']
             break
-    list2=[]
-    detailList=None
-    for i in list_a:
-        detailList = i['detailList']
-        break
-    list2=detailList
-    for k in list2:
-        maxSettleQty = k['maxSettleQty']
-        maxSettleAmount= k['maxSettleAmount']
-        curSettleQty= k['curSettleQty']
-        curSettleAmount=k['curSettleAmount']
-        leftSettleQty=k['leftSettleQty']
+    # list2=[]
+    # detailList=None
+    # for i in list_a:
+    #     detailList = i['detailList']
+    #     break
+    # 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,
@@ -600,14 +601,6 @@ def invoice(type=1,OBh_ID='OBhxxxxxxxxxxxxxxx'):
                                                  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)
@@ -618,18 +611,29 @@ def invoice(type=1,OBh_ID='OBhxxxxxxxxxxxxxxx'):
     hosVersion=3
     hosName=commonFuc().get_business_data(module,'hosName')
     invoiceQty=leftSettleQty
-    invoiceAmount=leftSettleAmount
+    invoiceAmount=maxSettleAmount
     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)
+    if type==2:#负结算
+
+        request_body = commonFuc().get_business_data(module, "payload3_2_2_2",hosName,invoiceQty,invoiceAmount,invoiceDate,hosId,hosVersion)
+    else:
+        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)
     time.sleep(3)
-    if commonFuc().analysis_json('code',result)==1004:
-        invoiceAmount = -leftSettleAmount
-        request_body = commonFuc().get_business_data(module, "payload3_2_2_2", hosName, invoiceQty, invoiceAmount,
-                                                     invoiceDate, hosId, hosVersion)
-        result = commonFuc().http_post(url, request_body, headers)
+    # while True:
+    #     time.sleep(3)
+    #     print('发票提交，等待3秒')
+    #     request_body = commonFuc().get_business_data(module, "payload3_2_2_2", hosName, -invoiceQty, -invoiceAmount,
+    #                                                  invoiceDate, hosId, hosVersion)
+    #     print('发票提交request_body2', request_body)
+    #     result = commonFuc().http_post(url, request_body, headers)
+    #     print('发票提交结果2', result)
+    #     if commonFuc().analysis_json('code',result)==0:
+    #         break
     print('result', result)
     #==============发票提交===========================================
     #===============发票确认列表查询

data/b5_spd3_core_business_flow/data

@@ -40,7 +40,7 @@ json_headers2: {
 "payload4": {"targetDeptId":"%s","targetAreaCode":"%s","hosId":"%s","sourceId":"%s","sourceType":"%s","pkgTaskId":null}
 "payload5": {"batchList":[{"viewId":"%s","shelfCode":"%s"}],"sourceId":"%s","sourceType":"%s","sourceVersion":"%s","targetDeptId":"%s","targetDeptName":"%s","targetAreaCode":"%s","targetAreaName":"%s","pkgTaskId":null}
 "payload6": {"pageNum":1,"pageSize":50,"orderBy":"","queryObject":{"branchId":"%s","taskType":0,"stockKind":"","sourceOrgName":"","hosId":"%s"}}
-"payload7": {"pageNum":1,"pageSize":50,"queryObject":{"goodsInfo":"","barCodeInfo":"","fromOrderNo":"","purModeList":[],"accountDate1":"","accountDate2":"","tbStatus":0,"hosId":"%s"},"hosId":"%s"}
+"payload7": {"pageNum":1,"pageSize":50,"queryObject":{"goodsInfo":"","provId":"%s",barCodeInfo":"","fromOrderNo":"","purModeList":[],"accountDate1":"","accountDate2":"","tbStatus":0,"hosId":"%s"},"hosId":"%s"}
 "payload8": {"genTypeEnum":"0","queryInfo":{"pageNum":1,"pageSize":50,"queryObject":{"goodsInfo":"","barCodeInfo":"","fromOrderNo":"","purModeList":[],"accountDate1":"","accountDate2":"","tbStatus":0,"hosId":"%s"}},"idList":["%s","%s"],"hosId":"%s"}
 "payload9": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"%s","invoiceDate2":"%s","tbStatus":"10","hosId":"%s"},"hosId":"%s"}
 "payload10": {"billList":[{"id":"%s","version":1}],"tbStatus":"15","comment":"","hosId":"%s"}

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分18秒</td>
+            <td class='details-col-elapsed'>1分31秒</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_a8流程五_中心库入库结算_正结算3_外网开票/log.html' target='_blank'>a_a8流程五_中心库入库结算_正结算3_外网开票</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_a9流程六_中心库入库结算_负结算/log.html' target='_blank'>a_a9流程六_中心库入库结算_负结算</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">18.227</td>
+            <td class="details-col-elapsed">91.585</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>