diff --git "a/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" "b/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" index d6588762354d4ca7030af78dae533787cfef2b42..400e7dbcf092b7588324d0e52f360fa19717d894 100644 --- "a/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" +++ "b/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" @@ -398,6 +398,7 @@ def main(): except: print('新增产品信息出现异常,后续的脚本必然无法走通,需要检查程序或者脚本或者环境是否出现问题') commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功') + sys.exit(0) else: # 删除今天之前的产品信息(包含内外网) # delData().Del_goods_info_all() diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index a3c4dcd6bf05796d3480629be3095b2d9cfff6fc..17c60c11dbcef9c51f99b90a9e55210a7c617115 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -157,22 +157,24 @@ try: # ==============分割线 暂时注释=============== add_goods() # 直销高值 select1('message1') - time.sleep(3) + time.sleep(6) check_mcms_goods_info(1)#审核前的产品信息 apply()#审批产品 - time.sleep(3) + time.sleep(6) check_mcms_goods_info_after_approval(1) #审核后的产品信息 add_goods1() # 直销低值 select1('message2') - time.sleep(3) + time.sleep(6) check_mcms_goods_info(2) # 审核前的产品信息 apply() + time.sleep(6) check_mcms_goods_info_after_approval(2) #审核后的产品信息 - add_goods2() # 直销试剂 select1('message3') + time.sleep(6) check_mcms_goods_info(3) # 审核前的产品信息 apply() + time.sleep(6) check_mcms_goods_info_after_approval(3) # 审核后的产品信息 add_goods3() # 集配 select1('message4') @@ -184,9 +186,11 @@ try: supplyProvHosGoods_add_DI() # ==============分割线 暂时注释=============== commonFuc().check_text_exist_result_text('succees', 'succees') -except: +except Exception as e: + print("发生异常：", str(e)) print('新增产品信息出现异常,后续的脚本必然无法走通,需要检查程序或者脚本或者环境是否出现问题') commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功') + sys.exit(0) else: # 删除今天之前的产品信息(包含内外网) # delData().Del_goods_info_all() diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index acbf3bdee9db16a9a98c27baf7c9ab206b80fc89..eeca0b11e2820e98403fb9a442a7c5304abe9548 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -522,17 +522,18 @@ try: time.sleep(6) # 检查院区数据，科室数据，库房，新增用户数据 check_basics_set_info() - time.sleep(3) + time.sleep(6) # 检查mcms_dept_goods_info表数据，验证科室添加的产品信息 check_mcms_dept_goods_info() grants_user() # 给用户授权 + time.sleep(6) # 检查授权数据 check_sys_user_mgr_range() set_dept_lead1() # 设置一级科室负责人 - time.sleep(3) + time.sleep(6) check_dept_leader() add_StockArea() # 添加库区 - time.sleep(3) + time.sleep(6) #检查库区数据 check_StockArea() commonFuc().check_text_exist_result_text('succees', 'succees') diff --git a/common/db/sql/sql_del_branch_info.py b/common/db/sql/sql_del_branch_info.py index dcdf956db00c340e09b7bba3873354921667ebed..b49ba918188c96b11c7fe9381129aadca95705ca 100644 --- a/common/db/sql/sql_del_branch_info.py +++ b/common/db/sql/sql_del_branch_info.py @@ -852,6 +852,9 @@ class delData(object): connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2", charset="utf8") cursor = connection.cursor() + hosGoodsId1 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] + hosGoodsId2 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] + hosGoodsId3 = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'] # 删除产品信息 sql1 = "delete from mcms_goods_info where goods_name like '%一次性注射器%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 5 day);" sql2 = "delete from mcms_goods_info where goods_name like '%新型冠状病毒检测试剂%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 5 day);" @@ -869,14 +872,14 @@ class delData(object): connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd_ybtest_hdi", charset="utf8") cursor = connection.cursor() - sql1 = "delete from mcms_goods_info where goods_name like '%一次性注射器%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 1 day);" - sql2 = "delete from mcms_goods_info where goods_name like '%新型冠状病毒检测试剂%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 1 day);" - sql3 = "delete from mcms_goods_info where goods_name like '%高值牙钻机%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 1 day);" + sql1 = "delete from mcms_goods_info where goods_name like '%一次性注射器%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 5 day);" + sql2 = "delete from mcms_goods_info where goods_name like '%新型冠状病毒检测试剂%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 5 day);" + sql3 = "delete from mcms_goods_info where goods_name like '%高值牙钻机%'and goods_spec ='G-31891'and create_time < DATE_SUB(CURDATE(),INTERVAL 5 day);" cursor.execute(sql1) cursor.execute(sql2) cursor.execute(sql3) cursor.execute("commit;") - print('外网产品信息删除成功 ') + print('外网产品信息删除成功') cursor.close() def check_goods_info(self,hos_goods_id): diff --git a/main1/main_text.py b/main1/main_text.py index 6a41a5250cec58223f58217f9a86addde8cdae47..ce804ae80c7af5e42794c503ee26ea56922f5548 100644 --- a/main1/main_text.py +++ b/main1/main_text.py @@ -384,7 +384,13 @@ def main_text(): count = tk.simpledialog.askstring("输入循环次数", "循环次数:", initialvalue="%s" % c) return count - + def del_goods_info(): + print('删除五天前的所有产品信息') + result = confirm() + if result == True: + result1 = confirm1() + if result1 == True: + delData().Del_goods_info_all() # 文本显示的位置。 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) @@ -410,14 +416,16 @@ def main_text(): 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=0) Button(root, text='删除指定\n院区数据', anchor='center', width=8, height=2, command=del_brachdata_from_brachid).grid(row=5, - column=0) - Button(root, text='删除当前\n院区业务\n数据', anchor='center', width=8, height=2, command=del_current_brachdata).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='流程十一开始\n一键执行', anchor='center', width=8, height=2, command=flow11_flow18).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=10) + Button(root, text='删除当前\n院区业务\n数据', anchor='center', width=8, height=2, command=del_current_brachdata).grid(row=5, + column=4) + Button(root, text='流程五开始\n一键执行', anchor='center', width=8, height=2, command=flow5_flow18).grid(row=5, column=6) + Button(root, text='删除垃圾\n数据', anchor='center', width=8, height=2, command=del_data).grid(row=5, column=8) + Button(root, text='流程十一开始\n一键执行', anchor='center', width=10, height=2, command=flow11_flow18).grid(row=6, column=0) + Button(root, text='从jenkins\n下载data\n数据', anchor='center', width=8, height=2, command=download_data).grid(row=6, + column=2) + Button(root, text='删除5天前\n产品数据', anchor='center', width=8, height=3, command=del_goods_info).grid(row=6, + column=4) Button(root, text='退 出', anchor='center', width=8, height=2, command=exit).grid(row=5, column=10)