流程九脚本编写

air_case/public1/public1/public1.py

@@ -874,10 +874,17 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
     while True:
         time.sleep(6)
         result = commonFuc().http_post(url, request_body, headers)
-        print('result', result)
+        print('内网发票核对result', result)
         try:
             data = commonFuc().analysis_json('data', result)
             total = commonFuc().analysis_json('total', data)
+            data1 = commonFuc().analysis_json('data', data)
+            id = commonFuc().analysis_json('id', data1)
+            if id == id1:
+                VI_id = id1
+                break
+            else:
+                continue
             if total == 0:
                 print('数据暂时未同步过来')
                 i = i + 1
@@ -889,23 +896,37 @@ def invoice(type=1, OBh_ID='OBhxxxxxxxxxxxxxxx'):
         except:
             continue
 
+
     print('result', '内网发票核对', result)
 
     data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+    version=commonFuc().analysis_json('version',data1)
     for i in data1:
         id = commonFuc().analysis_json('id', i)
         if id == id1:
+            VI_id = id1
             break
-    VI_id = id1
-    print('id1', id1)
+
+
+    print('id1', id1,'VI_id',VI_id)
+    print('version', version)
+
     # ==============发票列表查询
     # ==============发票核对提交
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                              "mcmsInvoice_invoiceUpdateStatusList_url")
-    print('url', url)
-    request_body = commonFuc().get_business_data(module, "payload10", VI_id, get_hosid())
-    print('request_body', request_body)
-    result = commonFuc().http_post(url, request_body, headers)
+    print('发票核对提交url', url)
+
+    request_body = commonFuc().get_business_data(module, "payload10", id1, version,get_hosid())
+
+    print('发票核对提交request_body', request_body)
+    while True:
+        result = commonFuc().http_post(url, request_body, headers)
+        code=commonFuc().analysis_json('code',result)
+        if code==0:
+            break
+        else:
+            time.sleep(6)
     print('发票核对提交result', result)
     # ==============发票核对提交
     # ==============内网发票核对============

data/b5_spd3_core_business_flow/data

@@ -51,6 +51,9 @@
 "herpService_BuyPick_updateLock_url": "/api/herpService/BuyPick/updateLock"
 "herpService_BuyPick_pickScan_url": "/api/herpService/BuyPick/pickScan"
 "herpService_hdiBarcode_scan_url": "/api/herpService/stock/hdiBarcode/scan/"
+"mcmsInvoice_getById_url": "/api/herpService/mcmsInvoice/getById/"
+
+
 
 "username": "xhs1009"
 "password": "1qaz!QAZ"
@@ -77,7 +80,7 @@ json_headers2: {
 "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"}
+"payload10": {"billList":[{"id":"%s","version":"%s"}],"tbStatus":"15","comment":"test","hosId":"%s"}
 "payload11": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"","invoiceDate2":"","checkDate1":"%s","checkDate2":"%s","tbStatus":"15","hosId":"%s"},"hosId":"%s"}
 "payload12": {"billList":[{"id":"%s","version":2}],"tbStatus":"20","hosId":"%s"}
 "payload13": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"%sT01:18:05.672Z","invoiceDate2":"%sT01:18:05.672Z","checkDate1":"","checkDate2":"","tbStatus":"20","hosId":"%s"},"hosId":"%s"}

report/summary.html

@@ -56,7 +56,7 @@
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>0</td>
-            <td class='details-col-elapsed'>0分20秒</td>
+            <td class='details-col-elapsed'>1分59秒</td>
             <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
@@ -74,7 +74,7 @@
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a_a9流程六_中心库入库结算_负结算/log.html' target='_blank'>a_a9流程六_中心库入库结算_负结算</a></td>
             <td class="fail">失败</td>
-            <td class="details-col-elapsed">20.676</td>
+            <td class="details-col-elapsed">119.012</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>