Merge remote-tracking branch 'remotes/origin/core_folw'

# Conflicts:
#	data/b5_spd3_core_business_flow/message10
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message13
#	data/b5_spd3_core_business_flow/message14
#	data/b5_spd3_core_business_flow/message15
#	data/b5_spd3_core_business_flow/message8
#	data/b5_spd3_core_business_flow/message9

air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air/a_a1_流程一外网企业注册审批.py

@@ -32,4 +32,4 @@ def main():
         print('=================流程一结束=================')
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

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

@@ -178,4 +178,4 @@ def main():
         print('=================流程二结束=================')
     except:
         print('a_a2_流程二供货关系申请提交审批,出现异常,请检查')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air/a_a3_流程三_产品导入和审批.py

@@ -403,4 +403,4 @@ def main():
         delData().Del_goods_info_all()
         commonFuc().check_text_exist_result_text('succees', 'succees')
         print('=================流程三结束=================')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air/a_a4_流程四_基础模块设置.py

@@ -309,4 +309,4 @@ def main():
     except Exception as e:
         commonFuc().check_text_exist_result_text('succees','error')
         print("发生异常：", str(e))
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air/a_a5流程五_中心库入库结算_正结算1_提交采购计划.py

@@ -495,4 +495,4 @@ def main():
         print("发生异常：", str(e))
     commonFuc().check_text_exist_result_text('succees','succees')
 
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_a6流程五_中心库入库结算_正结算2_外网配送.air/a_a6流程五_中心库入库结算_正结算2_外网配送.py

@@ -269,4 +269,4 @@ def main():
         traceback.print_exc()
     else:
         commonFuc().check_text_exist_result_text('succees','succees')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

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

@@ -423,4 +423,4 @@ def main():
         traceback.print_exc()
     else:
         commonFuc().check_text_exist_result_text('succees', 'succees')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

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

@@ -399,4 +399,4 @@ def main():
         traceback.print_exc()
     else:
         commonFuc().check_text_exist_result_text('succees', 'succees')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

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

@@ -239,4 +239,4 @@ def main():
         print('=================流程六结束=================')
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air/a_b0流程七_中心库入库结算_正负结算.py

@@ -237,4 +237,4 @@ def main():
         print('======================流程七结束============================')
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air/a_b1流程八_高值跟台业务流程.py

@@ -346,4 +346,4 @@ def main():
         print('================流程八结束===========================')
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air/a_b3流程十请领业务流_二级库向边仓.py

@@ -333,4 +333,4 @@ def main():
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')
 
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air/a_b4流程十一请领业务流_二级库向直送.py

@@ -846,4 +846,4 @@ def main():
         print('==========================流程十一结束==============================')
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py

@@ -446,4 +446,4 @@ def main():
 
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air/a_b6流程十三请领业务流_三级库向二级库.py

@@ -362,4 +362,4 @@ def main():
 
     except:
         commonFuc().check_text_exist_result_text('error ', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air/a_b7流程十四退库业务_消耗退库.py

@@ -591,4 +591,4 @@ def main():
         print('================流程十四执行完毕===================')
     except:
         commonFuc().check_text_exist_result_text('error', 'SUCCESS')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air/a_b8流程十五退库业务_三级库向二级库退库.py

@@ -436,4 +436,4 @@ def main():
 
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air/a_b9流程十六退库业务_二级库向一级库退库.py

@@ -573,4 +573,4 @@ def main():
 
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_c0流程十七退货业务_中心库退供应商.air/a_c0流程十七退货业务_中心库退供应商.py

@@ -637,4 +637,4 @@ def main():
 
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file

air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py

@@ -378,4 +378,4 @@ def main():
 
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')
-# main()
\ No newline at end of file
+main()
\ No newline at end of file