diff --git "a/air_case/b5_spd3_core_business_flow/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.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.py" "b/air_case/b5_spd3_core_business_flow/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.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.py" index 94cff45adda740815eaf1a549d9cb1c4bd5475b4..7d2e1c5828e87bb54bb5f7c2778ed71d4206ead9 100644 --- "a/air_case/b5_spd3_core_business_flow/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.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.py" +++ "b/air_case/b5_spd3_core_business_flow/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.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.py" @@ -331,8 +331,6 @@ def pick_execute(): print('提交拣货执行单,result1', result) -# 复核=================================== - try: # 设置部门用户 set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'], diff --git "a/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" new file mode 100644 index 0000000000000000000000000000000000000000..e8f39563e9db4bc92d2bc5c8b9bf8b6a8a8ba8d1 --- /dev/null +++ "b/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" @@ -0,0 +1,616 @@ +# -*- encoding=utf8 -*- +import json +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.fileUtls import FileUtils +from common.run_cmd_script import execute_command +from common.timeUtils import timeUtils +from airtest.core.api import using + +__author__ = "xiaohesheng" + +""" +case_tag:api,spd_core1,a_b8流程十五退库业务_三级库向二级库退库,id2302,id2302-18,sit,on +核心业务流:a_b8流程十五退库业务_三级库向二级库退库 +python runner_test.py tag id2302-18 debug mdm3 +""" + + +def SERACH_goods_id(GoodsId): + # 在请领出库渠道边仓中搜索产品 + 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")) + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_mcmsBranchGoodsInfo_page_url") + dept1 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1'] + # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] + # GoodsId = hosGoodsId.replace(get_hosid(), '') + request_body = commonFuc().get_business_data(module, "payload53_2", GoodsId, get_hosid(), get_branch_id(), dept1) + result = commonFuc().http_post(url, request_body, headers) + branchGoodsId = commonFuc().analysis_json('id', commonFuc().analysis_json('data', commonFuc().analysis_json('data', + result))) + return branchGoodsId + + +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")) + + # 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 + 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) + # ==============================获取条码信息 + # 从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() + + 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) + + 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) + + # # # # 发送请求 + 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") + + 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 + ) + + 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") + + 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) + + +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 + else: + udi_code = 'udi_code' + if type == 1: + pickScan3(udi_code, 1) # 低值扫码发放 + elif type == 3: + pickScan3(udi_code, 3) # 试剂扫码发放 + + +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")) + + 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) + + 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') + + +try: + updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 + sCan_grant(1) # 低值扫码发放 + sCan_grant(3) # 试剂扫码发放 + second_dept_consume_Out_Stock(2) # 高值消耗出库 + second_dept_consume_in_Stock(2) # 高值消耗退货入库 + second_dept_consume_Out_Stock(1) # 低值消耗出库 + second_dept_consume_in_Stock(1) # 低值消耗退回入库 + second_dept_consume_Out_Stock(3) # 试剂消耗出库 + second_dept_consume_in_Stock(3) # 试剂消耗退回入库 + commonFuc().check_text_exist_result_text('succees', 'succees') +except: + commonFuc().check_text_exist_result_text('error', '1') diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 37ba2d5cd342c9c2cdddacce92dba317662aec11..0c24f9de77364d4a990febdeeeffab284f1abe4f 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406070039 - distrBillId2: PSh0347202406070039 + distrBillId1: PSh0347202406070048 + distrBillId2: PSh0347202406070048 高值配送单号: - distrBillId1: PSh0347202406070040 - distrBillId2: PSh0347202406070040 + distrBillId1: PSh0347202406070049 + distrBillId2: PSh0347202406070049 试剂配送单号: - distrBillId1: PSh0347202406070041 - distrBillId2: PSh0347202406070041 + distrBillId1: PSh0347202406070050 + distrBillId2: PSh0347202406070050 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 907fa06677f26b269a8efae2623b57f1769d76e5..849c8b1cea4edfa7c400ede1db50420dedcb28f9 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024060726201 - orderNo2: PLAN2024060726201 + orderNo1: PLAN2024060726271 + orderNo2: PLAN2024060726271 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 52fb13a6186881f8647299be26687e753ea43fbc..3e8b3719d12f17a23a92c894571003faaf45c573 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024060726200 - orderNo2: PLAN2024060726200 + orderNo1: PLAN2024060726270 + orderNo2: PLAN2024060726270 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 0709f8b770e0eb135aa83187af05d6c172c568a9..6bb80eeec0f6ebcb19406bedaef5b564d6098935 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -8,22 +8,22 @@ taskType: 1 sourceOrgId: p1e27a sourceOrgName: 国药集团公司N2)Tj - sourceOrderNo: PSh0347202406070041 + sourceOrderNo: PSh0347202406070050 billMode: '66' stockKind: purMode: - sourceId: PSh0347202406070041 + sourceId: PSh0347202406070050 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024060726200 - purOrderNo: CG2024060718116 + planOrderNo: PLAN2024060726270 + purOrderNo: CG2024060718125 recOrgId: 7d4e304548bd4324bcd974e107ddeabd recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024060700036","planBillId":"Ph034720240607022845","planOrderNo":"PLAN2024060726200","buyOrderNo":"BUY2024060704819","purOrderNo":"CG2024060718116","purBillId":"Ch034720240607000107","purBillDate":"2024-06-07 - 10:36:41","distrBillId":"PSh0347202406070041","distrOrderNo":"PSh0347202406070041"}' - taskDate: '2024-06-07 10:37:31' + billRelationJson: '{"buyBillId":"Bh03472024060700045","planBillId":"Ph034720240607022915","planOrderNo":"PLAN2024060726270","buyOrderNo":"BUY2024060704828","purOrderNo":"CG2024060718125","purBillId":"Ch034720240607000116","purBillDate":"2024-06-07 + 15:43:40","distrBillId":"PSh0347202406070050","distrOrderNo":"PSh0347202406070050"}' + taskDate: '2024-06-07 15:44:18' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index ace294f63406c7dca03221cc428efd351d5f041f..06763dd367dc3b0e3827805f567cd4d5905b3bcb 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -26,10 +26,10 @@ productDate: '2024-06-07' provName: 国药集团公司N2)Tj provId: - viewId: '03838238' + viewId: '03838247' verifyFlag: 0 hasSterilize: 0 - id: '03838238' + id: '03838247' detailRelationJson: extInfo: '{"goodsGg":"G-31891","goodsCode":"00004021","purMode":60,"goodsName":"新型冠状病毒检测试剂%k$56","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660969","ybDefId":""}' recTemperature: 20 diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index ea0ed9fcd5a7626230aef5a8ad514ad7c626cea1..cea6dc6a137720077baf0c31a8be25e5455ff973 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024060700032 - CHECK_NO2: CHECKh03472024060700032 + CHECK_NO1: CHECKh03472024060700041 + CHECK_NO2: CHECKh03472024060700041 diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index de1521caf3e3b25af6388186cda8f6057932022b..b3b51aaa563369d509fa34fc771f9f1721820a5c 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,9 +1,9 @@ 条码信息: list_a: - &id001 - id: UT2406070008020003 - snCode: UT2406070008020003 - ssccCode: '010839000018756312' + id: UT2406070008020004 + snCode: UT2406070008020004 + ssccCode: '010839000018756411' pkgCodeSee: 0136570000040210104444112406071724121421UT240607000802 hosGoodsId: h034700004021 hosGoodsCode: '00004021' @@ -29,8 +29,8 @@ pkgDefId: extInfo: '{"pkgUdi": "0136570000040210104444112406071724121421UT240607000802", "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-06-07 - 14:12:47", "pkgBarcodeId": "UT240607000802"}' - bottleId: UT2406070008020003 + 14:14:10", "pkgBarcodeId": "UT240607000802"}' + bottleId: UT2406070008020004 pkgType: '67' miDjmc: '' miCode: '' @@ -40,7 +40,7 @@ shelfKindName: 普通货位 provName: 国药集团公司N2)Tj provId: p1e27a - inStockDate: '2024-06-07 14:12:46' + inStockDate: '2024-06-07 14:14:09' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 6bb57c9c2c7c2afa8e885a5660b97545922ca0df..5f7ca0a0c669f48dc7e2a4c6c5f0d41a2369cf94 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -16,7 +16,7 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 795.0 + qty: 1094.0 goodsImg: [] pkgDefId: 6b59ecdb3df2446f930143a20befab12 buyPkgQty: diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index adbd9c33a406e4c3cdbf6bbb5f09c6ccff9bea7f..2b1753097f3adfaab649f11546bb7d9b6d0899f2 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024060726199 - orderNo2: PLAN2024060726199 + orderNo1: PLAN2024060726269 + orderNo2: PLAN2024060726269 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 95f7a7d14ebdfc29b93529e1ad8e1fd3e4bc67a8..d4ca0a569709c9d7d943568f4fa8c7558e6d5a57 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,13 +1,13 @@ 配送订单信息: list_a: - &id001 - - id: Ch034720240607000107 - lastModified: '2024-06-07 10:36:41' + - id: Ch034720240607000116 + lastModified: '2024-06-07 15:43:40' version: 0 - createTime: '2024-06-07 10:36:41' + createTime: '2024-06-07 15:43:40' createUser: h0347_UID-051318 lastModifiedUser: - orderNo: CG2024060718116 + orderNo: CG2024060718125 billMode: '66' recType: HDI hosId: h0347 @@ -19,7 +19,7 @@ areaCode: areaName: billExpdtDate: - sourceId: Ph034720240607022845 + sourceId: Ph034720240607022915 sourceType: inSettlement: recUser: @@ -47,7 +47,7 @@ sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024060726200 + planOrderNo: PLAN2024060726270 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 7b478fa52adf717adc9fc630ceefa6dc29890b23..e25e6578b0e6fc8420cce91d061053e1af0581a3 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,15 +1,15 @@ 配送订单详细信息: list_a: - &id001 - - id: fb0288933bcd4070aba5bf0661c27246 + - id: f4bdc4ab90df4039abb3edf48bb39a11 lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240607000107 - orderNo: CG2024060718116 - sourceId: 1237a54bcde647618be47efb2735b583 + pid: Ch034720240607000116 + orderNo: CG2024060718125 + sourceId: 4be7a50506c34d41b0cdc3eca0631286 hosGoodsId: h034700004021 mdmGoodsCode: '11660969' goodsCode: '00004021' @@ -31,7 +31,7 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240607022845","buyDetailId":"Bh034720240607000360001","planDetailId":"1237a54bcde647618be47efb2735b583"}' + detailRelationJson: '{"planBillId":"Ph034720240607022915","buyDetailId":"Bh034720240607000450001","planDetailId":"4be7a50506c34d41b0cdc3eca0631286"}' extInfo: '{"goodsGg":"G-31891","goodsCode":"00004021","purMode":60,"goodsName":"新型冠状病毒检测试剂%k$56"}' remark: tbStatus: diff --git a/report/summary.html b/report/summary.html index 30d00e9269b8210f9c24f08f97317ecfab653567..15bc359e6b3b44e4b02a7c8e4864026951571f24 100644 --- a/report/summary.html +++ b/report/summary.html @@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 1 - 0分50秒 + 0分51秒 100.0% @@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 a_b7流程十四退库业务_消耗退库 成功 - 49.897 + 51.703 xiaohesheng