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

# Conflicts:
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message21

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

@@ -301,7 +301,7 @@ def check_buyWayText():
         buyWayText=commonFuc().analysis_json('buyWayText',i)
         if buyWayText=='边仓':
             j=j+1
-    if j==3:
+    if j>=3:
         commonFuc().check_text_exist_result_text('succees', 'succees')
     else:
         commonFuc().check_text_exist_result_text('error', 'succees')
@@ -310,7 +310,6 @@ def check_buyWayText():
 
 def main():
     try:
-
         set_dept_lead()  # 设置二级科室负责人
         # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0"
         add_logic_stock()
@@ -326,7 +325,7 @@ def main():
         # # 试剂
         second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
         BuyCarSubmit()  # 请领车提交
-        for i in range(6):  # 三个单据共审批6次
+        for i in range(3):  # 三个单据共审批6次
             approval_center()
         check_buyWayText()#验证出库渠道是否为边仓
         commonFuc().check_text_exist_result_text('succees', 'succees')

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

@@ -827,7 +827,7 @@ def main():
             # # 试剂
             second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
             BuyCarSubmit()  # 请领车提交
-            for i in range(6):  # 三个单据共审批6次
+            for i in range(3):  # 三个单据共审批6次
                 approval_center()
             # 采购模块处理
             purchase_module_process()

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024070831692
-  orderNo2: PLAN2024070831692
+  orderNo1: PLAN2024070831695
+  orderNo2: PLAN2024070831695

main1/main_text.py

@@ -80,8 +80,10 @@ def main_text():
         flow9()
         # sys.exit(0)
     def flow7():
+        tkinter.messagebox.showinfo('流程七开始执行')
         from execute import flow10
         flow10()
+        tkinter.messagebox.showinfo('流程七执行完毕')
         # sys.exit(0)
     def flow8():
         from execute import flow11
@@ -96,7 +98,7 @@ def main_text():
     def flow10():
         from execute import flow13
         flow13()
-        print('流程十三执行完毕','流程十三执行完毕')
+        print('流程十执行完毕','流程十执行完毕')
         # sys.exit(0)
     def flow11():
         from execute import flow14