diff --git "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.py"
index 382f2a135f736e636b1761a3d317759689ebe998..bc094fcaea6936f287d4339dce65b38ac9c0a8bd 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\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\272\214\347\272\247\345\272\223.py"
@@ -349,7 +349,7 @@ def get_centeStock_pick_list_counts():
return total1
-def pick_execute(GoodsId, type=1):
+def pick_execute():
module = "b5_spd3_core_business_flow"
# # 登录获取用户id等信息，使用创建的用户登录===========开始
info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
@@ -402,86 +402,90 @@ def pick_execute(GoodsId, type=1):
else:
udi_code = 'udi_code'
print('udi_code', udi_code)
- pickScan2(BH_ID, udi_code, type) # 扫码
- import pdb
- pdb.set_trace()
- # 提交拣货执行单
+ if purMode == 10:
+ targetAreaCode=pickScan2(BH_ID, udi_code, 1) # 低值
+ elif purMode == 20:
+ targetAreaCode=pickScan2(BH_ID, udi_code, 2) # 高值
+ elif purMode == 60:
+ targetAreaCode= pickScan2(BH_ID, udi_code, 3) # 试剂
+
+ # 提交领用出库单
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "herpService_BuyPick_updateStatus_url")
+ "herpService_stock_out_use_submit_url")
url = url + BH_ID
print('提交拣货执行单=================', url)
- request_body = commonFuc().get_business_data(module, "payload51", BH_ID)
+ request_body = commonFuc().get_business_data(module, "payload51_1", targetAreaCode)
print('提交拣货执行单', 'request_body', request_body)
result = commonFuc().http_post(url, request_body, headers)
print('提交拣货执行单,result1', result)
# 拣货===================================
- # 复核===================================
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "herpService_hdiBarcode_scan_url")
- url = url + udi_code
- print('复核=================', url)
- result = commonFuc().http_get(url, headers)
- print('复核,result1', result)
- result = commonFuc().http_get(url, headers)
- print('扫码复核result', result)
- data = commonFuc().analysis_json('data', result)
- UT_id = commonFuc().analysis_json('id', data)
- createTime = commonFuc().analysis_json('createTime', data)
- snCode = commonFuc().analysis_json('snCode', data)
- tagType = commonFuc().analysis_json('tagType', data)
- goodsDi = commonFuc().analysis_json('goodsDi', data)
- hosId = commonFuc().analysis_json('hosId', data)
- stockId = commonFuc().analysis_json('stockId', data)
- areaCode = commonFuc().analysis_json('areaCode', data)
- areaName = commonFuc().analysis_json('areaName', data)
- shelfCode = commonFuc().analysis_json('shelfCode', data)
- codeType = commonFuc().analysis_json('codeType', data)
- mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data)
- goodsCode = commonFuc().analysis_json('goodsCode', data)
- barName = commonFuc().analysis_json('barName', data)
- batchCode = commonFuc().analysis_json('batchCode', data)
- expdtDate = commonFuc().analysis_json('expdtDate', data)
- productDate = commonFuc().analysis_json('productDate', data)
- pkgCode = commonFuc().analysis_json('pkgCode', data)
- pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data)
- ssccCode = commonFuc().analysis_json('ssccCode', data)
- tbStatus = commonFuc().analysis_json('tbStatus', data)
- purMode = commonFuc().analysis_json('purMode', data)
- goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data)
- goodsSpec = commonFuc().analysis_json('goodsSpec', data)
- unit = commonFuc().analysis_json('unit', data)
- goodsName = commonFuc().analysis_json('goodsName', data)
- made = commonFuc().analysis_json('made', data)
- hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data)
- distrBillId = commonFuc().analysis_json('distrBillId', commonFuc().analysis_json('ext', data))
- purBillId = commonFuc().analysis_json('purBillId', commonFuc().analysis_json('ext', data))
- distrDetailId = commonFuc().analysis_json('distrDetailId', commonFuc().analysis_json('ext', data))
- pkgDefId = commonFuc().analysis_json('pkgDefId', commonFuc().analysis_json('ext', data))
- pkgDefQty = commonFuc().analysis_json('pkgDefQty', commonFuc().analysis_json('ext', data))
- pkgDefName = commonFuc().analysis_json('pkgDefName', commonFuc().analysis_json('ext', data))
- print(UT_id)
- # ========================扫码复核
- # ========出库复核提交==========
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "herpService_stock_review_pass_submit_url")
-
- print('url', url)
- # sourceId = ' '.join(PICK_ID)
- sourceId = BH_ID
- # 请求体
- request_body = commonFuc().get_business_data(module, "payload52", UT_id, createTime, snCode, hosId, stockId,
- areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
- mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
- productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
- distrDetailId,
- distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
- goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
- pkgDefName, made, hosGoodsCode, sourceId)
- print('request_body', request_body)
- # # # # 发送请求
- result = commonFuc().http_post(url, request_body, headers)
- print('herpService_stock_review_pass_submit_urlresult', result)
+ # # 复核===================================
+ # url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ # "herpService_hdiBarcode_scan_url")
+ # url = url + udi_code
+ # print('复核=================', url)
+ # result = commonFuc().http_get(url, headers)
+ # print('复核,result1', result)
+ # result = commonFuc().http_get(url, headers)
+ # print('扫码复核result', result)
+ # data = commonFuc().analysis_json('data', result)
+ # UT_id = commonFuc().analysis_json('id', data)
+ # createTime = commonFuc().analysis_json('createTime', data)
+ # snCode = commonFuc().analysis_json('snCode', data)
+ # tagType = commonFuc().analysis_json('tagType', data)
+ # goodsDi = commonFuc().analysis_json('goodsDi', data)
+ # hosId = commonFuc().analysis_json('hosId', data)
+ # stockId = commonFuc().analysis_json('stockId', data)
+ # areaCode = commonFuc().analysis_json('areaCode', data)
+ # areaName = commonFuc().analysis_json('areaName', data)
+ # shelfCode = commonFuc().analysis_json('shelfCode', data)
+ # codeType = commonFuc().analysis_json('codeType', data)
+ # mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data)
+ # goodsCode = commonFuc().analysis_json('goodsCode', data)
+ # barName = commonFuc().analysis_json('barName', data)
+ # batchCode = commonFuc().analysis_json('batchCode', data)
+ # expdtDate = commonFuc().analysis_json('expdtDate', data)
+ # productDate = commonFuc().analysis_json('productDate', data)
+ # pkgCode = commonFuc().analysis_json('pkgCode', data)
+ # pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data)
+ # ssccCode = commonFuc().analysis_json('ssccCode', data)
+ # tbStatus = commonFuc().analysis_json('tbStatus', data)
+ # purMode = commonFuc().analysis_json('purMode', data)
+ # goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data)
+ # goodsSpec = commonFuc().analysis_json('goodsSpec', data)
+ # unit = commonFuc().analysis_json('unit', data)
+ # goodsName = commonFuc().analysis_json('goodsName', data)
+ # made = commonFuc().analysis_json('made', data)
+ # hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data)
+ # distrBillId = commonFuc().analysis_json('distrBillId', commonFuc().analysis_json('ext', data))
+ # purBillId = commonFuc().analysis_json('purBillId', commonFuc().analysis_json('ext', data))
+ # distrDetailId = commonFuc().analysis_json('distrDetailId', commonFuc().analysis_json('ext', data))
+ # pkgDefId = commonFuc().analysis_json('pkgDefId', commonFuc().analysis_json('ext', data))
+ # pkgDefQty = commonFuc().analysis_json('pkgDefQty', commonFuc().analysis_json('ext', data))
+ # pkgDefName = commonFuc().analysis_json('pkgDefName', commonFuc().analysis_json('ext', data))
+ # print(UT_id)
+ # # ========================扫码复核
+ # # ========出库复核提交==========
+ # url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ # "herpService_stock_review_pass_submit_url")
+ #
+ # print('url', url)
+ # # sourceId = ' '.join(PICK_ID)
+ # sourceId = BH_ID
+ # # 请求体
+ # request_body = commonFuc().get_business_data(module, "payload52", UT_id, createTime, snCode, hosId, stockId,
+ # areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+ # mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
+ # productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
+ # distrDetailId,
+ # distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
+ # goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
+ # pkgDefName, made, hosGoodsCode, sourceId)
+ # print('request_body', request_body)
+ # # # # # 发送请求
+ # result = commonFuc().http_post(url, request_body, headers)
+ # print('herpService_stock_review_pass_submit_urlresult', result)
# 复核===================================
@@ -520,9 +524,7 @@ try:
updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库
# 二级科室领用出库
# 低值拣货执行
- hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
- GoodsId = hosGoodsId.replace(get_hosid(), '')
- pick_execute(GoodsId, 1)
+ pick_execute()
# # 高值拣货执行
# hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
# GoodsId = hosGoodsId.replace(get_hosid(), '')
diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py
index a76642e8a0ab87fcbbc24f260aa6c4e910b9b483..20793c9178fd97cba92eed9c6411fc86fa319448 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -2487,24 +2487,21 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码
unitName, hosGoodsCode, purModeText, PICK_ID, pickerId,
stockName)
elif type == 3:
- 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,
- distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName,
- purMode,
- goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
- pkgDefName, printNum, made,
- hosGoodsCode, PICK_ID, areaName, stockName)
+ request_body = commonFuc().get_business_data(module, "payload50_1_1", areaCode, areaName, UTid, createTime,
+ UTid, get_hosid(), stockId, areaCode, areaName, shelfCode,
+ codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi, barName,
+ batchCode, expdtDate, productDate, pkgCode, pkgCodeSee, ssccCode,
+ tbStatus, pkgDefId, purBillId, pkgDefName, distrBillId,
+ inStockTime, distrDetailId, purMode, price, goodsMfrsName,
+ goodsSpec, unit, goodsName, pkgDefId, pkgDefQty, pkgDefName, made,
+ unitName, hosGoodsCode, purModeText, PICK_ID, pickerId,
+ stockName)
print('request_body', '拣货扫码', request_body)
# # # # 发送请求
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
- PICK_ID = commonFuc().analysis_json('data', result)
+ return areaCode
def get_branch_name():
diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data
index a03b2ee13846949b65f4ed906e1dc1c6df13c81d..fd9d78f50d06514a227784505ff5837a27991867 100644
--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -65,6 +65,8 @@
"herpService_stock_barcode_page_url": "/api/herpService/stock/statistics/stock/barcode/page"
"herpService_stock_pick_scan_url": "/api/herpService/pick/scan"
"herpService_stock_out_use_buyInfo_url": "/api/herpService/stock/out/use/buyInfo/"
+"herpService_stock_out_use_submit_url": "/api/herpService/stock/out/use/submit"
+
"username": "xhs1009"
"username2": "test001"
@@ -146,6 +148,7 @@ json_headers2: {
"payload50_1_1": {"areaCode":"%s","areaName":"%s","hdiList":[{"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":"%s","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":"%s","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}],"id":"%s","pickerId":"%s","version":0,"stockName":"%s"}
"payload51": "%s"
+"payload51_1": {"targetAreaCode":"%s","billMode":16,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"PICKh03472405310056","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""}
"payload52": {"batchList":[{"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":"%s","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":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","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":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"sourceId":"%s","sourceType":"KS","sourceVersion":"3","remark":"","reviewAll":0}
"payload50_2": {"areaCode":"%s","hdiList":[{"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":"%s","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":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","multiChargeFlag":0,"useFrequency":1},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"purDetailId":null,"pkgDefName":null,"printNum":"%s","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":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s"}
"payload50_2_2": {"areaCode":"%s","areaName":"%s","hdiList":[{"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":{"pkgDefQty":1,"purBillId":"%s","distrBillId":"%s","inStockTime":"%s","useFrequency":1,"distrDetailId":"%s","certificateCode":"","multiChargeFlag":0},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","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":"%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}],"id":"%s","pickerId":"%s","version":0,"stockName":"%s"}
diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18
index 0b86be9e60b98096a1cc7479302bdf43b79665a7..2e47b6d74c40fd97e072b0ae3e82060ac19fbf95 100644
--- a/data/b5_spd3_core_business_flow/message18
+++ b/data/b5_spd3_core_business_flow/message18
@@ -1,38 +1,37 @@
条码信息:
list_a:
- &id001
- id: UT240531000205
- snCode: UT240531000205
- ssccCode: '010839000182039020'
- pkgCodeSee: 013643000003921010333112405311724120721UT240531000205
- hosGoodsId: h034700003921
- hosGoodsCode: '00003921'
- goodsCode: '00003921'
- goodsName: 一次性注射器_低值ga1u3
+ id: '8800000001059087'
+ snCode: '8800000001059087'
+ ssccCode: '010839000182078722'
+ pkgCodeSee: '0100000000003920102221124053117241207218800000001059087'
+ hosGoodsId: h034700003920
+ hosGoodsCode: '00003920'
+ goodsCode: '00003920'
+ goodsName: 高值牙钻机olAYM
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit: 支
- purMode: 10
- batchCode: '333'
+ purMode: 20
+ batchCode: '222'
productDate: '2024-05-31'
expdtDate: '2024-12-07'
- pkgDefName: '100'
- pkgDefQty: 100.0
+ pkgDefName:
+ pkgDefQty: 1.0
stockId: 54909748000e468fa2c6cc2761be4086
stockName: 二级检验科002库房
areaName: 默认库区
areaCode: areah03472140
lockStatus: 0
- unitName: 100支/100
+ unitName: 1支
shelfCode: areah03472140-A-01-01
shelfNo: A01-A-01-01
- pkgDefId: 175916cec2a645239c2f8bd189dbdbf2
- extInfo: '{"pkgDefId": "175916cec2a645239c2f8bd189dbdbf2", "pkgDefQty": 100, "purBillId":
- "CG2024053117243", "pkgDefName": "100", "distrBillId": "PSh0347202405310005",
- "inStockTime": "2024-05-31 15:26:41", "distrDetailId": "03837852", "certificateCode":
- ""}'
+ pkgDefId:
+ extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024053117256", "distrBillId": "PSh0347202405310009",
+ "inStockTime": "2024-05-31 14:56:27", "useFrequency": 1, "distrDetailId": "03837856",
+ "certificateCode": "", "multiChargeFlag": 0}'
bottleId:
- pkgType: '16'
+ pkgType: '20'
miDjmc: ''
miCode: ''
transferRatio: 1.0
@@ -41,13 +40,13 @@
shelfKindName: 普通货位
provName: 国药集团公司MRA4P
provId: p1e25f
- inStockDate: '2024-05-31 15:26:40'
+ inStockDate: '2024-05-31 14:56:26'
mfrCode:
made: 德国
price:
- barName: 100支/100
- purModeText: 低值耗材
- codeType: 16
+ barName: 1支
+ purModeText: 高值耗材
+ codeType: 20
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22
index d81f26a9ef061b86e0d9e00a1a5aa7e9b7883289..3343f86d68da0476dc92378cece2ecddaf1b9b4f 100644
--- a/data/b5_spd3_core_business_flow/message22
+++ b/data/b5_spd3_core_business_flow/message22
@@ -2,8 +2,8 @@
list_a:
- &id001
- id: 0702e472a3dd401ba00557cb70088ef9
- lastModified: '2024-05-31 16:18:34'
- version: 9
+ lastModified: '2024-05-31 16:45:09'
+ version: 10
createTime: '2024-05-31 08:42:09'
createUser: h0347_UID-051304
lastModifiedUser: h0347_UID-051304
diff --git a/report/summary.html b/report/summary.html
index 1232a0cf8937b3782f084d8f3483cbd6652b3923..68f0bebe1f1d78518d7f12cdc7d61e5e481fc088 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
| 1 |
0 |
- 6分56秒 |
+ 1分40秒 |
0.0% |
@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
| a_b5流程十二请领业务流_二级库向二级库 |
失败 |
- 416.265 |
+ 100.568 |
xiaohesheng |