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 7a47d608a4c3ea88a5218c1f563b55dc65d42555..bfd22e34d5ebaf8d98e6e308680862b73082d3b3 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"
@@ -62,14 +62,19 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库
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
- elif type == 3:
- # udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3
- print('下面处理')
- else:
- udi_code = 'udi_code'
- if type == 2:
+ 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")
@@ -141,11 +146,13 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库
extInfo = commonFuc().analysis_json('extInfo', list_a)
print('extInfo', extInfo)
# inStockTime = commonFuc().analysis_json('inStockTime', extInfo)
- inStockTime = reGetString(extInfo, 'inStockTime\"\: \"', '\"\, \"useFrequency')
+ 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"]
@@ -301,7 +308,7 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库
print('result', result)
elif type == 3:
print('检验试剂消耗出库')
- udi_code=get_udi2(4)#试剂单瓶条码
+ udi_code = get_udi2(4) # 试剂单瓶条码
# 从message18文件中获取信息
info = FileUtils().r_info8(module, "条码信息", 'message18')
data1 = info['list_a']
@@ -333,17 +340,17 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库
# print('info', info)
list_a = info['list_a']
extInfo = commonFuc().analysis_json('extInfo', list_a)
- pkgBarcodeId=commonFuc().analysis_json('id', 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)
+ 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")
@@ -412,14 +419,165 @@ def sCan_grant(type=1): # 获取条码and扫码发放高值不能发放
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)
+ 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)
+ 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)
+
try:
updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库
- sCan_grant(1)#低值扫码发放
- sCan_grant(3) # 试剂扫码发放
- second_dept_consume_Out_Stock(2)#高值消耗出库
- second_dept_consume_Out_Stock(1) # 低值消耗出库
+ # 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/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py
index 09d43b02a53ba766ab501691777f2826a669d19c..637bba49b3845b9cddc1633b7e3ab1072e298380 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -620,10 +620,12 @@ def get_udi2(type=1): # 二级科室库存明细查询获取条码
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
request_body = commonFuc().get_business_data(module, "payload17_2_1", GoodsId, get_branch_id(), deptid2)
+
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_2_2", GoodsId, get_branch_id(), deptid2)
+
elif type == 4:#试剂单瓶条码
hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
GoodsId = hosGoodsId.replace(get_hosid(), '')
diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data
index 4d9fec7e92d889103d37dd5fbc5ff46796ebcef7..d368954e2d2df2f932868ec20dff92a98c025367 100644
--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -67,6 +67,7 @@
"herpService_stock_out_use_buyInfo_url": "/api/herpService/stock/out/use/buyInfo/"
"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"
"username": "xhs1009"
"username2": "test001"
@@ -106,7 +107,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":["25"],"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":["20"],"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}}
@@ -175,4 +176,6 @@ json_headers2: {
"payload59": {"tbStatus":20,"code":"%s","areaCode":"","ignoreValidExpDate":true,"pickType":"KS_SL"}
"payload60": {"pickType":"KS_CB","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"默认库区","ignoreValidExpDate":false}
"payload61": {"pickType":"KS_XH","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":2,"chargeDeptId":"","ignoreValidExpDate":false}
-"payload62": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"hosId":"%s","goodsName":"","goodsSpec":"","purMode":"10"},"pageNum":1,"pageSize":50}
\ No newline at end of file
+"payload62": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"hosId":"%s","goodsName":"","goodsSpec":"","purMode":"10"},"pageNum":1,"pageSize":50}
+"payload63": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":"1","hosId":"%s","orderNo":"","goodsName":"","goodsSpec":"","purMode":"10","billMode":"10"},"pageNum":1,"pageSize":50}
+"payload64": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","inType":"0","bottleFlag":"1","patientId":"","patientName":"","consumeType":"1","hosId":"%s","goodsName":"","goodsSpec":"","orderNo":"","purMode":"60","billMode":"67"},"pageNum":1,"pageSize":50}
\ No newline at end of file
diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10
index 1b880f50a407a46041a14d04c0c3fa2a60250353..37ba2d5cd342c9c2cdddacce92dba317662aec11 100644
--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
@@ -1,9 +1,9 @@
低值配送单号:
- distrBillId1: PSh0347202406070021
- distrBillId2: PSh0347202406070021
+ distrBillId1: PSh0347202406070039
+ distrBillId2: PSh0347202406070039
高值配送单号:
- distrBillId1: PSh0347202406070022
- distrBillId2: PSh0347202406070022
+ distrBillId1: PSh0347202406070040
+ distrBillId2: PSh0347202406070040
试剂配送单号:
- distrBillId1: PSh0347202406070023
- distrBillId2: PSh0347202406070023
+ distrBillId1: PSh0347202406070041
+ distrBillId2: PSh0347202406070041
diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11
index 979dc65ed14ff3e04c8b4fc0af91b1eb6ce2b9d2..907fa06677f26b269a8efae2623b57f1769d76e5 100644
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
@@ -1,3 +1,3 @@
采购计划单号高值:
- orderNo1: PLAN2024060726145
- orderNo2: PLAN2024060726145
+ orderNo1: PLAN2024060726201
+ orderNo2: PLAN2024060726201
diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12
index 08f967322e6d7ea676a4743fa0993c4cb624fc15..52fb13a6186881f8647299be26687e753ea43fbc 100644
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
@@ -1,3 +1,3 @@
采购计划单号试剂:
- orderNo1: PLAN2024060726143
- orderNo2: PLAN2024060726143
+ orderNo1: PLAN2024060726200
+ orderNo2: PLAN2024060726200
diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13
index d82649057c46dd48f1e4cbfc46720ea3d930e25e..0709f8b770e0eb135aa83187af05d6c172c568a9 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: PSh0347202406070023
+ sourceOrderNo: PSh0347202406070041
billMode: '66'
stockKind:
purMode:
- sourceId: PSh0347202406070023
+ sourceId: PSh0347202406070041
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
- planOrderNo: PLAN2024060726143
- purOrderNo: CG2024060718087
+ planOrderNo: PLAN2024060726200
+ purOrderNo: CG2024060718116
recOrgId: 7d4e304548bd4324bcd974e107ddeabd
recOrgName: 二级检验科002
- billRelationJson: '{"buyBillId":"Bh03472024060700014","planBillId":"Ph034720240607022788","planOrderNo":"PLAN2024060726143","buyOrderNo":"BUY2024060704797","purOrderNo":"CG2024060718087","purBillId":"Ch034720240607000078","purBillDate":"2024-06-07
- 07:38:40","distrBillId":"PSh0347202406070023","distrOrderNo":"PSh0347202406070023"}'
- taskDate: '2024-06-07 07:39:23'
+ 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'
taskDateStart:
taskDateEnd:
billModeList:
diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14
index dc81be339080e97460458fe4655885e218a34306..ace294f63406c7dca03221cc428efd351d5f041f 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: '03838220'
+ viewId: '03838238'
verifyFlag: 0
hasSterilize: 0
- id: '03838220'
+ id: '03838238'
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 b1c946f112cd7688f86f573daf8bf82f2c6e64e7..ea0ed9fcd5a7626230aef5a8ad514ad7c626cea1 100644
--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
@@ -1,3 +1,3 @@
验收单号:
- CHECK_NO1: CHECKh03472024060700014
- CHECK_NO2: CHECKh03472024060700014
+ CHECK_NO1: CHECKh03472024060700032
+ CHECK_NO2: CHECKh03472024060700032
diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18
index 623ddb0f6ab282391bd4fedfed473affc1a3d7c9..e3bdb9291b985f2d60b3ac03c68945788187dad5 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: UT2406070008020005
- snCode: UT2406070008020005
- ssccCode: '010839000018756510'
+ id: UT2406070008020001
+ snCode: UT2406070008020001
+ ssccCode: '010839000018756114'
pkgCodeSee: 0136570000040210104444112406071724121421UT240607000802
hosGoodsId: h034700004021
hosGoodsCode: '00004021'
@@ -29,8 +29,8 @@
pkgDefId:
extInfo: '{"pkgUdi": "0136570000040210104444112406071724121421UT240607000802",
"pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-06-07
- 08:26:58", "pkgBarcodeId": "UT240607000802"}'
- bottleId: UT2406070008020005
+ 14:06:36", "pkgBarcodeId": "UT240607000802"}'
+ bottleId: UT2406070008020001
pkgType: '67'
miDjmc: ''
miCode: ''
@@ -40,7 +40,7 @@
shelfKindName: 普通货位
provName: 国药集团公司N2)Tj
provId: p1e27a
- inStockDate: '2024-06-07 08:26:58'
+ inStockDate: '2024-06-07 14:06:36'
mfrCode:
made: 德国
price:
diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21
index f62d39d4811949aa4e96e60c99e42ab6a0591c65..6bb57c9c2c7c2afa8e885a5660b97545922ca0df 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: 300.0
+ qty: 795.0
goodsImg: []
pkgDefId: 6b59ecdb3df2446f930143a20befab12
buyPkgQty:
diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7
index c08c9005cd00540d9d25775ac4c41b8c9d90492c..adbd9c33a406e4c3cdbf6bbb5f09c6ccff9bea7f 100644
--- a/data/b5_spd3_core_business_flow/message7
+++ b/data/b5_spd3_core_business_flow/message7
@@ -1,3 +1,3 @@
采购计划单号:
- orderNo1: PLAN2024060726144
- orderNo2: PLAN2024060726144
+ orderNo1: PLAN2024060726199
+ orderNo2: PLAN2024060726199
diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8
index ac451878caba932509f6f1dee16fa2cfab831cfa..95f7a7d14ebdfc29b93529e1ad8e1fd3e4bc67a8 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: Ch034720240607000078
- lastModified: '2024-06-07 07:38:40'
+ - id: Ch034720240607000107
+ lastModified: '2024-06-07 10:36:41'
version: 0
- createTime: '2024-06-07 07:38:40'
+ createTime: '2024-06-07 10:36:41'
createUser: h0347_UID-051318
lastModifiedUser:
- orderNo: CG2024060718087
+ orderNo: CG2024060718116
billMode: '66'
recType: HDI
hosId: h0347
@@ -19,7 +19,7 @@
areaCode:
areaName:
billExpdtDate:
- sourceId: Ph034720240607022788
+ sourceId: Ph034720240607022845
sourceType:
inSettlement:
recUser:
@@ -47,7 +47,7 @@
sumQty: 100.0
sumPkgQty: 1.0
sumAmount: '9999.9900'
- planOrderNo: PLAN2024060726143
+ planOrderNo: PLAN2024060726200
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9
index 143bb8c12da70fe2d1820846a19f937e730f8c30..7b478fa52adf717adc9fc630ceefa6dc29890b23 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: cec1b8fbe4fd4e79b2b714175312c46b
+ - id: fb0288933bcd4070aba5bf0661c27246
lastModified:
version:
createTime:
createUser:
lastModifiedUser:
- pid: Ch034720240607000078
- orderNo: CG2024060718087
- sourceId: 504bd33289024a1ca2771f60639330e5
+ pid: Ch034720240607000107
+ orderNo: CG2024060718116
+ sourceId: 1237a54bcde647618be47efb2735b583
hosGoodsId: h034700004021
mdmGoodsCode: '11660969'
goodsCode: '00004021'
@@ -31,7 +31,7 @@
notSendPkgQty: 0.0
inSettlement: 1
closeType: 1
- detailRelationJson: '{"planBillId":"Ph034720240607022788","buyDetailId":"Bh034720240607000140001","planDetailId":"504bd33289024a1ca2771f60639330e5"}'
+ detailRelationJson: '{"planBillId":"Ph034720240607022845","buyDetailId":"Bh034720240607000360001","planDetailId":"1237a54bcde647618be47efb2735b583"}'
extInfo: '{"goodsGg":"G-31891","goodsCode":"00004021","purMode":60,"goodsName":"新型冠状病毒检测试剂%k$56"}'
remark:
tbStatus:
diff --git a/report/summary.html b/report/summary.html
index 4a79c6fd6ce80ac360033ae0056651f8cf77aca8..2a2eff53e1fcd65902f542365dca3aa9c698443d 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
| 1 |
- 1 |
- 0分43秒 |
- 100.0% |
+ 0 |
+ 0分47秒 |
+ 0.0% |
@@ -94,8 +94,8 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
| a_b7流程十四退库业务_消耗退库 |
- 成功 |
- 42.861 |
+ 失败 |
+ 47.812 |
xiaohesheng |