diff --git "a/air_case/b5_spd3_core_business_flow/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.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.py" "b/air_case/b5_spd3_core_business_flow/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.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.py" index 34e5278b8e637d31bdd5f5c5badb00be3cb9c2d2..7a47d608a4c3ea88a5218c1f563b55dc65d42555 100644 --- "a/air_case/b5_spd3_core_business_flow/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.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.py" +++ "b/air_case/b5_spd3_core_business_flow/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.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.py" @@ -415,10 +415,10 @@ def sCan_grant(type=1): # 获取条码and扫码发放高值不能发放 try: updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 sCan_grant(1)#低值扫码发放 - # sCan_grant(3) # 试剂扫码发放 - # second_dept_consume_Out_Stock(2)#高值消耗出库 - # second_dept_consume_Out_Stock(1) # 低值消耗出库 - # second_dept_consume_Out_Stock(3) # 试剂消耗出库 + sCan_grant(3) # 试剂扫码发放 + second_dept_consume_Out_Stock(2)#高值消耗出库 + second_dept_consume_Out_Stock(1) # 低值消耗出库 + second_dept_consume_Out_Stock(3) # 试剂消耗出库 commonFuc().check_text_exist_result_text('succees', 'succees') except: diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 262fdafba160e2da154f8bb2a9b1197a70493e43..09d43b02a53ba766ab501691777f2826a669d19c 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -632,8 +632,8 @@ def get_udi2(type=1): # 二级科室库存明细查询获取条码 # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) - import pdb - pdb.set_trace() + # import pdb + # pdb.set_trace() print('aaaaaaaaaaaaaaaaresult',result) data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index 8b34c8488064707e2f67a97b79949ab9c394288b..4d9fec7e92d889103d37dd5fbc5ff46796ebcef7 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -106,7 +106,7 @@ json_headers2: { "payload17": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["","","","","",""],"goodsName":"%s","branchId":"%s","purModes":[],"ssccCode":"","deptId":"","deptQuery":false,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":""}} "payload17_1": {"pageNum":1,"pageSize":50,"queryObject":{"goodsName":"%s","branchId":"%s","purModes":[""],"ssccCode":"","deptId":"","deptQuery":false,"stockId":"","bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} "payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["10"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} -"payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["20"]"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} +"payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["20"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["25"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} "payload17_2_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["66"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} "payload17_3": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["67"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 3e1f75196d78b88f97933a4514a2a801289fd70c..623ddb0f6ab282391bd4fedfed473affc1a3d7c9 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: UT2406070008020004 - snCode: UT2406070008020004 - ssccCode: '010839000018756411' + id: UT2406070008020005 + snCode: UT2406070008020005 + ssccCode: '010839000018756510' pkgCodeSee: 0136570000040210104444112406071724121421UT240607000802 hosGoodsId: h034700004021 hosGoodsCode: '00004021' @@ -30,7 +30,7 @@ extInfo: '{"pkgUdi": "0136570000040210104444112406071724121421UT240607000802", "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-06-07 08:26:58", "pkgBarcodeId": "UT240607000802"}' - bottleId: UT2406070008020004 + bottleId: UT2406070008020005 pkgType: '67' miDjmc: '' miCode: '' diff --git a/report/summary.html b/report/summary.html index b8ae1af996f8930c6d9a9e3470379e12d09b96aa..4a79c6fd6ce80ac360033ae0056651f8cf77aca8 100644 --- a/report/summary.html +++ b/report/summary.html @@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间