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 7c81babc8f9daaec12393bda9bf271fb894d8d0c..8ce3570b7809faa0493587376b95237199816b69 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" @@ -834,7 +834,7 @@ def check_mcms_psi_dept_in(type=16): print('error') commonFuc().check_text_exist_result_text('error', 'succees') -try: +def main(): 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_b5流程十二请领业务流_二级库向二级库.air') @@ -864,9 +864,9 @@ try: 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 + # 编辑产品请领目标为二级检验科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) @@ -908,11 +908,14 @@ try: second_dept_one_key_in(5) second_dept_one_key_in(5) # # 上面暂时注释======================== - #检查入库单 + # 检查入库单 check_mcms_psi_dept_in(16) check_mcms_psi_dept_in(20) check_mcms_psi_dept_in(66) commonFuc().check_text_exist_result_text('succees', 'succees') + +try: + main() except Exception as e: # 打印错误信息 print(f"发生错误: {e}") diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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 c314421a40cd7558875f74eaa6ba22b7b143f0de..12ed887ab012eadd9a25ba151a46d56947a09ab7 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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" @@ -820,13 +820,12 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id1): else: print('error') commonFuc().check_text_exist_result_text('error', 'succees') -try: +def main(): 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_b6流程十三请领业务流_三级库向二级库.air') using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air') - from a_b6流程十三请领业务流_三级库向二级库 import edit_goods_target, second_dept_Request from a_b6流程十三请领业务流_三级库向二级库 import BuyCarSubmit, pick_execute # # 设置部门用户 @@ -840,7 +839,7 @@ try: # 设置库区联系人 set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"], get_stockAreaId2_new_fromDb(deptName3, 3)) # 设置库区联系人 - #三级科室产品分配 + # 三级科室产品分配 dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3']) updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库 @@ -863,8 +862,8 @@ try: for i in range(6): # 三个单据共审批6次 approval_center() - updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) #设置登录账号默认权限是二级库 - #二级科室领用出库 + updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 + # 二级科室领用出库 # 低值拣货执行 pick_execute() @@ -877,7 +876,7 @@ try: check_mcms_psi_dept(16) check_mcms_psi_dept(20) check_mcms_psi_dept(66) - updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) #设置登录账号默认权限是三级库 + updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库 # 上面暂时注释=================================== second_dept_one_key_in(3) second_dept_one_key_in(3) @@ -888,5 +887,8 @@ try: check_mcms_psi_dept_in(20) check_mcms_psi_dept_in(66) commonFuc().check_text_exist_result_text('succees', 'succees') + +try: + main() except: commonFuc().check_text_exist_result_text('error ', '1') diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\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_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index 7e5f92fc88c3e2b692afed72e7b770d4bf86f538..bceaf331c6635bfaa05e664f22126128fbb099a6 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\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_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -5,6 +5,8 @@ import traceback from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system from air_case.public1.public1.public1 import * from common.db.sql.sql_del_branch_info import delData +from common.db.sql.sql_tools import check_mcms_dept_buy_sql, get_PICK_id, get_buyBillId, get_PICK_order_no, \ + get_buyOrderNo, get_login_user_uxid_bydb, get_create_time, get_account_date from common.fileUtls import FileUtils from common.run_cmd_script import execute_command @@ -20,566 +22,388 @@ python runner_test.py tag id2303-17 debug mdm3 """ -def second_dept_consume_Out_Stock(type): # 二级库消耗出库 - module = "b5_spd3_core_business_flow" - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束 - # 我要请领_手工请领_列表查询=========================== - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) +def check_mcms_psi_dept_in(type=10): + branch_id = get_branch_id() + sql = " select * from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type) + actual = check_mcms_dept_buy_sql(sql) + print(actual) + info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28') + if type == 16: + source_id = info['DR_NO2'] + elif type == 20: + source_id = info['DR_NO3'] + else: + source_id = info['DR_NO1'] + source_id = ''.join(source_id) + source_no=get_id("select order_no from mcms_psi_dept where id='%s';"%source_id) + #获取入库单主键DR_ID + sql = " select id from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type) + DR_ID = get_id(sql) + #获取order_no + sql = " select order_no from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type) + order_no = get_id(sql) + target_corp_id = get_hosid() + target_branch_id = get_branch_id() + target_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + target_stock_id = get_stockId_fromdb(target_dept_name + '库房') + target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2) + PICK_id = get_PICK_id(branch_id, type) - # if type == 2: - # print('下面处理') - # elif type == 3: - # # udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3 - # print('下面处理') - # else: - # udi_code = 'udi_code' - if type == 2: - udi_code = get_udi2(2) # 获取条码 低值1 高值2 试剂3 - # import pdb - # pdb.set_trace() - info = (udi_code, udi_code) - titlename = ('udi_code', 'udi_code') - # 将高值消耗出库条码信息写入文件 - FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '高值消耗条码', titlename, 'message24') - # 高值消耗 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_pick_scan_url") - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - print('info', info) - list_a = info['list_a'] - stockId = commonFuc().analysis_json('stockId', list_a) - stockName = commonFuc().analysis_json('stockName', list_a) - areaCode = commonFuc().analysis_json('areaCode', list_a) - areaName = commonFuc().analysis_json('areaName', list_a) - # 从message18文件中获取信息 - request_body = commonFuc().get_business_data(module, "payload61", udi_code, stockId, stockName, areaCode, - areaName) - result = commonFuc().http_post(url, request_body, headers) - # 获取必要信息 - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] - data1 = commonFuc().analysis_json('data', result) - areaCode = commonFuc().analysis_json('areaCode', data1) - UTid = commonFuc().analysis_json('id', data1) - createTime = commonFuc().analysis_json('id', data1) - stockId = commonFuc().analysis_json('stockId', data1) - areaCode = commonFuc().analysis_json('areaCode', data1) - areaName = commonFuc().analysis_json('areaName', data1) - shelfCode = commonFuc().analysis_json('shelfCode', data1) - codeType = commonFuc().analysis_json('codeType', data1) - tagType = commonFuc().analysis_json('tagType', data1) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1) - mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1) - goodsCode = commonFuc().analysis_json('goodsCode', data1) - goodsDi = commonFuc().analysis_json('goodsDi', data1) - barName = commonFuc().analysis_json('barName', data1) - batchCode = commonFuc().analysis_json('batchCode', data1) - expdtDate = commonFuc().analysis_json('expdtDate', data1) - productDate = commonFuc().analysis_json('productDate', data1) - pkgCode = commonFuc().analysis_json('pkgCode', data1) - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data1) - ssccCode = commonFuc().analysis_json('ssccCode', data1) - tbStatus = commonFuc().analysis_json('tbStatus', data1) - ext = commonFuc().analysis_json('ext', data1) - distrDetailId = commonFuc().analysis_json('distrDetailId', ext) - distrBillId = commonFuc().analysis_json('distrBillId', ext) - purBillId = commonFuc().analysis_json('purBillId', ext) - pkgDefQty = commonFuc().analysis_json('pkgDefQty', ext) - pkgDefId = commonFuc().analysis_json('pkgDefId', ext) - pkgDefName = commonFuc().analysis_json('pkgDefName', ext) - purMode = commonFuc().analysis_json('purMode', data1) - goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) - goodsSpec = commonFuc().analysis_json('goodsSpec', data1) - unit = commonFuc().analysis_json('unit', data1) - goodsName = commonFuc().analysis_json('goodsName', data1) - pkgDefId = commonFuc().analysis_json('pkgDefId', data1) - # pkgDefQty=commonFuc().analysis_json('pkgDefQty',data1) - pkgDefName = commonFuc().analysis_json('pkgDefName', data1) - printNum = commonFuc().analysis_json('printNum', data1) - made = commonFuc().analysis_json('made', data1) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) - sourceId = commonFuc().analysis_json('sourceId', data1) - price = commonFuc().analysis_json('price', data1) - purModeText = commonFuc().analysis_json('purModeText', data1) - version = commonFuc().analysis_json('version', data1) - unitName = commonFuc().analysis_json('unitName', data1) - stockName=commonFuc().analysis_json('stockName', data1) - # ==============================获取条码信息 - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - # print('info', info) - list_a = info['list_a'] - extInfo = commonFuc().analysis_json('extInfo', list_a) - print('extInfo', extInfo) - # inStockTime = commonFuc().analysis_json('inStockTime', extInfo) - inStockTime = reGetString(extInfo, r'inStockTime": "', r'",') - print('inStockTime', inStockTime) - # 从message18文件中获取信息 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_out_submit_url") - # import pdb - # pdb.set_trace() + source_corp_id = get_hosid() + source_branch_id = get_branch_id() + source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + source_stock_id = get_stockId_fromdb(source_dept_name + '库房') + source_area_code = get_stockAreaId_new_fromDb(source_dept_name, 2) + buyBillId = get_buyBillId(branch_id, type) + pickOrderNo = get_PICK_order_no(branch_id, type) + buyOrderNo = get_buyOrderNo(branch_id, type) + pickBillId = get_PICK_id(branch_id, type) + psiDeptOutBillId = source_id + psiDeptOutOrderNo = source_no + create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']) + create_time = get_create_time("select create_time from mcms_psi_dept where id='%s';" % DR_ID) + last_modified = get_create_time("select last_modified from mcms_psi_dept where id='%s';" % DR_ID) + last_modified_user = create_user + accounter=create_user + sql="select account_date from mcms_psi_dept where id='%s';"%DR_ID + account_date=get_account_date(sql) + psiDeptInBillId=DR_ID + psiDeptInOrderNo=order_no + if type == 16: + # 子表检查 + check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_in_1', DR_ID, order_no, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id,source_no, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + accounter,account_date,buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, + psiDeptOutOrderNo,psiDeptInBillId,psiDeptInOrderNo + , create_user, create_time, last_modified, last_modified_user - deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"] - deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] - stockName2 = deptName2 + "库房" - createTime = timeUtils().get_time_hms(1) - request_body = "request_body" - mgrCorpName = get_hosname() - mgrRangeId = deptid2 - mgrRangeName = deptName2 - extStr1 = get_branch_name() - extStr3 = get_branch_name() - snCode = UTid - userLoginCode = username - cname = username - orgCode1 = get_orgCode() - orgName1 = get_orgName() - print(orgCode1, orgName1) + ) + elif type == 20: + # 子表检查 + check_mcms_psi_dept_batch_in(DR_ID, type, order_no,source_id) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_in_2', DR_ID, order_no, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id,source_no, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + accounter,account_date,buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, + psiDeptOutOrderNo,psiDeptInBillId,psiDeptInOrderNo + , create_user, create_time, last_modified, last_modified_user - request_body = commonFuc().get_business_data(module, "payload50_1_3", stockId, stockName2, areaCode, - areaName, - uxid, userLoginCode, cname, get_hosid(), get_branch_id(), - deptid1, - orgCode1, orgName1, get_hosid(), get_hosid(), mgrCorpName, - get_branch_id(), - get_branch_name(), mgrRangeId, mgrRangeName, extStr1, extStr3, - get_hosid(), stockId, - stockName2, areaCode, areaName, UTid, createTime, snCode, - get_hosid(), stockId, areaCode, areaName, shelfCode, - codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi, - barName, - batchCode, expdtDate, productDate, pkgCode, pkgCodeSee, - ssccCode, - tbStatus, purBillId, - distrBillId, - inStockTime, distrDetailId, purMode, price, goodsMfrsName, - goodsSpec, unit, goodsName, unitName, - hosGoodsCode, purModeText) - print('request_body', '高值消耗出库', request_body) + ) + else: + # 子表检查 + check_mcms_psi_dept_batch_in(DR_ID, type, order_no,source_id) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_in_3', DR_ID, order_no, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id,source_no, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + accounter,account_date,buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, + psiDeptOutOrderNo,psiDeptInBillId,psiDeptInOrderNo + , create_user, create_time, last_modified, last_modified_user - # # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - elif type == 1: - print('低值耗材消耗出库') - udi_code = get_udi2(1) - data1 = pickScan4(udi_code) - # 获取必要信息 - areaCode = commonFuc().analysis_json('areaCode', data1) - UTid = commonFuc().analysis_json('id', data1) - createTime = commonFuc().analysis_json('id', data1) - stockId = commonFuc().analysis_json('stockId', data1) - areaCode = commonFuc().analysis_json('areaCode', data1) - areaName = commonFuc().analysis_json('areaName', data1) - shelfCode = commonFuc().analysis_json('shelfCode', data1) - codeType = commonFuc().analysis_json('codeType', data1) - tagType = commonFuc().analysis_json('tagType', data1) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1) - mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1) - goodsCode = commonFuc().analysis_json('goodsCode', data1) - goodsDi = commonFuc().analysis_json('goodsDi', data1) - barName = commonFuc().analysis_json('barName', data1) - batchCode = commonFuc().analysis_json('batchCode', data1) - expdtDate = commonFuc().analysis_json('expdtDate', data1) - productDate = commonFuc().analysis_json('productDate', data1) - pkgCode = commonFuc().analysis_json('pkgCode', data1) - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data1) - ssccCode = commonFuc().analysis_json('ssccCode', data1) - tbStatus = commonFuc().analysis_json('tbStatus', data1) - ext = commonFuc().analysis_json('ext', data1) - distrDetailId = commonFuc().analysis_json('distrDetailId', ext) - distrBillId = commonFuc().analysis_json('distrBillId', ext) - purBillId = commonFuc().analysis_json('purBillId', ext) - pkgDefQty = commonFuc().analysis_json('pkgDefQty', ext) - pkgDefId = commonFuc().analysis_json('pkgDefId', ext) - pkgDefName = commonFuc().analysis_json('pkgDefName', ext) - purMode = commonFuc().analysis_json('purMode', data1) - goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) - goodsSpec = commonFuc().analysis_json('goodsSpec', data1) - unit = commonFuc().analysis_json('unit', data1) - goodsName = commonFuc().analysis_json('goodsName', data1) - pkgDefId = commonFuc().analysis_json('pkgDefId', data1) - # pkgDefQty=commonFuc().analysis_json('pkgDefQty',data1) - pkgDefName = commonFuc().analysis_json('pkgDefName', data1) - printNum = commonFuc().analysis_json('printNum', data1) - made = commonFuc().analysis_json('made', data1) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) - sourceId = commonFuc().analysis_json('sourceId', data1) - price = commonFuc().analysis_json('price', data1) - purModeText = commonFuc().analysis_json('purModeText', data1) - version = commonFuc().analysis_json('version', data1) - unitName = commonFuc().analysis_json('unitName', data1) - # ==============================获取条码信息 - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - # print('info', info) - list_a = info['list_a'] - extInfo = commonFuc().analysis_json('extInfo', list_a) - print('extInfo', extInfo) - # inStockTime = commonFuc().analysis_json('inStockTime', extInfo) - inStockTime = reGetString(extInfo, 'inStockTime\"\: \"', '\"\, \"distrDetailId') - print('inStockTime', inStockTime) - # 从message18文件中获取信息 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_out_submit_url") + ) - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"] - deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] - stockName2 = deptName2 + "库房" - createTime = timeUtils().get_time_hms(1) - request_body = "request_body" - mgrCorpName = get_hosname() - mgrRangeId = deptid2 - mgrRangeName = deptName2 - extStr1 = get_branch_name() - extStr3 = get_branch_name() - snCode = UTid - userLoginCode = username - cname = username - orgCode1 = get_orgCode() - orgName1 = get_orgName() - url2 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stockpile_list_url") + print('expected', expected) + print('aaaaaaaaaaaaaaaaa') + actual_value1 = get_process_list2(actual) + expected_value1 = get_process_list2(expected) + actual_value2 = actual_value1.replace(" ", "") + expected_value2 = expected_value1.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + print(compare_text_index(actual_value2, expected_value2)) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') +def check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id1): + branch_id = get_branch_id() + sql = " select * from mcms_psi_dept_batch where pid='%s';" % ( + DR_ID) + actual = check_mcms_dept_buy_sql(sql) + print('actual', actual) + batch_main_key = get_id("select id from mcms_psi_dept_batch where pid='%s';" % DR_ID) + pid = DR_ID + # order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID) + source_detail_id = source_id1+'0001' + pick_detail_id=None + if type == 16: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] + elif type == 20: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"] + else: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"] + mdm_goods_code = get_mdm_goods_code1(hos_goods_id) + goods_code = get_goods_code1(hos_goods_id) + pkg_def_id = get_pkg_def_id(hos_goods_id) + picker_name = FileUtils().r_info8("b2_herp3_bs", "用户名信息", 'message3')['username1'] + picker = get_login_user_uxid_bydb(picker_name) + source_batch_id=get_id("select source_batch_id from mcms_psi_dept_batch where pid='%s';" % DR_ID) + target_batch_id=source_batch_id + if check_batch_id(source_batch_id)==True: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + barcode_id=get_id("select barcode_id from mcms_psi_dept_batch where pid='%s';" % DR_ID) + if check_barcode_id(barcode_id)==True: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'] + shelf_code= get_stockAreaId_new_fromDb(dept_name, 2) + create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']) + create_time = get_create_time("select create_time from mcms_psi_dept_batch where pid='%s';" % DR_ID) + last_modified = get_create_time("select last_modified from mcms_psi_dept_batch where pid='%s';" % DR_ID) + last_modified_user = create_user + if type == 16: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch_in1', batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user - request_body2 = commonFuc().get_business_data(module, "payload62", stockId, stockName2, areaCode, areaName, - get_hosid()) - # # # # 发送请求 - result2 = commonFuc().http_post(url2, request_body2, headers) - availableQty = commonFuc().analysis_json('availableQty', commonFuc().analysis_json('data', - commonFuc().analysis_json( - 'data', result2))) - transferRatio = commonFuc().analysis_json('transferRatio', commonFuc().analysis_json('data', - commonFuc().analysis_json( - 'data', result2))) - print('result2', result2) - request_body = commonFuc().get_business_data(module, "payload50_1_4", stockId, stockName2, areaCode, - areaName, get_hosid(), deptid2, - uxid, userLoginCode, cname, get_hosid(), get_branch_id(), - deptid1, - orgCode1, orgName1, get_hosid(), get_hosid(), mgrCorpName, - get_branch_id(), - get_branch_name(), mgrRangeId, mgrRangeName, extStr1, extStr3, - stockId, - stockName2, areaCode, areaName, areaCode, - purMode, - hosGoodsId, goodsCode, batchCode, expdtDate, goodsSpec, goodsName, - goodsMfrsName, unit, mdmGoodsCode, availableQty, transferRatio - ) + ) + elif type == 20: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch_in2', batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user - print('request_body', request_body) - # # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - elif type == 3: - print('检验试剂消耗出库') - udi_code = get_udi2(4) # 试剂单瓶条码 - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - data1 = info['list_a'] - UTid = commonFuc().analysis_json('id', data1) - stockId = commonFuc().analysis_json('stockId', data1) - areaCode = commonFuc().analysis_json('areaCode', data1) - areaName = commonFuc().analysis_json('areaName', data1) - shelfCode = commonFuc().analysis_json('shelfCode', data1) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1) - goodsCode = commonFuc().analysis_json('goodsCode', data1) - barName = commonFuc().analysis_json('barName', data1) - batchCode = commonFuc().analysis_json('batchCode', data1) - expdtDate = commonFuc().analysis_json('expdtDate', data1) - productDate = commonFuc().analysis_json('productDate', data1) - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data1) - ssccCode = commonFuc().analysis_json('ssccCode', data1) - purMode = commonFuc().analysis_json('purMode', data1) - goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) - goodsSpec = commonFuc().analysis_json('goodsSpec', data1) - unit = commonFuc().analysis_json('unit', data1) - goodsName = commonFuc().analysis_json('goodsName', data1) - made = commonFuc().analysis_json('made', data1) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) - purModeText = commonFuc().analysis_json('purModeText', data1) - unitName = commonFuc().analysis_json('unitName', data1) - # ==============================获取条码信息 - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - # print('info', info) - list_a = info['list_a'] - extInfo = commonFuc().analysis_json('extInfo', list_a) - pkgBarcodeId = commonFuc().analysis_json('id', list_a) - print('extInfo', extInfo) - # inStockTime = commonFuc().analysis_json('inStockTime', extInfo) - inStockTime = reGetString(extInfo, r'inStockTime": "', r'",') - shelfNo = commonFuc().analysis_json('shelfNo', list_a) - pkgUdi = reGetString(extInfo, r'pkgDefId": "', r'",') - bottleId = commonFuc().analysis_json('bottleId', list_a) - shelfKindName = commonFuc().analysis_json('shelfKindName', list_a) - provName = commonFuc().analysis_json('provName', list_a) - provId = commonFuc().analysis_json('provId', list_a) - inStockDate = commonFuc().analysis_json('inStockDate', list_a) - # 从message18文件中获取信息 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_out_submit_url") + ) + else: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch_in3',batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"] - deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] - stockName2 = deptName2 + "库房" - createTime = timeUtils().get_time_hms(1) - request_body = "request_body" - mgrCorpName = get_hosname() - mgrRangeId = deptid2 - mgrRangeName = deptName2 - extStr1 = get_branch_name() - extStr3 = get_branch_name() - snCode = UTid - userLoginCode = username - cname = username - orgCode1 = get_orgCode() - orgName1 = get_orgName() - request_body = commonFuc().get_business_data(module, "payload50_1_5", stockId, stockName2, areaCode, - areaName, - uxid, userLoginCode, cname, get_hosid(), get_branch_id(), - deptid1, - orgCode1, orgName1, get_hosid(), get_hosid(), mgrCorpName, - get_branch_id(), - get_branch_name(), mgrRangeId, mgrRangeName, extStr1, extStr3, - get_hosid(), stockId, - stockName2, areaCode, areaName, UTid, snCode, ssccCode, pkgCodeSee, - hosGoodsId, hosGoodsCode, goodsCode, - goodsName, goodsSpec, goodsMfrsName, unit, purMode, batchCode, - productDate, expdtDate, stockId, stockName2, areaName, areaCode, - unitName, shelfCode, shelfNo, pkgUdi, inStockTime, pkgBarcodeId, - bottleId, shelfKindName, provName, provId, inStockDate, made, - barName, - purModeText - ) + ) - print('request_body', request_body) - # # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - # import pdb - # pdb.set_trace() - print('result', result) + print('expected', expected) + print('aaaaaaaaaaaaaaaaa') + actual_value1 = get_process_list2(actual) + expected_value1 = get_process_list2(expected) + actual_value2 = actual_value1.replace(" ", "") + expected_value2 = expected_value1.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + print(compare_text_index(actual_value2, expected_value2)) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') -def sCan_grant(type=1): # 获取条码and扫码发放高值不能发放 - module = "b5_spd3_core_business_flow" - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束 - if type == 1: - udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3 - elif type == 3: - udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3 +def check_mcms_psi_dept_batch(DR_ID,type,order_no): + branch_id = get_branch_id() + sql = " select * from mcms_psi_dept_batch where pid='%s';" % ( + DR_ID) + actual = check_mcms_dept_buy_sql(sql) + print('actual', actual) + batch_main_key = get_id("select id from mcms_psi_dept_batch where pid='%s';" % DR_ID) + pid = DR_ID + # order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID) + source_detail_id = get_pick_detail_id(branch_id,type) + pick_detail_id=source_detail_id + if type == 16: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"] + elif type == 20: + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"] else: - udi_code = 'udi_code' - if type == 1: - pickScan3(udi_code, 1) # 低值扫码发放 - elif type == 3: - pickScan3(udi_code, 3) # 试剂扫码发放 + hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"] + mdm_goods_code = get_mdm_goods_code1(hos_goods_id) + goods_code = get_goods_code1(hos_goods_id) + pkg_def_id = get_pkg_def_id(hos_goods_id) + picker_name = FileUtils().r_info8("b2_herp3_bs", "用户名信息", 'message3')['username1'] + picker = get_login_user_uxid_bydb(picker_name) + source_batch_id=get_id("select source_batch_id from mcms_psi_dept_batch where pid='%s';" % DR_ID) + target_batch_id=source_batch_id + if check_batch_id(source_batch_id)==True: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + barcode_id=get_id("select barcode_id from mcms_psi_dept_batch where pid='%s';" % DR_ID) + if check_barcode_id(barcode_id)==True: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + shelf_code= get_stockAreaId_new_fromDb(dept_name, 2) + create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']) + create_time = get_create_time("select create_time from mcms_psi_dept_batch where pid='%s';" % DR_ID) + last_modified = get_create_time("select last_modified from mcms_psi_dept_batch where pid='%s';" % DR_ID) + last_modified_user = create_user + if type == 16: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch1', batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user + ) + elif type == 20: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch2', batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user -def second_dept_consume_in_Stock(type=1): - module = 'b5_spd3_core_business_flow' - # # 登录获取用户id等信息，使用创建的用户登录===========开始 - info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 获取token和projectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 登录获取用户id等信息，使用创建的用户登录============结束\ - # 获取请求头信息 - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) + ) + else: + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept_batch3',batch_main_key, pid, order_no,source_detail_id + ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id, + target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified, + last_modified_user - if type == 2: - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_scan_url") - print('消耗扫条码,url', url) - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - data1 = info['list_a'] - stockId = commonFuc().analysis_json('stockId', data1) - areaCode = commonFuc().analysis_json('areaCode', data1) - areaName = commonFuc().analysis_json('areaName', data1) - shelfCode = commonFuc().analysis_json('shelfCode', data1) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1) - goodsCode = commonFuc().analysis_json('goodsCode', data1) - barName = commonFuc().analysis_json('barName', data1) - batchCode = commonFuc().analysis_json('batchCode', data1) - expdtDate = commonFuc().analysis_json('expdtDate', data1) - productDate = commonFuc().analysis_json('productDate', data1) - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data1) - ssccCode = commonFuc().analysis_json('ssccCode', data1) - purMode = commonFuc().analysis_json('purMode', data1) - goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) - goodsSpec = commonFuc().analysis_json('goodsSpec', data1) - unit = commonFuc().analysis_json('unit', data1) - goodsName = commonFuc().analysis_json('goodsName', data1) - made = commonFuc().analysis_json('made', data1) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) - purModeText = commonFuc().analysis_json('purModeText', data1) - unitName = commonFuc().analysis_json('unitName', data1) - # ==============================获取条码信息 - # 从message18文件中获取信息 - info = FileUtils().r_info8(module, "条码信息", 'message18') - # print('info', info) - list_a = info['list_a'] - extInfo = commonFuc().analysis_json('extInfo', list_a) - pkgBarcodeId = commonFuc().analysis_json('id', list_a) - print('extInfo', extInfo) - # inStockTime = commonFuc().analysis_json('inStockTime', extInfo) - inStockTime = reGetString(extInfo, r'inStockTime": "', r'",') - shelfNo = commonFuc().analysis_json('shelfNo', list_a) - pkgUdi = reGetString(extInfo, r'pkgDefId": "', r'",') - bottleId = commonFuc().analysis_json('bottleId', list_a) - shelfKindName = commonFuc().analysis_json('shelfKindName', list_a) - provName = commonFuc().analysis_json('provName', list_a) - provId = commonFuc().analysis_json('provId', list_a) - inStockDate = commonFuc().analysis_json('inStockDate', list_a) - stockName = commonFuc().analysis_json('stockName', list_a) + ) - request_body = commonFuc().get_business_data(module, "payload34", pkgCodeSee, stockId, stockName, - areaCode, areaName) - print('消耗扫条码', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('消耗扫条码,result', result) - viewId2 = commonFuc().analysis_json('id', commonFuc().analysis_json('data', result)) - DRh_id = commonFuc().analysis_json('billId', commonFuc().analysis_json('data', result)) - barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', result)) - # 扫条码 == == == == == == == == == == == == == == == == - # 消耗退回 == == == == == == == == == == == == == == == == - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_rtn_submit_url") - print('高值消耗退回,url', url) - billMode = '20' - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - request_body = commonFuc().get_business_data(module, "payload35", viewId2, hosGoodsId, DRh_id, - barcodeId, billMode, deptid2, areaCode, areaName) - print('消耗退回', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('消耗退回,result', result) - data = commonFuc().analysis_json('data', result) - code = commonFuc().analysis_json('code', result) - if data != None and code == 0: - commonFuc().check_text_exist_result_text('succees', 'succees') - else: - commonFuc().check_text_exist_result_text('error', 'succees') - elif type == 1: - print('低值耗材消耗退回入库') - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_dept_availablePage_list_url") - info = FileUtils().r_info8(module, "条码信息", 'message18') - list_a = info['list_a'] - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', list_a) - stockId = commonFuc().analysis_json('stockId', list_a) - stockName = commonFuc().analysis_json('stockName', list_a) - areaCode = commonFuc().analysis_json('areaCode', list_a) - areaName = commonFuc().analysis_json('areaName', list_a) - request_body = commonFuc().get_business_data(module, "payload63", stockId, stockName, - areaCode, areaName, get_hosid()) - print('低值消耗产品查询', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('低值消耗产品查询,result', result) + print('expected', expected) + print('aaaaaaaaaaaaaaaaa') + actual_value1 = get_process_list2(actual) + expected_value1 = get_process_list2(expected) + actual_value2 = actual_value1.replace(" ", "") + expected_value2 = expected_value1.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + print(compare_text_index(actual_value2, expected_value2)) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') - viewId2 = commonFuc().analysis_json('viewId', commonFuc().analysis_json('data', - commonFuc().analysis_json('data', - result))) - DRh_id = commonFuc().analysis_json('billId', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', - commonFuc().analysis_json('data', - result))) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', commonFuc().analysis_json('data', - commonFuc().analysis_json('data', - result))) - # 消耗退回 == == == == == == == == == == == == == == == == - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_rtn_submit_url") - print('低值消耗消耗退回,url', url) - billMode = '10' - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - request_body = commonFuc().get_business_data(module, "payload35", viewId2, hosGoodsId, DRh_id, - barcodeId, billMode, deptid2, areaCode, areaName) - print('低值消耗消耗退回', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('低值消耗消耗退回,result', result) - data = commonFuc().analysis_json('data', result) - code = commonFuc().analysis_json('code', result) - if data != None and code == 0: - commonFuc().check_text_exist_result_text('succees', 'succees') - else: - commonFuc().check_text_exist_result_text('error', 'succees') - elif type == 3: - print('试剂耗材消耗退回入库') - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_dept_availablePage_list_url") - info = FileUtils().r_info8(module, "条码信息", 'message18') - list_a = info['list_a'] - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', list_a) - stockId = commonFuc().analysis_json('stockId', list_a) - stockName = commonFuc().analysis_json('stockName', list_a) - areaCode = commonFuc().analysis_json('areaCode', list_a) - areaName = commonFuc().analysis_json('areaName', list_a) - request_body = commonFuc().get_business_data(module, "payload64", stockId, stockName, - areaCode, areaName, get_hosid()) - print('试剂耗材消耗退回入库产品查询', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('试剂耗材消耗退回入库产品查询,result', result) - # import pdb - # pdb.set_trace() - viewId2 = commonFuc().analysis_json('viewId', commonFuc().analysis_json('data', - commonFuc().analysis_json('data', - result))) - DRh_id = commonFuc().analysis_json('billId', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', - commonFuc().analysis_json('data', - result))) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', commonFuc().analysis_json('data', - commonFuc().analysis_json('data', - result))) - # 消耗退回 == == == == == == == == == == == == == == == == - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_rtn_submit_url") - print('试剂耗材消耗退回,url', url) - billMode = '67' - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - request_body = commonFuc().get_business_data(module, "payload35", viewId2, hosGoodsId, DRh_id, - barcodeId, billMode, deptid2, areaCode, areaName) - print('试剂耗材消耗退回', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('试剂耗材消耗退回,result', result) - data = commonFuc().analysis_json('data', result) - code = commonFuc().analysis_json('code', result) - if data != None and code == 0: - commonFuc().check_text_exist_result_text('succees', 'succees') - else: - commonFuc().check_text_exist_result_text('error', 'succees') +def check_mcms_psi_dept_out_and_in(type1=16,type2=10): + branch_id = get_branch_id() + sql = " select * from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_CB' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type1) + actual = check_mcms_dept_buy_sql(sql) + print(actual) + info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message26') + DR_ID=get_id(" select * from mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_CB' order by CREATE_TIME desc LIMIT 1;" % ( + branch_id, type1)) + sql = "select order_no from mcms_psi_dept where id='%s';" % DR_ID + order_no = get_id(sql) + target_corp_id = get_hosid() + target_branch_id = get_branch_id() + target_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'] + target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] + target_stock_id = get_stockId_fromdb(target_dept_name + '库房') + target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2) + PICK_id = get_PICK_id(branch_id, type) + source_id = PICK_id + source_corp_id = get_hosid() + source_branch_id = get_branch_id() + source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + source_stock_id = get_stockId_fromdb(source_dept_name + '库房') + source_area_code = get_stockAreaId_new_fromDb(source_dept_name, 2) + buyBillId = get_buyBillId(branch_id, type) + pickOrderNo = get_PICK_order_no(branch_id, type) + buyOrderNo = get_buyOrderNo(branch_id, type) + pickBillId = get_PICK_id(branch_id, type) + psiDeptOutBillId = DR_ID + psiDeptOutOrderNo = order_no + create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']) + create_time = get_create_time("select create_time from mcms_psi_dept where id='%s';" % DR_ID) + last_modified = get_create_time("select last_modified from mcms_psi_dept where id='%s';" % DR_ID) + last_modified_user = create_user + if type == 16: + # 子表检查 + check_mcms_psi_dept_batch(DR_ID,type,order_no) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept1', DR_ID, order_no, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, + psiDeptOutOrderNo + , create_user, create_time, last_modified, last_modified_user + ) + elif type == 20: + # 子表检查 + check_mcms_psi_dept_batch(DR_ID, type, order_no) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept2', DR_ID, order_no, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, + psiDeptOutOrderNo + , create_user, create_time, last_modified, last_modified_user) + else: + # 子表检查 + check_mcms_psi_dept_batch(DR_ID, type, order_no) + expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', + 'mcms_psi_dept3', DR_ID, order_no, target_corp_id, target_branch_id, + target_dept_id, target_dept_name, target_stock_id + , target_area_code, source_id, source_corp_id, source_branch_id, + source_dept_id, source_dept_name, source_stock_id, source_area_code, + buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId, + psiDeptOutOrderNo + , create_user, create_time, last_modified, last_modified_user) + + print('expected', expected) + print('aaaaaaaaaaaaaaaaa') + actual_value1 = get_process_list2(actual) + expected_value1 = get_process_list2(expected) + actual_value2 = actual_value1.replace(" ", "") + expected_value2 = expected_value1.replace(" ", "") + # print('actual_value2',actual_value2) + print('expected_value2') + print(expected_value2) + print('actual_value2') + print(actual_value2) + print(compare_text_index(actual_value2, expected_value2)) + if actual_value2 == expected_value2: + print('ok') + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + print('error') + commonFuc().check_text_exist_result_text('error', 'succees') try: + 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_b7流程十四退库业务_消耗退库.air') + using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air') + from a_b7流程十四退库业务_消耗退库 import sCan_grant,second_dept_consume_Out_Stock,second_dept_consume_in_Stock updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 sCan_grant(1) # 低值扫码发放 + check_mcms_psi_dept_out_and_in(16,10) + # check_mcms_psi_dept_in(10) sCan_grant(3) # 试剂扫码发放 second_dept_consume_Out_Stock(2) # 高值消耗出库 second_dept_consume_in_Stock(2) # 高值消耗退货入库 diff --git a/main1/main_text2.py b/main1/main_text2.py index 1ee007b175a0a4913311db28baeaff40ae797c9f..85471004ae5ce63fc79143b783928f91fa2fc8e6 100644 --- a/main1/main_text2.py +++ b/main1/main_text2.py @@ -127,22 +127,22 @@ def main_text(): sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送_数据库验证.air') using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送_数据库验证.air') from a_b4流程十一请领业务流_二级库向直送_数据库验证 import main - # print('流程11执行完毕','flow11执行完毕') + print('流程11执行完毕','flow11执行完毕') # sys.exit(0) def flow12(): print('调用流程十二') sys.path.append( pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b5流程十二请领业务流_二级库向二级库_数据库验证.air') using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b5流程十二请领业务流_二级库向二级库_数据库验证.air') - # from a_b5流程十二请领业务流_二级库向二级库_数据库验证 import main - # print('流程12执行完毕', 'flow12执行完毕') + from a_b5流程十二请领业务流_二级库向二级库_数据库验证 import main + print('流程12执行完毕', 'flow12执行完毕') # sys.exit(0) def flow13(): print('调用流程十三') sys.path.append( pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b6流程十三请领业务流_三级库向二级库_数据库验证.air') using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b6流程十三请领业务流_三级库向二级库_数据库验证.air') - # from a_b6流程十三请领业务流_三级库向二级库_数据库验证 import main + from a_b6流程十三请领业务流_三级库向二级库_数据库验证 import main print('流程13执行完毕', 'flow13执行完毕') # sys.exit(0) def flow14():