Merge remote-tracking branch 'remotes/origin/master' into core_flow

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

air_case/a4_mdm3_cm/a3供货关系申请_客户类型_医院_供销关系申请提交.air/a3供货关系申请_客户类型_医院_供销关系申请提交.py

@@ -43,15 +43,15 @@ def supply_and_marketing_apply():
     contactWay = contactUser
     request_body = commonFuc().get_business_data(module, "payload", h_corpId, contactUser, contactWay)
     # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    print('result', result)
-    # #获取接口返回数据
-    #
-    check_dict = commonFuc().get_business_data(module, "checkDict")
-    commonFuc().check_result(check_dict, result)
-    e_corpId = corpId
-    e_username = username
-    return e_corpId, h_corpId, e_username, h_name
+    # result = commonFuc().http_post(url, request_body, headers)
+    # print('result', result)
+    # # #获取接口返回数据
+    # #
+    # check_dict = commonFuc().get_business_data(module, "checkDict")
+    # commonFuc().check_result(check_dict, result)z
+    # e_corpId = corpId
+    # e_username = username
+    # return e_corpId, h_corpId, e_username, h_name
 
 
 # supply_and_marketing_apply()

data/b6_spd3_core_business_flow_database_check/data

@@ -394,3 +394,8 @@
 
 #中心库入库结算_正负结算_付款单子表
 "check_mcms_invoice_ext_detail_0919_1": '{"id": "%s", "pid": "%s", "invoice_id": "%s", "remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "hos_id": "%s"}'
+
+#中心库入库结算_负结算_开票数据主表
+"check_mcms_invoice_0924": '{"id": "%s", "hos_id": "%s", "branch_id": None, "invoice_code": "1", "invoice_number": "test", "invoice_num": 1, "prov_id": "%s", "prov_name": "%s", "invoice_amount": Decimal("-9999.990000"), "tb_status": 50, "invoice_date": %s, "settle_months": "%s", "tax_amount": None, "payment_bill_id": None, "yxpt_order_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 6, "invoice_qty": Decimal("-100.0000"), "remarks": "", "invoice_tag": None, "ext_info": None}'
+#中心库入库结算_负结算_付款单主表
+"check_mcms_invoice_ext_0924": '{"id": "%s", "hos_id": "%s", "prov_id": "%s", "prov_name": "%s", "payment_status": 20, "pay_channel": "YGPT", "pay_amount": Decimal("-9999.9900"), "remain_pay_amount": Decimal("0.0000"), "remark": None, "pay_date": %s, "pay_count": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "pay_user": "%s"}'

main1/main_text.py

@@ -229,7 +229,7 @@ def main_text():
             print('Cancel')
 
     def flow5_flow18():
-        date1= timeUtils().get_time_hms(1)
+        date1= timeUtils().get_time_hms(5)
         sys.stdout = Logger(date1+"output.txt")
         sys.stderr = Logger(date1+"error.txt")