From 3b1a5c7efca2d67acc5411d0e3660df02bda4b9d Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Mon, 15 Jul 2024 10:07:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E8=84=9A=E6=9C=AC=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...56\345\272\223\351\252\214\350\257\201.py" | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\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_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index 518f8537..20f782a9 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\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_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -32,17 +32,17 @@ def check_mcms_dept_buy_car(type=1): branch_id = get_branch_id() # 获取每次都会变化的字段create_time的值 create_time = get_create_time( - "select create_time from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s';" % ( + "select create_time from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s'order by create_time desc LIMIT 1;" % ( branch_id, hos_goods_id)) print('create_time', create_time) id = get_id( - "select id from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s';" % (branch_id, hos_goods_id)) + "select id from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s' order by create_time desc LIMIT 1;" % (branch_id, hos_goods_id)) print('id', id) create_user = get_id( - "select create_user from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s' LIMIT 1;" % ( + "select create_user from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s' order by create_time desc LIMIT 1;;" % ( branch_id, hos_goods_id)) print('create_time', create_time, 'id', id) - sql = """select * from mcms_dept_buy_car where branch_id='%s' and hos_goods_id='%s' LIMIT 1; + sql = """select * from mcms_dept_buy_car where branch_id='%s' and hos_goods_id='%s' order by create_time desc LIMIT 1; """ % (branch_id, hos_goods_id) actual_value1 = check_mcms_dept_buy_car_sql(sql) print(actual_value1) @@ -90,6 +90,8 @@ def check_mcms_dept_buy_car(type=1): print(expected_value2) print('actual_value2') print(actual_value2) + result = (compare_text_index(actual_value2, expected_value2)) + print('result', result) if actual_value2 == expected_value2: print('ok') commonFuc().check_text_exist_result_text('succees', 'succees') @@ -464,41 +466,41 @@ def mcms_dept_buy_detail_approval_after(type=16): try: # ==================暂时注释=================================== - # set_dept_lead() # 设置二级科室负责人 - # # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0" - # pro_path = commonFuc().get_pro_path2() - # print('pro_path', pro_path) - # sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air') - # using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air') - # from a_b3流程十请领业务流_二级库向边仓 import add_logic_stock - # - # add_logic_stock() - # - # from a_b3流程十请领业务流_二级库向边仓 import goods_move - # from a_b3流程十请领业务流_二级库向边仓 import second_dept_Request - # from a_b3流程十请领业务流_二级库向边仓 import BuyCarSubmit - # from a_b3流程十请领业务流_二级库向边仓 import check_buyWayText - # - # # # 设置产品出库渠道为边仓 - # goods_move() - # updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 - # # # # # 低值 - # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1) - # check_mcms_dept_buy_car(1) - # # # # 高值 - # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2) - # check_mcms_dept_buy_car(2) - # # # # 试剂 - # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) - # check_mcms_dept_buy_car(3) - # BuyCarSubmit() # 请领车提交 - # # 调用函数对数据库中的数据进行验证和比对 - # list_data = ['16', '20', '66'] - # for i in list_data: - # check_mcms_dept_buy(int(i)) - # mcms_dept_buy_detail(int(i)) - # for i in range(6): # 三个单据共审批6次 - # approval_center() + set_dept_lead() # 设置二级科室负责人 + # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0" + pro_path = commonFuc().get_pro_path2() + print('pro_path', pro_path) + sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air') + using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air') + from a_b3流程十请领业务流_二级库向边仓 import add_logic_stock + + add_logic_stock() + + from a_b3流程十请领业务流_二级库向边仓 import goods_move + from a_b3流程十请领业务流_二级库向边仓 import second_dept_Request + from a_b3流程十请领业务流_二级库向边仓 import BuyCarSubmit + from a_b3流程十请领业务流_二级库向边仓 import check_buyWayText + + # # 设置产品出库渠道为边仓 + goods_move() + updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 + # # # # 低值 + second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1) + check_mcms_dept_buy_car(1) + # # # 高值 + second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2) + check_mcms_dept_buy_car(2) + # # # 试剂 + second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) + check_mcms_dept_buy_car(3) + BuyCarSubmit() # 请领车提交 + # 调用函数对数据库中的数据进行验证和比对 + list_data = ['16', '20', '66'] + for i in list_data: + check_mcms_dept_buy(int(i)) + mcms_dept_buy_detail(int(i)) + for i in range(6): # 三个单据共审批6次 + approval_center() # ==================上面暂时注释=================================== list_data = ['16', '20', '66'] for i in list_data: -- GitLab