diff --git "a/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" "b/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" index 1c5aa6cc119e5a8211ad73b10731e9cf8904f8b9..a0a3c45941a4fbd9dae5cd756e590042bbd13b33 100644 --- "a/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" +++ "b/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241 \344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" @@ -294,132 +294,177 @@ def second_center_Stock_return_Out(type): # 中心库退供应商 result = commonFuc().http_post(url, request_body, headers) print('result', result) elif type == 1: - print('低值耗材或者试剂退库出库') - udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_pick_scan_url") - # 从message18文件中获取信息 + 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) + 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")) + # 从文件中获取必要信息 info = FileUtils().r_info8(module, "条码信息", 'message18') # print('info', info) list_a = info['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) - 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) + # 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'] + break + 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, "payload19", areaCode, UTid, createTime, UTid, 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, provId, provName, subProvId, + subProvName, + hosGoodsCode, subSendFlag, onlyKey, areaName, hosId, + get_branch_id(), + deptid1, deptName, stockId) + print('request_body', 'ccccccc', request_body) - request_body = commonFuc().get_business_data(module, "payload65", udi_code, stockId, deptId2, areaCode, - areaName, - targetStockId, targetDeptId) - print('request_body', request_body) + # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) - print('退库出库扫码result', result) - - # 获取必要信息 - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - data1 = commonFuc().analysis_json('data', result) - areaCode = commonFuc().analysis_json('areaCode', data1) - UTid = commonFuc().analysis_json('id', data1) - createTime = commonFuc().analysis_json('id', data1) - stockId = commonFuc().analysis_json('stockId', data1) - areaCode = commonFuc().analysis_json('areaCode', data1) - areaName = commonFuc().analysis_json('areaName', data1) - shelfCode = commonFuc().analysis_json('shelfCode', data1) - codeType = commonFuc().analysis_json('codeType', data1) - tagType = commonFuc().analysis_json('tagType', data1) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1) - mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1) - goodsCode = commonFuc().analysis_json('goodsCode', data1) - goodsDi = commonFuc().analysis_json('goodsDi', 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) - pkgCode = commonFuc().analysis_json('pkgCode', data1) - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data1) - ssccCode = commonFuc().analysis_json('ssccCode', data1) - tbStatus = commonFuc().analysis_json('tbStatus', data1) - ext = commonFuc().analysis_json('ext', data1) - distrDetailId = commonFuc().analysis_json('distrDetailId', ext) - distrBillId = commonFuc().analysis_json('distrBillId', ext) - purBillId = commonFuc().analysis_json('purBillId', ext) - pkgDefQty = commonFuc().analysis_json('pkgDefQty', ext) - pkgDefId = commonFuc().analysis_json('pkgDefId', ext) - pkgDefName = commonFuc().analysis_json('pkgDefName', ext) - 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) - pkgDefId = commonFuc().analysis_json('pkgDefId', data1) - # pkgDefQty=commonFuc().analysis_json('pkgDefQty',data1) - pkgDefName = commonFuc().analysis_json('pkgDefName', data1) - printNum = commonFuc().analysis_json('printNum', data1) - made = commonFuc().analysis_json('made', data1) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) - sourceId = commonFuc().analysis_json('sourceId', data1) - price = commonFuc().analysis_json('price', data1) - purModeText = commonFuc().analysis_json('purModeText', data1) - version = commonFuc().analysis_json('version', 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) - print('extInfo', extInfo) - # inStockTime = commonFuc().analysis_json('inStockTime', extInfo) - inStockTime = reGetString(extInfo, 'inStockTime\"\: \"', '\"\, \"distrDetailId') - print('inStockTime', inStockTime) - # 从message18文件中获取信息 + print('result', result) + PICK_ID = commonFuc().analysis_json('data', result) + # =====================出库复核列表查询获取pickid=============== url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_out_submit_url") - - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] - deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"] - deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] - stockName2 = deptName2 + "库房" - createTime = timeUtils().get_time_hms(1) - request_body = "request_body" - mgrCorpName = get_hosname() - mgrRangeId = deptid2 - mgrRangeName = deptName2 - extStr1 = get_branch_name() - extStr3 = get_branch_name() - snCode = UTid - userLoginCode = username - cname = username - orgCode1 = get_orgCode() - orgName1 = get_orgName() + "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) - request_body = commonFuc().get_business_data(module, "payload50_2_4", stockId, deptId2, areaCode, - areaName,targetStockId,targetDeptId, - uxid, userLoginCode, cname, get_hosid(), get_branch_id(), - deptid1, - orgCode1, orgName1, get_hosid(), get_hosid(), mgrCorpName, - get_branch_id(), - get_branch_name(), mgrRangeId, mgrRangeName, extStr1, extStr3, - get_hosid(), stockId,deptId2, - areaCode, areaName, targetStockId, targetDeptId, UTid,createTime,snCode, - get_hosid(), stockId, areaCode, areaName, shelfCode, - codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi, - barName, - batchCode, expdtDate, productDate, pkgCode, pkgCodeSee, - ssccCode, - tbStatus, pkgDefId,purBillId, - distrBillId, - inStockTime, distrDetailId,purMode, price, goodsMfrsName, - goodsSpec, unit, goodsName,pkgDefId,pkgDefName,made, unitName, - hosGoodsCode, purModeText) + # =====================出库复核列表查询获取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) print('request_body', request_body) # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) - print('低值产品退库出库，result', result) + print('herpService_stock_review_pass_submit_urlresult', result) + # ========出库复核提交 elif type == 3: print('试剂产品退库出库') udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3 @@ -552,10 +597,10 @@ def second_center_Stock_return_Out(type): # 中心库退供应商 try: updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库 - second_center_Stock_return_Out(2) #高值耗材退货出库 + # second_center_Stock_return_Out(2) #高值耗材退货出库 # approval_center()#审批 # putaway()#中心库上架 - # second_center_Stock_return_Out(1) #低值耗材退货出库 + second_center_Stock_return_Out(1) #低值耗材退货出库 # approval_center() # 审批 # putaway() # 中心库上架 # second_center_Stock_return_Out(3) #试剂耗材退货出库 diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 5db0a60fab954e0bc4469a194aea3881929c4ac2..48b08471fee2af8b7099310acf046d044e16819c 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406180076 - cname: 国药集团公司gFOwi + e_id: CR202406190038 + cname: 国药集团公司Z6F#v diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index b300ae325d312e09a89df958bb1b24efad696d90..bdc6e9c2ee8c4ed9ad58b88c3491c8a56e8cda2f 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院GF(j) - h_name: 湖南省人民医院GF(j) + h_id: 湖南省人民医院@RtSG + h_name: 湖南省人民医院@RtSG diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 6e077f19122a1288a7342872108728bba9024c99..0b96bb28e4148589f82e2d63284f33f4c261590d 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406180021_1 + MSPid: MSP2406190011_1 hosId: h0347 - hosGoodsId: h034700004173 - provGoodsid: provGood-99221361 - goodsAuditBillId: MSP2406180021 - targetId: MSP2406180021_1 + hosGoodsId: h034700004184 + provGoodsid: provGood-99221372 + goodsAuditBillId: MSP2406190011 + targetId: MSP2406190011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 86bef4ce23434bab3c80551c9e8713bf56657285..26948adedd82d376e517d043981d63818da7b39c 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202407' - pid: OBh0347202406180005 - hosGoodsId: h034700004170 - goodsCode: '00004170' - goodsName: 一次性注射器_低值D4tGq + pid: OBh0347202406190004 + hosGoodsId: h034700004181 + goodsCode: '00004181' + goodsName: 一次性注射器_低值YxUS@ goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,14 +20,14 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202406180005 + - pid: OBh0347202406190004 settleMonth: '202407' - accountDate: '2024-06-18' - hosGoodsId: h034700004170 + accountDate: '2024-06-19' + hosGoodsId: h034700004181 batchCode: '333' - distrDetailId: '03838557' - distrId: PSh0347202406180020 - distrOrderNo: PSh0347202406180020 + distrDetailId: '03838584' + distrId: PSh0347202406190005 + distrOrderNo: PSh0347202406190005 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -36,11 +36,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e2aa - branchId: h0347-3681 - balanceDetId: OBh0347202406180005-000001 + provId: p1e2ae + branchId: h0347-3684 + balanceDetId: OBh0347202406190004-000001 purMode: 10 - barCode: 013681000004170010333112406181724122521UT240618000802 + barCode: 013684000004181010333112406191724122621UT240619000202 batchId: price: maxQty: @@ -53,15 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202406180005h034700004170 - - pid: OBh0347202406180005 + viewId: 202407OBh0347202406190004h034700004181 + - pid: OBh0347202406190004 settleMonth: '202407' - accountDate: '2024-06-18' - hosGoodsId: h034700004170 + accountDate: '2024-06-19' + hosGoodsId: h034700004181 batchCode: '333' - distrDetailId: '03838557' - distrId: PSh0347202406180020 - distrOrderNo: PSh0347202406180020 + distrDetailId: '03838584' + distrId: PSh0347202406190005 + distrOrderNo: PSh0347202406190005 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -70,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e2aa - branchId: h0347-3681 - balanceDetId: OBh0347202406180005-000002 + provId: p1e2ae + branchId: h0347-3684 + balanceDetId: OBh0347202406190004-000002 purMode: 10 - barCode: 013681000004170010333112406181724122521UT240618000846 + barCode: 013684000004181010333112406191724122621UT240619000202 batchId: price: maxQty: @@ -87,10 +87,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202406180005h034700004170 - unique: 202407OBh0347202406180005h034700004170 + viewId: 202407OBh0347202406190004h034700004181 + unique: 202407OBh0347202406190004h034700004181 onlineKind: '10' - viewId: 202407OBh0347202406180005h034700004170 + viewId: 202407OBh0347202406190004h034700004181 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index bcee588ac6c0d497b7bed916bac60ae360d9df20..7b984a8a8866e5b02007f5f26c2624010386667e 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3681 - branch_name: 东土城路院区!IhMl + branch_id: h0347-3684 + branch_name: 东土城路院区L3*Gp 科室信息: - dept2_id: 841867446f2943f98fc5e32eb3d096a4 + dept2_id: f30e982dcac741ccab5c8ad19e52bc08 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index a5fb0756be7cff8da0a27006a6c923f33a778038..67d5d7bf1d38dadf096f50abd14ee2bff14a8efb 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试8M)(@ - username2: 自动化测试8M)(@ + username1: 自动化测试71LE8 + username2: 自动化测试71LE8 diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index af51eef847ea4a06f61d8696467923e3c31f6187..2748a734305459b9b66b3cd42114ad14a1354af5 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: fc63d8b32f764950916d8ebd54cfb292 + dept1_id: 1589537ac5ce4e6fa00c04e8b9c99a53 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index 35178d85009971547b9faced546d74d2c8a15626..9d6caaf9724398e103e6f4019d444d2e397e7f31 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: fc63d8b32f764950916d8ebd54cfb292 - stockAreaId: 748ea274a2cd4f1e809dc34eaf6f71df + dept1_id: 1589537ac5ce4e6fa00c04e8b9c99a53 + stockAreaId: 1a1df9332eb84328aa8c57023d8570ff diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index a156ca9217fd355430a3b942f9b1671276edac04..e165dd40c99012a815f11f911596d1c6e353403c 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: fc63d8b32f764950916d8ebd54cfb292 - deptid2: 841867446f2943f98fc5e32eb3d096a4 - deptid3: ec3821ff59384808871a2a10458b564b - deptid4: 3e3d90abd5744f59b3f8a747df56bdd0 - deptid5: 34fc2c77ac44430382834b2282846ede + deptid1: 1589537ac5ce4e6fa00c04e8b9c99a53 + deptid2: f30e982dcac741ccab5c8ad19e52bc08 + deptid3: f5ed5089eb4d41ea807d13923e5b4fc4 + deptid4: 769085be24064d8f911f9b55b8d9052b + deptid5: c830e366e0a94e7786d0aa89d4897892 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index e80c7b0d6d92d287ab47d454a5752dcdf09947ef..0d00ad73870827a88a08347deda2f66f4d94fa3b 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 748ea274a2cd4f1e809dc34eaf6f71df - shelfCode: areah03472376 + shelfid: 1a1df9332eb84328aa8c57023d8570ff + shelfCode: areah03472395 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 6ac3f1c1d78455e532b8f00de9e14e65c6898093..166233c43066bbdd49cc8e2e3038b06fd2b89772 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e2aa + e_corpId: p1e2ae h_corpId: h0347 - e_username: 国药集团公司gFOwi + e_username: 国药集团公司Z6F#v h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 51d17de46585f633485ea6c54222496045724f0d..3130ab57a13d1b50b5e22b58f37a8802e1235c40 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406180017_1 + MSPid: MSP2406190007_1 hosId: h0347 - hosGoodsId: h034700004169 - provGoodsid: provGood-99221357 - goodsAuditBillId: MSP2406180017 - targetId: MSP2406180017_1 + hosGoodsId: h034700004180 + provGoodsid: provGood-99221368 + goodsAuditBillId: MSP2406190007 + targetId: MSP2406190007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 443b2c85392deff15975a4c18b8e943d45a74a23..e7e838c31cde8b3c58dd476a0785cba790e1c5d1 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406180036 - distrBillId2: PSh0347202406180036 + distrBillId1: PSh0347202406190046 + distrBillId2: PSh0347202406190046 高值配送单号: - distrBillId1: PSh0347202406180037 - distrBillId2: PSh0347202406180037 + distrBillId1: PSh0347202406190047 + distrBillId2: PSh0347202406190047 试剂配送单号: - distrBillId1: PSh0347202406180038 - distrBillId2: PSh0347202406180038 + distrBillId1: PSh0347202406190048 + distrBillId2: PSh0347202406190048 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 4026a060c2039d8fb8a21d2288e08c523a9a02c7..e26661614c238c6467e80099aff3ee5cea009b6e 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024061829162 - orderNo2: PLAN2024061829162 + orderNo1: PLAN2024061929302 + orderNo2: PLAN2024061929302 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 73ebd6fc6c8091c6c01f211339508049251199ab..4a5970092fd91d41dac1d3d1a98736e11e5ac1fb 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024061829164 - orderNo2: PLAN2024061829164 + orderNo1: PLAN2024061929301 + orderNo2: PLAN2024061929301 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 5bc0896aca7e708eeb7db7947d40415034b30135..ddb573edf2c826e60592cb46d03da58f2766bde1 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-3681 + branchId: h0347-3684 deptId: taskType: 1 - sourceOrgId: p1e2aa - sourceOrgName: 国药集团公司gFOwi - sourceOrderNo: PSh0347202406180038 + sourceOrgId: p1e2ae + sourceOrgName: 国药集团公司Z6F#v + sourceOrderNo: PSh0347202406190048 billMode: '66' stockKind: purMode: - sourceId: PSh0347202406180038 + sourceId: PSh0347202406190048 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024061829164 - purOrderNo: CG2024061819122 - recOrgId: 841867446f2943f98fc5e32eb3d096a4 + planOrderNo: PLAN2024061929301 + purOrderNo: CG2024061919213 + recOrgId: f30e982dcac741ccab5c8ad19e52bc08 recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024061800015","planBillId":"Ph034720240618025809","planOrderNo":"PLAN2024061829164","buyOrderNo":"BUY2024061805110","purOrderNo":"CG2024061819122","purBillId":"Ch034720240618000120","purBillDate":"2024-06-18 - 10:44:44","distrBillId":"PSh0347202406180038","distrOrderNo":"PSh0347202406180038"}' - taskDate: '2024-06-18 10:45:24' + billRelationJson: '{"buyBillId":"Bh03472024061900013","planBillId":"Ph034720240619025946","planOrderNo":"PLAN2024061929301","buyOrderNo":"BUY2024061905134","purOrderNo":"CG2024061919213","purBillId":"Ch034720240619000084","purBillDate":"2024-06-19 + 11:18:07","distrBillId":"PSh0347202406190048","distrOrderNo":"PSh0347202406190048"}' + taskDate: '2024-06-19 11:18:52' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 8292e90a2a83e261e2ac6eeede0452423949fb8c..5a817b3bde6759193c6e180e854151bea367ed33 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: h034700004171 + hosGoodsId: h034700004182 mdmGoodsCode: - spdGoodsCode: '11661120' - goodsCode: '00004171' - goodsName: 新型冠状病毒检测试剂IkfpG + spdGoodsCode: '11661131' + goodsCode: '00004182' + goodsName: 新型冠状病毒检测试剂)IWA8 goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2024-12-25' - productDate: '2024-06-18' - provName: 国药集团公司gFOwi + expdtDate: '2024-12-26' + productDate: '2024-06-19' + provName: 国药集团公司Z6F#v provId: - viewId: '03838575' + viewId: '03838618' verifyFlag: 0 hasSterilize: 0 - id: '03838575' + id: '03838618' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004171","purMode":60,"goodsName":"新型冠状病毒检测试剂IkfpG","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661120","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004182","purMode":60,"goodsName":"新型冠状病毒检测试剂)IWA8","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661131","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 @@ -56,6 +56,7 @@ multiChargeFlag: 0 useFrequency: 1 codingType: 0 + limitMessage: list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 137647b839c1121a7a68620e710c5811f67ce109..cfec9791580cb6f1330deaf834d9cb99ef7e8819 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024061800016 - CHECK_NO2: CHECKh03472024061800016 + CHECK_NO1: CHECKh03472024061900019 + CHECK_NO2: CHECKh03472024061900019 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 3d1484162a20aad5626269b84e5e47267037f982..643007902d641192345204cc72b61895350a3556 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-051346 + createUser: h0347_UID-051348 lastModifiedUser: billMode: '16' recType: stockKind: purMode: - sourceId: CHECKh03472024061800004 + sourceId: CHECKh03472024061900002 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: fc63d8b32f764950916d8ebd54cfb292 + deptId: 1589537ac5ce4e6fa00c04e8b9c99a53 deptName: - branchId: h0347-3681 + branchId: h0347-3684 branchName: taskType: 1 - sourceOrgId: p1e2aa - sourceOrgName: 国药集团公司gFOwi - sourceOrderNo: YS240618004 - taskSourceNo: PSh0347202406180020 - areaCode: areah03472376 + sourceOrgId: p1e2ae + sourceOrgName: 国药集团公司Z6F#v + sourceOrderNo: YS240619002 + taskSourceNo: PSh0347202406190005 + areaCode: areah03472395 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-06-18 10:16:19' + taskDate: '2024-06-19 07:12:32' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 53e7cff64e60bdc6f92d8c6997e512e170273f28..7703a909f0f8069a1ecbc8c872daa873b88b1db1 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: CHECKh034720240618000040001 + - id: CHECKh034720240619000020001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024061800004 - hosGoodsId: h034700004170 + pid: CHECKh03472024061900002 + hosGoodsId: h034700004181 batchCode: '333' - expdtDate: '2024-12-25' - productDate: '2024-06-18' + expdtDate: '2024-12-26' + productDate: '2024-06-19' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03838557' + srcBatchId: '03838584' srcBatchPrice: 99.9999 - shelfCode: areah03472376-2-01-01 + shelfCode: areah03472395-2-01-01 shelfKind: - barcodeId: UT240618000801 + barcodeId: UT240619000201 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202406180020 - distrDetailId: '03838557' + distrId: PSh0347202406190005 + distrDetailId: '03838584' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000041703332024-12-25100支/100 + viewId: h0347000041813332024-12-26100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03838557' - mdmGoodsCode: '11661119' - goodsCode: '00004170' + sourceDetailId: '03838584' + mdmGoodsCode: '11661130' + goodsCode: '00004181' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3681 - purBillId: Ch034720240618000087 - provId: p1e2aa - provName: 国药集团公司gFOwi + branchId: h0347-3684 + purBillId: Ch034720240619000043 + provId: p1e2ae + provName: 国药集团公司Z6F#v subSendFlag: 10 - exeProvId: p1e2aa - exeProvName: 国药集团公司gFOwi - purDetailId: 5a9052477c5a4fb4ad5c2d35da7cb7c2 - goodsName: 一次性注射器_低值D4tGq + exeProvId: p1e2ae + exeProvName: 国药集团公司Z6F#v + purDetailId: 03c9834e6d4b46b3ab0cfac981b1c533 + goodsName: 一次性注射器_低值YxUS@ goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: 6a72ee6d39dc4c2fb68511c3f43e5cec - supplyId: a588a1647e4c43f2a39c0b62905be306 - subProvId: p1e2aa - subProvName: 国药集团公司gFOwi + pkgDefId: b7017f07562043248982017d4690f17c + supplyId: d2e06e2176be47c68d0f18105b8f52b7 + subProvId: p1e2ae + subProvName: 国药集团公司Z6F#v subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004170' + goodsCode: '00004181' purMode: 10 - goodsName: 一次性注射器_低值D4tGq + goodsName: 一次性注射器_低值YxUS@ ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661119' + erpCode: '11661130' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 6b28eebd319ba3fd43d922bbb47c097f820f847e..ad0222c0ee7b137bc0067da3bb6a8567a4533dda 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,53 +1,119 @@ 条码信息: list_a: - &id001 - id: UT240618001402 - snCode: UT240618001402 - ssccCode: '010839000184853822' - pkgCodeSee: 0136810000041710104444112406181724122521UT240618001402 - hosGoodsId: h034700004171 - hosGoodsCode: '00004171' - goodsCode: '00004171' - goodsName: 新型冠状病毒检测试剂IkfpG - goodsSpec: G-31891 - goodsMfrsName: 德国歌德公司 Geuder AG - unit: 支 - purMode: 60 - batchCode: '4444' - productDate: '2024-06-18' - expdtDate: '2024-12-25' - pkgDefName: '100' - pkgDefQty: 100.0 - stockId: 581f3e9c002a45dd9c660928d3f86bfb - stockName: 二级检验科002库房 - areaName: 默认库区 - areaCode: areah03472373 - lockStatus: 0 - unitName: 100支/100 - shelfCode: areah03472373-A-01-01 - shelfNo: A01-A-01-01 - pkgDefId: 64e44170045f437983f34884f8f89fa7 - extInfo: '{"pkgDefId": "64e44170045f437983f34884f8f89fa7", "pkgDefQty": 100, "purBillId": - "CG2024061819116", "pkgDefName": "100", "distrBillId": "PSh0347202406180032", - "inStockTime": "2024-06-18 10:39:06", "distrDetailId": "03838569", "certificateCode": - ""}' - bottleId: - pkgType: '66' - miDjmc: '' - miCode: '' - transferRatio: 1.0 - qty: 1 - shelfKind: 0 - shelfKindName: 普通货位 - provName: 国药集团公司gFOwi - provId: p1e2aa - inStockDate: '2024-06-18 10:39:06' - mfrCode: - made: 德国 - price: - barName: 100支/100 - purModeText: 检验试剂 - codeType: 66 + - id: UT240619000204 + lastModified: + version: + createTime: '2024-06-19 07:10:42' + createUser: + lastModifiedUser: + snCode: UT240619000204 + hosId: h0347 + branchId: + stockId: 788e923ee3aa4b0cb516a0d8d9d98498 + areaCode: areah03472395 + areaName: 自动化测试 + shelfCode: areah03472395-2-01-01 + codeType: 16 + tagType: 0 + hosGoodsId: h034700004181 + mdmGoodsCode: '11661130' + goodsCode: '00004181' + goodsDi: '36840000041810' + barName: 100支/100 + batchCode: '333' + expdtDate: '2024-12-26' + productDate: '2024-06-19' + mfrCode: + mfrCodeSee: + pkgCode: "013684000004181010333\x1D112406191724122621UT240619000204" + pkgCodeSee: 013684000004181010333112406191724122621UT240619000204 + ssccCode: '010839000184885021' + extInfo: + outId: + tbStatus: 20 + goodsCodeDi: + barcodeId: + ext: + pkgDefId: b7017f07562043248982017d4690f17c + pkgDefQty: 100 + purBillId: CG2024061919172 + pkgDefName: '100' + distrBillId: PSh0347202406190005 + inStockTime: '2024-06-19 07:19:54' + distrDetailId: '03838584' + certificateCode: '' + sourceDetailId: + purMode: 10 + purModes: + price: + pid: + goodsMfrsName: 德国歌德公司 Geuder AG + mfrsName: + goodsSpec: G-31891 + unit: 支 + goodsName: 一次性注射器_低值YxUS@ + pkgDefId: b7017f07562043248982017d4690f17c + pkgDefQty: 100 + defaultPkgDefQty: + defaultQty: + defaultSurplusQty: + defaultPkgDefId: + purDetailId: + pkgDefName: '100' + printNum: 0 + deptId: + deptName: + billId: + taskId: + made: 德国 + provId: p1e2ae + provName: 国药集团公司Z6F#v + subProvId: p1e2ae + subProvName: 国药集团公司Z6F#v + provHosGoodsId: + sourceType: + taskDate: + sourceOrderNo: + taskType: + detailId: + branchGoodsPkgDefList: + unitName: + areaCodeList: + diType: + mdmGoodsSpecCode: + hosGoodsCode: '00004181' + supplyId: + inSettlement: + spdGoodsCode: + codeKind: + brand: + miCode: + transferRatio: 1.0 + miDjmc: + tbStatusList: + purModeText: + stockName: + tbStatusText: + pkgType: + bottleId: + pkgStatus: + qty: + packUnit: + minSaleQty: + rfidFlag: + mfrCodeFlag: + scanStatus: + scanId: + multiChargeFlag: + useFrequency: + chargeUnit: + lockStatus: + remark: + hosBatchId: + settleFlag: + inStockTime: + subSendFlag: 10 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index 2423d09aa24a72de8140bde83c81628dda8af620..f7056b8ec0410e2ec2f668ea7ddea037c00f01b6 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: h034700004169 - hosGoodsCode: '00004169' - provId: p1e2aa - subProvId: p1e2aa - subProvName: 国药集团公司gFOwi - goodsName: 高值牙钻机@xK^5 + - hosGoodsId: h034700004180 + hosGoodsCode: '00004180' + provId: p1e2ae + subProvId: p1e2ae + subProvName: 国药集团公司Z6F#v + goodsName: 高值牙钻机PU$H^ 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 234ff9a8fdb2579d10ffa3b759055c75f9c995cd..f7d7bc55674c2b72a85e45534c3f8db68e5e3ba5 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406180018_1 + MSPid: MSP2406190008_1 hosId: h0347 - hosGoodsId: h034700004170 - provGoodsid: provGood-99221358 - goodsAuditBillId: MSP2406180018 - targetId: MSP2406180018_1 + hosGoodsId: h034700004181 + provGoodsid: provGood-99221369 + goodsAuditBillId: MSP2406190008 + targetId: MSP2406190008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index d31ce461bd862ee532050fb62322e50b58b4e558..87821413315317b039110fa66349d940ea753965 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: '8800000001068210' - snCode: '8800000001068210' - ssccCode: '010839000184853525' - pkgCodeSee: '01000000000041691022221124061817241225218800000001068210' - hosGoodsId: h034700004169 - hosGoodsCode: '00004169' - goodsCode: '00004169' - goodsName: 高值牙钻机@xK^5 + id: '8800000001068614' + snCode: '8800000001068614' + ssccCode: '010839000184974725' + pkgCodeSee: '01000000000041801022221124061917241226218800000001068614' + hosGoodsId: h034700004180 + hosGoodsCode: '00004180' + goodsCode: '00004180' + goodsName: 高值牙钻机PU$H^ goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-06-18' - expdtDate: '2024-12-25' + productDate: '2024-06-19' + expdtDate: '2024-12-26' pkgDefName: pkgDefQty: 1.0 - stockId: 581f3e9c002a45dd9c660928d3f86bfb + stockId: 19846ed1d3434641bdf5745ddadb00c1 stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472373 + areaCode: areah03472393 lockStatus: 0 unitName: 1支 - shelfCode: areah03472373-A-01-01 + shelfCode: areah03472393-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406180029", "inStockTime": - "2024-06-18 10:30:15", "useFrequency": 1, "distrDetailId": "03838566", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406190014", "inStockTime": + "2024-06-19 11:03:20", "useFrequency": 1, "distrDetailId": "03838593", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司gFOwi - provId: p1e2aa - inStockDate: '2024-06-18 10:30:14' + provName: 国药集团公司Z6F#v + provId: p1e2ae + inStockDate: '2024-06-19 11:03:20' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index c18888ea26ff902618cec2cb372b24828921a874..423f7b0b84369e6fd95bc9b72de3f57dc2751395 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: h034700004171 + - hosGoodsId: h034700004182 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂IkfpG + goodsName: 新型冠状病毒检测试剂)IWA8 goodsSpec: G-31891 - mdmGoodsCode: '11661120' - goodsCode: '00004171' + mdmGoodsCode: '11661131' + goodsCode: '00004182' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -18,20 +18,20 @@ pkgQty: qty: 300.0 goodsImg: [] - pkgDefId: 64e44170045f437983f34884f8f89fa7 + pkgDefId: 435edbc5f99541a29447e6d3703a461a buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 841867446f2943f98fc5e32eb3d096a4 + deptId: f30e982dcac741ccab5c8ad19e52bc08 deptName: areaCode: areaName: - targetDeptId: fc63d8b32f764950916d8ebd54cfb292 + targetDeptId: 1589537ac5ce4e6fa00c04e8b9c99a53 targetDeptName: 设备科001 - targetStockId: bd5e7522df07403db5cb95604d2bcbb2 - targetStockName: 东土城路院区!IhMl中心库房 + targetStockId: 788e923ee3aa4b0cb516a0d8d9d98498 + targetStockName: 东土城路院区L3*Gp中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,7 +39,7 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司gFOwi + provName: 国药集团公司Z6F#v noRecPkgQty: 1.0 noRecQty: 100.0 autoUnpack: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index fafc68fadc3fb3b2350a7fdbb23304c6a81b11ee..feb28c893bc5184af058442a6bc3dd82d4d91168 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: 900f30591f3a45bcba8517d08082916f - lastModified: '2024-06-18 10:50:51' + - id: 98534bb3804a40448b6d2dfbd19590f4 + lastModified: '2024-06-19 11:24:20' version: 1 - createTime: '2024-06-18 10:08:22' - createUser: h0347_UID-051346 - lastModifiedUser: h0347_UID-051346 - stockId: 6e25e19bbe05485a9fa0e91b7041cdc3 - shelfCode: areah03472374 + createTime: '2024-06-19 07:05:11' + createUser: h0347_UID-051348 + lastModifiedUser: h0347_UID-051348 + stockId: e357dee580394540ad29b7184286d134 + shelfCode: areah03472394 shelfName: 默认库区 address: 三级检测组003 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051346 + linkman: h0347_UID-051348 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: ec3821ff59384808871a2a10458b564b + deptId: f5ed5089eb4d41ea807d13923e5b4fc4 areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 33b3aaca57ede3ac941431436ac7840c3046379a..1f8476ea0a91684be57490baee1de117de72ac95 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406180019_1 + MSPid: MSP2406190009_1 hosId: h0347 - hosGoodsId: h034700004171 - provGoodsid: provGood-99221359 - goodsAuditBillId: MSP2406180019 - targetId: MSP2406180019_1 + hosGoodsId: h034700004182 + provGoodsid: provGood-99221370 + goodsAuditBillId: MSP2406190009 + targetId: MSP2406190009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 78a9197e2459816162130dcbfe045112094d0b9c..a0f93b9e883e63f8327c80666376165d382e6a33 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406180020_1 + MSPid: MSP2406190010_1 hosId: h0347 - hosGoodsId: h034700004172 - provGoodsid: provGood-99221360 - goodsAuditBillId: MSP2406180020 - targetId: MSP2406180020_1 + hosGoodsId: h034700004183 + provGoodsid: provGood-99221371 + goodsAuditBillId: MSP2406190010 + targetId: MSP2406190010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 6e077f19122a1288a7342872108728bba9024c99..0b96bb28e4148589f82e2d63284f33f4c261590d 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406180021_1 + MSPid: MSP2406190011_1 hosId: h0347 - hosGoodsId: h034700004173 - provGoodsid: provGood-99221361 - goodsAuditBillId: MSP2406180021 - targetId: MSP2406180021_1 + hosGoodsId: h034700004184 + provGoodsid: provGood-99221372 + goodsAuditBillId: MSP2406190011 + targetId: MSP2406190011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 272b9138cce41854d4e1545c4486f99ec83b9a35..22252b31b1cec5b7b3c8759716aaf20eda48a93e 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 64e44170045f437983f34884f8f89fa7 - unitPackageid2: 64e44170045f437983f34884f8f89fa7 + unitPackageid1: 435edbc5f99541a29447e6d3703a461a + unitPackageid2: 435edbc5f99541a29447e6d3703a461a diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index a83669234fc2064e5258cfe6c906777828325fbf..80d16145a9c195b94bb95b30a7e8e6206e25fa89 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024061829163 - orderNo2: PLAN2024061829163 + orderNo1: PLAN2024061929303 + orderNo2: PLAN2024061929303 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 9a14e7e4154f0bf7da4769ed881306dac6493577..dc23c8d66cdfe379c02c23cd15bd3e2b7a9cd864 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: Ch034720240618000120 - lastModified: '2024-06-18 10:44:44' + - id: Ch034720240619000084 + lastModified: '2024-06-19 11:18:07' version: 0 - createTime: '2024-06-18 10:44:44' - createUser: h0347_UID-051346 + createTime: '2024-06-19 11:18:07' + createUser: h0347_UID-051348 lastModifiedUser: - orderNo: CG2024061819122 + orderNo: CG2024061919213 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3681 + branchId: h0347-3684 deptId: deptName: - recOrgId: 841867446f2943f98fc5e32eb3d096a4 + recOrgId: f30e982dcac741ccab5c8ad19e52bc08 recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240618025809 + sourceId: Ph034720240619025946 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e2aa - provName: 国药集团公司gFOwi + provId: p1e2ae + provName: 国药集团公司Z6F#v subSendFlag: - exeProvId: p1e2aa - exeProvName: 国药集团公司gFOwi + exeProvId: p1e2ae + exeProvName: 国药集团公司Z6F#v billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区!IhMl + branchName: 东土城路院区L3*Gp sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024061829164 + planOrderNo: PLAN2024061929301 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 94cec6726b8908749a8517f528530095ca6e8ac9..5edbaf4fb571c4a60081e99ecada31092a13eeb4 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: 187c2c7490ad41098e444c9641258fad + - id: 724e3fd8c8144de99ba547f750133c5e lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240618000120 - orderNo: CG2024061819122 - sourceId: c3f00ad869614a949ca38f58b0d53559 - hosGoodsId: h034700004171 - mdmGoodsCode: '11661120' - goodsCode: '00004171' + pid: Ch034720240619000084 + orderNo: CG2024061919213 + sourceId: 576efbcacac8494681cef2c1ca1120f0 + hosGoodsId: h034700004182 + mdmGoodsCode: '11661131' + goodsCode: '00004182' purMode: 60 price: '99.9999' - supplyId: bd97573615c644359cf761b0afd1072a - pkgDefId: 64e44170045f437983f34884f8f89fa7 + supplyId: 82e4fd96a89a40b5a8314d6c3115dd37 + pkgDefId: 435edbc5f99541a29447e6d3703a461a pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240618025809","buyDetailId":"Bh034720240618000150001","planDetailId":"c3f00ad869614a949ca38f58b0d53559"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004171","purMode":60,"goodsName":"新型冠状病毒检测试剂IkfpG"}' + detailRelationJson: '{"planBillId":"Ph034720240619025946","buyDetailId":"Bh034720240619000130001","planDetailId":"576efbcacac8494681cef2c1ca1120f0"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004182","purMode":60,"goodsName":"新型冠状病毒检测试剂)IWA8"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂IkfpG + goodsName: 新型冠状病毒检测试剂)IWA8 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11661120' - erpCode: '11661120' + mdmGoodsSpecCode: '11661131' + erpCode: '11661131' made: 德国 goodsDi: '01123456789012' miDjmc: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '36810000041710' + diUse: '36840000041820' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e2aa - subProvName: 国药集团公司gFOwi + subProvId: p1e2ae + subProvName: 国药集团公司Z6F#v subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 diff --git a/report/summary.html b/report/summary.html index bf4764e74393c012dcd63b6f6711ea50861c8571..a8d1892d3abd7ed26a88327bc57e72740662372b 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 0 - 1分10秒 - 0.0% + 1 + 0分12秒 + 100.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - a_a3_流程三_产品导入和审批 - 失败 - 70.168 + a_c0流程十七退货业务 中心库退供应商 + 成功 + 12.286 xiaohesheng