流程十四脚本编写

air_case/b2_herp3_bs/r_g7流程设置_审批流程设置_自定义流程_删除.air/r_g7流程设置_审批流程设置_自定义流程_删除.py

@@ -77,4 +77,5 @@ except:
     print('出现异常')
 finally:
     branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
-    delData().Delete_branch_by_id(3,branch_id)
+    delData().Delete_branch_by_id(3,branch_id)
\ No newline at end of file
+    delData().Delete_probeInfo_other(3,branch_id)
\ No newline at end of file

air_case/b6_spd3_core_business_flow_database_check/a_b7流程十四退库业务_消耗退库_数据库验证.air/a_b7流程十四退库业务_消耗退库_数据库验证.py

@@ -920,18 +920,18 @@ from a_b7流程十四退库业务_消耗退库 import sCan_grant,second_dept_con
 try:
     updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
     sCan_grant(1)  # 低值扫码发放
-    check_mcms_psi_dept_out_and_in(16,10)
+    check_mcms_psi_dept_out_and_in(16,10)#检查出库单和入库单（包括主表和子表）
     sCan_grant(3)  # 试剂扫码发放
-    check_mcms_psi_dept_out_and_in(66,67)
+    check_mcms_psi_dept_out_and_in(66,67)#检查出库单和入库单（包括主表和子表）
     second_dept_consume_Out_Stock(2)  # 高值消耗出库
     second_dept_consume_in_Stock(2)  # 高值消耗退货入库
-    check_mcms_psi_dept_out_and_in(20, 20)   #检查高值消耗出库单和消耗入库单
+    check_mcms_psi_dept_out_and_in(20, 20)   #检查高值消耗出库单和消耗入库单包括主表和子表）
     second_dept_consume_Out_Stock(1)  # 低值消耗出库
     second_dept_consume_in_Stock(1)  # 低值消耗退回入库
-    check_mcms_psi_dept_XH_CK(10,10)
+    check_mcms_psi_dept_XH_CK(10,10)#检查低值消耗出库单和消耗入库单包括主表和子表
     second_dept_consume_Out_Stock(3)  # 试剂消耗出库
     second_dept_consume_in_Stock(3)  # 试剂消耗退回入库
-    check_mcms_psi_dept_XH_CK(67, 67)
+    check_mcms_psi_dept_XH_CK(67, 67)#检查试剂消耗出库单和消耗入库单包括主表和子表
     commonFuc().check_text_exist_result_text('SUCCESS', 'SUCCESS')
 except Exception as e:
     # 打印错误信息

common/db/sql/sql_del_branch_info.py

@@ -3,6 +3,7 @@
 
 import pymysql
 
+from air_case.public1.public1.public1 import get_branch_id
 from common.common_func import commonFuc
 from common.fileUtls import FileUtils
 
@@ -150,15 +151,17 @@ class delData(object):
         # print('多余库房信息删除成功 ')
         cursor.close()
 
-    def Delete_probeInfo_other(self,type=1):
+    def Delete_probeInfo_other(self,type=1,branch_id='branch_id'):
         connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
                                      charset="utf8")
         cursor = connection.cursor()
         # 删除多余库房信息
         if type==1:
             sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区_____中心库房';"
-        else:
+        elif type==2:
             sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区______中心库房';"
+        else:
+            sql = "delete  from mcms_stock_info where branch_id = '%s';" % branch_id
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")