diff --git "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" index 21d524e635d0a305df99b533230fba62819f3aa4..ac96d50e68f9063ca0c3a07aa56eec88ebfe5747 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" @@ -403,24 +403,25 @@ def pick_execute(): udi_code = 'udi_code' print('udi_code', udi_code) if purMode == 10: - targetAreaCode=pickScan2(BH_ID, udi_code, 1) # 低值 + targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 1) # 低值 elif purMode == 20: - targetAreaCode=pickScan2(BH_ID, udi_code, 2) # 高值 + targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 2) # 高值 elif purMode == 60: - targetAreaCode= pickScan2(BH_ID, udi_code, 3) # 试剂 + targetAreaCode,sourceId= pickScan2(BH_ID, udi_code, 3) # 试剂 else: targetAreaCode='targetAreaCode' + sourceId='sourceId' # 提交领用出库单 url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_out_use_submit_url") url = url + BH_ID print('提交拣货执行单=================', url) if purMode == 10: - request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode) + request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode,sourceId) elif purMode == 20: - request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode) + request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode,sourceId) elif purMode == 60: - request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode) + request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode,sourceId) print('提交拣货执行单', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 665809c38d7cd978790604debab753a89887d666..221cef65ba4a4d404a47a76dda1fe18569a711a7 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -2483,7 +2483,7 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码 batchCode, expdtDate, productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, purBillId, distrBillId, inStockTime, distrDetailId, purMode, price, goodsMfrsName, - goodsSpec, unit, goodsName, pkgDefName, made, + goodsSpec, unit, goodsName, made, unitName, hosGoodsCode, purModeText, PICK_ID, pickerId, stockName) elif type == 3: @@ -2501,7 +2501,7 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码 # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) - return areaCode + return areaCode,PICK_ID def get_branch_name(): diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 91d22845de3c5339421151eb4dbd7bd55653429f..820010efe8f7fc22e12c60594c50d8bef68ff722 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202405310038 - cname: 国药集团公司MRA4P + e_id: CR202406030038 + cname: 国药集团公司mvYxk diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index d3492a7595f95e89301234f15681a58d232f7e2d..5cfa7d8dcbd0ec7c7f3ea71274526383b43e1d8f 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院DXn!1 - h_name: 湖南省人民医院DXn!1 + h_id: 湖南省人民医院#vYfi + h_name: 湖南省人民医院#vYfi diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index ae0bd5ee0bffbe47327b28f37d178517a797272f..971a9697ea36164b9df8084dff0c2bb7d971b583 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405310011_1 + MSPid: MSP2406030011_1 hosId: h0347 - hosGoodsId: h034700003924 - provGoodsid: provGood-99221102 - goodsAuditBillId: MSP2405310011 - targetId: MSP2405310011_1 + hosGoodsId: h034700003967 + provGoodsid: provGood-99221148 + goodsAuditBillId: MSP2406030011 + targetId: MSP2406030011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 89adf4ccb5d3e9f40a89c1b018af2e115bc0006f..1604ebc700e9f7807f0c95057cf5a5566eafb079 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202406' - pid: OBh0347202405310004 - hosGoodsId: h034700003921 - goodsCode: '00003921' - goodsName: 一次性注射器_低值ga1u3 + pid: OBh0347202406030004 + hosGoodsId: h034700003964 + goodsCode: '00003964' + goodsName: 一次性注射器_低值qjUa2 goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,13 +20,13 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202405310004 + - pid: OBh0347202406030004 settleMonth: '202406' - hosGoodsId: h034700003921 + hosGoodsId: h034700003964 batchCode: '333' - distrDetailId: '03837852' - distrId: PSh0347202405310005 - distrOrderNo: PSh0347202405310005 + distrDetailId: '03837924' + distrId: PSh0347202406030005 + distrOrderNo: PSh0347202406030005 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -35,11 +35,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e25f - branchId: h0347-3643 - balanceDetId: OBh0347202405310004-000001 + provId: p1e267 + branchId: h0347-3649 + balanceDetId: OBh0347202406030004-000001 purMode: 10 - barCode: 013643000003921010333112405311724120721UT240531000202 + barCode: 013649000003964010333112406031724121021UT240603000202 batchId: price: maxQty: @@ -51,14 +51,15 @@ oneFcatName: volumeFlag: onlineKind: - viewId: 202406OBh0347202405310004h034700003921 - - pid: OBh0347202405310004 + invoicePrice: 99.9999 + viewId: 202406OBh0347202406030004h034700003964 + - pid: OBh0347202406030004 settleMonth: '202406' - hosGoodsId: h034700003921 + hosGoodsId: h034700003964 batchCode: '333' - distrDetailId: '03837852' - distrId: PSh0347202405310005 - distrOrderNo: PSh0347202405310005 + distrDetailId: '03837924' + distrId: PSh0347202406030005 + distrOrderNo: PSh0347202406030005 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -67,11 +68,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e25f - branchId: h0347-3643 - balanceDetId: OBh0347202405310004-000002 + provId: p1e267 + branchId: h0347-3649 + balanceDetId: OBh0347202406030004-000002 purMode: 10 - barCode: 013643000003921010333112405311724120721UT240531000212 + barCode: 013649000003964010333112406031724121021UT240603000288 batchId: price: maxQty: @@ -83,10 +84,11 @@ oneFcatName: volumeFlag: onlineKind: - viewId: 202406OBh0347202405310004h034700003921 - unique: 202406OBh0347202405310004h034700003921 + invoicePrice: 99.9999 + viewId: 202406OBh0347202406030004h034700003964 + unique: 202406OBh0347202406030004h034700003964 onlineKind: '10' - viewId: 202406OBh0347202405310004h034700003921 + viewId: 202406OBh0347202406030004h034700003964 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 5896521554c9cca94a57449469c797a64062192e..5f0abbed9cef4a95e7a9d18a871fd93b2143a833 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3643 - branch_name: 东土城路院区UhFS2 + branch_id: h0347-3649 + branch_name: 东土城路院区kBIb2 科室信息: - dept2_id: 2400310b2a484a71a3d050da4ea37ad0 + dept2_id: f8eb781292cd452eabd5ca99f8867aff dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index fcc8292130dce19feaf8b313059d6b74c87bbde7..8ce87cb17b834d063cd8a568df3bffd0d24d57e3 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试oO48w - username2: 自动化测试oO48w + username1: 自动化测试QBz5q + username2: 自动化测试QBz5q diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index fb34e2b30d38e7cc612db4529df4dbee545e5952..378cec56202249967939f8211c43a91a3c62800a 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 4d0db8a18c454c0f8887dc578e353d16 + dept1_id: f6e2b5eb722b42e18bcc93ef29371337 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index 74968dcba603af9b3620573192b57ed85accaf82..038c3b40412dfc77c22bed6f382d9cb06ba8a2e0 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: 4d0db8a18c454c0f8887dc578e353d16 - stockAreaId: f4e67f11442248bc8549d13cba17a792 + dept1_id: f6e2b5eb722b42e18bcc93ef29371337 + stockAreaId: eb359aa3c32942f8a00e9c761312a853 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 9c77b781935cf4eefe63cee06054d3fc0aea4ff2..b58338e7f2fabde0338d5b591161dbb41f6f86bc 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: 4d0db8a18c454c0f8887dc578e353d16 - deptid2: 2400310b2a484a71a3d050da4ea37ad0 - deptid3: 972e8e5b8f4b40e9a84572a92b707900 - deptid4: 3ba6b6a6260d4cf1bba826e19cfc6397 - deptid5: f71f3f896dad46c0af9403ad5cc0e8fc + deptid1: f6e2b5eb722b42e18bcc93ef29371337 + deptid2: f8eb781292cd452eabd5ca99f8867aff + deptid3: fe1b462bb9ee4ce0b818977f2cd1ea76 + deptid4: 3c2a3eb7fb0d437fb7b395ef8469246b + deptid5: 9252920c3ff247fbbe034564fc6e9270 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index d00baa2d046230cb4f979e94290c3fe69937865f..94b91434a6fabc5aeb2728fa3f93b28d3c6febb2 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: f4e67f11442248bc8549d13cba17a792 - shelfCode: areah03472143 + shelfid: eb359aa3c32942f8a00e9c761312a853 + shelfCode: areah03472181 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index 40b4bdcd5bfcdb883c48899b9656eefe8797c4cb..37e7748228b25ca42972011712037e18a18246d4 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -148,9 +148,9 @@ json_headers2: { "payload50_1_1": {"areaCode":"%s","areaName":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":0,"hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefId":"%s","pkgDefQty":100,"purBillId":"%s","pkgDefName":"%s","distrBillId":"%s","inStockTime":"%s","distrDetailId":"%s","certificateCode":""},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":"%s","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":"%s","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"%s","stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":1,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null,"hosBatchId":null,"settleFlag":null,"inStockTime":null}],"id":"%s","pickerId":"%s","version":0,"stockName":"%s"} "payload51": "%s" -"payload51_1_1": {"targetAreaCode":"%s","billMode":16,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"PICKh03472405310056","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} -"payload51_1_2": {"targetAreaCode":"%s","billMode":20,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"PICKh03472405310056","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} -"payload51_1_3": {"targetAreaCode":"%s","billMode":66,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"PICKh03472405310056","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} +"payload51_1_1": {"targetAreaCode":"%s","billMode":16,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"%s","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} +"payload51_1_2": {"targetAreaCode":"%s","billMode":20,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"%s","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} +"payload51_1_3": {"targetAreaCode":"%s","billMode":66,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"%s","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""} "payload52": {"batchList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"sourceId":"%s","sourceType":"KS","sourceVersion":"3","remark":"","reviewAll":0} "payload50_2": {"areaCode":"%s","hdiList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","goodsCodeDi":null,"barcodeId":null,"ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","multiChargeFlag":0,"useFrequency":1},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"purDetailId":null,"pkgDefName":null,"printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":null,"provName":null,"subProvId":null,"subProvName":null,"provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s"} diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 3e228487b1fddf38e2be81a5e409892018c3cef7..1189fe2ef580c3fc37e29f13c34996594e4fe319 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e25f + e_corpId: p1e267 h_corpId: h0347 - e_username: 国药集团公司MRA4P + e_username: 国药集团公司mvYxk h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index dbc9a1d6be4424eba08a144f7032faba67aa3b59..638b5f981ed9500512dbc96848a986781b464ae2 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405310007_1 + MSPid: MSP2406030007_1 hosId: h0347 - hosGoodsId: h034700003920 - provGoodsid: provGood-99221098 - goodsAuditBillId: MSP2405310007 - targetId: MSP2405310007_1 + hosGoodsId: h034700003963 + provGoodsid: provGood-99221144 + goodsAuditBillId: MSP2406030007 + targetId: MSP2406030007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 5764dbd7033ea151e0ef145988aa98276af51038..70e2f2a26793250a7ce87c62d68bd539fe574840 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,12 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202405310011 - distrBillId2: PSh0347202405310011 + distrBillId1: PSh0347202406030034 + distrBillId2: PSh0347202406030034 高值配送单号: - distrBillId1: PSh0347202405310012 - distrBillId2: PSh0347202405310012 + distrBillId1: PSh0347202406030035 + distrBillId2: PSh0347202406030035 试剂配送单号: - distrBillId1: PSh0347202405310013 - distrBillId2: PSh0347202405310013 -高值跟台配送单号: - distrBillId1: PSh0347202405310014 - distrBillId2: PSh0347202405310014 + distrBillId1: PSh0347202406030036 + distrBillId2: PSh0347202406030036 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 8bd908f7dc3fc33998f3941aea2bcca2a08d57d1..642a4895d6c617f4bc967442b22805df86ca4a94 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024053124773 - orderNo2: PLAN2024053124773 + orderNo1: PLAN2024060325174 + orderNo2: PLAN2024060325174 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index a118ac66034b0aa3982711c19f3783524e72c36d..226b5b78dac5b78e7cf35c7769afb996c6b8c024 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024053124774 - orderNo2: PLAN2024053124774 + orderNo1: PLAN2024060325172 + orderNo2: PLAN2024060325172 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 7bed229ad52eaec0c1ac536d359bade70f8f194d..bff6b6175c7837e8569a8c7c7561e6d680652e6a 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,33 +3,34 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3643 + branchId: h0347-3649 deptId: taskType: 1 - sourceOrgId: p1e25f - sourceOrgName: 国药集团公司MRA4P - sourceOrderNo: PSh0347202405310014 - billMode: '25' + sourceOrgId: p1e267 + sourceOrgName: 国药集团公司mvYxk + sourceOrderNo: PSh0347202406030033 + billMode: '66' stockKind: purMode: - sourceId: PSh0347202405310014 + sourceId: PSh0347202406030033 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: SSSQ202405310281 - purOrderNo: SSTZ202405310257 - recOrgId: 2400310b2a484a71a3d050da4ea37ad0 + planOrderNo: PLAN2024060325169 + purOrderNo: CG2024060317545 + recOrgId: f8eb781292cd452eabd5ca99f8867aff recOrgName: 二级检验科002 - billRelationJson: '{"operationApplyOrderNo":"SSSQ202405310281","operationNoticeBillId":"Nh034720240531000001","distrBillId":"PSh0347202405310014","operationNoticeOrderNo":"SSTZ202405310257","distrOrderNo":"PSh0347202405310014","operationApplyBillId":"Oh034720240531000001"}' - taskDate: '2024-05-31 07:23:53' + billRelationJson: '{"buyBillId":"Bh03472024060300021","planBillId":"Ph034720240603021814","planOrderNo":"PLAN2024060325169","buyOrderNo":"BUY2024060304540","purOrderNo":"CG2024060317545","purBillId":"Ch034720240603000109","purBillDate":"2024-06-03 + 11:11:57","distrBillId":"PSh0347202406030033","distrOrderNo":"PSh0347202406030033"}' + taskDate: '2024-06-03 11:12:14' taskDateStart: taskDateEnd: billModeList: viewIdList: - supplierFlag: false + supplierFlag: true tbStatus: 20 - remark: + remark: '' list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index d16e9d064829b77c2bd1b3390b44b8f418cb6b1f..580319dd2daf435c84ef1d460de0ff874ee43db6 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -1,13 +1,13 @@ 验收单详情信息: list_a: - &id001 - - purMode: 20 - unitName: 1支 - hosGoodsId: h034700003920 + - purMode: 60 + unitName: 100支/100 + hosGoodsId: h034700003965 mdmGoodsCode: - spdGoodsCode: '11660857' - goodsCode: '00003920' - goodsName: 高值牙钻机olAYM + spdGoodsCode: '11660903' + goodsCode: '00003965' + goodsName: 新型冠状病毒检测试剂9jSFk goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -16,27 +16,27 @@ goodsDi: miCode: miDjmc: - certificateCode: + certificateCode: '' rfidFlag: 0 pkgDefId: - pkgDefName: - pkgDefQty: 1.0 - batchCode: '2222' - expdtDate: '2024-12-07' - productDate: '2024-05-31' - provName: 国药集团公司MRA4P + pkgDefName: '100' + pkgDefQty: 100.0 + batchCode: '4444' + expdtDate: '2024-12-10' + productDate: '2024-06-03' + provName: 国药集团公司mvYxk provId: - viewId: '03837861' + viewId: '03837956' verifyFlag: 0 hasSterilize: 0 - id: '03837861' + id: '03837956' detailRelationJson: - extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00003965","purMode":60,"goodsName":"新型冠状病毒检测试剂9jSFk","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660903","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 distrPkgQty: 1.0 - distrQty: 1.0 + distrQty: 100.0 price: 99.9999 checkQty: 0.0 checkPkgQty: 0 @@ -44,7 +44,7 @@ initQty: totalQty: rowNum: - settlement: 3 + settlement: 1 hdiBarcodeList: detailId: pkgCode: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 79b4e29c423afb1c828f46994c86f9950a16ebcc..f025217a32dc64c06f9b8274741798a2909482e3 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024053100005 - CHECK_NO2: CHECKh03472024053100005 + CHECK_NO1: CHECKh03472024060300023 + CHECK_NO2: CHECKh03472024060300023 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 40d12ad6654bbe69cefeb3cb61ac857a8a566fb8..36394738ce1561ace596608b0c14a307ae9b14a5 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: CHECKh03472024053100002 + sourceId: CHECKh03472024060300002 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: 4d0db8a18c454c0f8887dc578e353d16 + deptId: f6e2b5eb722b42e18bcc93ef29371337 deptName: - branchId: h0347-3643 + branchId: h0347-3649 branchName: taskType: 1 - sourceOrgId: p1e25f - sourceOrgName: 国药集团公司MRA4P - sourceOrderNo: YS240531002 - taskSourceNo: PSh0347202405310005 - areaCode: areah03472143 + sourceOrgId: p1e267 + sourceOrgName: 国药集团公司mvYxk + sourceOrderNo: YS240603002 + taskSourceNo: PSh0347202406030005 + areaCode: areah03472181 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-05-31 07:12:17' + taskDate: '2024-06-03 07:13:10' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 415fd2ddaff96f19a9455fffae282da7c001eb65..ef73b2d687faf7e560d1ba9257cedd0ebe0dd595 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: CHECKh034720240531000020001 + - id: CHECKh034720240603000020001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024053100002 - hosGoodsId: h034700003921 + pid: CHECKh03472024060300002 + hosGoodsId: h034700003964 batchCode: '333' - expdtDate: '2024-12-07' - productDate: '2024-05-31' + expdtDate: '2024-12-10' + productDate: '2024-06-03' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03837852' + srcBatchId: '03837924' srcBatchPrice: 99.9999 - shelfCode: areah03472143-2-01-01 + shelfCode: areah03472181-2-01-01 shelfKind: - barcodeId: UT240531000201 + barcodeId: UT240603000201 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202405310005 - distrDetailId: '03837852' + distrId: PSh0347202406030005 + distrDetailId: '03837924' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000039213332024-12-07100支/100 + viewId: h0347000039643332024-12-10100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03837852' - mdmGoodsCode: '11660858' - goodsCode: '00003921' + sourceDetailId: '03837924' + mdmGoodsCode: '11660902' + goodsCode: '00003964' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3643 - purBillId: Ch034720240531000043 - provId: p1e25f - provName: 国药集团公司MRA4P + branchId: h0347-3649 + purBillId: Ch034720240603000043 + provId: p1e267 + provName: 国药集团公司mvYxk subSendFlag: 10 - exeProvId: p1e25f - exeProvName: 国药集团公司MRA4P - purDetailId: f1d687de4e2e4032849f0ea71da9be93 - goodsName: 一次性注射器_低值ga1u3 + exeProvId: p1e267 + exeProvName: 国药集团公司mvYxk + purDetailId: f5e9653dd03145c2abb8b3ae9dca98bb + goodsName: 一次性注射器_低值qjUa2 goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: 175916cec2a645239c2f8bd189dbdbf2 - supplyId: 444473a2ccee4ef7a582be9f6eed0279 - subProvId: p1e25f - subProvName: 国药集团公司MRA4P + pkgDefId: f01689fa3fef495db5b42af937a62c36 + supplyId: 29ea957e99fd49efb2521a28faa0efb2 + subProvId: p1e267 + subProvName: 国药集团公司mvYxk subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00003921' + goodsCode: '00003964' purMode: 10 - goodsName: 一次性注射器_低值ga1u3 + goodsName: 一次性注射器_低值qjUa2 ygptCode: '' transCond: '' storageCond: '' - erpCode: '11660858' + erpCode: '11660902' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 2e47b6d74c40fd97e072b0ae3e82060ac19fbf95..234f1171db6ad45ff4aa62933f566d45fd6ec043 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,34 +1,34 @@ 条码信息: list_a: - &id001 - id: '8800000001059087' - snCode: '8800000001059087' - ssccCode: '010839000182078722' - pkgCodeSee: '0100000000003920102221124053117241207218800000001059087' - hosGoodsId: h034700003920 - hosGoodsCode: '00003920' - goodsCode: '00003920' - goodsName: 高值牙钻机olAYM + id: '8800000001060547' + snCode: '8800000001060547' + ssccCode: '010839000182497226' + pkgCodeSee: '0100000000003963102221124060317241210218800000001060547' + hosGoodsId: h034700003963 + hosGoodsCode: '00003963' + goodsCode: '00003963' + goodsName: 高值牙钻机^A%aM goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '222' - productDate: '2024-05-31' - expdtDate: '2024-12-07' + productDate: '2024-06-03' + expdtDate: '2024-12-10' pkgDefName: pkgDefQty: 1.0 - stockId: 54909748000e468fa2c6cc2761be4086 + stockId: 6b6ca005ff174cf28bdfb475f7e57aad stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472140 + areaCode: areah03472179 lockStatus: 0 unitName: 1支 - shelfCode: areah03472140-A-01-01 + shelfCode: areah03472179-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024053117256", "distrBillId": "PSh0347202405310009", - "inStockTime": "2024-05-31 14:56:27", "useFrequency": 1, "distrDetailId": "03837856", + extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024060317506", "distrBillId": "PSh0347202406030016", + "inStockTime": "2024-06-03 07:34:14", "useFrequency": 1, "distrDetailId": "03837935", "certificateCode": "", "multiChargeFlag": 0}' bottleId: pkgType: '20' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司MRA4P - provId: p1e25f - inStockDate: '2024-05-31 14:56:26' + provName: 国药集团公司mvYxk + provId: p1e267 + inStockDate: '2024-06-03 07:34:13' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index 88250738e64ba3c80e3ce41622ef9fa2db28490e..fa23ec3b0f2fcf4369cd918ba0e5face3cbff2c4 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: h034700003920 - hosGoodsCode: '00003920' - provId: p1e25f - subProvId: p1e25f - subProvName: 国药集团公司MRA4P - goodsName: 高值牙钻机olAYM + - hosGoodsId: h034700003963 + hosGoodsCode: '00003963' + provId: p1e267 + subProvId: p1e267 + subProvName: 国药集团公司mvYxk + goodsName: 高值牙钻机^A%aM 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 95f4e3d9c79d68962942d894110a336a4c79c589..bd77773896a6f8c2e50f97937d09eb6b3a24185d 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405310008_1 + MSPid: MSP2406030008_1 hosId: h0347 - hosGoodsId: h034700003921 - provGoodsid: provGood-99221099 - goodsAuditBillId: MSP2405310008 - targetId: MSP2405310008_1 + hosGoodsId: h034700003964 + provGoodsid: provGood-99221145 + goodsAuditBillId: MSP2406030008 + targetId: MSP2406030008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 1d71eb4e48d648baabfcfb2c15b84cf8b41c6599..d9d1a6b78ca98ca58873c7a4c65e03378dbd3bf5 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: '8800000001059286' - snCode: '8800000001059286' - ssccCode: '010839000182128625' - pkgCodeSee: '01000000000039201022221124053117241207218800000001059286' - hosGoodsId: h034700003920 - hosGoodsCode: '00003920' - goodsCode: '00003920' - goodsName: 高值牙钻机olAYM + id: '8800000001060546' + snCode: '8800000001060546' + ssccCode: '010839000182497028' + pkgCodeSee: '01000000000039631022221124060317241210218800000001060546' + hosGoodsId: h034700003963 + hosGoodsCode: '00003963' + goodsCode: '00003963' + goodsName: 高值牙钻机^A%aM goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-05-31' - expdtDate: '2024-12-07' + productDate: '2024-06-03' + expdtDate: '2024-12-10' pkgDefName: pkgDefQty: 1.0 - stockId: 54909748000e468fa2c6cc2761be4086 + stockId: 6b6ca005ff174cf28bdfb475f7e57aad stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472140 + areaCode: areah03472179 lockStatus: 0 unitName: 1支 - shelfCode: areah03472140-A-01-01 + shelfCode: areah03472179-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202405310014", "inStockTime": - "2024-05-31 07:24:55", "useFrequency": 1, "distrDetailId": "03837861", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406030014", "inStockTime": + "2024-06-03 07:25:56", "useFrequency": 1, "distrDetailId": "03837933", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司MRA4P - provId: p1e25f - inStockDate: '2024-05-31 07:24:54' + provName: 国药集团公司mvYxk + provId: p1e267 + inStockDate: '2024-06-03 07:25:56' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 42df148c7c8fced45110b040f93e5523739296a6..6bac3b1d9ee85931957d97f0da6124d6f4a6717e 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: h034700003922 + - hosGoodsId: h034700003965 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂@q1Mc + goodsName: 新型冠状病毒检测试剂9jSFk goodsSpec: G-31891 - mdmGoodsCode: '11660859' - goodsCode: '00003922' + mdmGoodsCode: '11660903' + goodsCode: '00003965' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -18,30 +18,30 @@ pkgQty: qty: 200.0 goodsImg: [] - pkgDefId: 1fa6b0cb864543e29e0c13633473169d + pkgDefId: 568e14ff69ff4d9a9489b94a09190c34 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 2400310b2a484a71a3d050da4ea37ad0 + deptId: f8eb781292cd452eabd5ca99f8867aff deptName: areaCode: areaName: - targetDeptId: 4d0db8a18c454c0f8887dc578e353d16 + targetDeptId: f6e2b5eb722b42e18bcc93ef29371337 targetDeptName: 设备科001 - targetStockId: c83c1ac85bbc4f818f4d7555fae181b9 - targetStockName: 东土城路院区UhFS2中心库房 + targetStockId: a55bfa0cbbed47b5bcf9dcf0d30daf76 + targetStockName: 东土城路院区kBIb2中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 1 + grantWay: 3 deptGoodsStatus: codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司MRA4P - noRecPkgQty: 6.0 - noRecQty: 600.0 + provName: 国药集团公司mvYxk + noRecPkgQty: 3.0 + noRecQty: 300.0 autoUnpack: consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index ad9679ad7b5d06551f53ebc3d2ca5db15cdd41dc..a799b77968d0c3b7b1500a835f0469f11ec195a6 100644 --- a/data/b5_spd3_core_business_flow/message22 +++ b/data/b5_spd3_core_business_flow/message22 @@ -1,16 +1,16 @@ 库区信息: list_a: - &id001 - - id: 0702e472a3dd401ba00557cb70088ef9 - lastModified: '2024-05-31 17:04:57' - version: 12 - createTime: '2024-05-31 08:42:09' - createUser: h0347_UID-051304 - lastModifiedUser: h0347_UID-051304 - stockId: 084edce6f55844a8b9ce30bf26dca659 - shelfCode: areah03472144 + - id: 96bcc652cdba4464948a0dd9c99640ae + lastModified: '2024-06-03 07:26:19' + version: 1 + createTime: '2024-06-03 07:04:40' + createUser: h0347_UID-051310 + lastModifiedUser: h0347_UID-051310 + stockId: 6b6ca005ff174cf28bdfb475f7e57aad + shelfCode: areah03472179 shelfName: 默认库区 - address: 二级科室005 + address: 二级检验科002 shelfType: stockType: 0 defaultFlag: 1 @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051304 + linkman: h0347_UID-051310 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: f71f3f896dad46c0af9403ad5cc0e8fc + deptId: f8eb781292cd452eabd5ca99f8867aff areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 1f2cbe062273a6a330ed959a9135ab2d5c4971a5..fcb1f0e41ea89b59c0ae7802a5f6cdc3e7933fae 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405310009_1 + MSPid: MSP2406030009_1 hosId: h0347 - hosGoodsId: h034700003922 - provGoodsid: provGood-99221100 - goodsAuditBillId: MSP2405310009 - targetId: MSP2405310009_1 + hosGoodsId: h034700003965 + provGoodsid: provGood-99221146 + goodsAuditBillId: MSP2406030009 + targetId: MSP2406030009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index e1177596d65794f6a98c0be5ec4cd7f45fbba6bd..1d8805bc5fd3dce26134748da386eeb0232bdc8d 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405310010_1 + MSPid: MSP2406030010_1 hosId: h0347 - hosGoodsId: h034700003923 - provGoodsid: provGood-99221101 - goodsAuditBillId: MSP2405310010 - targetId: MSP2405310010_1 + hosGoodsId: h034700003966 + provGoodsid: provGood-99221147 + goodsAuditBillId: MSP2406030010 + targetId: MSP2406030010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index ae0bd5ee0bffbe47327b28f37d178517a797272f..971a9697ea36164b9df8084dff0c2bb7d971b583 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405310011_1 + MSPid: MSP2406030011_1 hosId: h0347 - hosGoodsId: h034700003924 - provGoodsid: provGood-99221102 - goodsAuditBillId: MSP2405310011 - targetId: MSP2405310011_1 + hosGoodsId: h034700003967 + provGoodsid: provGood-99221148 + goodsAuditBillId: MSP2406030011 + targetId: MSP2406030011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 2049a95772f4f39f21b9ca2e5c04150ab2bcc0fb..2cd4e1eba552b644797faace683f7ad58d94c705 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 1fa6b0cb864543e29e0c13633473169d - unitPackageid2: 1fa6b0cb864543e29e0c13633473169d + unitPackageid1: 568e14ff69ff4d9a9489b94a09190c34 + unitPackageid2: 568e14ff69ff4d9a9489b94a09190c34 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index e109892451a5e79d79383e7955ccac9d3be76cd6..32369522ceb1ab36cab5758005fa442a2f45100d 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024053124772 - orderNo2: PLAN2024053124772 + orderNo1: PLAN2024060325173 + orderNo2: PLAN2024060325173 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 749ff02ed56994bc585447c46a52ca94e905bf05..7b910e71d1694592f2f7ad07a2ff09b28788f0c9 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,38 +1,53 @@ 配送订单信息: list_a: - &id001 - - id: Nh034720240531000001 - orderNo: SSTZ202405310257 - sourceOrderNo: SSSQ202405310281 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区UhFS2 - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-06-01' - operDoctor: 李* - patientName: 张* - status: 10 - statusText: 待确认 + - id: Ch034720240603000112 + lastModified: '2024-06-03 11:23:33' version: 0 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试oO48w - distPriority: 0 - distPriorityText: - distId: - distNo: + createTime: '2024-06-03 11:23:33' + createUser: h0347_UID-051310 + lastModifiedUser: + orderNo: CG2024060317548 + billMode: '66' + recType: HDI + hosId: h0347 + branchId: h0347-3649 + deptId: + deptName: + recOrgId: f8eb781292cd452eabd5ca99f8867aff + recOrgName: 二级检验科002 + areaCode: + areaName: + billExpdtDate: + sourceId: Ph034720240603021817 + sourceType: + inSettlement: + recUser: + recPhone: + recAddr: 二级检验科002 + provId: p1e267 + provName: 国药集团公司mvYxk + subSendFlag: + exeProvId: p1e267 + exeProvName: 国药集团公司mvYxk + billRelationJson: + extInfo: + barcodeFlag: 1 + pkgFlag: + remark: '' + priority: + closeStatus: 0 + closeDate: + upStatus: + tbStatus: 30 hosVersion: 3 - createTime: '2024-05-31 07:23:29' - sumQty: - sumAmount: - operationPkg: 0 - provId: p1e25f - provName: 国药集团公司MRA4P - subProvId: '' - subProvName: '' - recDeptId: 2400310b2a484a71a3d050da4ea37ad0 + billType: CGD + hosName: 邹城市人民医院(test) + branchName: 东土城路院区kBIb2 + sumQty: 100.0 + sumPkgQty: 1.0 + sumAmount: '9999.9900' + planOrderNo: PLAN2024060325172 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 49901f88248503e713423148cacb06b6c5d0c52a..85f1b45cf8ec09259f902274fbb0ccf3fb94fd09 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,70 +1,87 @@ 配送订单详细信息: list_a: - &id001 - id: Nh034720240531000001 - orderNo: SSTZ202405310257 - sourceOrderNo: SSSQ202405310281 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区UhFS2 - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-06-01' - operDoctor: 李* - patientName: 张* - status: 20 - statusText: 待配送 - version: 1 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试oO48w - distPriority: 0 - distPriorityText: 否 - distId: - distNo: - hosVersion: 3 - createTime: '2024-05-31 07:23:29' - sumQty: 1 - sumAmount: '99.9999' - operationPkg: 0 - provId: p1e25f - provName: 国药集团公司MRA4P - subProvId: '' - subProvName: '' - recDeptId: 2400310b2a484a71a3d050da4ea37ad0 - list_b: - - *id001 - list_c: - - *id001 -配送订单详细信息2: - list_a: - - &id001 - - id: h034720240531000001 - hosGoodsId: h034700003920 - goodsNum: 1 + - id: 1bb8ed62d84244aa9ebb24a1efefde2c + lastModified: + version: + createTime: + createUser: + lastModifiedUser: + pid: Ch034720240603000112 + orderNo: CG2024060317548 + sourceId: 904b5a12b36c49838e8b512af793df4f + hosGoodsId: h034700003965 + mdmGoodsCode: '11660903' + goodsCode: '00003965' + purMode: 60 price: '99.9999' - inSettlement: 3 - inSettlementText: 消耗结算 - goodsName: 高值牙钻机olAYM - goodsSpec: G-31891 - goodsCode: '00003920' - goodsMfrsId: mfrs-11229 - goodsMfrsName: 德国歌德公司 Geuder AG + supplyId: 5e4246f30eb645d9bb91bf40ba1963ae + pkgDefId: 568e14ff69ff4d9a9489b94a09190c34 + pkgDefName: '100' + pkgDefQty: 100.0 + pkgQty: 1.0 + qty: 100.0 + conPkgQty: 1.0 + conQty: 100.0 + checkPkgQty: 0.0 + checkQty: 0.0 + distrPkgQty: 0.0 + distrQty: 0.0 + notSendQty: 0.0 + notSendPkgQty: 0.0 + inSettlement: 1 + closeType: 1 + detailRelationJson: '{"planBillId":"Ph034720240603021817","buyDetailId":"Bh034720240603000270001","planDetailId":"904b5a12b36c49838e8b512af793df4f"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00003965","purMode":60,"goodsName":"新型冠状病毒检测试剂9jSFk"}' + remark: + tbStatus: + hosVersion: unit: 支 - subProvId: p1e25f - subProvName: 国药集团公司MRA4P - totalAmount: '99.9999' - spdGoodsCode: '11660857' - barCodeMng: 2 - erpCode: '11660857' + goodsName: 新型冠状病毒检测试剂9jSFk + mfrsId: mfrs-11229 + mfrsName: 德国歌德公司 Geuder AG + goodsGg: G-31891 + mdmGoodsSpecCode: '11660903' + erpCode: '11660903' + made: 德国 + goodsDi: + miDjmc: + miGoodsGg: + miGoodsXh: + miCode: + miTwentyCode: + miTwentysevenCode: '' + miKindCode: + purchaseContent: + purchaseUnit: + buyContent: + buyUnit: + transferRatio: + extend: + hitCode: '12' + hitPrice: 99.9999 + barCodeMng: '2' + rfidFlag: + goodsRegCert: '' + transCond: '' + storageCond: '' + diType: gs1 + diUse: '36490000039650' multiChargeFlag: 0 useFrequency: 1 chargeUnit: - hitCode: '12' - hitPrice: '99.999900' - diUse: - goodsDi: + amount: '9999.9900' + unitName: 100支/100 + subProvId: p1e267 + subProvName: 国药集团公司mvYxk + subPrice: 99.9999 + replPkgQty: 1.0 + replQty: 100.0 + ybDefId: + logicId: + provGoodsId: + sendFlag: + curQry: list_b: - *id001 list_c: diff --git a/report/summary.html b/report/summary.html index 8d4d98c627aa86a572b2ee4d8142ec38a8c09dab..ba41a318bb74d7e7f7ef3759ba612b48cc6add0c 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间