From 5ddeebb41c7c3bf8ee11d49747f8aa1489943a86 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Wed, 12 Jun 2024 11:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E4=BA=8C=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...47\345\272\223\351\200\200\345\272\223.py" | 72 +++++++++++-------- data/b5_spd3_core_business_flow/data | 4 +- 2 files changed, 46 insertions(+), 30 deletions(-) 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" index 9c0aae74..235d6849 100644 --- "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" @@ -47,7 +47,7 @@ def SERACH_goods_id(GoodsId): return branchGoodsId -def second_dept_return_Out_Stock(type): # 三级库退货出库 +def second_dept_return_Out_Stock(type): # 三级库退库出库 module = "b5_spd3_core_business_flow" # # 登录获取用户id等信息，使用创建的用户登录===========开始 info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') @@ -65,7 +65,7 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 if type == 2: udi_code = get_udi2(2) # 获取条码 低值1 高值2 试剂3 - # 高值退货出库 + # 高值退库出库 url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_pick_scan_url") # 从message18文件中获取信息 @@ -80,8 +80,6 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 targetDeptId= FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] targetStockId =get_stockId(deptName+'库房',2) - import pdb - pdb.set_trace() request_body = commonFuc().get_business_data(module, "payload65", udi_code, stockId, deptId3,areaCode, areaName, targetStockId,targetDeptId) @@ -195,11 +193,34 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) - elif type == 1 or type==3: - print('低值耗材消耗出库') - udi_code = get_udi2(1) - data1 = pickScan4(udi_code) + elif type == 1: + print('低值耗材或者试剂退库出库') + udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3 + 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) + deptId3 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"] + targetDeptId = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] + deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] + targetStockId = get_stockId(deptName + '库房', 2) + + request_body = commonFuc().get_business_data(module, "payload65", udi_code, stockId, deptId3, areaCode, + areaName, + targetStockId, targetDeptId) + print('request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('退库出库扫码result', result) + # 获取必要信息 + deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', '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) @@ -274,33 +295,26 @@ def second_dept_return_Out_Stock(type): # 三级库退货出库 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, + request_body = commonFuc().get_business_data(module, "payload50_2_4", stockId, stockName2, areaCode, + areaName,targetStockId,targetDeptId, 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 - ) + get_hosid(), stockId,deptId3, + areaCode, areaName, targetStockId, targetDeptId, 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,made, unitName, + hosGoodsCode, purModeText) print('request_body', request_body) # # # # 发送请求 diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index c2774a94..578bcada 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -154,7 +154,6 @@ json_headers2: { "payload50_1_4": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"sourceType":"CK_XH","hosId":"%s","pickType":"KS_XH","deptId":"%s","user":{"uxid":"%s","userLoginCode":"%s","employeeNo":null,"cname":"%s","corpId":"%s","corpCode":null,"corpKind":1,"corpName":null,"branchId":"%s","branchName":null,"orgId":"%s","orgCode":"%s","orgName":"%s","job":null,"tel":"xhs0301","email":null,"mgrCorpId":"%s","mgrCorpCode":"%s","mgrCorpKind":1,"mgrCorpName":"%s","mgrBranchId":"%s","mgrBranchName":"%s","mgrRangeId":"%s","mgrRangeName":"%s","extStr1":"%s","extStr2":null,"extStr3":"%s","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"barCodeList":[{"id":"","lastModified":null,"version":null,"createTime":null,"createUser":null,"lastModifiedUser":null,"hosId":null,"branchId":null,"deptId":null,"deptName":null,"stockId":null,"stockName":null,"areaCode":"%s","areaName":null,"purMode":"%s","hosGoodsId":"%s","goodsCode":"%s","batchCode":"%s","expdtDate":"%s","hosBatchId":null,"batchPrice":null,"qty":1,"shelfCode":null,"barcodeFlag":null,"pkgFlag":null,"goodsSpec":"%s","goodsName":"%s","goodsMfrsName":"%s","unit":"%s","miCode":"","miDjmc":"","mdmGoodsCode":"%s","availableQty":"%s","transferRatio":"%s","shelfNo":null,"detailId":null,"pickId":null,"provId":null,"provName":null,"subProvId":null,"subProvName":null,"subSendFlag":null,"subSendFlagText":null}]}} "payload50_1_5": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"0","patientId":"","patientName":"","consumeType":21,"machineId":"","machineName":"","sourceType":"CK_XH","user":{"uxid":"%s","userLoginCode":"%s","employeeNo":null,"cname":"%s","corpId":"%s","corpCode":null,"corpKind":1,"corpName":null,"branchId":"%s","branchName":null,"orgId":"%s","orgCode":"%s","orgName":"%s","job":null,"tel":"xhs0301","email":null,"mgrCorpId":"%s","mgrCorpCode":"%s","mgrCorpKind":1,"mgrCorpName":"%s","mgrBranchId":"%s","mgrBranchName":"%s","mgrRangeId":"%s","mgrRangeName":"%s","extStr1":"%s","extStr2":null,"extStr3":"%s","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"hosId":"%s","pickType":"KS_XH","pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"0","patientId":"","patientName":"","consumeType":21,"machineId":"","machineName":"","barCodeList":[{"id":"%s","snCode":"%s","ssccCode":"%s","pkgCodeSee":"%s","hosGoodsId":"%s","hosGoodsCode":"%s","goodsCode":"%s","goodsName":"%s","goodsSpec":"%s","goodsMfrsName":"%s","unit":"%s","purMode":"%s","batchCode":"%s","productDate":"%s","expdtDate":"%s","pkgDefName":null,"pkgDefQty":1,"stockId":"%s","stockName":"%s","areaName":"%s","areaCode":"%s","lockStatus":0,"unitName":"%s","shelfCode":"%s","shelfNo":"%s","pkgDefId":null,"extInfo":"{\"pkgUdi\": \"%s\", \"pkgDefId\": \"\", \"pkgDefQty\": 1, \"pkgDefName\": \"\", \"inStockTime\": \"%s\", \"pkgBarcodeId\": \"%s\"}","bottleId":"%s","pkgType":"67","miDjmc":"","miCode":"","transferRatio":1,"qty":1,"shelfKind":0,"shelfKindName":"%s","provName":"%s","provId":"%s","inStockDate":"%s","mfrCode":null,"made":"%s","price":null,"barName":"%s","purModeText":"%s","codeType":67}]}} -"payload50_2_3": {"stockId":"6aed92fca2564fb39466c482fa01f91e","deptId":"29b06dee6cf84ae595994651e2a37cf1","remark":"","areaCode":"areah03472276","areaName":"默认库区","targetStockId":"032e7ca5b4f44998a94959cabd0ae8bd","targetDeptId":"38197ff974f8454bbb30b8f18b9de57b","reasonKind":"11","sourceType":"CK_TK","user":{"uxid":"h0347_UID-051326","userLoginCode":"自动化测试ueoQR","employeeNo":null,"cname":"自动化测试ueoQR","corpId":"h0347","corpCode":null,"corpKind":1,"corpName":null,"branchId":"h0347-3665","branchName":null,"orgId":"6b8df290f73d41b3b0e5516361749b4c","orgCode":"h0347-3665:org10462","orgName":"设备科001","job":null,"tel":"xhs0301","email":null,"mgrCorpId":"h0347","mgrCorpCode":"h0347","mgrCorpKind":1,"mgrCorpName":"邹城市人民医院(test)","mgrBranchId":"h0347-3665","mgrBranchName":"东土城路院区vfAtR","mgrRangeId":"29b06dee6cf84ae595994651e2a37cf1","mgrRangeName":"三级检测组003","extStr1":"东土城路院区vfAtR","extStr2":null,"extStr3":"东土城路院区vfAtR","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"hosId":"h0347","pickType":"KS_TK","pickCreateVO":{"stockId":"6aed92fca2564fb39466c482fa01f91e","deptId":"29b06dee6cf84ae595994651e2a37cf1","remark":"","areaCode":"areah03472276","areaName":"默认库区","targetStockId":"032e7ca5b4f44998a94959cabd0ae8bd","targetDeptId":"38197ff974f8454bbb30b8f18b9de57b","reasonKind":"11","barCodeList":[{"id":"8800000001065137","lastModified":null,"version":null,"createTime":"2024-06-11 07:38:10","createUser":null,"lastModifiedUser":null,"snCode":"8800000001065137","hosId":"h0347","branchId":null,"stockId":"6aed92fca2564fb39466c482fa01f91e","areaCode":"areah03472276","areaName":"默认库区","shelfCode":"areah03472276-A-01-01","codeType":20,"tagType":0,"hosGoodsId":"h034700004063","mdmGoodsCode":"11661011","goodsCode":"00004063","goodsDi":"00000000004063","barName":"1支","batchCode":"222","expdtDate":"2024-12-18","productDate":"2024-06-11","mfrCode":null,"mfrCodeSee":null,"pkgCode":"010000000000406310222\u001d1124061117241218218800000001065137","pkgCodeSee":"0100000000004063102221124061117241218218800000001065137","ssccCode":"010839000183863822","extInfo":null,"outId":null,"tbStatus":20,"goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefQty":1,"purBillId":"CG2024061118451","distrBillId":"PSh0347202406110019","inStockTime":"2024-06-11 11:22:04","useFrequency":1,"distrDetailId":"03838335","certificateCode":"","multiChargeFlag":0},"sourceDetailId":null,"purMode":20,"purModes":null,"price":99.9999,"pid":null,"goodsMfrsName":"德国歌德公司 Geuder AG","mfrsName":null,"goodsSpec":"G-31891","unit":"支","goodsName":"高值牙钻机2O$Zc","pkgDefId":null,"pkgDefQty":null,"defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":null,"printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"德国","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"1支","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"00004063","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"高值耗材","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}]}} "payload51": "%s" @@ -291,6 +290,9 @@ json_headers2: { } } +"payload50_2_4": {"remark":"","stockId":"%s","deptId":"%s","reasonKind":"11","areaCode":"%s","areaName":"%s","targetStockId":"%s","targetDeptId":"%s","sourceType":"CK_TK","user":{"uxid":"%s","userLoginCode":"%s","employeeNo":null,"cname":"%s","corpId":"%s","corpCode":null,"corpKind":1,"corpName":null,"branchId":"%s","branchName":null,"orgId":"%s","orgCode":"%s","orgName":"%s","job":null,"tel":"xhs0301","email":null,"mgrCorpId":"%s","mgrCorpCode":"%s","mgrCorpKind":1,"mgrCorpName":"%s","mgrBranchId":"%s","mgrBranchName":"%s","mgrRangeId":"%s","mgrRangeName":"%s","extStr1":"%s","extStr2":null,"extStr3":"%s","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"hosId":"%s","pickType":"KS_TK","pickCreateVO":{"remark":"","stockId":"%s","deptId":"%s","reasonKind":"11","areaCode":"%s","areaName":"%s","targetStockId":"%s","targetDeptId":"%s","barCodeList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":0,"hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefId":"%s","pkgDefQty":100,"purBillId":"%s","pkgDefName":"100","distrBillId":"%s","inStockTime":"%s","distrDetailId":"%s","certificateCode":""},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":100,"defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":"%s","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"%s","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"%s","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}]}} + + "payload53": {"queryObject":{"goodsName":"%s","goodsMfrsName":"","purModes":[],"hosId":"%s","branchId":"%s","goodsSpec":"","importGrantRule":2,"deptId":"%s"},"pageNum":1,"pageSize":50} "payload53_2": {"queryObject":{"goodsName":"%s","goodsMfrsName":"","purModes":[],"hosId":"%s","branchId":"%s","grantRule":2,"goodsSpec":"","deptId":"%s"},"pageNum":1,"pageSize":50} -- GitLab