From 3ff1cdb109a254c05bf2d497b544d25a77e301f5 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Wed, 26 Jun 2024 15:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...06\345\214\205\345\212\237\350\203\275.py" | 200 +++--------------- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 +- data/a6_mdm3_si/message | 56 ++--- data/b2_herp3_bs/message | 6 +- data/b2_herp3_bs/message3 | 4 +- data/b2_herp3_bs/message4 | 2 +- data/b2_herp3_bs/message6 | 10 +- data/b2_herp3_bs/message7 | 4 +- data/b5_spd3_core_business_flow/data | 2 +- data/b5_spd3_core_business_flow/message | 4 +- data/b5_spd3_core_business_flow/message1 | 10 +- data/b5_spd3_core_business_flow/message10 | 12 +- data/b5_spd3_core_business_flow/message11 | 4 +- data/b5_spd3_core_business_flow/message12 | 4 +- data/b5_spd3_core_business_flow/message13 | 22 +- data/b5_spd3_core_business_flow/message14 | 20 +- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 20 +- data/b5_spd3_core_business_flow/message17 | 58 ++--- data/b5_spd3_core_business_flow/message18 | 57 ++--- data/b5_spd3_core_business_flow/message19 | 12 +- data/b5_spd3_core_business_flow/message2 | 10 +- data/b5_spd3_core_business_flow/message20 | 36 ++-- data/b5_spd3_core_business_flow/message21 | 20 +- data/b5_spd3_core_business_flow/message22 | 18 +- data/b5_spd3_core_business_flow/message3 | 10 +- data/b5_spd3_core_business_flow/message4 | 10 +- data/b5_spd3_core_business_flow/message5 | 10 +- data/b5_spd3_core_business_flow/message6 | 4 +- data/b5_spd3_core_business_flow/message7 | 4 +- data/b5_spd3_core_business_flow/message8 | 28 +-- data/b5_spd3_core_business_flow/message9 | 34 +-- 34 files changed, 283 insertions(+), 430 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" "b/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" index ebd8bd18..b9eb33c3 100644 --- "a/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" +++ "b/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" @@ -20,7 +20,7 @@ python runner_test.py tag id2302-20 debug mdm3 """ -def second_center_Stock_return_Out(type): # 中心库退供应商 +def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放) module = "b5_spd3_core_business_flow" # # 登录获取用户id等信息，使用创建的用户登录===========开始 info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') @@ -35,7 +35,8 @@ def second_center_Stock_return_Out(type): # 中心库退供应商 commonFuc().get_business_data(module, "json_contentType"), token, commonFuc().get_business_data(module, "X-APP-CODE")) - if type == 2:#高值退货出库 + if type == 1: + print('低值耗材扫码发放') module = "b5_spd3_core_business_flow" # # 登录获取用户id等信息，使用创建的用户登录===========开始 info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') @@ -46,181 +47,31 @@ def second_center_Stock_return_Out(type): # 中心库退供应商 token, projectCode, uxid, corpId, info = login(username, password, 2) # 登录获取用户id等信息，使用创建的用户登录============结束 # 到库房明细查询，查询产品的udi码 - get_udi(2) - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_submit_url") - print('url', 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")) - # 从文件中获取必要信息 + udi_code=get_udi1(1) + #扫码==================== + # 退货出库扫条码 + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_stock_pick_scan_url") + # 从message18文件中获取信息 info = FileUtils().r_info8(module, "条码信息", 'message18') # print('info', info) list_a = info['list_a'] - # print('list_a', list_a[0], type(list_a), len(list_a)) - UTid = 'UT' - areaCode = 'areaCode'; - createTime = 'createTime'; - hosId = 'hosId'; - stockId = 'stockId'; - areaCode = 'areaCode'; - areaName = 'areaName'; - shelfCode = 'shelfCode' - codeType = 'codeType'; - tagType = 'tagType'; - hosGoodsId = 'hosGoodsId'; - mdmGoodsCode = 'mdmGoodsCode'; - goodsCode = 'goodsCode'; - goodsDi = 'goodsDi'; - barName = 'barName'; - batchCode = 'batchCode' - expdtDate = 'expdtDate'; - productDate = 'productDate' - pkgCode = 'pkgCode' - print('aaaaaaaaaaaaaaaaaaaaaaaaa', list_a[0]) - list_b = list_a[0] - for i in list_b: - print(i) - UTid = i['id'] - areaCode = i['areaCode'] - createTime = i['createTime'] - hosId = i['hosId'] - stockId = i['stockId']; - areaCode = i['areaCode']; - areaName = i['areaName']; - shelfCode = i['shelfCode'] - codeType = i['codeType']; - tagType = i['tagType']; - hosGoodsId = i['hosGoodsId']; - mdmGoodsCode = i['mdmGoodsCode'] - goodsCode = i['goodsCode']; - goodsDi = i['goodsDi']; - barName = i['barName']; - batchCode = i['batchCode'] - expdtDate = i['expdtDate']; - productDate = i['productDate'] - pkgCode = i['pkgCode'] - pkgCodeSee = i['pkgCodeSee'] - ssccCode = i['ssccCode'] - tbStatus = i['tbStatus'] - onlyKey = i['hosGoodsId'] - ext = i['ext'] - print('ext', ext) - distrDetailId = ext['distrDetailId'] - distrBillId = ext['distrBillId'] - purBillId = ext['purBillId'] - pkgDefQty = ext['pkgDefQty'] - # pkgDefId = ext['pkgDefId'] - # pkgDefName = ext['pkgDefName'] - purMode = i['purMode'] - goodsMfrsName = i['goodsMfrsName'] - goodsSpec = i['goodsSpec'] - unit = i['unit'] - goodsName = i['goodsName'] - pkgDefId = i['pkgDefId'] - # pkgDefQty = i['pkgDefQty'] - pkgDefName = i['pkgDefName'] - printNum = i['printNum'] - made = i['made'] - provId = i['provId'] - provName = i['provName'] - subProvId = i['subProvId'] - subProvName = i['subProvName'] - hosGoodsCode = i['hosGoodsCode'] - subSendFlag = i['subSendFlag'] - areaName = i['areaName'] - hosId = i['hosId'] - inStockTime=i['inStockTime'] - break - # pkgDefQty=1 - 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, "payload66", areaCode, UTid, createTime, UTid, hosId, - stockId, - areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId, - mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate, - productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,pkgDefQty, - purBillId,distrBillId,inStockTime,distrDetailId, - purMode, - goodsMfrsName, goodsSpec, unit, goodsName - , printNum, made, provId, provName, subProvId, - subProvName, - hosGoodsCode, subSendFlag, onlyKey, areaName, hosId, - get_branch_id(), - deptid1, deptName, stockId) - print('request_body', 'ccccccc', request_body) + 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) + deptId2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] + targetDeptId = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"] + deptName = get_branch_name() + targetStockId = get_stockId(deptName + '中心库房', 1) - # # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - PICK_ID = commonFuc().analysis_json('data', result) - # =====================出库复核列表查询获取pickid=============== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_pick_return_page_url") - print('url', url) - request_body = commonFuc().get_business_data(module, "payload20", get_branch_id(), get_hosid(), deptid1) - # # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - - # =====================出库复核列表查询获取pickid=============== - # =======================查看出库单详细信息=============== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_pick_checkReview_url") - url = url + ' '.join(PICK_ID) + '?pickedFlag=true' - print('url', url) - # # # # 发送请求 - result = commonFuc().http_get(url, headers) - print('查看出库单详细信息result', result) - # =======================查看出库单详细信息=============== - # ========================扫码复核 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_hdiBarcode_scan_url") - url = url + pkgCode - print('url', url) - # # # # 发送请求 - 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) - tbStatus = commonFuc().analysis_json('tbStatus', 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) - # 请求体 - request_body = commonFuc().get_business_data(module, "payload21", 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) + request_body = commonFuc().get_business_data(module, "payload67", udi_code, stockId, deptId2, areaCode, + areaName, + targetStockId, targetDeptId) print('request_body', request_body) - # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) - print('herpService_stock_review_pass_submit_urlresult', result) - # ========出库复核提交 - elif type == 1: - print('低值耗材退货出库') - 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等信息，使用创建的用户登录============结束 - # 到库房明细查询，查询产品的udi码 - get_udi(1) + print('扫码发放result', result) + #扫码======================= url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_submit_url") print('url', url) headers = commonFuc().get_business_data(module, "json_headers2", @@ -381,7 +232,7 @@ def second_center_Stock_return_Out(type): # 中心库退供应商 print('herpService_stock_review_pass_submit_urlresult', result) # ========出库复核提交 elif type == 3: - print('试剂产品退库出库') + print('试剂产品扫码发放') module = "b5_spd3_core_business_flow" # # 登录获取用户id等信息，使用创建的用户登录===========开始 info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') @@ -555,9 +406,8 @@ def second_center_Stock_return_Out(type): # 中心库退供应商 try: updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库 - second_center_Stock_return_Out(2) #高值耗材退货出库 - second_center_Stock_return_Out(1) #低值耗材退货出库 - second_center_Stock_return_Out(3) #试剂耗材退货出库 + center_Stock_unpack(1) #低值耗材退货出库 + center_Stock_unpack(2) #试剂耗材退货出库 commonFuc().check_text_exist_result_text('succees', 'succees') except: commonFuc().check_text_exist_result_text('error', '1') diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index b3784fed..9f0405f5 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406260057 - cname: 国药集团公司XTQY% + e_id: CR202406260095 + cname: 国药集团公司EJey4 diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 009841ee..c8c0be6d 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院CZ5Yd - h_name: 湖南省人民医院CZ5Yd + h_id: 湖南省人民医院Z5&dX + h_name: 湖南省人民医院Z5&dX diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 60c600da..e396894d 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260016_1 + MSPid: MSP2406260031_1 hosId: h0347 - hosGoodsId: h034700004268 - provGoodsid: provGood-99221456 - goodsAuditBillId: MSP2406260016 - targetId: MSP2406260016_1 + hosGoodsId: h034700004283 + provGoodsid: provGood-99221471 + goodsAuditBillId: MSP2406260031 + targetId: MSP2406260031_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 66f77330..4ce4d74a 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202407' - pid: OBh0347202406250004 - hosGoodsId: h034700004249 - goodsCode: '00004249' - goodsName: 一次性注射器_低值qPW6a + pid: OBh0347202406260028 + hosGoodsId: h034700004280 + goodsCode: '00004280' + goodsName: 一次性注射器_低值#c!$C goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,14 +20,14 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202406250004 + - pid: OBh0347202406260028 settleMonth: '202407' - accountDate: '2024-06-25' - hosGoodsId: h034700004249 + accountDate: '2024-06-26' + hosGoodsId: h034700004280 batchCode: '333' - distrDetailId: '03838814' - distrId: PSh0347202406250006 - distrOrderNo: PSh0347202406250006 + distrDetailId: '03838870' + distrId: PSh0347202406260019 + distrOrderNo: PSh0347202406260019 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -36,11 +36,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e2c6 - branchId: h0347-3695 - balanceDetId: OBh0347202406250004-000001 + provId: p1e2d0 + branchId: h0347-3701 + balanceDetId: OBh0347202406260028-000001 purMode: 10 - barCode: 013695000004249010333112406251725010121UT240625000202 + barCode: 013701000004280010333112406261725010221UT240626001002 batchId: price: maxQty: @@ -53,15 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202406250004h034700004249 - - pid: OBh0347202406250004 + viewId: 202407OBh0347202406260028h034700004280 + - pid: OBh0347202406260028 settleMonth: '202407' - accountDate: '2024-06-25' - hosGoodsId: h034700004249 + accountDate: '2024-06-26' + hosGoodsId: h034700004280 batchCode: '333' - distrDetailId: '03838814' - distrId: PSh0347202406250006 - distrOrderNo: PSh0347202406250006 + distrDetailId: '03838870' + distrId: PSh0347202406260019 + distrOrderNo: PSh0347202406260019 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -70,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e2c6 - branchId: h0347-3695 - balanceDetId: OBh0347202406250004-000002 + provId: p1e2d0 + branchId: h0347-3701 + balanceDetId: OBh0347202406260028-000002 purMode: 10 - barCode: 013695000004249010333112406251725010121UT240625000230 + barCode: 013701000004280010333112406261725010221UT240626001005 batchId: price: maxQty: @@ -87,10 +87,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202406250004h034700004249 - unique: 202407OBh0347202406250004h034700004249 + viewId: 202407OBh0347202406260028h034700004280 + unique: 202407OBh0347202406260028h034700004280 onlineKind: '10' - viewId: 202407OBh0347202406250004h034700004249 + viewId: 202407OBh0347202406260028h034700004280 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 498de4ec..d2a59b45 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3700 - branch_name: 东土城路院区jKS)c + branch_id: h0347-3701 + branch_name: 东土城路院区!(BYi 科室信息: - dept2_id: 898e41952dc149d483b9d35661beb59b + dept2_id: a164fd08a56b448d978c2e48dabc64f6 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index fc583935..1654713d 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试%iSdx - username2: 自动化测试%iSdx + username1: 自动化测试tnS^4 + username2: 自动化测试tnS^4 diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index b1ed29e3..39257cc4 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 4a36111658c64ce9b40bf51f9f7350a0 + dept1_id: f94c7beab2524e1eb14aa161d1feac8a dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 2494fb15..91af16db 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,10 +1,12 @@ 所有科室id: - deptid1: 59b55a6e68f34dd89817aa100756b645 - deptid2: 898e41952dc149d483b9d35661beb59b - deptid3: 418e884f03b84ee7afc7edfd6b64e47b - deptid4: 55b6506d25e0419db778c7c2a3168a96 + deptid1: f94c7beab2524e1eb14aa161d1feac8a + deptid2: a164fd08a56b448d978c2e48dabc64f6 + deptid3: 8aa972b9fcb14c3ebdb27d6b027600e8 + deptid4: 67edba6ed3ee4e7eb44ccfec38c74df7 + deptid5: a73183483031453c9c4a26b71d04ea05 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 deptid3: 三级检测组003 deptid4: 科室004 + deptid5: 二级科室005 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 6477ff2b..fb8ae58b 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: a8fada2ef07049bda5486310465944c3 - shelfCode: areah03472480 + shelfid: 15e6a96ff5374ed19335cabfccd454dd + shelfCode: areah03472488 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index b0bb174f..7d96ba4e 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -443,6 +443,6 @@ json_headers2: { "stockId": "%s", "pickType": "TH" } - +"payload67": {"pickType":"CB","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s中心库房","areaCode":"%s","areaName":"%s","ignoreValidExpDate":false} "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}' diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 80a54a60..4f689add 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e2cc + e_corpId: p1e2d0 h_corpId: h0347 - e_username: 国药集团公司XTQY% + e_username: 国药集团公司EJey4 h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 4c1ea753..46e4a3cc 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260012_1 + MSPid: MSP2406260027_1 hosId: h0347 - hosGoodsId: h034700004264 - provGoodsid: provGood-99221452 - goodsAuditBillId: MSP2406260012 - targetId: MSP2406260012_1 + hosGoodsId: h034700004279 + provGoodsid: provGood-99221467 + goodsAuditBillId: MSP2406260027 + targetId: MSP2406260027_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 4c8beb86..ab6cc76c 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406250022 - distrBillId2: PSh0347202406250022 + distrBillId1: PSh0347202406260035 + distrBillId2: PSh0347202406260035 高值配送单号: - distrBillId1: PSh0347202406250023 - distrBillId2: PSh0347202406250023 + distrBillId1: PSh0347202406260036 + distrBillId2: PSh0347202406260036 试剂配送单号: - distrBillId1: PSh0347202406250024 - distrBillId2: PSh0347202406250024 + distrBillId1: PSh0347202406260037 + distrBillId2: PSh0347202406260037 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 261bdc71..d2343c45 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024062630098 - orderNo2: PLAN2024062630098 + orderNo1: PLAN2024062630184 + orderNo2: PLAN2024062630184 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 675c9a05..05010485 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024062630099 - orderNo2: PLAN2024062630099 + orderNo1: PLAN2024062630186 + orderNo2: PLAN2024062630186 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 4e3d27d1..0a561e7f 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,27 +3,27 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3695 + branchId: h0347-3701 deptId: taskType: 1 - sourceOrgId: p1e2c6 - sourceOrgName: 国药集团公司YG6X1 - sourceOrderNo: PSh0347202406250024 + sourceOrgId: p1e2d0 + sourceOrgName: 国药集团公司EJey4 + sourceOrderNo: PSh0347202406260037 billMode: '66' stockKind: purMode: - sourceId: PSh0347202406250024 + sourceId: PSh0347202406260037 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024062529968 - purOrderNo: CG2024062519663 - recOrgId: e74d518c952741f388a2ceb6560c550c + planOrderNo: PLAN2024062630186 + purOrderNo: CG2024062619774 + recOrgId: a164fd08a56b448d978c2e48dabc64f6 recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024062500015","planBillId":"Ph034720240625026613","planOrderNo":"PLAN2024062529968","buyOrderNo":"BUY2024062505272","purOrderNo":"CG2024062519663","purBillId":"Ch034720240625000076","purBillDate":"2024-06-25 - 07:36:18","distrBillId":"PSh0347202406250024","distrOrderNo":"PSh0347202406250024"}' - taskDate: '2024-06-25 07:37:06' + billRelationJson: '{"buyBillId":"Bh03472024062600015","planBillId":"Ph034720240626026831","planOrderNo":"PLAN2024062630186","buyOrderNo":"BUY2024062605317","purOrderNo":"CG2024062619774","purBillId":"Ch034720240626000087","purBillDate":"2024-06-26 + 14:18:26","distrBillId":"PSh0347202406260037","distrOrderNo":"PSh0347202406260037"}' + taskDate: '2024-06-26 14:18:50' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 16819a97..3b228f33 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -3,11 +3,11 @@ - &id001 - purMode: 60 unitName: 100支/100 - hosGoodsId: h034700004250 + hosGoodsId: h034700004281 mdmGoodsCode: - spdGoodsCode: '11661198' - goodsCode: '00004250' - goodsName: 新型冠状病毒检测试剂UZ5@q + spdGoodsCode: '11661229' + goodsCode: '00004281' + goodsName: 新型冠状病毒检测试剂4GWk! goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2025-01-01' - productDate: '2024-06-25' - provName: 国药集团公司YG6X1 + expdtDate: '2025-01-02' + productDate: '2024-06-26' + provName: 国药集团公司EJey4 provId: - viewId: '03838832' + viewId: '03838888' verifyFlag: 0 hasSterilize: 0 - id: '03838832' + id: '03838888' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004250","purMode":60,"goodsName":"新型冠状病毒检测试剂UZ5@q","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661198","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004281","purMode":60,"goodsName":"新型冠状病毒检测试剂4GWk!","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661229","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 966a45ad..009c2cc2 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024062500014 - CHECK_NO2: CHECKh03472024062500014 + CHECK_NO1: CHECKh03472024062600115 + CHECK_NO2: CHECKh03472024062600115 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 65c3adc9..2869154e 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -5,34 +5,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051359 + createUser: h0347_UID-051365 lastModifiedUser: billMode: '16' recType: stockKind: purMode: - sourceId: CHECKh03472024062500002 + sourceId: CHECKh03472024062600102 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: ddab2a8e526b415092dd22527c326c0d + deptId: f94c7beab2524e1eb14aa161d1feac8a deptName: - branchId: h0347-3695 + branchId: h0347-3701 branchName: taskType: 1 - sourceOrgId: p1e2c6 - sourceOrgName: 国药集团公司YG6X1 - sourceOrderNo: YS240625002 - taskSourceNo: PSh0347202406250006 - areaCode: areah03472460 + sourceOrgId: p1e2d0 + sourceOrgName: 国药集团公司EJey4 + sourceOrderNo: YS240626102 + taskSourceNo: PSh0347202406260019 + areaCode: areah03472488 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-06-25 07:10:07' + taskDate: '2024-06-26 13:48:29' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index c1e98f99..c086c67a 100644 --- a/data/b5_spd3_core_business_flow/message17 +++ b/data/b5_spd3_core_business_flow/message17 @@ -1,7 +1,7 @@ 验收单库存详情信息: list_a: - &id001 - - id: CHECKh034720240625000020001 + - id: CHECKh034720240626001020001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024062500002 - hosGoodsId: h034700004249 + pid: CHECKh03472024062600102 + hosGoodsId: h034700004280 batchCode: '333' - expdtDate: '2025-01-01' - productDate: '2024-06-25' + expdtDate: '2025-01-02' + productDate: '2024-06-26' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03838814' + srcBatchId: '03838870' srcBatchPrice: 99.9999 - shelfCode: areah03472460-2-01-01 + shelfCode: areah03472488-2-01-01 shelfKind: - barcodeId: UT240625000201 + barcodeId: UT240626001001 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202406250006 - distrDetailId: '03838814' + distrId: PSh0347202406260019 + distrDetailId: '03838870' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000042493332025-01-01100支/100 + viewId: h0347000042803332025-01-02100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03838814' - mdmGoodsCode: '11661197' - goodsCode: '00004249' + sourceDetailId: '03838870' + mdmGoodsCode: '11661228' + goodsCode: '00004280' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3695 - purBillId: Ch034720240625000043 - provId: p1e2c6 - provName: 国药集团公司YG6X1 + branchId: h0347-3701 + purBillId: Ch034720240626000054 + provId: p1e2d0 + provName: 国药集团公司EJey4 subSendFlag: 10 - exeProvId: p1e2c6 - exeProvName: 国药集团公司YG6X1 - purDetailId: b7ed3ba04dac46a3a7552af9e1415345 - goodsName: 一次性注射器_低值qPW6a + exeProvId: p1e2d0 + exeProvName: 国药集团公司EJey4 + purDetailId: 5fa29fb5d2744fb5849dd21cdb891f10 + goodsName: 一次性注射器_低值#c!$C goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: 7ffe292707c5454e9fd8fd68bda2e292 - supplyId: 8d6273b7bca84dd8aace12b9422d7fd6 - subProvId: p1e2c6 - subProvName: 国药集团公司YG6X1 + pkgDefId: 9affbca4b6bc42bb9603239a4f47748d + supplyId: b73baa3ec3634d088e6009b198757be1 + subProvId: p1e2d0 + subProvName: 国药集团公司EJey4 subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004249' + goodsCode: '00004280' purMode: 10 - goodsName: 一次性注射器_低值qPW6a + goodsName: 一次性注射器_低值#c!$C ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661197' + erpCode: '11661228' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 4b7bd115..fab0049f 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,52 +1,53 @@ 条码信息: list_a: - &id001 - id: UT2406250008020001 - snCode: UT2406250008020001 - ssccCode: '010839000019001015' - pkgCodeSee: 0136950000042500104444112406251725010121UT240625000802 - hosGoodsId: h034700004250 - hosGoodsCode: '00004250' - goodsCode: '00004250' - goodsName: 新型冠状病毒检测试剂UZ5@q + id: UT240626001602 + snCode: UT240626001602 + ssccCode: '010839000185876325' + pkgCodeSee: 0137010000042810104444112406261725010221UT240626001602 + hosGoodsId: h034700004281 + hosGoodsCode: '00004281' + goodsCode: '00004281' + goodsName: 新型冠状病毒检测试剂4GWk! goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 60 batchCode: '4444' - productDate: '2024-06-25' - expdtDate: '2025-01-01' - pkgDefName: - pkgDefQty: 1.0 - stockId: b93bcb0253534ea29ad7afb69efe855d - stockName: 二级检验科002库房 + productDate: '2024-06-26' + expdtDate: '2025-01-02' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: a5e9d4db55ca4fd482ce2a8f50d5d006 + stockName: 三级检测组003库房 areaName: 默认库区 - areaCode: areah03472459 + areaCode: areah03472485 lockStatus: 0 - unitName: 1支 - shelfCode: areah03472459-A-01-01 + unitName: 100支/100 + shelfCode: areah03472485-A-01-01 shelfNo: A01-A-01-01 - pkgDefId: - extInfo: '{"pkgUdi": "0136950000042500104444112406251725010121UT240625000802", - "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-06-25 - 08:24:37", "pkgBarcodeId": "UT240625000802"}' - bottleId: UT2406250008020001 - pkgType: '67' + pkgDefId: d2e7b571331e43368ffe9bd7f4d2e772 + extInfo: '{"pkgDefId": "d2e7b571331e43368ffe9bd7f4d2e772", "pkgDefQty": 100, "purBillId": + "CG2024062619768", "pkgDefName": "100", "distrBillId": "PSh0347202406260031", + "inStockTime": "2024-06-26 14:26:36", "distrDetailId": "03838882", "certificateCode": + ""}' + bottleId: + pkgType: '66' miDjmc: '' miCode: '' transferRatio: 1.0 qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司YG6X1 - provId: p1e2c6 - inStockDate: '2024-06-25 08:24:36' + provName: 国药集团公司EJey4 + provId: p1e2d0 + inStockDate: '2024-06-26 14:26:35' mfrCode: made: 德国 price: - barName: 1支 + barName: 100支/100 purModeText: 检验试剂 - codeType: 67 + codeType: 66 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index 6619b365..a12a5eb3 100644 --- a/data/b5_spd3_core_business_flow/message19 +++ b/data/b5_spd3_core_business_flow/message19 @@ -1,12 +1,12 @@ 产品信息: list_a: - &id001 - - hosGoodsId: h034700004248 - hosGoodsCode: '00004248' - provId: p1e2c6 - subProvId: p1e2c6 - subProvName: 国药集团公司YG6X1 - goodsName: 高值牙钻机boJ^l + - hosGoodsId: h034700004279 + hosGoodsCode: '00004279' + provId: p1e2d0 + subProvId: p1e2d0 + subProvName: 国药集团公司EJey4 + goodsName: 高值牙钻机aiJGu goodsSpec: G-31891 goodsGeneralName: goodsMfrsId: mfrs-11229 diff --git a/data/b5_spd3_core_business_flow/message2 b/data/b5_spd3_core_business_flow/message2 index 66ace9a7..b3409143 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260013_1 + MSPid: MSP2406260028_1 hosId: h0347 - hosGoodsId: h034700004265 - provGoodsid: provGood-99221453 - goodsAuditBillId: MSP2406260013 - targetId: MSP2406260013_1 + hosGoodsId: h034700004280 + provGoodsid: provGood-99221468 + goodsAuditBillId: MSP2406260028 + targetId: MSP2406260028_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index b19ee7cc..39f802a1 100644 --- a/data/b5_spd3_core_business_flow/message20 +++ b/data/b5_spd3_core_business_flow/message20 @@ -1,34 +1,34 @@ 二级库条码信息: list_a: - &id001 - id: '8800000001070798' - snCode: '8800000001070798' - ssccCode: '010839000185610127' - pkgCodeSee: '01000000000042481022221124062517250101218800000001070798' - hosGoodsId: h034700004248 - hosGoodsCode: '00004248' - goodsCode: '00004248' - goodsName: 高值牙钻机boJ^l + id: '8800000001071666' + snCode: '8800000001071666' + ssccCode: '010839000185876028' + pkgCodeSee: '01000000000042791022221124062617250102218800000001071666' + hosGoodsId: h034700004279 + hosGoodsCode: '00004279' + goodsCode: '00004279' + goodsName: 高值牙钻机aiJGu goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-06-25' - expdtDate: '2025-01-01' + productDate: '2024-06-26' + expdtDate: '2025-01-02' pkgDefName: pkgDefQty: 1.0 - stockId: b93bcb0253534ea29ad7afb69efe855d + stockId: a304d698ea7b43ac80964d338825012b stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472459 + areaCode: areah03472486 lockStatus: 0 unitName: 1支 - shelfCode: areah03472459-A-01-01 + shelfCode: areah03472486-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406250015", "inStockTime": - "2024-06-25 07:22:29", "useFrequency": 1, "distrDetailId": "03838823", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406260028", "inStockTime": + "2024-06-26 14:03:54", "useFrequency": 1, "distrDetailId": "03838879", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司YG6X1 - provId: p1e2c6 - inStockDate: '2024-06-25 07:22:29' + provName: 国药集团公司EJey4 + provId: p1e2d0 + inStockDate: '2024-06-26 14:03:54' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index b2c6ba7d..a42d6dae 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -1,14 +1,14 @@ 二级库请领产品信息: list_a: - &id001 - - hosGoodsId: h034700004250 + - hosGoodsId: h034700004281 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂UZ5@q + goodsName: 新型冠状病毒检测试剂4GWk! goodsSpec: G-31891 - mdmGoodsCode: '11661198' - goodsCode: '00004250' + mdmGoodsCode: '11661229' + goodsCode: '00004281' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -18,20 +18,20 @@ pkgQty: qty: 300.0 goodsImg: [] - pkgDefId: f121128ac98c4403a42071377783f2f5 + pkgDefId: d2e7b571331e43368ffe9bd7f4d2e772 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: e74d518c952741f388a2ceb6560c550c + deptId: a164fd08a56b448d978c2e48dabc64f6 deptName: areaCode: areaName: - targetDeptId: ddab2a8e526b415092dd22527c326c0d + targetDeptId: f94c7beab2524e1eb14aa161d1feac8a targetDeptName: 设备科001 - targetStockId: 4fcc223453af4fd0a202b81c28ef424a - targetStockName: 东土城路院区W!1gh中心库房 + targetStockId: d7e35cf14e9c4a89aa6befa525497649 + targetStockName: 东土城路院区!(BYi中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,7 +39,7 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司YG6X1 + provName: 国药集团公司EJey4 noRecPkgQty: 1.0 noRecQty: 100.0 autoUnpack: 0 diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index a887014d..0854bd8c 100644 --- a/data/b5_spd3_core_business_flow/message22 +++ b/data/b5_spd3_core_business_flow/message22 @@ -1,14 +1,14 @@ 库区信息: list_a: - &id001 - - id: 133af10380e74f438f399279d0728482 - lastModified: '2024-06-25 07:22:54' + - id: 99968abd895e4985bc5f46cb68d49221 + lastModified: '2024-06-26 14:04:20' version: 1 - createTime: '2024-06-25 07:03:35' - createUser: h0347_UID-051359 - lastModifiedUser: h0347_UID-051359 - stockId: b93bcb0253534ea29ad7afb69efe855d - shelfCode: areah03472459 + createTime: '2024-06-26 13:41:53' + createUser: h0347_UID-051365 + lastModifiedUser: h0347_UID-051365 + stockId: a304d698ea7b43ac80964d338825012b + shelfCode: areah03472486 shelfName: 默认库区 address: 二级检验科002 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051359 + linkman: h0347_UID-051365 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: e74d518c952741f388a2ceb6560c550c + deptId: a164fd08a56b448d978c2e48dabc64f6 areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index e16d2129..ecac6235 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260014_1 + MSPid: MSP2406260029_1 hosId: h0347 - hosGoodsId: h034700004266 - provGoodsid: provGood-99221454 - goodsAuditBillId: MSP2406260014 - targetId: MSP2406260014_1 + hosGoodsId: h034700004281 + provGoodsid: provGood-99221469 + goodsAuditBillId: MSP2406260029 + targetId: MSP2406260029_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 322d46b8..2e213fd0 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260015_1 + MSPid: MSP2406260030_1 hosId: h0347 - hosGoodsId: h034700004267 - provGoodsid: provGood-99221455 - goodsAuditBillId: MSP2406260015 - targetId: MSP2406260015_1 + hosGoodsId: h034700004282 + provGoodsid: provGood-99221470 + goodsAuditBillId: MSP2406260030 + targetId: MSP2406260030_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 60c600da..e396894d 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406260016_1 + MSPid: MSP2406260031_1 hosId: h0347 - hosGoodsId: h034700004268 - provGoodsid: provGood-99221456 - goodsAuditBillId: MSP2406260016 - targetId: MSP2406260016_1 + hosGoodsId: h034700004283 + provGoodsid: provGood-99221471 + goodsAuditBillId: MSP2406260031 + targetId: MSP2406260031_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 3c0e7f2f..31cd2781 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: c1eeab0a751d41a795363bfe7016ee6b - unitPackageid2: c1eeab0a751d41a795363bfe7016ee6b + unitPackageid1: d2e7b571331e43368ffe9bd7f4d2e772 + unitPackageid2: d2e7b571331e43368ffe9bd7f4d2e772 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 87e22ddf..e7a93cc7 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024062630097 - orderNo2: PLAN2024062630097 + orderNo1: PLAN2024062630185 + orderNo2: PLAN2024062630185 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 5f4d9e10..2cbb9cd3 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,35 +1,35 @@ 配送订单信息: list_a: - &id001 - - id: Ch034720240625000076 - lastModified: '2024-06-25 07:36:18' + - id: Ch034720240626000087 + lastModified: '2024-06-26 14:18:26' version: 0 - createTime: '2024-06-25 07:36:18' - createUser: h0347_UID-051359 + createTime: '2024-06-26 14:18:26' + createUser: h0347_UID-051365 lastModifiedUser: - orderNo: CG2024062519663 + orderNo: CG2024062619774 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3695 + branchId: h0347-3701 deptId: deptName: - recOrgId: e74d518c952741f388a2ceb6560c550c + recOrgId: a164fd08a56b448d978c2e48dabc64f6 recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240625026613 + sourceId: Ph034720240626026831 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e2c6 - provName: 国药集团公司YG6X1 + provId: p1e2d0 + provName: 国药集团公司EJey4 subSendFlag: - exeProvId: p1e2c6 - exeProvName: 国药集团公司YG6X1 + exeProvId: p1e2d0 + exeProvName: 国药集团公司EJey4 billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区W!1gh + branchName: 东土城路院区!(BYi sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024062529968 + planOrderNo: PLAN2024062630186 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 2c63d26c..4dde37b2 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,22 +1,22 @@ 配送订单详细信息: list_a: - &id001 - - id: 3ca2c386416f420dbd6f0757d92e6b01 + - id: 555d2316885b414f99a0683b594b8384 lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240625000076 - orderNo: CG2024062519663 - sourceId: 44b2e11e354847caab8a7bd1e2b0d4c9 - hosGoodsId: h034700004250 - mdmGoodsCode: '11661198' - goodsCode: '00004250' + pid: Ch034720240626000087 + orderNo: CG2024062619774 + sourceId: 3af3399cfd2f49e69784fdf09795a7bf + hosGoodsId: h034700004281 + mdmGoodsCode: '11661229' + goodsCode: '00004281' purMode: 60 price: '99.9999' - supplyId: 7795585dd8a448cf9733f436b4fd6fd7 - pkgDefId: f121128ac98c4403a42071377783f2f5 + supplyId: a43b723dd03d43ed899f3878615417c9 + pkgDefId: d2e7b571331e43368ffe9bd7f4d2e772 pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240625026613","buyDetailId":"Bh034720240625000150001","planDetailId":"44b2e11e354847caab8a7bd1e2b0d4c9"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004250","purMode":60,"goodsName":"新型冠状病毒检测试剂UZ5@q"}' + detailRelationJson: '{"planBillId":"Ph034720240626026831","buyDetailId":"Bh034720240626000150001","planDetailId":"3af3399cfd2f49e69784fdf09795a7bf"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004281","purMode":60,"goodsName":"新型冠状病毒检测试剂4GWk!"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂UZ5@q + goodsName: 新型冠状病毒检测试剂4GWk! mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11661198' - erpCode: '11661198' + mdmGoodsSpecCode: '11661229' + erpCode: '11661229' made: 德国 goodsDi: '01123456789012' miDjmc: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '36950000042500' + diUse: '37010000042810' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e2c6 - subProvName: 国药集团公司YG6X1 + subProvId: p1e2d0 + subProvName: 国药集团公司EJey4 subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 -- GitLab