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

main1/main_text.py

@@ -163,6 +163,21 @@ def main_text():
                 print('===================删除垃圾数据完毕============================')
         else:
             print('Cancel')
+    def flow5_flow18():
+        flow5()
+        flow6()
+        flow7()
+        flow8()
+        flow9()
+        flow10()
+        flow11()
+        flow12()
+        flow13()
+        flow14()
+        flow15()
+        flow16()
+        flow17()
+        flow18()
 
 
     def confirm():
@@ -175,7 +190,8 @@ def main_text():
         # print(result)
         print("用户选择了:", "OK" if result else "Cancel")
         return result
-
+    def download_data():
+        print('从Jenkins服务器下载data数据')
     # 文本显示的位置。
     Button(root, text='流程一\n外网企业注册审批', width=16, height=8,command=flow1).grid(row=2,column=0)
     Button(root, text='流程二\n供货关系申请审批', anchor='center', width=16, height=8,command=flow2).grid(row=2,column=2)
@@ -196,8 +212,10 @@ def main_text():
     Button(root, text='流程十七\n退库业务_中心库退\n供应商', anchor='center', width=16, height=8,command=flow17).grid(row=4,column=8)
     Button(root, text='流程十八\n中心库业务_拆包功能', anchor='center', width=16, height=8,command=flow18).grid(row=4,column=10)
     Button(root, text='一键执行', anchor='center', width=8, height=2,command=flow0).grid(row=5,column=2)
-    Button(root, text='删除垃圾数据', anchor='center', width=8, height=2,command=del_data).grid(row=5,column=4)
-    Button(root, text='退  出', anchor='center', width=8, height=2,command=exit).grid(row=5,column=8)
+    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='退  出', anchor='center', width=8, height=2,command=exit).grid(row=5,column=10)
 
     # Button(root, text='anchor', anchor='e', width=30, height=4).pack()
     # Button(root, text='anchor', anchor='w', width=30, height=4).pack()