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

@@ -439,4 +439,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_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py

@@ -375,7 +375,6 @@ def main():
         center_Stock_unpack(3)  # 试剂耗材扫码发放
         commonFuc().check_text_exist_result_text('succees', 'succees')
         print('================流程十八执行完毕===================')
-        print('================流程十八执行完毕===================')
 
     except:
         commonFuc().check_text_exist_result_text('error', 'succees')

geckodriver.log

-1691384174643	geckodriver	INFO	Listening on 127.0.0.1:60395
-1691384177063	mozrunner::runner	INFO	Running command: "D:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe" "--marionette" "-foreground" "-no-remote" "-profile" "C:\\Users\\ADMINI~1\\AppData\\Local\\Temp\\rust_mozprofilekzunjD"
-console.warn: services.settings: Ignoring preference override of remote settings server
-console.warn: services.settings: Allow by setting MOZ_REMOTE_SETTINGS_DEVTOOLS=1 in the environment
-1691384177326	Marionette	INFO	Marionette enabled
-Dynamically enable window occlusion 0
-console.error: "Warning: unrecognized command line flag" "-foreground"
-1691384177391	Marionette	INFO	Listening on port 60405
-1691384177764	RemoteAgent	WARN	TLS certificate errors will be ignored for this session
-[GFX1-]: Failed to create a D3D11 content device: 0x887a0031
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-1691384189508	Marionette	INFO	Stopped listening on port 60405
-Dynamically enable window occlusion 1
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-JavaScript error: chrome://remote/content/marionette/cert.sys.mjs, line 51: NS_ERROR_NOT_AVAILABLE: Component returned failure code: 0x80040111 (NS_ERROR_NOT_AVAILABLE) [nsICertOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData]
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443
-[Parent 13764, IPC I/O Parent] WARNING: DuplicateHandle failed for handle 0 in TransferHandles: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:621
-[GPU 15232, IPC I/O Child] WARNING: pipe error: 232: file /builds/worker/checkouts/gecko/ipc/chromium/src/chrome/common/ipc_channel_win.cc:443

main1/main_text.py

@@ -88,7 +88,7 @@ def main_text():
     def flow8():
         from execute import flow11
         flow11()
-        print('流程八执行完毕','流程八执行完毕')
+        print('流程八执行完毕','流程八执行完毕 ')
         # sys.exit(0)
     def flow9():
         from execute import flow12
@@ -214,7 +214,7 @@ def main_text():
     Button(root, text='一键执行', anchor='center', width=8, height=2,command=flow0).grid(row=5,column=2)
     Button(root, text='流程五开始\n一键执行', anchor='center', width=8, height=2,command=flow5_flow18).grid(row=5,column=4)
     Button(root, text='删除垃圾\n数据', anchor='center', width=8, height=2,command=del_data).grid(row=5,column=6)
-    Button(root, text='从jenkins下载data\n数据', anchor='center', width=8, height=2,command=download_data).grid(row=5,column=8)
+    Button(root, text='从jenkins\n下载data\n数据', anchor='center', width=8, height=2,command=download_data).grid(row=5,column=8)
     Button(root, text='退  出', anchor='center', width=8, height=2,command=exit).grid(row=5,column=10)
 
     # Button(root, text='anchor', anchor='e', width=30, height=4).pack()