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

air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air/a_a3_流程三_产品导入和审批.py

@@ -400,7 +400,7 @@ def main():
         commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功')
     else:
         # 删除今天之前的产品信息(包含内外网)
-        delData().Del_goods_info_all()
+        # delData().Del_goods_info_all()
         commonFuc().check_text_exist_result_text('succees', 'succees')
         print('=================流程三结束=================')
 main()
\ No newline at end of file

air_case/b6_spd3_core_business_flow_database_check/a_a9流程六_中心库入库结算_负结算_数据库验证.air/a_a9流程六_中心库入库结算_负结算_数据库验证.py

@@ -1022,28 +1022,28 @@ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a9流程六_
 using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air')
 from a_a9流程六_中心库入库结算_负结算 import center_warehouse_return
 try:
-    # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
-    # # test1() # 提交采购计划   # 外网配送   # 内网验收入库结算
-    # # 先查询所有的部门信息写入文件
-    # dept_query_all()
-    # # 设置库房人员，根据传入的科室id和科室名称来设置库房
-    # # 中心库type=1 二级type=2三级type=3
-    # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
-    # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
-    # # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  #设置登录账号默认权限是中心库
+    updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
+    # test1() # 提交采购计划   # 外网配送   # 内网验收入库结算
+    # 先查询所有的部门信息写入文件
+    dept_query_all()
+    # 设置库房人员，根据传入的科室id和科室名称来设置库房
+    # 中心库type=1 二级type=2三级type=3
+    set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
+    set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
+    # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  #设置登录账号默认权限是中心库
+    center_warehouse_return()#中心库退货
     # center_warehouse_return()#中心库退货
-    # # center_warehouse_return()#中心库退货
-    # OBh_ID=settle()  # 生成结算单
-    # print(OBh_ID)
-    # time.sleep(6)
-    # check_mcms_out_balance(1, OBh_ID)  # 结算审批前的结算数据
-    # # 调用审批结算单
-    # approval_center(OBh_ID)
-    # time.sleep(6)
-    # check_mcms_out_balance_approve_after(1, OBh_ID)  # 结算审批后的结算数据
-    # time.sleep(3)
-    # invoice(2,OBh_ID)#type=2 传递结算单号，外网查询开票
-    # time.sleep(3)
+    OBh_ID=settle()  # 生成结算单
+    print(OBh_ID)
+    time.sleep(6)
+    check_mcms_out_balance(1, OBh_ID)  # 结算审批前的结算数据
+    # 调用审批结算单
+    approval_center(OBh_ID)
+    time.sleep(6)
+    check_mcms_out_balance_approve_after(1, OBh_ID)  # 结算审批后的结算数据
+    time.sleep(3)
+    invoice(2,OBh_ID)#type=2 传递结算单号，外网查询开票
+    time.sleep(3)
     # 检查最终的发票数据,过程数据在流程五中检查
     check_mcms_invoice()
     time.sleep(3)

common/db/sql/sql_del_branch_info.py

@@ -686,9 +686,9 @@ class delData(object):
                                      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);"
         #删除结算点设置中的垃圾产品数据
         sql4 = "delete from supply_prov_hos_goods where  hos_goods_id not in(select id from mcms_goods_info);"
         cursor.execute(sql1)