From 0ce97df5c0a09fb1e0f9caf3e464a3ea1be00130 Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Thu, 4 Jul 2024 14:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...21\344\270\255\345\277\203\345\272\223.py" | 1 - ...56\345\272\223\351\252\214\350\257\201.py" | 380 +----------------- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 +- data/a6_mdm3_si/message | 72 ++-- data/b2_herp3_bs/message | 6 +- data/b2_herp3_bs/message3 | 4 +- data/b2_herp3_bs/message4 | 2 +- data/b2_herp3_bs/message6 | 10 +- data/b2_herp3_bs/message7 | 4 +- data/b5_spd3_core_business_flow/message | 4 +- data/b5_spd3_core_business_flow/message1 | 10 +- data/b5_spd3_core_business_flow/message10 | 12 +- data/b5_spd3_core_business_flow/message11 | 4 +- data/b5_spd3_core_business_flow/message12 | 4 +- data/b5_spd3_core_business_flow/message13 | 22 +- data/b5_spd3_core_business_flow/message14 | 20 +- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 30 +- data/b5_spd3_core_business_flow/message17 | 105 +++-- data/b5_spd3_core_business_flow/message18 | 40 +- data/b5_spd3_core_business_flow/message19 | 12 +- data/b5_spd3_core_business_flow/message2 | 10 +- data/b5_spd3_core_business_flow/message20 | 36 +- data/b5_spd3_core_business_flow/message21 | 26 +- 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 | 28 +- data/b5_spd3_core_business_flow/message9 | 36 +- report/summary.html | 12 +- 35 files changed, 300 insertions(+), 670 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py" index e8c2d8f7..d8bfa3c7 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223.py" @@ -399,7 +399,6 @@ try: # 设置库区联系人 set_stockShelf_Linkman() # 低值 - 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) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index f80cc538..85df010a 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b2\346\265\201\347\250\213\344\271\235\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\270\255\345\277\203\345\272\223_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -13,7 +13,7 @@ from airtest.core.api import using __author__ = "xiaohesheng" """ -case_tag:api,b6_spd3_core_business_flow_database_check,a_b2流程九请领业务流_二级库向中心库,id23032,id2303-12,sit,on +case_tag:api,b6_spd3_core_business_flow_database_check,a_b2流程九请领业务流_二级库向中心库,id2303,id2303-12,sit,on 核心业务流:a_b2流程九请领业务流_二级库向中心库 python runner_test.py tag id2303-12 debug mdm3 注意：如果二级库请领了，在中心库生成拣货单的时候看不到数据，原因是产品请领出库渠道不是中心库， @@ -22,374 +22,6 @@ python runner_test.py tag id2303-12 debug mdm3 脚本存在上下游的关系，下面的业务会修改出库渠道，如果调试脚本，注意这个因素的影响 """ - -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)) - # 创建领车交易================================================= - # 一键审批================================================= - # url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - # "herpService_approvalBatch_url") - # print('一键审批=================', url) - # - # request_body = commonFuc().get_business_data(module, "payload45", currentTaskList) - # - # print('一键审批', 'request_body', request_body) - # result = commonFuc().http_post(url, request_body, headers) - # print('一键审批,result', result) - # 一键审批================================================= -def centeStock_pick(): - 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")) - # 生成拣货单列表查询=============================================== - url1 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_BuyPick_buyPage_url") - print('生成拣货单列表查询=================', url1) - request_body1 = commonFuc().get_business_data(module, "payload46") - - print('生成拣货单列表查询', 'request_body', request_body1) - result1 = commonFuc().http_post(url1, request_body1, headers) - print('生成拣货单列表查询,result1', result1) - total1=commonFuc().analysis_json('total',commonFuc().analysis_json('data',result1)) - Bh_id=commonFuc().analysis_json('id',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result1))) - # 生成拣货单列表查询=============================================== - #生成拣货单=============================================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_BuyPick_savePick_url") - print('生成拣货单=================', url) - request_body = commonFuc().get_business_data(module, "payload47",Bh_id) - - print('生成拣货单', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('生成拣货单,result', result) - while True: - result = commonFuc().http_post(url, request_body, headers) - remark=commonFuc().analysis_json('remark',commonFuc().analysis_json('data',result)) - time.sleep(3) - print('remark',remark) - if remark==None: - break - #生成拣货单=============================================== - while True: - result1 = commonFuc().http_post(url1, request_body1, headers) - # import pdb - # pdb.set_trace() - print('result1',result1) - total2 = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result1)) - print('total2', total2,'total1',total1) - if total1-total2==1: - print('==================生成拣货单完成============================') - break - -def get_centeStock_pick_list_counts(): - 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")) - url1 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_BuyPick_buyPage_url") - print('生成拣货单列表查询=================', url1) - request_body1 = commonFuc().get_business_data(module, "payload46") - - print('生成拣货单列表查询', 'request_body', request_body1) - result1 = commonFuc().http_post(url1, request_body1, headers) - print('生成拣货单列表查询,result1', result1) - total1 = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result1)) - return total1 -def pick_execute(GoodsId,type=1): - 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")) - url1 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_BuyPick_pickPage_url") - print('拣货执行列表页面=================', url1) - request_body1 = commonFuc().get_business_data(module, "payload48",GoodsId) - - print('拣货执行列表页面', 'request_body', request_body1) - result1 = commonFuc().http_post(url1, request_body1, headers) - print('拣货执行列表页面,result1', result1) - #获取id - PICK_ID=commonFuc().analysis_json('id',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result1))) - version=commonFuc().analysis_json('version',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result1))) - # 生成拣货单列表查询=============================================== - # 生成拣货单列表锁定=============================================== - - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_BuyPick_updateLock_url") - print('生成拣货单列表锁定=================', url) - # version=int(version)+1 - request_body = commonFuc().get_business_data(module, "payload49", PICK_ID,version) - - print('生成拣货单列表锁定', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('生成拣货单列表锁定,result1', result) - # 生成拣货单列表锁定=============================================== - #拣货============================== - if type==1: - udi_code=get_udi1(1) #获取条码 低值1 高值2 试剂3 - elif type==2: - udi_code = get_udi1(2) # 获取条码 低值1 高值2 试剂3 - elif type==3: - udi_code = get_udi1(3) # 获取条码 低值1 高值2 试剂3 - else: - udi_code='udi_code' - print('udi_code',udi_code) - pickScan(PICK_ID,udi_code,type) - #提交拣货执行单 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_BuyPick_updateStatus_url") - url=url+PICK_ID - print('提交拣货执行单=================', url) - request_body = commonFuc().get_business_data(module, "payload51",PICK_ID) - print('提交拣货执行单', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('提交拣货执行单,result1', result) - - #拣货=================================== - #复核=================================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_hdiBarcode_scan_url") - url = url + udi_code - print('复核=================', url) - result = commonFuc().http_get(url, headers) - print('复核,result1', result) - result = commonFuc().http_get(url, headers) - print('扫码复核result', result) - data = commonFuc().analysis_json('data', result) - UT_id = commonFuc().analysis_json('id', data) - createTime = commonFuc().analysis_json('createTime', data) - snCode = commonFuc().analysis_json('snCode', data) - tagType = commonFuc().analysis_json('tagType', data) - goodsDi = commonFuc().analysis_json('goodsDi', data) - hosId= commonFuc().analysis_json('hosId', data) - stockId= commonFuc().analysis_json('stockId', data) - areaCode= commonFuc().analysis_json('areaCode', data) - areaName= commonFuc().analysis_json('areaName', data) - shelfCode= commonFuc().analysis_json('shelfCode', data) - codeType= commonFuc().analysis_json('codeType', data) - mdmGoodsCode= commonFuc().analysis_json('mdmGoodsCode', data) - goodsCode= commonFuc().analysis_json('goodsCode', data) - barName= commonFuc().analysis_json('barName', data) - batchCode= commonFuc().analysis_json('batchCode', data) - expdtDate= commonFuc().analysis_json('expdtDate', data) - productDate= commonFuc().analysis_json('productDate', data) - pkgCode= commonFuc().analysis_json('pkgCode', data) - pkgCodeSee= commonFuc().analysis_json('pkgCodeSee', data) - ssccCode= commonFuc().analysis_json('ssccCode', data) - tbStatus= commonFuc().analysis_json('tbStatus', data) - purMode= commonFuc().analysis_json('purMode', data) - goodsMfrsName= commonFuc().analysis_json('goodsMfrsName', data) - goodsSpec= commonFuc().analysis_json('goodsSpec', data) - unit= commonFuc().analysis_json('unit', data) - goodsName= commonFuc().analysis_json('goodsName', data) - made= commonFuc().analysis_json('made', data) - hosGoodsCode= commonFuc().analysis_json('hosGoodsCode', data) - distrBillId = commonFuc().analysis_json('distrBillId', commonFuc().analysis_json('ext', data)) - purBillId = commonFuc().analysis_json('purBillId', commonFuc().analysis_json('ext', data)) - distrDetailId = commonFuc().analysis_json('distrDetailId', commonFuc().analysis_json('ext', data)) - pkgDefId = commonFuc().analysis_json('pkgDefId', commonFuc().analysis_json('ext', data)) - pkgDefQty = commonFuc().analysis_json('pkgDefQty', commonFuc().analysis_json('ext', data)) - pkgDefName =commonFuc().analysis_json('pkgDefName', commonFuc().analysis_json('ext', data)) - print(UT_id) - # ========================扫码复核 - # ========出库复核提交========== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_stock_review_pass_submit_url") - - print('url', url) - # sourceId = ' '.join(PICK_ID) - sourceId = PICK_ID - # 请求体 - request_body = commonFuc().get_business_data(module, "payload52", UT_id, createTime, snCode, hosId, stockId, - areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId, - mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate, - productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, distrDetailId, - distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode, - goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty, - pkgDefName, made, hosGoodsCode, sourceId) - print('request_body', request_body) - # # # # 发送请求 - result = commonFuc().http_post(url, request_body, headers) - print('herpService_stock_review_pass_submit_urlresult', result) - #复核=================================== try: updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 # 二级库区信息写入文件 @@ -399,17 +31,23 @@ try: # 设置库区联系人 set_stockShelf_Linkman() # 低值 - + pro_path = commonFuc().get_pro_path() + sys.path.append(pro_path + r'\\air_case\\b5_spd3_core_business_flow\\a_b2流程九请领业务流_二级库向中心库.air') + using(pro_path + r'\\air_case\\b5_spd3_core_business_flow\\a_b2流程九请领业务流_二级库向中心库.air') + from a_b2流程九请领业务流_二级库向中心库 import second_dept_Request 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) - + from a_b2流程九请领业务流_二级库向中心库 import BuyCarSubmit BuyCarSubmit() # 请领车提交 for i in range(6): # 三个单据共审批6次 approval_center() updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库 + from a_b2流程九请领业务流_二级库向中心库 import get_centeStock_pick_list_counts + from a_b2流程九请领业务流_二级库向中心库 import centeStock_pick + from a_b2流程九请领业务流_二级库向中心库 import pick_execute #获取拣货单列表个数 for i in range(get_centeStock_pick_list_counts()): centeStock_pick()#中心库拣货 diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 292d91ba..12df10d8 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202407030038 - cname: 国药集团公司MPah7 + e_id: CR202407040182 + cname: 国药集团公司ASrWh diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index ab73b20c..a6ab52c7 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院!^KoE - h_name: 湖南省人民医院!^KoE + h_id: 湖南省人民医院ejaH9 + h_name: 湖南省人民医院ejaH9 diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index bf008852..618163e2 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407030011_1 + MSPid: MSP2407040052_1 hosId: h0347 - hosGoodsId: h034700004382 - provGoodsid: provGood-99221577 - goodsAuditBillId: MSP2407030011 - targetId: MSP2407030011_1 + hosGoodsId: h034700004436 + provGoodsid: provGood-99221632 + goodsAuditBillId: MSP2407040052 + targetId: MSP2407040052_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index a5894081..ad670d97 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,45 +2,45 @@ list_a: - &id001 settleMonth: '202407' - pid: OBh0347202407030004 - hosGoodsId: h034700004379 - goodsCode: '00004379' - goodsName: 一次性注射器_低值KBYLs + pid: OBh0347202407040010 + hosGoodsId: h034700004433 + goodsCode: '00004433' + goodsName: 一次性注射器_低值7QT@( goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 - leftSettleAmount: 0.0 + leftSettleAmount: 19999.98 batchCode: kindName: factName: cacheleftAmount: 19999.98 purMode: 10 - waitInvoicingNum: 0.0 + waitInvoicingNum: 200.0 invoicingPrice: normalContractId: normalContract: '1' detailList: - - pid: OBh0347202407030004 + - pid: OBh0347202407040010 settleMonth: '202407' - accountDate: '2024-07-03' - hosGoodsId: h034700004379 + accountDate: '2024-07-04' + hosGoodsId: h034700004433 batchCode: '333' - distrDetailId: '03839114' - distrId: PSh0347202407030002 - distrOrderNo: PSh0347202407030002 + distrDetailId: '03839233' + distrId: PSh0347202407040093 + distrOrderNo: PSh0347202407040093 settlePrice: 99.9999 - maxSettleQty: -100.0 - maxSettleAmount: -9999.99 - curSettleQty: -100.0 - curSettleAmount: -9999.99 - leftSettleQty: -100.0 - leftSettleAmount: -9999.99 + maxSettleQty: 100.0 + maxSettleAmount: 9999.99 + curSettleQty: 100.0 + curSettleAmount: 9999.99 + leftSettleQty: 100.0 + leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e2ec - branchId: h0347-3714 - balanceDetId: OBh0347202407030004-000001 + provId: p1e2fe + branchId: h0347-3725 + balanceDetId: OBh0347202407040010-000001 purMode: 10 - barCode: 013714000004379010333112407031725010921UT240703000002 + barCode: 010112345678901210333112407041725011021UT240704000894 batchId: price: maxQty: @@ -53,15 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202407030004h034700004379 - - pid: OBh0347202407030004 + viewId: 202407OBh0347202407040010h034700004433 + - pid: OBh0347202407040010 settleMonth: '202407' - accountDate: '2024-07-03' - hosGoodsId: h034700004379 + accountDate: '2024-07-04' + hosGoodsId: h034700004433 batchCode: '333' - distrDetailId: '03839114' - distrId: PSh0347202407030002 - distrOrderNo: PSh0347202407030002 + distrDetailId: '03839233' + distrId: PSh0347202407040093 + distrOrderNo: PSh0347202407040093 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -70,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e2ec - branchId: h0347-3714 - balanceDetId: OBh0347202407030004-000002 + provId: p1e2fe + branchId: h0347-3725 + balanceDetId: OBh0347202407040010-000002 purMode: 10 - barCode: 013714000004379010333112407031725010921UT240703000025 + barCode: 010112345678901210333112407041725011021UT240704000916 batchId: price: maxQty: @@ -87,10 +87,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202407030004h034700004379 - unique: 202407OBh0347202407030004h034700004379 + viewId: 202407OBh0347202407040010h034700004433 + unique: 202407OBh0347202407040010h034700004433 onlineKind: '10' - viewId: 202407OBh0347202407030004h034700004379 + viewId: 202407OBh0347202407040010h034700004433 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 309f1a6c..91a34259 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3714 - branch_name: 东土城路院区QJH)# + branch_id: h0347-3725 + branch_name: 东土城路院区ftZkF 科室信息: - dept2_id: b8cbdc0117e8499cb1ccac00cb6166ca + dept2_id: f8324b9a0bff4ed7a43350b91a04426f dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 38eb340e..d6c8d5ea 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试lPIo0 - username2: 自动化测试lPIo0 + username1: 自动化测试AZlIj + username2: 自动化测试AZlIj diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index c5f8bc66..220dad47 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 0b61ab7ea9b746a3844426111c5ec6db + dept1_id: 3e559b76a8fc42819e9c1370d488cab8 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 99026e5c..e9f32f30 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: 0b61ab7ea9b746a3844426111c5ec6db - deptid2: b8cbdc0117e8499cb1ccac00cb6166ca - deptid3: f10f9bac7ca3421093f6f20e4f71d1ca - deptid4: 3e5f25d08e33424288d9d0f223eb3b00 - deptid5: fe6d1b6f141d4f0490bbaae4fd23de77 + deptid1: 3e559b76a8fc42819e9c1370d488cab8 + deptid2: f8324b9a0bff4ed7a43350b91a04426f + deptid3: cc17aab4a5b74b14a5168897a9e6d8f3 + deptid4: 65f9bd02a2104011a8e11754db3a8a48 + deptid5: 8a687d0771fe40e49568fbfd6c2b3560 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 83c72745..94925abe 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 8125a0cfb1d74982abbd67e19f2547e8 - shelfCode: areah03472565 + shelfid: 2303b7e9bd6c4d49b3791eecea8a6bb5 + shelfCode: areah03472615 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index a31348a2..bb9edcc2 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e2ec + e_corpId: p1e2fe h_corpId: h0347 - e_username: 国药集团公司MPah7 + e_username: 国药集团公司ASrWh h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index d8e4b1ed..83eafa69 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407030007_1 + MSPid: MSP2407040048_1 hosId: h0347 - hosGoodsId: h034700004378 - provGoodsid: provGood-99221573 - goodsAuditBillId: MSP2407030007 - targetId: MSP2407030007_1 + hosGoodsId: h034700004432 + provGoodsid: provGood-99221628 + goodsAuditBillId: MSP2407040048 + targetId: MSP2407040048_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index da4c7995..5f24abb2 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202407030021 - distrBillId2: PSh0347202407030021 + distrBillId1: PSh0347202407040112 + distrBillId2: PSh0347202407040112 高值配送单号: - distrBillId1: PSh0347202407030022 - distrBillId2: PSh0347202407030022 + distrBillId1: PSh0347202407040113 + distrBillId2: PSh0347202407040113 试剂配送单号: - distrBillId1: PSh0347202407030023 - distrBillId2: PSh0347202407030023 + distrBillId1: PSh0347202407040114 + distrBillId2: PSh0347202407040114 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 3002fe05..01d38ff1 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024070331116 - orderNo2: PLAN2024070331116 + orderNo1: PLAN2024070431307 + orderNo2: PLAN2024070431307 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 8851946b..5c22c947 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024070331114 - orderNo2: PLAN2024070331114 + orderNo1: PLAN2024070431308 + orderNo2: PLAN2024070431308 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 600efa7d..61bef5d3 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,27 +3,27 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3714 + branchId: h0347-3725 deptId: taskType: 1 - sourceOrgId: p1e2ec - sourceOrgName: 国药集团公司MPah7 - sourceOrderNo: PSh0347202407030023 + sourceOrgId: p1e2fe + sourceOrgName: 国药集团公司ASrWh + sourceOrderNo: PSh0347202407040114 billMode: '66' stockKind: purMode: - sourceId: PSh0347202407030023 + sourceId: PSh0347202407040114 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024070331114 - purOrderNo: CG2024070320422 - recOrgId: b8cbdc0117e8499cb1ccac00cb6166ca + planOrderNo: PLAN2024070431308 + purOrderNo: CG2024070420563 + recOrgId: f8324b9a0bff4ed7a43350b91a04426f recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024070300022","planBillId":"Ph034720240703027759","planOrderNo":"PLAN2024070331114","buyOrderNo":"BUY2024070305586","purOrderNo":"CG2024070320422","purBillId":"Ch034720240703000051","purBillDate":"2024-07-03 - 07:42:40","distrBillId":"PSh0347202407030023","distrOrderNo":"PSh0347202407030023"}' - taskDate: '2024-07-03 07:42:58' + billRelationJson: '{"buyBillId":"Bh03472024070400147","planBillId":"Ph034720240704027953","planOrderNo":"PLAN2024070431308","buyOrderNo":"BUY2024070405751","purOrderNo":"CG2024070420563","purBillId":"Ch034720240704000140","purBillDate":"2024-07-04 + 12:39:22","distrBillId":"PSh0347202407040114","distrOrderNo":"PSh0347202407040114"}' + taskDate: '2024-07-04 12:39:54' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 81d2aaf8..9af04723 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -3,11 +3,11 @@ - &id001 - purMode: 60 unitName: 100支/100 - hosGoodsId: h034700004380 + hosGoodsId: h034700004434 mdmGoodsCode: - spdGoodsCode: '11661333' - goodsCode: '00004380' - goodsName: 新型冠状病毒检测试剂Gg(sT + spdGoodsCode: '11661387' + goodsCode: '00004434' + goodsName: 新型冠状病毒检测试剂)CVXH goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2025-01-09' - productDate: '2024-07-03' - provName: 国药集团公司MPah7 + expdtDate: '2025-01-10' + productDate: '2024-07-04' + provName: 国药集团公司ASrWh provId: - viewId: '03839135' + viewId: '03839254' verifyFlag: 0 hasSterilize: 0 - id: '03839135' + id: '03839254' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004380","purMode":60,"goodsName":"新型冠状病毒检测试剂Gg(sT","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661333","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004434","purMode":60,"goodsName":"新型冠状病毒检测试剂)CVXH","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661387","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 797e266b..246d3dfb 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024070300023 - CHECK_NO2: CHECKh03472024070300023 + CHECK_NO1: CHECKh03472024070400113 + CHECK_NO2: CHECKh03472024070400113 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 1f277c82..fa704ee9 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -5,34 +5,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051380 + createUser: h0347_UID-051391 lastModifiedUser: - billMode: '66' + billMode: '16' recType: stockKind: purMode: - sourceId: DRh034720240703000050 - sourceType: CK_TK - sourceVersion: 1 + sourceId: CHECKh03472024070400092 + sourceType: PSD + sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: 0b61ab7ea9b746a3844426111c5ec6db + deptId: 3e559b76a8fc42819e9c1370d488cab8 deptName: - branchId: h0347-3714 + branchId: h0347-3725 branchName: - taskType: 2 - sourceOrgId: b8cbdc0117e8499cb1ccac00cb6166ca - sourceOrgName: 二级检验科002 - sourceOrderNo: DN20240703000050 - taskSourceNo: DN20240703000050 - areaCode: - areaName: + taskType: 1 + sourceOrgId: p1e2fe + sourceOrgName: 国药集团公司ASrWh + sourceOrderNo: YS240704092 + taskSourceNo: PSh0347202407040093 + areaCode: areah03472615 + areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-03 07:55:08' + taskDate: '2024-07-04 12:06:38' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index ed9acf1f..47042c11 100644 --- a/data/b5_spd3_core_business_flow/message17 +++ b/data/b5_spd3_core_business_flow/message17 @@ -1,36 +1,36 @@ 验收单库存详情信息: list_a: - &id001 - - id: DRh0347202407030000500001 + - id: CHECKh034720240704000920001 lastModified: version: createTime: createUser: lastModifiedUser: rowIdx: - purMode: 60 + purMode: 10 unitName: 100支/100 - pid: DRh034720240703000050 - hosGoodsId: h034700004380 - batchCode: '4444' - expdtDate: '2025-01-09' - productDate: '2024-07-03' + pid: CHECKh03472024070400092 + hosGoodsId: h034700004433 + batchCode: '333' + expdtDate: '2025-01-10' + productDate: '2024-07-04' batchPrice: 99.9999 settlement: 1 - batchType: 40 - srcBatchId: Ph034724070300015 + batchType: 20 + srcBatchId: '03839233' srcBatchPrice: 99.9999 - shelfCode: areah03472565-2-01-01 + shelfCode: areah03472615-2-01-01 shelfKind: - barcodeId: UT240703000206 + barcodeId: UT240704000853 subBarcodeId: - qty: 100.0 - pkgQty: 1 - distrId: PSh0347202407030014 - distrDetailId: '03839126' - pkgDefQty: - pkgDefName: - viewId: h03470000438044442025-01-09100支/100 + qty: 10000.0 + pkgQty: 100 + distrId: PSh0347202407040093 + distrDetailId: '03839233' + pkgDefQty: 100.0 + pkgDefName: '100' + viewId: h0347000044333332025-01-10100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,60 +38,53 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: PICKh03472407030022660001 - mdmGoodsCode: '11661333' - goodsCode: '00004380' - tbStatus: - billMode: - hosId: - branchId: - purBillId: Ch034720240703000042 - provId: p1e2ec - provName: - subProvId: p1e2ec - purDetailId: - goodsName: 新型冠状病毒检测试剂Gg(sT + sourceDetailId: '03839233' + mdmGoodsCode: '11661386' + goodsCode: '00004433' + tbStatus: 1 + billMode: '16' + hosId: h0347 + branchId: h0347-3725 + purBillId: Ch034720240704000121 + provId: p1e2fe + provName: 国药集团公司ASrWh + subSendFlag: 10 + exeProvId: p1e2fe + exeProvName: 国药集团公司ASrWh + purDetailId: 288f2ff00593475584b663be8650ed56 + goodsName: 一次性注射器_低值7QT@( goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 - sourceBatchId: Ph034724070300015 - targetBatchId: Ph034724070300015 - pkgDefId: + purPrice: 99.9999 + pkgDefId: 0cef5dc580aa4b5dbe97ce2add7cbb21 + supplyId: 003da1b8dde74730bd8856b131cc5629 + subProvId: p1e2fe + subProvName: 国药集团公司ASrWh + subPrice: 99.9999 + distrPrice: 99.9999 + distrPkgQty: 100.0 + distrQty: 10000.0 certificateCode: '' productCertCode: + detailRelationJson: extInfo: psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004380' - purMode: 60 - goodsName: 新型冠状病毒检测试剂Gg(sT + goodsCode: '00004433' + purMode: 10 + goodsName: 一次性注射器_低值7QT@( ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661333' + erpCode: '11661386' ybDefId: '' - contractId: '' - normalContractId: '' - fcatId: '' - fcatName: '' - goodsKindId: '' - goodsKindName: '' - miTwentysevenCode: '' - focus_control: '0' - focus_control_type: - rtnQty: - hisChargeNo: + purTaskId: + multiChargeFlag: trustMrfsName: - pkgCodeSee: - chargeFlag: - stockKind: CK_TK - sourceDeptId: b8cbdc0117e8499cb1ccac00cb6166ca - targetDeptId: 0b61ab7ea9b746a3844426111c5ec6db - ableDelFlag: - pickType: KS_TK list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 321bb814..23d79615 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,35 +1,35 @@ 条码信息: list_a: - &id001 - id: UT240703000103 - snCode: UT240703000103 - ssccCode: '010839000186842626' - pkgCodeSee: 0137140000043800104444112407031725010921UT240703000103 - hosGoodsId: h034700004380 - hosGoodsCode: '00004380' - goodsCode: '00004380' - goodsName: 新型冠状病毒检测试剂Gg(sT + id: UT240704000953 + snCode: UT240704000953 + ssccCode: '010839000187002326' + pkgCodeSee: 0101123456789012104444112407041725011021UT240704000953 + hosGoodsId: h034700004434 + hosGoodsCode: '00004434' + goodsCode: '00004434' + goodsName: 新型冠状病毒检测试剂)CVXH goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 60 batchCode: '4444' - productDate: '2024-07-03' - expdtDate: '2025-01-09' + productDate: '2024-07-04' + expdtDate: '2025-01-10' pkgDefName: '100' pkgDefQty: 100.0 - stockId: f896eeb8ca244a9e8509dff52540dd52 - stockName: 东土城路院区QJH)#中心库房 + stockId: 92286fa2798042d6af9879fdaf89c5ad + stockName: 东土城路院区ftZkF中心库房 areaName: 自动化测试 - areaCode: areah03472565 + areaCode: areah03472615 lockStatus: 0 unitName: 100支/100 - shelfCode: areah03472565-2-01-01 + shelfCode: areah03472615-2-01-01 shelfNo: 自动化测试-2-01-01 - pkgDefId: e2411ffda9f44439a3c3eccbd0139a8e - extInfo: '{"pkgDefId": "e2411ffda9f44439a3c3eccbd0139a8e", "pkgDefQty": 100, "purBillId": - "CG2024070320404", "pkgDefName": "100", "distrBillId": "PSh0347202407030004", - "inStockTime": "2024-07-03 07:08:18", "distrDetailId": "03839116", "certificateCode": + pkgDefId: fa18f079634e4978a3231c4b669794e1 + extInfo: '{"pkgDefId": "fa18f079634e4978a3231c4b669794e1", "pkgDefQty": 100, "purBillId": + "CG2024070420546", "pkgDefName": "100", "distrBillId": "PSh0347202407040095", + "inStockTime": "2024-07-04 12:07:46", "distrDetailId": "03839235", "certificateCode": ""}' bottleId: pkgType: '66' @@ -39,8 +39,8 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司MPah7 - provId: p1e2ec + provName: 国药集团公司ASrWh + provId: p1e2fe inStockDate: mfrCode: made: 德国 diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index a4b4b235..2dceaee8 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: h034700004378 - hosGoodsCode: '00004378' - provId: p1e2ec - subProvId: p1e2ec - subProvName: 国药集团公司MPah7 - goodsName: 高值牙钻机HTILW + - hosGoodsId: h034700004432 + hosGoodsCode: '00004432' + provId: p1e2fe + subProvId: p1e2fe + subProvName: 国药集团公司ASrWh + goodsName: 高值牙钻机8hjrB 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 c7f94497..aa0866db 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407030008_1 + MSPid: MSP2407040049_1 hosId: h0347 - hosGoodsId: h034700004379 - provGoodsid: provGood-99221574 - goodsAuditBillId: MSP2407030008 - targetId: MSP2407030008_1 + hosGoodsId: h034700004433 + provGoodsid: provGood-99221629 + goodsAuditBillId: MSP2407040049 + targetId: MSP2407040049_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 3b42d4e5..3b256db7 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: '8800000001074985' - snCode: '8800000001074985' - ssccCode: '010839000186852427' - pkgCodeSee: '01000000000043781022221124070317250109218800000001074985' - hosGoodsId: h034700004378 - hosGoodsCode: '00004378' - goodsCode: '00004378' - goodsName: 高值牙钻机HTILW + id: '8800000001075520' + snCode: '8800000001075520' + ssccCode: '010839000187012325' + pkgCodeSee: '01000000000044321022221124070417250110218800000001075520' + hosGoodsId: h034700004432 + hosGoodsCode: '00004432' + goodsCode: '00004432' + goodsName: 高值牙钻机8hjrB goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-07-03' - expdtDate: '2025-01-09' + productDate: '2024-07-04' + expdtDate: '2025-01-10' pkgDefName: pkgDefQty: 1.0 - stockId: 9b75871c07194f6bab2c73397d47a57d + stockId: a7a5bedfb8a3408fb17c4abdfd9da4d5 stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472563 + areaCode: areah03472614 lockStatus: 0 unitName: 1支 - shelfCode: areah03472563-A-01-01 + shelfCode: areah03472614-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407030005", "inStockTime": - "2024-07-03 07:15:57", "useFrequency": 1, "distrDetailId": "03839117", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407040096", "inStockTime": + "2024-07-04 12:12:48", "useFrequency": 1, "distrDetailId": "03839236", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司MPah7 - provId: p1e2ec - inStockDate: '2024-07-03 07:15:56' + provName: 国药集团公司ASrWh + provId: p1e2fe + inStockDate: '2024-07-04 12:12:48' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index f7d3fb10..5954bbbc 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: h034700004380 + - hosGoodsId: h034700004434 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂Gg(sT + goodsName: 新型冠状病毒检测试剂)CVXH goodsSpec: G-31891 - mdmGoodsCode: '11661333' - goodsCode: '00004380' + mdmGoodsCode: '11661387' + goodsCode: '00004434' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -18,30 +18,30 @@ pkgQty: qty: 600.0 goodsImg: [] - pkgDefId: e2411ffda9f44439a3c3eccbd0139a8e + pkgDefId: fa18f079634e4978a3231c4b669794e1 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: b8cbdc0117e8499cb1ccac00cb6166ca + deptId: f8324b9a0bff4ed7a43350b91a04426f deptName: areaCode: areaName: - targetDeptId: 0b61ab7ea9b746a3844426111c5ec6db + targetDeptId: 3e559b76a8fc42819e9c1370d488cab8 targetDeptName: 设备科001 - targetStockId: f896eeb8ca244a9e8509dff52540dd52 - targetStockName: 东土城路院区QJH)#中心库房 + targetStockId: 92286fa2798042d6af9879fdaf89c5ad + targetStockName: 东土城路院区ftZkF中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 3 + grantWay: 1 deptGoodsStatus: codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司MPah7 - noRecPkgQty: 1.0 - noRecQty: 100.0 + provName: 国药集团公司ASrWh + noRecPkgQty: 2.0 + noRecQty: 200.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index 5df57426..eaabeeb9 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: a6122c5d20ea4a5f80e9185f7d221a26 - lastModified: '2024-07-03 07:16:23' - version: 1 - createTime: '2024-07-03 07:03:45' - createUser: h0347_UID-051380 - lastModifiedUser: h0347_UID-051380 - stockId: 9b75871c07194f6bab2c73397d47a57d - shelfCode: areah03472563 + - id: c620cac823d34206acda9c65da3e5591 + lastModified: '2024-07-04 13:59:57' + version: 3 + createTime: '2024-07-04 12:03:16' + createUser: h0347_UID-051391 + lastModifiedUser: h0347_UID-051391 + stockId: a7a5bedfb8a3408fb17c4abdfd9da4d5 + shelfCode: areah03472614 shelfName: 默认库区 address: 二级检验科002 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051380 + linkman: h0347_UID-051391 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: b8cbdc0117e8499cb1ccac00cb6166ca + deptId: f8324b9a0bff4ed7a43350b91a04426f areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 1cb178a3..2186c65c 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407030009_1 + MSPid: MSP2407040050_1 hosId: h0347 - hosGoodsId: h034700004380 - provGoodsid: provGood-99221575 - goodsAuditBillId: MSP2407030009 - targetId: MSP2407030009_1 + hosGoodsId: h034700004434 + provGoodsid: provGood-99221630 + goodsAuditBillId: MSP2407040050 + targetId: MSP2407040050_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index d18c4bfd..f745b7f4 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407030010_1 + MSPid: MSP2407040051_1 hosId: h0347 - hosGoodsId: h034700004381 - provGoodsid: provGood-99221576 - goodsAuditBillId: MSP2407030010 - targetId: MSP2407030010_1 + hosGoodsId: h034700004435 + provGoodsid: provGood-99221631 + goodsAuditBillId: MSP2407040051 + targetId: MSP2407040051_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index bf008852..618163e2 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407030011_1 + MSPid: MSP2407040052_1 hosId: h0347 - hosGoodsId: h034700004382 - provGoodsid: provGood-99221577 - goodsAuditBillId: MSP2407030011 - targetId: MSP2407030011_1 + hosGoodsId: h034700004436 + provGoodsid: provGood-99221632 + goodsAuditBillId: MSP2407040052 + targetId: MSP2407040052_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index cb1ea488..4a29e246 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: e2411ffda9f44439a3c3eccbd0139a8e - unitPackageid2: e2411ffda9f44439a3c3eccbd0139a8e + unitPackageid1: fa18f079634e4978a3231c4b669794e1 + unitPackageid2: fa18f079634e4978a3231c4b669794e1 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index c6b21f51..33e8dd3e 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024070331115 - orderNo2: PLAN2024070331115 + orderNo1: PLAN2024070431309 + orderNo2: PLAN2024070431309 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 5c4dc6ea..ff7c0958 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,35 +1,35 @@ 配送订单信息: list_a: - &id001 - - id: Ch034720240703000051 - lastModified: '2024-07-03 07:42:40' + - id: Ch034720240704000140 + lastModified: '2024-07-04 12:39:22' version: 0 - createTime: '2024-07-03 07:42:40' - createUser: h0347_UID-051380 + createTime: '2024-07-04 12:39:22' + createUser: h0347_UID-051391 lastModifiedUser: - orderNo: CG2024070320422 + orderNo: CG2024070420563 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3714 + branchId: h0347-3725 deptId: deptName: - recOrgId: b8cbdc0117e8499cb1ccac00cb6166ca + recOrgId: f8324b9a0bff4ed7a43350b91a04426f recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240703027759 + sourceId: Ph034720240704027953 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e2ec - provName: 国药集团公司MPah7 + provId: p1e2fe + provName: 国药集团公司ASrWh subSendFlag: - exeProvId: p1e2ec - exeProvName: 国药集团公司MPah7 + exeProvId: p1e2fe + exeProvName: 国药集团公司ASrWh billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区QJH)# + branchName: 东土城路院区ftZkF sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024070331114 + planOrderNo: PLAN2024070431308 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index fbe67e76..5c36d25e 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,22 +1,22 @@ 配送订单详细信息: list_a: - &id001 - - id: 0598c819eeb241d1af9ac77b7c0c212a + - id: e74e6c1317764d2090021827bf92a73e lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240703000051 - orderNo: CG2024070320422 - sourceId: 0c6f3e165de0422882ceff0ca7aec13a - hosGoodsId: h034700004380 - mdmGoodsCode: '11661333' - goodsCode: '00004380' + pid: Ch034720240704000140 + orderNo: CG2024070420563 + sourceId: 5b53cfd509b24819bc51c208184de065 + hosGoodsId: h034700004434 + mdmGoodsCode: '11661387' + goodsCode: '00004434' purMode: 60 price: '99.9999' - supplyId: 52d7233dd2e0439ebf8401ae1a3509f3 - pkgDefId: e2411ffda9f44439a3c3eccbd0139a8e + supplyId: fb3c93a93de14ef79a3baa0998a2ecd9 + pkgDefId: fa18f079634e4978a3231c4b669794e1 pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240703027759","buyDetailId":"Bh034720240703000220001","planDetailId":"0c6f3e165de0422882ceff0ca7aec13a"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004380","purMode":60,"goodsName":"新型冠状病毒检测试剂Gg(sT"}' + detailRelationJson: '{"planBillId":"Ph034720240704027953","buyDetailId":"Bh034720240704001470001","planDetailId":"5b53cfd509b24819bc51c208184de065"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004434","purMode":60,"goodsName":"新型冠状病毒检测试剂)CVXH"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂Gg(sT + goodsName: 新型冠状病毒检测试剂)CVXH mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11661333' - erpCode: '11661333' + mdmGoodsSpecCode: '11661387' + erpCode: '11661387' made: 德国 goodsDi: '01123456789012' miDjmc: @@ -65,15 +65,15 @@ goodsRegCert: '' transCond: '' storageCond: '' - diType: gs1 - diUse: '37140000043800' + diType: + diUse: '01123456789012' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e2ec - subProvName: 国药集团公司MPah7 + subProvId: p1e2fe + subProvName: 国药集团公司ASrWh subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 diff --git a/report/summary.html b/report/summary.html index b88fd836..6bf8de7d 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 1 - 0分19秒 - 100.0% + 0 + 2分15秒 + 0.0% @@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - a_c1流程十八中心库业务_拆包功能 - 成功 - 19.484 + a_b2流程九请领业务流_二级库向中心库_数据库验证 + 失败 + 135.099 xiaohesheng -- GitLab