diff --git "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py"
index 5384b0eb3a6615ae8b3b0b68021ef43607647065..5d4e64348ee50163434f44dc3f3be8aa05671a23 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py"
@@ -294,7 +294,8 @@ def pick_execute(GoodsId):
print('生成拣货单列表锁定,result1', result)
# 生成拣货单列表锁定===============================================
#拣货==============================
- udi_code=get_udi(1) #获取条码 低值1 高值2 试剂3
+ udi_code=get_udi1(1) #获取条码 低值1 高值2 试剂3
+ print('udi_code',udi_code)
pickScan(PICK_ID)
# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
# "herpService_BuyPick_updateLock_url")
diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py
index 36a9f7610c8bcdbbc37326d69ade2e918ba93fac..3359886d5216b6a63fc3995f594cd729c05844ac 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -508,8 +508,59 @@ def call_login(type=1): # type=1外网登录 2内网登录
token1, projectCode1, uxid1, corpId1, info1 = login(username, password, 2)
return token1, projectCode1, uxid1, corpId1, info1
+def get_udi1(type=1):#库存明细查询获取条码
+ # type=1低值 2高值 3试剂
+ module = "b5_spd3_core_business_flow"
+ token, projectCode1, uxid1, corpId1, info1 = call_login()
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsInvoice_barcode_url")
+ print('get_udi', url)
+ # 获取请求头信息
+ 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 get_udi(type=1):
+ # # 请求体
+ request_body = 'request_body'
+ if type == 1:
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ request_body = commonFuc().get_business_data(module, "payload17", GoodsId, get_branch_id())
+ elif type == 2:
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ request_body = commonFuc().get_business_data(module, "payload17", GoodsId, get_branch_id())
+ elif type == 3:
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ request_body = commonFuc().get_business_data(module, "payload17", GoodsId, get_branch_id())
+
+ print('getudi_request_body', request_body)
+
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+
+ pkgcode = data1[0]['pkgCodeSee']
+ pkgcode1 = pkgcode[0:20]
+ pkgcode2 = pkgcode[21:len(pkgcode)]
+ print(pkgcode1, pkgcode2)
+ # 013530000003170010333\x1D112404261724110221UT240426000001802
+ print('aaaaaaaaaaaaaaaaa', data1[0]['pkgCodeSee'])
+ # # 将条码信息写入文件
+
+ list_a = []
+ list_b = []
+ list_c = []
+ list_a.append(data1)
+ list_b.append(data1)
+ list_c.append(data1)
+ # print('list_a', len(list_a), list_a)
+ info = (list_a, list_b, list_c)
+ titlename = ('list_a', 'list_b', 'list_c')
+ # 将条码信息写入文件
+ FileUtils().w_info8(info, module, '条码信息', titlename, 'message18')
+ return pkgcode
+def get_udi(type=1):#退货出库扫条码
# type=1低值 2高值 3试剂
module = "b5_spd3_core_business_flow"
token, projectCode1, uxid1, corpId1, info1 = call_login()
@@ -547,7 +598,8 @@ def get_udi(type=1):
print(pkgcode1, pkgcode2)
# 013530000003170010333\x1D112404261724110221UT240426000001802
print('aaaaaaaaaaaaaaaaa', data1[0]['pkgCodeSee'])
- # 扫条码
+
+ # 退货出库扫条码
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_return_scan_url")
print('herpService_pick_return_scan_url', url)
branch_name = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_name"]
@@ -2018,7 +2070,7 @@ def pickScan(PICK_ID):#拣货扫码
areaName = 'areaName';
shelfCode = 'shelfCode'
codeType = 'codeType';
- tagType = 'tagType';
+ tagType = '0';
hosGoodsId = 'hosGoodsId';
mdmGoodsCode = 'mdmGoodsCode';
goodsCode = 'goodsCode';
@@ -2034,13 +2086,13 @@ def pickScan(PICK_ID):#拣货扫码
print(i)
UTid = i['id']
areaCode = i['areaCode']
- createTime = i['createTime']
- hosId = i['hosId']
+ # createTime = i['createTime']
+ # hosId = i['hosId']
stockId = i['stockId'];
areaCode = i['areaCode'];
areaName = i['areaName'];
shelfCode = i['shelfCode']
- codeType = i['codeType'];
+ codeType = i['pkgType'];
tagType = i['tagType'];
hosGoodsId = i['hosGoodsId'];
mdmGoodsCode = i['mdmGoodsCode']
@@ -2085,8 +2137,9 @@ def pickScan(PICK_ID):#拣货扫码
deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid1"]
stockName=get_branch_name()
+ createTime=timeUtils().get_time_hms(1)
# # 请求体
- request_body = commonFuc().get_business_data(module, "payload50", areaCode, UTid, createTime, UTid, hosId, stockId,
+ request_body = commonFuc().get_business_data(module, "payload50", areaCode, UTid, createTime, UTid, get_hosid(), stockId,
areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, distrDetailId,
diff --git a/report/summary.html b/report/summary.html
index 4be023f84ab09bcb9606aca3f862cc9ba3705d7a..0aef5e93cf887c2d11e03ffeb787af822809889a 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -56,7 +56,7 @@
| 1 |
0 |
- 1分48秒 |
+ 1分20秒 |
0.0% |
@@ -74,7 +74,7 @@
| a_b2流程九请领业务流_二级库向中心库 |
失败 |
- 107.966 |
+ 80.157 |
xiaohesheng |