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_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py

@@ -410,16 +410,13 @@ def main():
         """
         这里的审批跟审批流的设置有关
         """
-        for i in range(3):  # 三个单据共审批3次
+        for i in range(6):  # 三个单据共审批6次
             approval_center()
         updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  #设置登录账号默认权限是中心库
         #获取拣货单列表个数
-        try:
-            for i in range(get_centeStock_pick_list_counts()):
-                centeStock_pick()#中心库拣货
-        except:
-            for i in range(3):  # 三个单据共审批3次
-                approval_center()
+        for i in range(get_centeStock_pick_list_counts()):
+            centeStock_pick()#中心库拣货
+
         #低值拣货执行
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')