From eef60321e16c83ff90013e5390b296c987357be0 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Thu, 6 Jun 2024 09:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E4=BA=8C=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...10\350\200\227\351\200\200\345\272\223.py" | 101 +++++++++++++++++- air_case/public1/public1/public1.py | 2 +- 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/message5 | 4 +- data/b2_herp3_bs/message6 | 8 +- 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 | 18 ++-- data/b5_spd3_core_business_flow/message17 | 58 +++++----- data/b5_spd3_core_business_flow/message18 | 65 +++++------ 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 | 22 ++-- 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 +++--- 36 files changed, 362 insertions(+), 264 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" index 6fd82915..c83ed930 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" @@ -84,9 +84,7 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库 request_body = commonFuc().get_business_data(module, "payload61", udi_code, stockId, stockName, areaCode, areaName) result = commonFuc().http_post(url, request_body, headers) - # 获取必要信息 - deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"] deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"] data1 = commonFuc().analysis_json('data', result) @@ -192,6 +190,105 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库 print('result', result) elif type==1: print('低值耗材消耗出库') + udi_code = get_udi2(1) + data1 = pickScan3(udi_code, 1) + # 获取必要信息 + 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文件中获取信息 + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "dept_stock_out_submit_url") + + 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() + print(orgCode1, orgName1) + request_body = commonFuc().get_business_data(module, "payload50_1_4", stockId, stockName2, areaCode, + areaName, + 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, + stockName2, areaCode, areaName, UTid, createTime, snCode, + get_hosid(), stockId, areaCode, areaName, shelfCode, + codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi, + barName, + batchCode, expdtDate, productDate, pkgCode, pkgCodeSee, + ssccCode, + tbStatus, pkgDefId, pkgDefQty, purBillId, pkgDefName, + distrBillId, + inStockTime, distrDetailId, purMode, price, goodsMfrsName, + goodsSpec, unit, goodsName, pkgDefId, pkgDefQty, unitName, + hosGoodsCode, purModeText) + + def sCan_grant(type=1): # 获取条码and扫码发放高值不能发放 module = "b5_spd3_core_business_flow" diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index c6083b4b..735e897b 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -2687,7 +2687,7 @@ def pickScan3(udi_code, type=1): # 二级库扫码发放(高值产品不能扫 # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) - + return data1 def get_branch_name(): diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 39565101..81e59c37 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406050038 - cname: 国药集团公司brO2Y + e_id: CR202406060038 + cname: 国药集团公司LK05j diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 7f6e5ba4..627cb71b 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院AqxEC - h_name: 湖南省人民医院AqxEC + h_id: 湖南省人民医院J8y$I + h_name: 湖南省人民医院J8y$I diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 690bb465..3fcbff42 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406050011_1 + MSPid: MSP2406060011_1 hosId: h0347 - hosGoodsId: h034700003993 - provGoodsid: provGood-99221180 - goodsAuditBillId: MSP2406050011 - targetId: MSP2406050011_1 + hosGoodsId: h034700004012 + provGoodsid: provGood-99221199 + goodsAuditBillId: MSP2406060011 + targetId: MSP2406060011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 888bb170..4615e5e7 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202406' - pid: OBh0347202406050004 - hosGoodsId: h034700003990 - goodsCode: '00003990' - goodsName: 一次性注射器_低值n2Yed + pid: OBh0347202406060004 + hosGoodsId: h034700004009 + goodsCode: '00004009' + goodsName: 一次性注射器_低值vYh04 goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,13 +20,13 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202406050004 + - pid: OBh0347202406060004 settleMonth: '202406' - hosGoodsId: h034700003990 + hosGoodsId: h034700004009 batchCode: '333' - distrDetailId: '03838083' - distrId: PSh0347202406050005 - distrOrderNo: PSh0347202406050005 + distrDetailId: '03838141' + distrId: PSh0347202406060005 + distrOrderNo: PSh0347202406060005 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -35,31 +35,31 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e272 - branchId: h0347-3653 - balanceDetId: OBh0347202406050004-000001 + provId: p1e276 + branchId: h0347-3655 + balanceDetId: OBh0347202406060004-000001 purMode: 10 - barCode: 013653000003990010333112406051724121221UT240605000202 + barCode: 013655000004009010333112406061724121321UT240606000202 batchId: price: maxQty: settleQty: id: - hosVersion: + hosVersion: 3 jsonData: oneFcatId: oneFcatName: volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202406OBh0347202406050004h034700003990 - - pid: OBh0347202406050004 + viewId: 202406OBh0347202406060004h034700004009 + - pid: OBh0347202406060004 settleMonth: '202406' - hosGoodsId: h034700003990 + hosGoodsId: h034700004009 batchCode: '333' - distrDetailId: '03838083' - distrId: PSh0347202406050005 - distrOrderNo: PSh0347202406050005 + distrDetailId: '03838141' + distrId: PSh0347202406060005 + distrOrderNo: PSh0347202406060005 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -68,27 +68,27 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e272 - branchId: h0347-3653 - balanceDetId: OBh0347202406050004-000002 + provId: p1e276 + branchId: h0347-3655 + balanceDetId: OBh0347202406060004-000002 purMode: 10 - barCode: 013653000003990010333112406051724121221UT240605000293 + barCode: 013655000004009010333112406061724121321UT240606000242 batchId: price: maxQty: settleQty: id: - hosVersion: + hosVersion: 3 jsonData: oneFcatId: oneFcatName: volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202406OBh0347202406050004h034700003990 - unique: 202406OBh0347202406050004h034700003990 + viewId: 202406OBh0347202406060004h034700004009 + unique: 202406OBh0347202406060004h034700004009 onlineKind: '10' - viewId: 202406OBh0347202406050004h034700003990 + viewId: 202406OBh0347202406060004h034700004009 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 378d937f..1a4a8de9 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3653 - branch_name: 东土城路院区UGRId + branch_id: h0347-3655 + branch_name: 东土城路院区nzo#r 科室信息: - dept2_id: 82a5f0b26d5141d9a42c8b6a2f1bd2f0 + dept2_id: 82394e14fcd94eb6ad2474304cb2a808 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index a5033f48..ed5d3b09 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试KAvpj - username2: 自动化测试KAvpj + username1: 自动化测试IVw7F + username2: 自动化测试IVw7F diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 107a5ee4..b345bee5 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: de2d193e9bb64578b8ef8a09eb410280 + dept1_id: 25bc0309da024bf1b59a735cf2cd68d4 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index 30b02607..b3ee4217 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: de2d193e9bb64578b8ef8a09eb410280 - stockAreaId: b33240f352da443db8708c4624d97238 + dept1_id: 25bc0309da024bf1b59a735cf2cd68d4 + stockAreaId: ae0cdd2a649e49c69bb8deb191544b93 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 12da5b6c..21fec1d7 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,8 +1,8 @@ 所有科室id: - deptid1: de2d193e9bb64578b8ef8a09eb410280 - deptid2: 82a5f0b26d5141d9a42c8b6a2f1bd2f0 - deptid3: 4276a53583e34e049a6f0ceaa4ad66f1 - deptid4: d8a5713acfb6435cbcf59b987696e915 + deptid1: 25bc0309da024bf1b59a735cf2cd68d4 + deptid2: 82394e14fcd94eb6ad2474304cb2a808 + deptid3: e5b1a058c0784d9680c342098f40759a + deptid4: 3f866ead661f4e84a987691920b6a461 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 2d1de86e..eacd0a92 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: b33240f352da443db8708c4624d97238 - shelfCode: areah03472209 + shelfid: ae0cdd2a649e49c69bb8deb191544b93 + shelfCode: areah03472220 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index b4ad19a6..e85f71cb 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -148,7 +148,7 @@ json_headers2: { "payload50_1_1": {"areaCode":"%s","areaName":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":0,"hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefId":"%s","pkgDefQty":100,"purBillId":"%s","pkgDefName":"%s","distrBillId":"%s","inStockTime":"%s","distrDetailId":"%s","certificateCode":""},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":"%s","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"%s","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"%s","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}],"id":"%s","pickerId":"%s","version":0,"stockName":"%s"} "payload50_1_2": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","sourceType":"CK_CB","user":{"uxid":"%s","userLoginCode":"%s","employeeNo":null,"cname":"%s","corpId":"%s","corpCode":null,"corpKind":1,"corpName":null,"branchId":"%s","branchName":null,"orgId":"%s","orgCode":"%s","orgName":"%s","job":null,"tel":"xhs0301","email":null,"mgrCorpId":"%s","mgrCorpCode":"%s","mgrCorpKind":1,"mgrCorpName":"%s","mgrBranchId":"%s","mgrBranchName":"%s","mgrRangeId":"%s","mgrRangeName":"%s","extStr1":"%s","extStr2":null,"extStr3":"%s","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"hosId":"%s","pickType":"KS_CB","pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","barCodeList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":0,"hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefId":"%s","pkgDefQty":"%s","purBillId":"%s","pkgDefName":"%s","distrBillId":"%s","inStockTime":"%s","distrDetailId":"%s","certificateCode":""},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":"100","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"德国","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"%s","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"%s","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}]}} "payload50_1_3": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":2,"chargeDeptId":"","sourceType":"CK_XH","user":{"uxid":"%s","userLoginCode":"%s","employeeNo":null,"cname":"%s","corpId":"%s","corpCode":null,"corpKind":1,"corpName":null,"branchId":"%s","branchName":null,"orgId":"%s","orgCode":"%s","orgName":"%s","job":null,"tel":"xhs0301","email":null,"mgrCorpId":"%s","mgrCorpCode":"%s","mgrCorpKind":1,"mgrCorpName":"%s","mgrBranchId":"%s","mgrBranchName":"%s","mgrRangeId":"%s","mgrRangeName":"%s","extStr1":"%s","extStr2":null,"extStr3":"%s","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"hosId":"%s","pickType":"KS_XH","pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":2,"chargeDeptId":"","barCodeList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":0,"hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefQty":1,"purBillId":"%s","distrBillId":"%s","inStockTime":"%s","useFrequency":1,"distrDetailId":"%s","certificateCode":"","multiChargeFlag":0},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":null,"printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"德国","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"%s","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"%s","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}]}} - +"payload50_1_4": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"sourceType":"CK_XH","hosId":"%s","pickType":"KS_XH","deptId":"%s","user":{"uxid":"%s","userLoginCode":"%s","employeeNo":null,"cname":"%s","corpId":"%s","corpCode":null,"corpKind":1,"corpName":null,"branchId":"%s","branchName":null,"orgId":"%s","orgCode":"%s","orgName":"%s","job":null,"tel":"%s","email":null,"mgrCorpId":"%s","mgrCorpCode":"%s","mgrCorpKind":1,"mgrCorpName":"%s","mgrBranchId":"%s","mgrBranchName":"%s","mgrRangeId":"%s","mgrRangeName":"%s","extStr1":"%s","extStr2":null,"extStr3":"%s","roles":[{"roleCode":"ro00442","roleName":"医院管理员"}],"wechatNickName":null,"mgrDeptKind":null,"adminFlag":null,"datascopeMap":null,"dataGroupList":null,"workFlowGroupSimpleVOList":null,"extMap":null},"pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"barCodeList":[{"id":"","lastModified":null,"version":null,"createTime":null,"createUser":null,"lastModifiedUser":null,"hosId":null,"branchId":null,"deptId":null,"deptName":null,"stockId":null,"stockName":null,"areaCode":"%s","areaName":null,"purMode":"%s","hosGoodsId":"%s","goodsCode":"%s","batchCode":"%s","expdtDate":"%s","hosBatchId":null,"batchPrice":null,"qty":1,"shelfCode":null,"barcodeFlag":null,"pkgFlag":null,"goodsSpec":"%s","goodsName":"%s","goodsMfrsName":"%s","unit":"%s","miCode":"","miDjmc":"","mdmGoodsCode":"%s","availableQty":"%s","transferRatio":"%s","shelfNo":null,"detailId":null,"pickId":null,"provId":null,"provName":null,"subProvId":null,"subProvName":null,"subSendFlag":null,"subSendFlagText":null}]}} "payload51": "%s" "payload51_1_1": {"targetAreaCode":"%s","billMode":16,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"%s","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 48d6f49f..79158d1e 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e272 + e_corpId: p1e276 h_corpId: h0347 - e_username: 国药集团公司brO2Y + e_username: 国药集团公司LK05j h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 72718cf7..bce0e998 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406050007_1 + MSPid: MSP2406060007_1 hosId: h0347 - hosGoodsId: h034700003989 - provGoodsid: provGood-99221176 - goodsAuditBillId: MSP2406050007 - targetId: MSP2406050007_1 + hosGoodsId: h034700004008 + provGoodsid: provGood-99221195 + goodsAuditBillId: MSP2406060007 + targetId: MSP2406060007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 86d4f4d9..1dfd4b3b 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406050043 - distrBillId2: PSh0347202406050043 + distrBillId1: PSh0347202406060021 + distrBillId2: PSh0347202406060021 高值配送单号: - distrBillId1: PSh0347202406050044 - distrBillId2: PSh0347202406050044 + distrBillId1: PSh0347202406060022 + distrBillId2: PSh0347202406060022 试剂配送单号: - distrBillId1: PSh0347202406050045 - distrBillId2: PSh0347202406050045 + distrBillId1: PSh0347202406060023 + distrBillId2: PSh0347202406060023 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 1fd87266..29efd3f5 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024060525587 - orderNo2: PLAN2024060525587 + orderNo1: PLAN2024060625712 + orderNo2: PLAN2024060625712 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 26d13372..412c5a9c 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024060525585 - orderNo2: PLAN2024060525585 + orderNo1: PLAN2024060625714 + orderNo2: PLAN2024060625714 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index dd57b4ad..51351dfd 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-3653 + branchId: h0347-3655 deptId: taskType: 1 - sourceOrgId: p1e272 - sourceOrgName: 国药集团公司brO2Y - sourceOrderNo: PSh0347202406050045 + sourceOrgId: p1e276 + sourceOrgName: 国药集团公司LK05j + sourceOrderNo: PSh0347202406060023 billMode: '66' stockKind: purMode: - sourceId: PSh0347202406050045 + sourceId: PSh0347202406060023 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024060525585 - purOrderNo: CG2024060517878 - recOrgId: 82a5f0b26d5141d9a42c8b6a2f1bd2f0 + planOrderNo: PLAN2024060625714 + purOrderNo: CG2024060617963 + recOrgId: 82394e14fcd94eb6ad2474304cb2a808 recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024060500033","planBillId":"Ph034720240605022230","planOrderNo":"PLAN2024060525585","buyOrderNo":"BUY2024060504713","purOrderNo":"CG2024060517878","purBillId":"Ch034720240605000099","purBillDate":"2024-06-05 - 15:46:08","distrBillId":"PSh0347202406050045","distrOrderNo":"PSh0347202406050045"}' - taskDate: '2024-06-05 15:46:31' + billRelationJson: '{"buyBillId":"Bh03472024060600015","planBillId":"Ph034720240606022359","planOrderNo":"PLAN2024060625714","buyOrderNo":"BUY2024060604737","purOrderNo":"CG2024060617963","purBillId":"Ch034720240606000078","purBillDate":"2024-06-06 + 07:38:40","distrBillId":"PSh0347202406060023","distrOrderNo":"PSh0347202406060023"}' + taskDate: '2024-06-06 07:39:24' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index eec686d5..001a5d01 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: h034700003991 + hosGoodsId: h034700004010 mdmGoodsCode: - spdGoodsCode: '11660938' - goodsCode: '00003991' - goodsName: 新型冠状病毒检测试剂YryIH + spdGoodsCode: '11660958' + goodsCode: '00004010' + goodsName: 新型冠状病毒检测试剂20zyQ goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2024-12-12' - productDate: '2024-06-05' - provName: 国药集团公司brO2Y + expdtDate: '2024-12-13' + productDate: '2024-06-06' + provName: 国药集团公司LK05j provId: - viewId: '03838124' + viewId: '03838159' verifyFlag: 0 hasSterilize: 0 - id: '03838124' + id: '03838159' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00003991","purMode":60,"goodsName":"新型冠状病毒检测试剂YryIH","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660938","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660958","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 11b11456..192e7537 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024060500034 - CHECK_NO2: CHECKh03472024060500034 + CHECK_NO1: CHECKh03472024060600014 + CHECK_NO2: CHECKh03472024060600014 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 205ecb39..5576d4a5 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -11,28 +11,28 @@ recType: stockKind: purMode: - sourceId: CHECKh03472024060500002 + sourceId: CHECKh03472024060600002 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: de2d193e9bb64578b8ef8a09eb410280 + deptId: 25bc0309da024bf1b59a735cf2cd68d4 deptName: - branchId: h0347-3653 + branchId: h0347-3655 branchName: taskType: 1 - sourceOrgId: p1e272 - sourceOrgName: 国药集团公司brO2Y - sourceOrderNo: YS240605002 - taskSourceNo: PSh0347202406050005 - areaCode: areah03472209 + sourceOrgId: p1e276 + sourceOrgName: 国药集团公司LK05j + sourceOrderNo: YS240606002 + taskSourceNo: PSh0347202406060005 + areaCode: areah03472220 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-06-05 07:12:48' + taskDate: '2024-06-06 07:12:57' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index fdf25ed6..55fa5402 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: CHECKh034720240605000020001 + - id: CHECKh034720240606000020001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024060500002 - hosGoodsId: h034700003990 + pid: CHECKh03472024060600002 + hosGoodsId: h034700004009 batchCode: '333' - expdtDate: '2024-12-12' - productDate: '2024-06-05' + expdtDate: '2024-12-13' + productDate: '2024-06-06' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03838083' + srcBatchId: '03838141' srcBatchPrice: 99.9999 - shelfCode: areah03472209-2-01-01 + shelfCode: areah03472220-2-01-01 shelfKind: - barcodeId: UT240605000201 + barcodeId: UT240606000201 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202406050005 - distrDetailId: '03838083' + distrId: PSh0347202406060005 + distrDetailId: '03838141' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000039903332024-12-12100支/100 + viewId: h0347000040093332024-12-13100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03838083' - mdmGoodsCode: '11660937' - goodsCode: '00003990' + sourceDetailId: '03838141' + mdmGoodsCode: '11660957' + goodsCode: '00004009' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3653 - purBillId: Ch034720240605000043 - provId: p1e272 - provName: 国药集团公司brO2Y + branchId: h0347-3655 + purBillId: Ch034720240606000045 + provId: p1e276 + provName: 国药集团公司LK05j subSendFlag: 10 - exeProvId: p1e272 - exeProvName: 国药集团公司brO2Y - purDetailId: e6d36f8370244ae8a4c1bac4c8fd2a24 - goodsName: 一次性注射器_低值n2Yed + exeProvId: p1e276 + exeProvName: 国药集团公司LK05j + purDetailId: bfd436c0c58744199f537fa7b7d98922 + goodsName: 一次性注射器_低值vYh04 goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: f22dcfbbc0ce4354a51aa7e7fbb287ce - supplyId: 2c8b5223d59b47699e56f06e769f8763 - subProvId: p1e272 - subProvName: 国药集团公司brO2Y + pkgDefId: e0b21bdcd917429980f0f5aa6cbc98d0 + supplyId: eccc6447512f4253b7711981866d28dd + subProvId: p1e276 + subProvName: 国药集团公司LK05j subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00003990' + goodsCode: '00004009' purMode: 10 - goodsName: 一次性注射器_低值n2Yed + goodsName: 一次性注射器_低值vYh04 ygptCode: '' transCond: '' storageCond: '' - erpCode: '11660937' + erpCode: '11660957' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index c14cd34a..fa7908bd 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: '8800000001062563' - snCode: '8800000001062563' - ssccCode: '010839000183091928' - pkgCodeSee: '0100000000003989102221124060517241212218800000001062563' - hosGoodsId: h034700003989 - hosGoodsCode: '00003989' - goodsCode: '00003989' - goodsName: 高值牙钻机EiMLT + id: UT240606000701 + snCode: UT240606000701 + ssccCode: '010839000183220922' + pkgCodeSee: 0136550000040100104444112406061724121321UT240606000701 + hosGoodsId: h034700004010 + hosGoodsCode: '00004010' + goodsCode: '00004010' + goodsName: 新型冠状病毒检测试剂20zyQ goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 - purMode: 20 - batchCode: '222' - productDate: '2024-06-05' - expdtDate: '2024-12-12' - pkgDefName: - pkgDefQty: 1.0 - stockId: 4b3f3a1252094ec79ed3053474fa8bae - stockName: 二级检验科002库房 - areaName: 默认库区 - areaCode: areah03472207 + purMode: 60 + batchCode: '4444' + productDate: '2024-06-06' + expdtDate: '2024-12-13' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 2ca86f5a96044b21899027321759fc3e + stockName: 东土城路院区nzo#r中心库房 + areaName: 自动化测试 + areaCode: areah03472220 lockStatus: 0 - unitName: 1支 - shelfCode: areah03472207-A-01-01 - shelfNo: A01-A-01-01 - pkgDefId: - extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024060517849", "distrBillId": "PSh0347202406050016", - "inStockTime": "2024-06-05 07:34:30", "useFrequency": 1, "distrDetailId": "03838094", - "certificateCode": "", "multiChargeFlag": 0}' + unitName: 100支/100 + shelfCode: areah03472220-2-01-01 + shelfNo: 自动化测试-2-01-01 + pkgDefId: 60abe88ab2b5432da8f7e75a74e92584 + extInfo: '{"pkgDefId": "60abe88ab2b5432da8f7e75a74e92584", "pkgDefQty": 100, "purBillId": + "CG2024060617956", "pkgDefName": "100", "distrBillId": "PSh0347202406060013", + "inStockTime": "2024-06-06 07:19:01", "distrDetailId": "03838149", "certificateCode": + ""}' bottleId: - pkgType: '20' + pkgType: '66' miDjmc: '' miCode: '' transferRatio: 1.0 qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司brO2Y - provId: p1e272 - inStockDate: '2024-06-05 07:34:30' + provName: 国药集团公司LK05j + provId: p1e276 + inStockDate: mfrCode: made: 德国 price: - barName: 1支 - purModeText: 高值耗材 - codeType: 20 + barName: 100支/100 + purModeText: 检验试剂 + 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 b991b3ba..ad794b9d 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: h034700003989 - hosGoodsCode: '00003989' - provId: p1e272 - subProvId: p1e272 - subProvName: 国药集团公司brO2Y - goodsName: 高值牙钻机EiMLT + - hosGoodsId: h034700004008 + hosGoodsCode: '00004008' + provId: p1e276 + subProvId: p1e276 + subProvName: 国药集团公司LK05j + goodsName: 高值牙钻机fW59I 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 93f9cb14..9749759f 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406050008_1 + MSPid: MSP2406060008_1 hosId: h0347 - hosGoodsId: h034700003990 - provGoodsid: provGood-99221177 - goodsAuditBillId: MSP2406050008 - targetId: MSP2406050008_1 + hosGoodsId: h034700004009 + provGoodsid: provGood-99221196 + goodsAuditBillId: MSP2406060008 + targetId: MSP2406060008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 16df3340..938c54de 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: '8800000001062562' - snCode: '8800000001062562' - ssccCode: '010839000183091720' - pkgCodeSee: '01000000000039891022221124060517241212218800000001062562' - hosGoodsId: h034700003989 - hosGoodsCode: '00003989' - goodsCode: '00003989' - goodsName: 高值牙钻机EiMLT + id: '8800000001063057' + snCode: '8800000001063057' + ssccCode: '010839000183230921' + pkgCodeSee: '01000000000040081022221124060617241213218800000001063057' + hosGoodsId: h034700004008 + hosGoodsCode: '00004008' + goodsCode: '00004008' + goodsName: 高值牙钻机fW59I goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-06-05' - expdtDate: '2024-12-12' + productDate: '2024-06-06' + expdtDate: '2024-12-13' pkgDefName: pkgDefQty: 1.0 - stockId: 4b3f3a1252094ec79ed3053474fa8bae + stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6 stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472207 + areaCode: areah03472218 lockStatus: 0 unitName: 1支 - shelfCode: areah03472207-A-01-01 + shelfCode: areah03472218-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406050014", "inStockTime": - "2024-06-05 07:25:33", "useFrequency": 1, "distrDetailId": "03838092", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406060014", "inStockTime": + "2024-06-06 07:24:55", "useFrequency": 1, "distrDetailId": "03838150", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司brO2Y - provId: p1e272 - inStockDate: '2024-06-05 07:25:32' + provName: 国药集团公司LK05j + provId: p1e276 + inStockDate: '2024-06-06 07:24:54' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 25fec053..e2cc4b57 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: h034700003991 + - hosGoodsId: h034700004010 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂YryIH + goodsName: 新型冠状病毒检测试剂20zyQ goodsSpec: G-31891 - mdmGoodsCode: '11660938' - goodsCode: '00003991' + mdmGoodsCode: '11660958' + goodsCode: '00004010' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -16,22 +16,22 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 600.0 + qty: 300.0 goodsImg: [] - pkgDefId: 9b5f3fab5de04bfebda012d9cb5d98a3 + pkgDefId: 60abe88ab2b5432da8f7e75a74e92584 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 82a5f0b26d5141d9a42c8b6a2f1bd2f0 + deptId: 82394e14fcd94eb6ad2474304cb2a808 deptName: areaCode: areaName: - targetDeptId: de2d193e9bb64578b8ef8a09eb410280 + targetDeptId: 25bc0309da024bf1b59a735cf2cd68d4 targetDeptName: 设备科001 - targetStockId: 803b4355223a41a481ed91fc16387035 - targetStockName: 东土城路院区UGRId中心库房 + targetStockId: 2ca86f5a96044b21899027321759fc3e + targetStockName: 东土城路院区nzo#r中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,7 +39,7 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司brO2Y + provName: 国药集团公司LK05j 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 d6258042..8a868830 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: 72e703fb4164477095c838511f6a5698 - lastModified: '2024-06-05 07:25:57' + - id: 6c5a12c8d1d3406ca731e006c3f7076b + lastModified: '2024-06-06 07:25:19' version: 1 - createTime: '2024-06-05 07:04:38' - createUser: h0347_UID-051314 - lastModifiedUser: h0347_UID-051314 - stockId: 4b3f3a1252094ec79ed3053474fa8bae - shelfCode: areah03472207 + createTime: '2024-06-06 07:04:42' + createUser: h0347_UID-051316 + lastModifiedUser: h0347_UID-051316 + stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6 + shelfCode: areah03472218 shelfName: 默认库区 address: 二级检验科002 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051314 + linkman: h0347_UID-051316 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 82a5f0b26d5141d9a42c8b6a2f1bd2f0 + deptId: 82394e14fcd94eb6ad2474304cb2a808 areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index e2d41445..9293698d 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406050009_1 + MSPid: MSP2406060009_1 hosId: h0347 - hosGoodsId: h034700003991 - provGoodsid: provGood-99221178 - goodsAuditBillId: MSP2406050009 - targetId: MSP2406050009_1 + hosGoodsId: h034700004010 + provGoodsid: provGood-99221197 + goodsAuditBillId: MSP2406060009 + targetId: MSP2406060009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index c82093cd..da210639 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406050010_1 + MSPid: MSP2406060010_1 hosId: h0347 - hosGoodsId: h034700003992 - provGoodsid: provGood-99221179 - goodsAuditBillId: MSP2406050010 - targetId: MSP2406050010_1 + hosGoodsId: h034700004011 + provGoodsid: provGood-99221198 + goodsAuditBillId: MSP2406060010 + targetId: MSP2406060010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 690bb465..3fcbff42 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406050011_1 + MSPid: MSP2406060011_1 hosId: h0347 - hosGoodsId: h034700003993 - provGoodsid: provGood-99221180 - goodsAuditBillId: MSP2406050011 - targetId: MSP2406050011_1 + hosGoodsId: h034700004012 + provGoodsid: provGood-99221199 + goodsAuditBillId: MSP2406060011 + targetId: MSP2406060011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index def07188..a1ad2640 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 9b5f3fab5de04bfebda012d9cb5d98a3 - unitPackageid2: 9b5f3fab5de04bfebda012d9cb5d98a3 + unitPackageid1: 60abe88ab2b5432da8f7e75a74e92584 + unitPackageid2: 60abe88ab2b5432da8f7e75a74e92584 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 6deb82fd..0c76b420 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024060525586 - orderNo2: PLAN2024060525586 + orderNo1: PLAN2024060625713 + orderNo2: PLAN2024060625713 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 02ac19fd..1194937b 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: Ch034720240605000099 - lastModified: '2024-06-05 15:46:08' + - id: Ch034720240606000078 + lastModified: '2024-06-06 07:38:40' version: 0 - createTime: '2024-06-05 15:46:08' - createUser: h0347_UID-051314 + createTime: '2024-06-06 07:38:40' + createUser: h0347_UID-051316 lastModifiedUser: - orderNo: CG2024060517878 + orderNo: CG2024060617963 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3653 + branchId: h0347-3655 deptId: deptName: - recOrgId: 82a5f0b26d5141d9a42c8b6a2f1bd2f0 + recOrgId: 82394e14fcd94eb6ad2474304cb2a808 recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240605022230 + sourceId: Ph034720240606022359 sourceType: inSettlement: recUser: recPhone: recAddr: 二级检验科002 - provId: p1e272 - provName: 国药集团公司brO2Y + provId: p1e276 + provName: 国药集团公司LK05j subSendFlag: - exeProvId: p1e272 - exeProvName: 国药集团公司brO2Y + exeProvId: p1e276 + exeProvName: 国药集团公司LK05j billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区UGRId + branchName: 东土城路院区nzo#r sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024060525585 + planOrderNo: PLAN2024060625714 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index e8bd126b..6ad4df1a 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: 0cfc0513ba3a4abf9dac9632d8d89665 + - id: 713e167638ba4e5c9a5a78fde53dd2c7 lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240605000099 - orderNo: CG2024060517878 - sourceId: 740ec9658e80465aa8fbdca39a2e07c6 - hosGoodsId: h034700003991 - mdmGoodsCode: '11660938' - goodsCode: '00003991' + pid: Ch034720240606000078 + orderNo: CG2024060617963 + sourceId: cdb4324be0d240b3a4fab9e05e0487c4 + hosGoodsId: h034700004010 + mdmGoodsCode: '11660958' + goodsCode: '00004010' purMode: 60 price: '99.9999' - supplyId: 1d3787c2759749e6aad1677f397c3bbc - pkgDefId: 9b5f3fab5de04bfebda012d9cb5d98a3 + supplyId: 2b706b4703354212a6ded9bef264f540 + pkgDefId: 60abe88ab2b5432da8f7e75a74e92584 pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240605022230","buyDetailId":"Bh034720240605000330001","planDetailId":"740ec9658e80465aa8fbdca39a2e07c6"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00003991","purMode":60,"goodsName":"新型冠状病毒检测试剂YryIH"}' + detailRelationJson: '{"planBillId":"Ph034720240606022359","buyDetailId":"Bh034720240606000150001","planDetailId":"cdb4324be0d240b3a4fab9e05e0487c4"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂YryIH + goodsName: 新型冠状病毒检测试剂20zyQ mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11660938' - erpCode: '11660938' + mdmGoodsSpecCode: '11660958' + erpCode: '11660958' made: 德国 goodsDi: miDjmc: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '36530000039910' + diUse: '36550000040100' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e272 - subProvName: 国药集团公司brO2Y + subProvId: p1e276 + subProvName: 国药集团公司LK05j subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 -- GitLab