Commit f83e5a95 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

脚本优化

parent 95d47d59
......@@ -72,7 +72,7 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
result = commonFuc().http_post(url, request_body, headers)
print('扫码发放result', result)
#扫码=======================
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_submit_url")
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_centCbSubmit_url")
print('url', url)
headers = commonFuc().get_business_data(module, "json_headers2",
commonFuc().get_business_data(module, "json_contentType"), token,
......@@ -158,7 +158,7 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid1"]
# # 请求体
request_body = commonFuc().get_business_data(module, "payload19", areaCode, UTid, createTime, UTid, hosId,
request_body = commonFuc().get_business_data(module, "payload68", areaCode, UTid, createTime, UTid, hosId,
stockId,
areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
......
......@@ -68,6 +68,7 @@
"herpService_stock_out_use_submit_url": "/api/herpService/stock/out/use/submit"
"herpService_stockpile_list_url": "/api/herpService/stockpile/list"
"herpService_dept_availablePage_list_url": "/api/herpService/dept/stock/rtn/availablePage"
"herpService_centCbSubmit_url": "/api/herpService/process/task/centCbSubmit
"username": "xhs1009"
"username2": "test001"
......@@ -444,5 +445,6 @@ json_headers2: {
"pickType": "TH"
}
"payload67": {"pickType":"CB","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","ignoreValidExpDate":false}
"payload68": {"stockId":"d7e35cf14e9c4a89aa6befa525497649","stockName":"东土城路院区!(BYi中心库房","areaCode":"areah03472488","areaName":"自动化测试","barCodeList":[{"id":"UT240626001004","lastModified":null,"version":null,"createTime":"2024-06-26 13:46:39","createUser":null,"lastModifiedUser":null,"snCode":"UT240626001004","hosId":"h0347","branchId":null,"stockId":"d7e35cf14e9c4a89aa6befa525497649","areaCode":"areah03472488","areaName":"自动化测试","shelfCode":"areah03472488-2-01-01","codeType":16,"tagType":0,"hosGoodsId":"h034700004280","mdmGoodsCode":"11661228","goodsCode":"00004280","goodsDi":"37010000042800","barName":"100支/100","batchCode":"333","expdtDate":"2025-01-02","productDate":"2024-06-26","mfrCode":null,"mfrCodeSee":null,"pkgCode":"013701000004280010333\u001d112406261725010221UT240626001004","pkgCodeSee":"013701000004280010333112406261725010221UT240626001004","ssccCode":"010839000185786327","extInfo":null,"outId":null,"tbStatus":20,"goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefId":"9affbca4b6bc42bb9603239a4f47748d","pkgDefQty":100,"purBillId":"CG2024062619741","pkgDefName":"100","distrBillId":"PSh0347202406260019","inStockTime":"2024-06-26 13:55:46","distrDetailId":"03838870","certificateCode":""},"sourceDetailId":null,"purMode":10,"purModes":null,"price":99.9999,"pid":null,"goodsMfrsName":"德国歌德公司 Geuder AG","mfrsName":null,"goodsSpec":"G-31891","unit":"支","goodsName":"一次性注射器_低值#c!$C","pkgDefId":"9affbca4b6bc42bb9603239a4f47748d","pkgDefQty":100,"defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":"100","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":"100支/100","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"00004280","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}],"pickType":"CB","tbStatus":20}
"expected_value": "('00004260', 'h0347', 'p1e2ca', '177df1fadf39415ea5ce40e64edf449d', None, '11661208', '11661208', '11661208', '一次性注射器_低值hMY2F','一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzhMY2F', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2ca:UID-051951', datetime.datetime(2024, 6, 26, 7, 1, 39), 'p1e2ca:UID-051951', 0, 0, 1, None)"
"expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}'
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment