From 3f738b1840f5fd1fb2029c707f25245a81086477 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Mon, 27 May 2024 16:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...21\344\272\214\347\272\247\345\272\223.py" | 320 ++++++++++++++++++ data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 +- data/a6_mdm3_si/message | 53 +-- data/b2_herp3_bs/data | 2 + 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/message | 4 +- data/b5_spd3_core_business_flow/message1 | 10 +- data/b5_spd3_core_business_flow/message10 | 15 +- data/b5_spd3_core_business_flow/message11 | 4 +- data/b5_spd3_core_business_flow/message12 | 4 +- data/b5_spd3_core_business_flow/message13 | 27 +- data/b5_spd3_core_business_flow/message14 | 40 +-- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 122 +------ data/b5_spd3_core_business_flow/message17 | 58 ++-- data/b5_spd3_core_business_flow/message18 | 50 ++- data/b5_spd3_core_business_flow/message19 | 12 +- data/b5_spd3_core_business_flow/message2 | 10 +- data/b5_spd3_core_business_flow/message20 | 34 +- data/b5_spd3_core_business_flow/message21 | 22 +- data/b5_spd3_core_business_flow/message22 | 20 +- 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 | 75 ++-- data/b5_spd3_core_business_flow/message9 | 135 ++++---- report/summary.html | 10 +- 36 files changed, 674 insertions(+), 441 deletions(-) create mode 100644 "air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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_b4\346\265\201\347\250\213\345\215\201\344\270\200\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" diff --git "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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_b4\346\265\201\347\250\213\345\215\201\344\270\200\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_b4\346\265\201\347\250\213\345\215\201\344\270\200\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_b4\346\265\201\347\250\213\345\215\201\344\270\200\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" new file mode 100644 index 00000000..16762619 --- /dev/null +++ "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\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_b4\346\265\201\347\250\213\345\215\201\344\270\200\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" @@ -0,0 +1,320 @@ +# -*- encoding=utf8 -*- +import json +import traceback + +from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system +from air_case.public1.public1.public1 import * +from common.db.sql.sql_del_branch_info import delData + +from common.fileUtls import FileUtils +from common.run_cmd_script import execute_command +from common.timeUtils import timeUtils +from airtest.core.api import using + +__author__ = "xiaohesheng" + +""" +case_tag:api,spd_core1,a_b4流程十一请领业务流_二级库向二级库,id2302,id2302-14,sit,on +核心业务流:a_b4流程十一请领业务流_二级库向二级库 +python runner_test.py tag id2302-14 debug mdm3 +""" + + +def SERACH_goods_id(GoodsId): + module = 'b5_spd3_core_business_flow' + # # 登录获取用户id等信息，使用创建的用户登录===========开始 + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + username = info['username1'] + password = commonFuc().get_business_data("b2_herp3_bs", "password") + print('username,password', username, password) + # # 获取token和projectCode + token, projectCode, uxid, corpId, info = login(username, password, 2) + # 登录获取用户id等信息，使用创建的用户登录============结束\ + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_mcmsBranchGoodsInfo_page_url") + dept1 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1'] + # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] + # GoodsId = hosGoodsId.replace(get_hosid(), '') + request_body = commonFuc().get_business_data(module, "payload53", GoodsId, get_hosid(), get_branch_id(), dept1) + result = commonFuc().http_post(url, request_body, headers) + branchGoodsId = commonFuc().analysis_json('id', commonFuc().analysis_json('data', commonFuc().analysis_json('data', + result))) + return branchGoodsId + + +def goods_move(): + # # 登录获取用户id等信息，使用创建的用户登录===========开始 + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + username = info['username1'] + password = commonFuc().get_business_data("b2_herp3_bs", "password") + print('username,password', username, password) + # # 获取token和projectCode + token, projectCode, uxid, corpId, info = login(username, password, 2) + # 登录获取用户id等信息，使用创建的用户登录============结束 + module = "b2_herp3_bs" + # g0_请领出库渠道设置_转移产品到边仓 + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "updateSettleType_url") + + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + for i in range(1, 4): + info = FileUtils().r_info8('b5_spd3_core_business_flow', "产品审核信息", 'message%s' % i) + hosGoodsId = info['hosGoodsId'] + GoodsId = hosGoodsId.replace(get_hosid(), '') + branchGoodsId = SERACH_goods_id(GoodsId) + # #请求体 + request_body = commonFuc().get_business_data(module, "payload47", branchGoodsId, hosGoodsId, get_branch_id()) + print(request_body) + # # # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('goods_move,result', result) + + +def second_dept_Request(hosGoodsId, type): + module = "b5_spd3_core_business_flow" + # # 登录获取用户id等信息，使用创建的用户登录===========开始 + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + username = info['username1'] + password = commonFuc().get_business_data("b2_herp3_bs", "password") + print('username,password', username, password) + # # 获取token和projectCode + token, projectCode, uxid, corpId, info = login(username, password, 2) + # 登录获取用户id等信息，使用创建的用户登录============结束 + # 我要请领_手工请领_列表查询=========================== + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_buy_queryGoodsInfoPage_url") + print('我要请领_手工请领_列表查询=================', url) + deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + # 高值 + # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] + GoodsId = hosGoodsId.replace(get_hosid(), '') + areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode) + print('我要请领_手工请领_列表查询', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('我要请领_手工请领_列表查询,result', result) + data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) + goodsName = commonFuc().analysis_json('goodsName', data1) + goodsSpec = commonFuc().analysis_json('goodsSpec', data1) + mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1) + goodsCode = commonFuc().analysis_json('goodsCode', data1) + unit = commonFuc().analysis_json('unit', data1) + purMode = commonFuc().analysis_json('purMode', data1) + goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) + unitName = commonFuc().analysis_json('unitName', data1) + price = commonFuc().analysis_json('price', data1) + deptId = commonFuc().analysis_json('deptId', data1) + # areaCode=commonFuc().analysis_json('areaCode',data1) + areaName = '默认库区' + targetDeptId = commonFuc().analysis_json('targetDeptId', data1) + targetDeptName = commonFuc().analysis_json('targetDeptName', data1) + targetStockId = commonFuc().analysis_json('targetStockId', data1) + targetStockName = commonFuc().analysis_json('targetStockName', data1) + purModeText = commonFuc().analysis_json('purModeText', data1) + goodsGeneralName = commonFuc().analysis_json('goodsGeneralName', data1) + provName = commonFuc().analysis_json('provName', data1) + pkgDefId = commonFuc().analysis_json('pkgDefId', data1) + # 信息写入文件 + list_a = [] + list_b = [] + list_c = [] + list_a.append(data1) + list_b.append(data1) + list_c.append(data1) + # print('list_a', len(list_a), list_a) + info = (list_a, list_b, list_c) + titlename = ('list_a', 'list_b', 'list_c') + FileUtils().w_info8(info, module, '二级库请领产品信息', titlename, 'message21') + # 我要请领_手工请领_列表查询=========================== + # 添加到请领车============================================= + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_buy_createBuyCar_url") + print('添加到请领车=================', url) + if type == 1: + request_body = commonFuc().get_business_data(module, "payload40", hosGoodsId, goodsName, goodsSpec, + mdmGoodsCode, + goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price, + deptId, + areaCode, areaName, targetDeptId, targetDeptName, targetStockId, + targetStockName, purModeText, goodsGeneralName, provName) + elif type == 2: + request_body = commonFuc().get_business_data(module, "payload41", hosGoodsId, goodsName, goodsSpec, + mdmGoodsCode, + goodsCode, unit, purMode, goodsMfrsName, unitName, price, deptId, + areaCode, areaName, targetDeptId, targetDeptName, targetStockId, + targetStockName, purModeText, goodsGeneralName, provName) + elif type == 3: + request_body = commonFuc().get_business_data(module, "payload42", hosGoodsId, goodsName, goodsSpec, + mdmGoodsCode, + goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price, + deptId, + areaCode, areaName, targetDeptId, targetDeptName, targetStockId, + targetStockName, purModeText, goodsGeneralName, provName) + request_body = get_process_list(request_body) + print('添加到请领车', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('添加到请领车,result', result) + # 添加到请领车============================================= + + +def BuyCarSubmit(): + module = "b5_spd3_core_business_flow" + # # 登录获取用户id等信息，使用创建的用户登录===========开始 + info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3') + username = info['username1'] + password = commonFuc().get_business_data("b2_herp3_bs", "password") + print('username,password', username, password) + # # 获取token和projectCode + token, projectCode, uxid, corpId, info = login(username, password, 2) + # 登录获取用户id等信息，使用创建的用户登录============结束 + # 我要请领_手工请领_列表查询=========================== + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + # 请领车查询=============================================== + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_buy_queryBuyCarPage_url") + print('请领车查询=================', url) + deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'] + deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'] + areaCode = get_stockAreaId_new(deptid2, deptname2, 2) + request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2) + + print('请领车查询', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('请领车查询,result', result) + data = commonFuc().analysis_json('data', result) + list_id = [] + for i in data: + id = commonFuc().analysis_json('id', i) + list_id.append(id) + # 请领车查询=============================================== + # 请领车提交=============================================== + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_buy_validBuyCarSubmit_url") + print('请领车提交=================', url) + + billExpdtDate = timeUtils().get_time_add(30, 2) + print('billExpdtDate', billExpdtDate) + request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0], + list_id[1], list_id[2]) + + print('请领车提交', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('请领车提交,result', result) + # 请领车提交=============================================== + # 创建领车交易================================================= + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_buy_createBuyBill_url") + print('创建领车交易=================', url) + + billExpdtDate = timeUtils().get_time_add(30, 2) + request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0], + list_id[1], list_id[2]) + + print('创建领车交易', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('创建领车交易,result', result) + currentTaskList = commonFuc().analysis_json('currentTaskList', commonFuc().analysis_json('data', result)) + + +def add_logic_stock(): + delData().Delete_yb_logic_stock() + module = "b5_spd3_core_business_flow" + # 登录集中管控平台 + token, projectCode, uxid, corpId, info = login_platform() + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + # #添加云仓=============================================== + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, + "platformService_basic_logic_save_url") + print('添加云仓=================', url) + + request_body = commonFuc().get_business_data(module, "payload54", get_hosid(), get_branch_id(), get_branch_id(), + uxid, uxid, get_in_userid(), get_hosid(), uxid, uxid) + + print('添加云仓', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('添加云仓,result', result) + + +def cloud_stock_opeartion(): + print('云仓处理') + # 云仓登录 + token, projectCode, uxid, corpId, info =login_logic_stock() + module = "b5_spd3_core_business_flow" + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + # #云仓处理查看单据=============================================== + url = commonFuc().get_api_url() + commonFuc().get_business_data(module, + "platformService_basic_logic_save_url") + print('云仓处理查看单据=================', url) + + request_body = commonFuc().get_business_data(module, "payload54", get_hosid(), get_branch_id(), get_branch_id(), + uxid, uxid, get_in_userid(), get_hosid(), uxid, uxid) + + print('云仓处理查看单据', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('云仓处理查看单据,result', result) + +def add_dept2(): + module='b2_herp3_bs' + # 内网登录 + username = commonFuc().get_business_data(module, "username") + # print('医院名称',username) + password = commonFuc().get_business_data(module, "password") + # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa') + # 获取token和projectCode + token, projectCode, uxid, corpId, info = login_system(username, password).get_token() + # print( token,projectCode,uxid,corpId,info) + # c3_新增科室_特殊科室_二级库房 + branch_id = FileUtils().r_info(module, '院区新增')["branch_id"] + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_insert_url") + + # 获取请求头信息 + headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + commonFuc().get_business_data(module, "X-APP-CODE")) + + # #请求体 + request_body = commonFuc().get_business_data(module, "payload15_2", get_branch_id(),get_hosid()) + print(request_body) + # # # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + print('result', result) + +try: + add_dept2() + # set_dept_lead() # 设置二级科室负责人 + # # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0" + # add_logic_stock() + # + # # 设置产品出库渠道为边仓 + # goods_move() + # updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 + # + # # # # 低值 + # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1) + # # # 高值 + # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2) + # # # 试剂 + # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) + # BuyCarSubmit() # 请领车提交 + # for i in range(6): # 三个单据共审批6次 + # approval_center() + commonFuc().check_text_exist_result_text('succees', 'succees') +except: + commonFuc().check_text_exist_result_text('error', '1') diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index bffbc196..6badafc7 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202405240038 - cname: 国药集团公司oJCHn + e_id: CR202405270038 + cname: 国药集团公司$U^K@ diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 28c518e0..129d3596 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院#I4Ev - h_name: 湖南省人民医院#I4Ev + h_id: 湖南省人民医院N8UEp + h_name: 湖南省人民医院N8UEp diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index b10eaab1..0838d0d4 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405240010_1 + MSPid: MSP2405270011_1 hosId: h0347 - hosGoodsId: h034700003765 - provGoodsid: provGood-99220898 - goodsAuditBillId: MSP2405240010 - targetId: MSP2405240010_1 + hosGoodsId: h034700003813 + provGoodsid: provGood-99220946 + goodsAuditBillId: MSP2405270011 + targetId: MSP2405270011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 0d69c16b..12bd0668 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202406' - pid: OBh0347202405220004 - hosGoodsId: h034700003681 - goodsCode: '00003681' - goodsName: 一次性注射器_低值@s2rQ + pid: OBh0347202405270004 + hosGoodsId: h034700003810 + goodsCode: '00003810' + goodsName: 一次性注射器_低值GAP0b goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -16,16 +16,17 @@ cacheleftAmount: 19999.98 purMode: 10 waitInvoicingNum: 0.0 + invoicingPrice: 99.9999 normalContractId: normalContract: '1' detailList: - - pid: OBh0347202405220004 + - pid: OBh0347202405270004 settleMonth: '202406' - hosGoodsId: h034700003681 + hosGoodsId: h034700003810 batchCode: '333' - distrDetailId: '03837536' - distrId: PSh0347202405220005 - distrOrderNo: PSh0347202405220005 + distrDetailId: '03837740' + distrId: PSh0347202405270005 + distrOrderNo: PSh0347202405270005 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -34,11 +35,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e223 - branchId: h0347-3616 - balanceDetId: OBh0347202405220004-000001 + provId: p1e24c + branchId: h0347-3635 + balanceDetId: OBh0347202405270004-000001 purMode: 10 - barCode: 013616000003681010333112405221724112821UT240522000202 + barCode: 013635000003810010333112405271724120321UT240527000202 batchId: price: maxQty: @@ -50,14 +51,14 @@ oneFcatName: volumeFlag: onlineKind: - viewId: 202406OBh0347202405220004h034700003681 - - pid: OBh0347202405220004 + viewId: 202406OBh0347202405270004h034700003810 + - pid: OBh0347202405270004 settleMonth: '202406' - hosGoodsId: h034700003681 + hosGoodsId: h034700003810 batchCode: '333' - distrDetailId: '03837536' - distrId: PSh0347202405220005 - distrOrderNo: PSh0347202405220005 + distrDetailId: '03837740' + distrId: PSh0347202405270005 + distrOrderNo: PSh0347202405270005 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -66,11 +67,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e223 - branchId: h0347-3616 - balanceDetId: OBh0347202405220004-000002 + provId: p1e24c + branchId: h0347-3635 + balanceDetId: OBh0347202405270004-000002 purMode: 10 - barCode: 013616000003681010333112405221724112821UT240522000254 + barCode: 013635000003810010333112405271724120321UT240527000233 batchId: price: maxQty: @@ -82,10 +83,10 @@ oneFcatName: volumeFlag: onlineKind: - viewId: 202406OBh0347202405220004h034700003681 - unique: 202406OBh0347202405220004h034700003681 + viewId: 202406OBh0347202405270004h034700003810 + unique: 202406OBh0347202405270004h034700003810 onlineKind: '10' - viewId: 202406OBh0347202405220004h034700003681 + viewId: 202406OBh0347202405270004h034700003810 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/data b/data/b2_herp3_bs/data index 6af85901..567244eb 100644 --- a/data/b2_herp3_bs/data +++ b/data/b2_herp3_bs/data @@ -211,6 +211,8 @@ json_headers2: { "payload13": {"pageNum": 1,"pageSize": 50,"orderBy": "code asc","queryObject": {"ename": "","branchId": "院区id", "branchId": "%s", "hosId": "医院id", "hosId": "h0347" }} "payload14": {"branchId":"%s","cname":"","ename":"设备科001","erpCode":"001","address":"设备科001","contactWay":"13401003250","deptKind":1,"deptCate":1,"deptLevel":"1","flag":"1","hisDeptCodes":"","deptType":"1","packetType":"0","corpId":"h0347","corpKind":1} "payload15": {"branchId":"%s","cname":"","ename":"二级检验科002","erpCode":"002","address":"二级检验科002","contactWay":"13401003250","deptKind":7,"deptCate":1,"deptLevel":"2","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1} +"payload15_2": {"branchId":"%s","cname":"","ename":"二级检验科005","erpCode":"005","address":"二级检验科005","contactWay":"13401003250","deptKind":7,"deptCate":1,"deptLevel":"2","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"%s","corpKind":1} + "payload16": {"branchId":"%s","pid":"%s","cname":"","ename":"三级检测组003","erpCode":"003","address":"三级检测组003","contactWay":"12401003250","deptKind":7,"deptCate":1,"deptLevel":"3","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1} "payload17": {"branchId":"%s","pid":"%s","cname":"","ename":"科室004","erpCode":"004","address":"三级科室004","contactWay":"三级科室004","deptKind":5,"deptCate":1,"deptLevel":"4","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1} diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index bf7e65e6..6066f966 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3627 - branch_name: 东土城路院区WDUvl + branch_id: h0347-3635 + branch_name: 东土城路院区PMue6 科室信息: - dept2_id: 1c14108179f54e28bce5b1df6b33fc57 + dept2_id: ebacb1842d234dfd9dbc59fc11bad8bf dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 44ff4b36..8c00694b 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试3(GIe - username2: 自动化测试3(GIe + username1: 自动化测试uVgNZ + username2: 自动化测试uVgNZ diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 8ec8e952..d669b61b 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: f3f1209531c84bddafbe05bd5d6585f0 + dept1_id: e621323f605c477493861a11cf8ee8a8 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index 82f0fb50..4a4cb832 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: f3f1209531c84bddafbe05bd5d6585f0 - stockAreaId: ee2b9bb497544e5896ee916ba37449fb + dept1_id: e621323f605c477493861a11cf8ee8a8 + stockAreaId: ddf2943da6f64fe9a5461563aed113bc diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 2290b7d4..7cc07f25 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,8 +1,8 @@ 所有科室id: - deptid1: f3f1209531c84bddafbe05bd5d6585f0 - deptid2: 1c14108179f54e28bce5b1df6b33fc57 - deptid3: f972064d25184d298b82978d807c563d - deptid4: 4226aff73a8d44ab973620a539cc33e9 + deptid1: e621323f605c477493861a11cf8ee8a8 + deptid2: ebacb1842d234dfd9dbc59fc11bad8bf + deptid3: 97dac712280c45a89bbe2ad3ae40280b + deptid4: 05a182bdd747451882d4abec8fc7bc2f 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 3651df32..4bb46da2 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: ee2b9bb497544e5896ee916ba37449fb - shelfCode: areah03472053 + shelfid: ddf2943da6f64fe9a5461563aed113bc + shelfCode: areah03472094 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 89b79b90..03b0d0f1 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e23c + e_corpId: p1e24c h_corpId: h0347 - e_username: 国药集团公司oJCHn + e_username: 国药集团公司$U^K@ h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 234a4cf0..0aac7ca1 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405240006_1 + MSPid: MSP2405270007_1 hosId: h0347 - hosGoodsId: h034700003761 - provGoodsid: provGood-99220894 - goodsAuditBillId: MSP2405240006 - targetId: MSP2405240006_1 + hosGoodsId: h034700003809 + provGoodsid: provGood-99220942 + goodsAuditBillId: MSP2405270007 + targetId: MSP2405270007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 6ca4beae..263e8408 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,12 @@ 低值配送单号: - distrBillId1: PSh0347202405240033 - distrBillId2: PSh0347202405240033 + distrBillId1: PSh0347202405270011 + distrBillId2: PSh0347202405270011 高值配送单号: - distrBillId1: PSh0347202405240035 - distrBillId2: PSh0347202405240035 + distrBillId1: PSh0347202405270012 + distrBillId2: PSh0347202405270012 试剂配送单号: - distrBillId1: PSh0347202405240036 - distrBillId2: PSh0347202405240036 + distrBillId1: PSh0347202405270013 + distrBillId2: PSh0347202405270013 +高值跟台配送单号: + distrBillId1: PSh0347202405270014 + distrBillId2: PSh0347202405270014 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index fd10c317..ae4b01a3 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024052423841 - orderNo2: PLAN2024052423841 + orderNo1: PLAN2024052724253 + orderNo2: PLAN2024052724253 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 96068853..27a1fd82 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024052423842 - orderNo2: PLAN2024052423842 + orderNo1: PLAN2024052724254 + orderNo2: PLAN2024052724254 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index d2610c8c..5415583d 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,34 +3,33 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3627 + branchId: h0347-3635 deptId: taskType: 1 - sourceOrgId: p1e23c - sourceOrgName: 国药集团公司oJCHn - sourceOrderNo: PSh0347202405240036 - billMode: '66' + sourceOrgId: p1e24c + sourceOrgName: 国药集团公司$U^K@ + sourceOrderNo: PSh0347202405270014 + billMode: '25' stockKind: purMode: - sourceId: PSh0347202405240036 + sourceId: PSh0347202405270014 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024052423842 - purOrderNo: CG2024052416651 - recOrgId: f3f1209531c84bddafbe05bd5d6585f0 - recOrgName: 设备科001 - billRelationJson: '{"planBillId":"Ph034720240524020487","planOrderNo":"PLAN2024052423842","purOrderNo":"CG2024052416651","purBillId":"Ch034720240524000091","purBillDate":"2024-05-24 - 10:37:52","distrBillId":"PSh0347202405240036","distrOrderNo":"PSh0347202405240036"}' - taskDate: '2024-05-24 10:38:08' + planOrderNo: SSSQ202405270276 + purOrderNo: SSTZ202405270252 + recOrgId: ebacb1842d234dfd9dbc59fc11bad8bf + recOrgName: 二级检验科002 + billRelationJson: '{"operationApplyOrderNo":"SSSQ202405270276","operationNoticeBillId":"Nh034720240527000001","distrBillId":"PSh0347202405270014","operationNoticeOrderNo":"SSTZ202405270252","distrOrderNo":"PSh0347202405270014","operationApplyBillId":"Oh034720240527000001"}' + taskDate: '2024-05-27 07:25:51' taskDateStart: taskDateEnd: billModeList: viewIdList: supplierFlag: false 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 4fda07a3..8f013c01 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: 60 - unitName: 100支/100 - hosGoodsId: h034700003763 + - purMode: 20 + unitName: 1支 + hosGoodsId: h034700003809 mdmGoodsCode: - spdGoodsCode: '11660655' - goodsCode: '00003763' - goodsName: 新型冠状病毒检测试剂JO67D + spdGoodsCode: '11660701' + goodsCode: '00003809' + goodsName: 高值牙钻机&K)tl goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -16,27 +16,27 @@ goodsDi: miCode: miDjmc: - certificateCode: '' + certificateCode: rfidFlag: 0 pkgDefId: - pkgDefName: '100' - pkgDefQty: 100.0 - batchCode: '4444' - expdtDate: '2024-11-30' - productDate: '2024-05-24' - provName: 国药集团公司oJCHn + pkgDefName: + pkgDefQty: 1.0 + batchCode: '2222' + expdtDate: '2024-12-03' + productDate: '2024-05-27' + provName: 国药集团公司$U^K@ provId: - viewId: '03837648' + viewId: '03837749' verifyFlag: 0 hasSterilize: 0 - id: '03837648' + id: '03837749' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00003763","purMode":60,"goodsName":"新型冠状病毒检测试剂JO67D","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660655","ybDefId":""}' + extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 - distrPkgQty: 100.0 - distrQty: 10000.0 + distrPkgQty: 1.0 + distrQty: 1.0 price: 99.9999 checkQty: 0.0 checkPkgQty: 0 @@ -44,7 +44,7 @@ initQty: totalQty: rowNum: - settlement: 1 + settlement: 3 hdiBarcodeList: detailId: pkgCode: @@ -55,7 +55,7 @@ trustMrfsName: multiChargeFlag: 0 useFrequency: 1 - codingType: + codingType: 0 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 4e7f5377..964f73fc 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024052400324 - CHECK_NO2: CHECKh03472024052400324 + CHECK_NO1: CHECKh03472024052700004 + CHECK_NO2: CHECKh03472024052700004 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index e32f5304..44594e23 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -11,132 +11,28 @@ recType: stockKind: purMode: - sourceId: CHECKh03472024052400322 + sourceId: CHECKh03472024052700001 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: f3f1209531c84bddafbe05bd5d6585f0 + deptId: e621323f605c477493861a11cf8ee8a8 deptName: - branchId: h0347-3627 + branchId: h0347-3635 branchName: taskType: 1 - sourceOrgId: p1e23c - sourceOrgName: 国药集团公司oJCHn - sourceOrderNo: YS240524322 - taskSourceNo: PSh0347202405240027 - areaCode: areah03472053 + sourceOrgId: p1e24c + sourceOrgName: 国药集团公司$U^K@ + sourceOrderNo: YS240527001 + taskSourceNo: PSh0347202405270005 + areaCode: areah03472094 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-05-24 10:33:15' - pkgTaskId: - pkgFlag: - remark: '' - goodsSpec: - areaList: - areaDefaultFlag: - excludeDeptIds: - deptIds: - sourceReplId: - defaultAreaCode: - defaultAreaName: - sourceNo: - distrOrderNo: - deptBuyer: - stockName: - dataDeptIds: - oldDeptName: - oldOrderNo: - allowRejectFlag: - targetCodingType: 0 - - id: - lastModified: - version: - createTime: - createUser: - lastModifiedUser: - billMode: '16' - recType: - stockKind: - purMode: - sourceId: CHECKh03472024052400321 - sourceType: PSD - sourceVersion: 0 - batchList: - billRelationJson: - hosId: h0347 - deptId: f3f1209531c84bddafbe05bd5d6585f0 - deptName: - branchId: h0347-3627 - branchName: - taskType: 1 - sourceOrgId: p1e23c - sourceOrgName: 国药集团公司oJCHn - sourceOrderNo: YS240524321 - taskSourceNo: PSh0347202405240023 - areaCode: areah03472053 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-05-24 10:20:24' - pkgTaskId: - pkgFlag: - remark: '' - goodsSpec: - areaList: - areaDefaultFlag: - excludeDeptIds: - deptIds: - sourceReplId: - defaultAreaCode: - defaultAreaName: - sourceNo: - distrOrderNo: - deptBuyer: - stockName: - dataDeptIds: - oldDeptName: - oldOrderNo: - allowRejectFlag: - targetCodingType: 0 - - id: - lastModified: - version: - createTime: - createUser: - lastModifiedUser: - billMode: '20' - recType: - stockKind: - purMode: - sourceId: CHECKh03472024052400273 - sourceType: PSD - sourceVersion: 0 - batchList: - billRelationJson: - hosId: h0347 - deptId: f3f1209531c84bddafbe05bd5d6585f0 - deptName: - branchId: h0347-3627 - branchName: - taskType: 1 - sourceOrgId: p1e23c - sourceOrgName: 国药集团公司oJCHn - sourceOrderNo: YS240524273 - taskSourceNo: PSh0347202405240016 - areaCode: areah03472053 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-05-24 10:02:25' + taskDate: '2024-05-27 07:12:19' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 8574c7e9..9fce559f 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: CHECKh034720240524003220001 + - id: CHECKh034720240527000010001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024052400322 - hosGoodsId: h034700003762 + pid: CHECKh03472024052700001 + hosGoodsId: h034700003810 batchCode: '333' - expdtDate: '2024-11-30' - productDate: '2024-05-24' + expdtDate: '2024-12-03' + productDate: '2024-05-27' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03837639' + srcBatchId: '03837740' srcBatchPrice: 99.9999 - shelfCode: areah03472053-2-01-01 + shelfCode: areah03472094-2-01-01 shelfKind: - barcodeId: UT240524000901 + barcodeId: UT240527000201 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202405240027 - distrDetailId: '03837639' + distrId: PSh0347202405270005 + distrDetailId: '03837740' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000037623332024-11-30100支/100 + viewId: h0347000038103332024-12-03100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03837639' - mdmGoodsCode: '11660654' - goodsCode: '00003762' + sourceDetailId: '03837740' + mdmGoodsCode: '11660702' + goodsCode: '00003810' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3627 - purBillId: Ch034720240524000065 - provId: p1e23c - provName: 国药集团公司oJCHn + branchId: h0347-3635 + purBillId: Ch034720240527000044 + provId: p1e24c + provName: 国药集团公司$U^K@ subSendFlag: 10 - exeProvId: p1e23c - exeProvName: 国药集团公司oJCHn - purDetailId: 188774e4698143e093c93a44508f4219 - goodsName: 一次性注射器_低值(GH)x + exeProvId: p1e24c + exeProvName: 国药集团公司$U^K@ + purDetailId: 2b54c9e07b6542f3a4626424e8bce808 + goodsName: 一次性注射器_低值GAP0b goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: 088c5c85bcce4e13819302c37470253e - supplyId: cee60bfbae36451baddaeb710869bc05 - subProvId: p1e23c - subProvName: 国药集团公司oJCHn + pkgDefId: 3357b59177e14c07bcfa632072bc3ce3 + supplyId: 6ce5e586eb7d45c0ac5b6e82fae84a8f + subProvId: p1e24c + subProvName: 国药集团公司$U^K@ subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00003762' + goodsCode: '00003810' purMode: 10 - goodsName: 一次性注射器_低值(GH)x + goodsName: 一次性注射器_低值GAP0b ygptCode: '' transCond: '' storageCond: '' - erpCode: '11660654' + erpCode: '11660702' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 47e292e0..5b3d9688 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,7 +1,51 @@ 条码信息: list_a: - - + - &id001 + id: UT240527000701 + snCode: UT240527000701 + ssccCode: '010839000181609927' + pkgCodeSee: 0136350000038110104444112405271724120321UT240527000701 + hosGoodsId: h034700003811 + hosGoodsCode: '00003811' + goodsCode: '00003811' + goodsName: 新型冠状病毒检测试剂9jSW1 + goodsSpec: G-31891 + goodsMfrsName: 德国歌德公司 Geuder AG + unit: 支 + purMode: 60 + batchCode: '4444' + productDate: '2024-05-27' + expdtDate: '2024-12-03' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 40a8863b26db47cc9e14c01aee2f19c0 + stockName: 东土城路院区PMue6中心库房 + areaName: 自动化测试 + areaCode: areah03472094 + lockStatus: 0 + unitName: 100支/100 + shelfCode: areah03472094-2-01-01 + shelfNo: 自动化测试-2-01-01 + pkgDefId: 4777e8610956450fb451f5ced1883bff + extInfo: '{"distrDetailId":"03837748","distrBillId":"PSh0347202405270013","certificateCode":"","purBillId":"CG2024052716941","pkgDefQty":100,"pkgDefId":"4777e8610956450fb451f5ced1883bff","pkgDefName":"100"}' + bottleId: + pkgType: '66' + miDjmc: '' + miCode: '' + transferRatio: 1.0 + qty: 1 + shelfKind: 0 + shelfKindName: 普通货位 + provName: 国药集团公司$U^K@ + provId: p1e24c + inStockDate: + mfrCode: + made: 德国 + price: + barName: 100支/100 + purModeText: 检验试剂 + codeType: 66 list_b: - - + - *id001 list_c: - - + - *id001 diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index 02d3417d..042796d0 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: h034700003746 - hosGoodsCode: '00003746' - provId: p1e236 - subProvId: p1e236 - subProvName: 国药集团公司p0t4h - goodsName: 高值牙钻机FgmfE + - hosGoodsId: h034700003809 + hosGoodsCode: '00003809' + provId: p1e24c + subProvId: p1e24c + subProvName: 国药集团公司$U^K@ + goodsName: 高值牙钻机&K)tl 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 18b0ba4e..ff9f8706 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405240007_1 + MSPid: MSP2405270008_1 hosId: h0347 - hosGoodsId: h034700003762 - provGoodsid: provGood-99220895 - goodsAuditBillId: MSP2405240007 - targetId: MSP2405240007_1 + hosGoodsId: h034700003810 + provGoodsid: provGood-99220943 + goodsAuditBillId: MSP2405270008 + targetId: MSP2405270008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 0b59a6fe..1426beec 100644 --- a/data/b5_spd3_core_business_flow/message20 +++ b/data/b5_spd3_core_business_flow/message20 @@ -1,33 +1,33 @@ 二级库条码信息: list_a: - &id001 - id: '8800000001053568' - snCode: '8800000001053568' - ssccCode: '010839000180429724' - pkgCodeSee: '01000000000036801022221124052217241128218800000001053568' - hosGoodsId: h034700003680 - hosGoodsCode: '00003680' - goodsCode: '00003680' - goodsName: 高值牙钻机(0rN$ + id: '8800000001057530' + snCode: '8800000001057530' + ssccCode: '010839000181619926' + pkgCodeSee: '01000000000038091022221124052717241203218800000001057530' + hosGoodsId: h034700003809 + hosGoodsCode: '00003809' + goodsCode: '00003809' + goodsName: 高值牙钻机&K)tl goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-05-22' - expdtDate: '2024-11-28' + productDate: '2024-05-27' + expdtDate: '2024-12-03' pkgDefName: pkgDefQty: 1.0 - stockId: 11453fa95e8b40e6ad0682ca579cd712 + stockId: 170bebbeae3240779530ef3f35b69cf7 stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03471984 + areaCode: areah03472093 lockStatus: 0 unitName: 1支 - shelfCode: areah03471984-A-01-01 + shelfCode: areah03472093-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"distrDetailId":"03837545","distrBillId":"PSh0347202405220014","pkgDefQty":1,"multiChargeFlag":0,"useFrequency":1}' + extInfo: '{"distrDetailId":"03837749","distrBillId":"PSh0347202405270014","pkgDefQty":1,"multiChargeFlag":0,"useFrequency":1}' bottleId: pkgType: '25' miDjmc: '' @@ -36,9 +36,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司f$F5C - provId: p1e223 - inStockDate: '2024-05-22 07:24:05' + provName: 国药集团公司$U^K@ + provId: p1e24c + inStockDate: '2024-05-27 07:27:05' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index bf0c666f..e841cdac 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -2,11 +2,11 @@ list_a: - &id001 - id: - hosGoodsId: h034700003748 - goodsName: 新型冠状病毒检测试剂pKIh2 + hosGoodsId: h034700003811 + goodsName: 新型冠状病毒检测试剂9jSW1 goodsSpec: G-31891 - mdmGoodsCode: '11660640' - goodsCode: '00003748' + mdmGoodsCode: '11660703' + goodsCode: '00003811' unit: 支 purMode: 60 goodsMfrsName: 德国歌德公司 Geuder AG @@ -17,28 +17,28 @@ pkgQty: qty: 0 goodsImg: [] - pkgDefId: 16b05f527c984671a679c6448275aa4a + pkgDefId: 4777e8610956450fb451f5ced1883bff buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: ae5633c54a4741c08e1b76d10025ebf5 + deptId: ebacb1842d234dfd9dbc59fc11bad8bf deptName: areaCode: areaName: - targetDeptId: 550f4768e0f74ccbb706d3afa3d63a59 + targetDeptId: e621323f605c477493861a11cf8ee8a8 targetDeptName: 设备科001 - targetStockId: e0dc175070b640229a9d913d5161aac0 - targetStockName: 东土城路院区CU2K!中心库房 + targetStockId: 40a8863b26db47cc9e14c01aee2f19c0 + targetStockName: 东土城路院区PMue6中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 2 + grantWay: 1 deptGoodsStatus: codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司p0t4h + provName: 国药集团公司$U^K@ noRecPkgQty: 0 noRecQty: 0 list_b: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index df9f2195..b44e0126 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: 2920c945491743478cac349bb5c9124c - lastModified: '2024-05-23 14:57:15' - version: 2 - createTime: '2024-05-23 14:45:15' - createUser: h0347_UID-051284 - lastModifiedUser: h0347_UID-051284 - stockId: ecdd64ecfb2340c897051b3ed314a258 - shelfCode: areah03472028 + - id: 9cac5fc2be99473fbb9a58e0a91f1e84 + lastModified: '2024-05-27 07:27:28' + version: 1 + createTime: '2024-05-27 07:04:39' + createUser: h0347_UID-051296 + lastModifiedUser: h0347_UID-051296 + stockId: 170bebbeae3240779530ef3f35b69cf7 + shelfCode: areah03472093 shelfName: 默认库区 address: 二级检验科002 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051284 + linkman: h0347_UID-051296 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: ae5633c54a4741c08e1b76d10025ebf5 + deptId: ebacb1842d234dfd9dbc59fc11bad8bf areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index a7e8e7a1..878bafa0 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405240008_1 + MSPid: MSP2405270009_1 hosId: h0347 - hosGoodsId: h034700003763 - provGoodsid: provGood-99220896 - goodsAuditBillId: MSP2405240008 - targetId: MSP2405240008_1 + hosGoodsId: h034700003811 + provGoodsid: provGood-99220944 + goodsAuditBillId: MSP2405270009 + targetId: MSP2405270009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 6bc7e3da..2f87c254 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405240009_1 + MSPid: MSP2405270010_1 hosId: h0347 - hosGoodsId: h034700003764 - provGoodsid: provGood-99220897 - goodsAuditBillId: MSP2405240009 - targetId: MSP2405240009_1 + hosGoodsId: h034700003812 + provGoodsid: provGood-99220945 + goodsAuditBillId: MSP2405270010 + targetId: MSP2405270010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index b10eaab1..0838d0d4 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405240010_1 + MSPid: MSP2405270011_1 hosId: h0347 - hosGoodsId: h034700003765 - provGoodsid: provGood-99220898 - goodsAuditBillId: MSP2405240010 - targetId: MSP2405240010_1 + hosGoodsId: h034700003813 + provGoodsid: provGood-99220946 + goodsAuditBillId: MSP2405270011 + targetId: MSP2405270011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 63c27e11..92cd3754 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: c45825629a4947f09e489ad172d82c94 - unitPackageid2: c45825629a4947f09e489ad172d82c94 + unitPackageid1: 4777e8610956450fb451f5ced1883bff + unitPackageid2: 4777e8610956450fb451f5ced1883bff diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 1b5fe062..10ee4789 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024052423840 - orderNo2: PLAN2024052423840 + orderNo1: PLAN2024052724252 + orderNo2: PLAN2024052724252 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 9fec1f3a..3589d199 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,53 +1,38 @@ 配送订单信息: list_a: - &id001 - - id: Ch034720240524000091 - lastModified: '2024-05-24 10:37:52' - version: 0 - createTime: '2024-05-24 10:37:52' - createUser: h0347_UID-051288 - lastModifiedUser: - orderNo: CG2024052416651 - billMode: '66' - recType: YND + - id: Nh034720240527000001 + orderNo: SSTZ202405270252 + sourceOrderNo: SSSQ202405270276 hosId: h0347 - branchId: h0347-3627 - deptId: - deptName: - recOrgId: f3f1209531c84bddafbe05bd5d6585f0 - recOrgName: 设备科001 - areaCode: - areaName: - billExpdtDate: - sourceId: Ph034720240524020487 - sourceType: - inSettlement: - recUser: - recPhone: - recAddr: 自动化测试 - provId: p1e23c - provName: 国药集团公司oJCHn - subSendFlag: - exeProvId: p1e23c - exeProvName: 国药集团公司oJCHn - billRelationJson: - extInfo: - barcodeFlag: 1 - pkgFlag: - remark: '' - priority: - closeStatus: 0 - closeDate: - upStatus: - tbStatus: 30 - hosVersion: 3 - billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区WDUvl - sumQty: 10000.0 - sumPkgQty: 100.0 - sumAmount: '999999.0000' - planOrderNo: PLAN2024052423842 + branchName: 东土城路院区PMue6 + recDeptName: 二级检验科002 + operName: 血管扩张术 + operDate: '2024-05-28' + operDoctor: 李* + patientName: 张* + status: 10 + statusText: 待确认 + version: 0 + patientInHosId: '123456' + surDeptName: '' + remark: 自动化测试 + createUserName: 自动化测试uVgNZ + distPriority: 0 + distPriorityText: + distId: + distNo: + hosVersion: 3 + createTime: '2024-05-27 07:25:40' + sumQty: + sumAmount: + operationPkg: 0 + provId: p1e24c + provName: 国药集团公司$U^K@ + subProvId: '' + subProvName: '' + recDeptId: ebacb1842d234dfd9dbc59fc11bad8bf list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 014b8734..597351f4 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,87 +1,70 @@ 配送订单详细信息: list_a: - &id001 - - id: eb232b6179aa4d679172d5082d1f6dee - lastModified: - version: - createTime: - createUser: - lastModifiedUser: - pid: Ch034720240524000091 - orderNo: CG2024052416651 - sourceId: b905a7b30fae47a18a54d8be4ae2c54b - hosGoodsId: h034700003763 - mdmGoodsCode: '11660655' - goodsCode: '00003763' - purMode: 60 + id: Nh034720240527000001 + orderNo: SSTZ202405270252 + sourceOrderNo: SSSQ202405270276 + hosId: h0347 + hosName: 邹城市人民医院(test) + branchName: 东土城路院区PMue6 + recDeptName: 二级检验科002 + operName: 血管扩张术 + operDate: '2024-05-28' + operDoctor: 李* + patientName: 张* + status: 20 + statusText: 待配送 + version: 1 + patientInHosId: '123456' + surDeptName: '' + remark: 自动化测试 + createUserName: 自动化测试uVgNZ + distPriority: 0 + distPriorityText: 否 + distId: + distNo: + hosVersion: 3 + createTime: '2024-05-27 07:25:40' + sumQty: 1 + sumAmount: '99.9999' + operationPkg: 0 + provId: p1e24c + provName: 国药集团公司$U^K@ + subProvId: '' + subProvName: '' + recDeptId: ebacb1842d234dfd9dbc59fc11bad8bf + list_b: + - *id001 + list_c: + - *id001 +配送订单详细信息2: + list_a: + - &id001 + - id: h034720240527000001 + hosGoodsId: h034700003809 + goodsNum: 1 price: '99.9999' - supplyId: 65f6a25c1ea64e48966e89c40d1ddec0 - pkgDefId: c45825629a4947f09e489ad172d82c94 - pkgDefName: '100' - pkgDefQty: 100.0 - pkgQty: 100.0 - qty: 10000.0 - conPkgQty: 100.0 - conQty: 10000.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":"Ph034720240524020487","planDetailId":"b905a7b30fae47a18a54d8be4ae2c54b"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00003763","purMode":60,"goodsName":"新型冠状病毒检测试剂JO67D"}' - remark: - tbStatus: - hosVersion: + inSettlement: 3 + inSettlementText: 消耗结算 + goodsName: 高值牙钻机&K)tl + goodsSpec: G-31891 + goodsCode: '00003809' + goodsMfrsId: mfrs-11229 + goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 - goodsName: 新型冠状病毒检测试剂JO67D - mfrsId: mfrs-11229 - mfrsName: 德国歌德公司 Geuder AG - goodsGg: G-31891 - mdmGoodsSpecCode: '11660655' - erpCode: '11660655' - 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: '36270000037630' + subProvId: p1e24c + subProvName: 国药集团公司$U^K@ + totalAmount: '99.9999' + spdGoodsCode: '11660701' + barCodeMng: 2 + erpCode: '11660701' multiChargeFlag: 0 useFrequency: 1 chargeUnit: - amount: '999999.0000' - unitName: 100支/100 - subProvId: p1e23c - subProvName: 国药集团公司oJCHn - subPrice: 99.9999 - replPkgQty: 100.0 - replQty: 10000.0 - ybDefId: - logicId: - provGoodsId: - sendFlag: - curQry: + hitCode: '12' + hitPrice: '99.999900' + diUse: + goodsDi: list_b: - *id001 list_c: diff --git a/report/summary.html b/report/summary.html index aaf84d68..667802c7 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 1 + 0 0分2秒 - 100.0% + 0.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - a2_编辑医院信息 - 成功 - 1.895 + a_b4流程十一请领业务流_二级库向二级库 + 失败 + 2.065 xiaohesheng -- GitLab