From 6a98de6676bb1cde99000df37293c15a9309b082 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Tue, 23 Jul 2024 14:01:36 +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=E4=BA=8C=E8=84=9A=E6=9C=AC=E7=BC=96?= =?UTF-8?q?=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_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\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_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index 75320522..47f7a784 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\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_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\344\272\214\347\272\247\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -190,7 +190,7 @@ def mcms_dept_buy_detail(type=16): # 检查二级库请领单审批前的主表数据 def check_mcms_dept_buy(type=16): branch_id = get_branch_id() - sql = """select * from mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc LIMIT 1; + sql = """select * from mcms_dept_buy where branch_id='%s' and bill_mode='%s' and buy_kind='LY' order by create_time desc LIMIT 1; """ % (branch_id, type) actual = check_mcms_dept_buy_sql(sql) print(actual) @@ -258,7 +258,7 @@ def check_mcms_dept_buy(type=16): last_modified, last_modified_user) elif type == 20: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_dept_buy_direct_sending2', id1, order_no1, get_hosid(), + 'mcms_dept_buy5_2', id1, order_no1, get_hosid(), branch_id, deptid2, deptname2, area_code, area_name, target_dept_id, target_dept_name, target_stock_id, target_stock_name, bill_expdt_date, rec_user, @@ -266,7 +266,7 @@ def check_mcms_dept_buy(type=16): last_modified, last_modified_user) else: expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', - 'mcms_dept_buy_direct_sending3', id1, order_no1, get_hosid(), + 'mcms_dept_buy5_3', id1, order_no1, get_hosid(), branch_id, deptid2, deptname2, area_code, area_name, target_dept_id, target_dept_name, target_stock_id, target_stock_name, bill_expdt_date, rec_user, @@ -303,44 +303,45 @@ try: from a_b5流程十二请领业务流_二级库向二级库 import add_new_deptinfo,edit_goods_target,second_dept_Request from a_b5流程十二请领业务流_二级库向二级库 import BuyCarSubmit,pick_execute #========下面暂时注释 - # add_dept2() # 新增一个二级科室 - # add_new_deptinfo() # 写入科室信息到文件中 - # grants_user_new() # 新增授权 - # # 同步库房信息 - # execute_command("python runner_test.py tag id2263-221 debug sit") - # # 设置部门用户 - # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], - # FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2) - # # 设置部门负责人 - # set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人 - # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], - # FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2) - # - # # 设置库区联系人 - # deptName5 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] - # - # set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"], - # get_stockAreaId2_new_fromDb(deptName5, 2)) - # #新建科室产品分配 - # dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']) - # #编辑产品请领目标为二级检验科002 - # currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] - # targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] - # edit_goods_target(currentDeptId, targetDeptId) - # - # updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是新二级库 + add_dept2() # 新增一个二级科室 + add_new_deptinfo() # 写入科室信息到文件中 + grants_user_new() # 新增授权 + # 同步库房信息 + execute_command("python runner_test.py tag id2263-221 debug sit") + # 设置部门用户 + set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], + FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2) + # 设置部门负责人 + set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人 + get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'], + FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 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) + # 设置库区联系人 + deptName5 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] + + set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"], + get_stockAreaId2_new_fromDb(deptName5, 2)) + #新建科室产品分配 + dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']) + #编辑产品请领目标为二级检验科002 + currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] + targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + edit_goods_target(currentDeptId, targetDeptId) + + updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是新二级库 + + # # 低值 + 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() # 请领车提交 + BuyCarSubmit() # 请领车提交 + time.sleep(6) list_data = ['16', '20', '66'] for i in list_data: check_mcms_dept_buy(int(i)) @@ -351,6 +352,7 @@ try: # 二级科室领用出库 # 低值拣货执行 pick_execute() + second_dept_one_key_in(5) second_dept_one_key_in(5) second_dept_one_key_in(5) -- GitLab