From 43dad6290ef5bbca9f629a719bc81a767b62876d Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Tue, 4 Jun 2024 09:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E4=B8=80=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...23\345\220\221\347\233\264\351\200\201.py" | 45 +- ...21\344\272\214\347\272\247\345\272\223.py" | 393 ++++++++++++++++++ air_case/public1/public1/public1.py | 25 +- data/a2_mdm3_ea/message | 4 +- data/a3_mdm3_hs/message | 4 +- data/a5_mdm3_pdm/message2 | 10 +- data/a6_mdm3_si/message | 68 +-- 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 | 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 | 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 | 36 +- data/b5_spd3_core_business_flow/message15 | 4 +- data/b5_spd3_core_business_flow/message16 | 18 +- data/b5_spd3_core_business_flow/message17 | 58 +-- data/b5_spd3_core_business_flow/message18 | 59 +-- 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 | 75 ++-- data/b5_spd3_core_business_flow/message9 | 135 +++--- report/summary.html | 4 +- 37 files changed, 800 insertions(+), 374 deletions(-) create mode 100644 "air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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\347\233\264\351\200\201.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\347\233\264\351\200\201.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\347\233\264\351\200\201.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\347\233\264\351\200\201.py" index b1d7561f..ab72b6af 100644 --- "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\347\233\264\351\200\201.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\347\233\264\351\200\201.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\347\233\264\351\200\201.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\347\233\264\351\200\201.py" @@ -819,28 +819,29 @@ try: # 从下面开始,上面的暂时注释 goods_move2() # 设置产品出库渠道为直送 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() - # 采购模块处理 - purchase_module_process() - for i in range(3): # 三个单据共审批3次 - approval_center() - order_dp(1) # 1低值 - order_dp(2) # 2高值 - order_dp(3) # 3试剂 - check_accept_order(1) # 低值 - check_accept_order(2) # 高值 - check_accept_order(3) # 试剂 - second_dept_one_key_in() - second_dept_one_key_in() - second_dept_one_key_in() + for i in range(3): + # # 低值 + 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() + # 采购模块处理 + purchase_module_process() + for i in range(3): # 三个单据共审批3次 + approval_center() + order_dp(1) # 1低值 + order_dp(2) # 2高值 + order_dp(3) # 3试剂 + check_accept_order(1) # 低值 + check_accept_order(2) # 高值 + check_accept_order(3) # 试剂 + second_dept_one_key_in() + second_dept_one_key_in() + second_dept_one_key_in() commonFuc().check_text_exist_result_text('succees', 'succees') except: commonFuc().check_text_exist_result_text('error', '1') diff --git "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\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..84fb64d6 --- /dev/null +++ "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" @@ -0,0 +1,393 @@ +# -*- 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_b6流程十三请领业务流_三级库向二级库,id2302,id2302-16,sit,on +核心业务流:a_b6流程十三请领业务流_三级库向二级库 +python runner_test.py tag id2302-16 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_2", 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 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')['deptid5'] + deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] + # 高值 + # 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, 'message23') + # 我要请领_手工请领_列表查询=========================== + # 添加到请领车============================================= + 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')['deptid5'] + deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'] + 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 edit_goods_target(currentDeptId, targetDeptId): + module = "b2_herp3_bs" + # # 登录获取用户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等信息，使用创建的用户登录============结束 + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "basic_mcmsDeptGoodsInfo_page_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, "payload58_13_1", currentDeptId, get_hosid()) + result = commonFuc().http_post(url, request_body, headers) + print('科室产品列表查询', result) + data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) + for i in data1: + shelfCode = commonFuc().analysis_json('shelfCode', i) + id1 = commonFuc().analysis_json('id', i) + pkgDefId = commonFuc().analysis_json('pkgDefId', i) + purMode = commonFuc().analysis_json('purMode', i) + tbStatus = commonFuc().analysis_json('tbStatus', i) + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_basic_mcmsDeptGoodsInfo_url") + url = url + id1 + result = commonFuc().http_get(url, headers) + print('获取产品详情信息', result) + data2 = commonFuc().analysis_json('data', result) + packetQty = commonFuc().analysis_json('packetQty', data2) + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "basic_mcmsDeptGoodsInfo_updateById") + if purMode == 60 or purMode == 10: # 低值和试剂 + request_body = commonFuc().get_business_data(module, "payload58_10_1", id1, pkgDefId, targetDeptId, + shelfCode, packetQty, + tbStatus) + elif purMode == 20: # 高值 + request_body = commonFuc().get_business_data(module, "payload58_10_2", id1, targetDeptId, + shelfCode, tbStatus) + print('编辑产品请领渠道request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('编辑产品请领渠道result', result) + + +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_stock_out_buyPage_url") + print('领用出库列表查询=================', url1) + request_body1 = commonFuc().get_business_data(module, "payload46_1", get_branch_id()) + + 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(): + 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_stock_out_buyPage_url") + print('请领出库列表页面=================', url1) + request_body1 = commonFuc().get_business_data(module, "payload46_1", get_branch_id()) + + print('请领出库列表页面', 'request_body', request_body1) + result1 = commonFuc().http_post(url1, request_body1, headers) + print('请领出库列表页面,result1', result1) + data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result1)) + for i in data1: + # 获取id + BH_ID = commonFuc().analysis_json('id', i) + version = commonFuc().analysis_json('version', i) + deptBuyDetailVOList = commonFuc().analysis_json('deptBuyDetailVOList', i) + purMode = commonFuc().analysis_json('purMode', deptBuyDetailVOList) + # 生成拣货单列表查询=============================================== + # 生成拣货单列表锁定=============================================== + + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_stock_out_use_updateLock_url") + print('请领出库列表列表页面锁定=================', url) + # version=int(version)+1 + request_body = commonFuc().get_business_data(module, "payload49_1", BH_ID, version) + + print('请领出库列表列表页面锁定', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('请领出库列表列表页面锁定,result1', result) + # 生成拣货单列表锁定=============================================== + + # 拣货============================== + if purMode == 10: + udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3 + elif purMode == 20: + udi_code = get_udi2(2) # 获取条码 低值1 高值2 试剂3 + elif purMode == 60: + udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3 + else: + udi_code = 'udi_code' + print('udi_code', udi_code) + if purMode == 10: + targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 1) # 低值 + elif purMode == 20: + targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 2) # 高值 + elif purMode == 60: + targetAreaCode,sourceId= pickScan2(BH_ID, udi_code, 3) # 试剂 + else: + targetAreaCode='targetAreaCode' + sourceId='sourceId' + # 提交领用出库单 + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_stock_out_use_submit_url") + print('提交拣货执行单=================', url) + if purMode == 10: + request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode,sourceId) + elif purMode == 20: + request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode,sourceId) + elif purMode == 60: + request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode,sourceId) + + print('提交拣货执行单', 'request_body', request_body) + result = commonFuc().http_post(url, request_body, headers) + print('提交拣货执行单,result1', result) + + +# 复核=================================== + +try: + # 设置部门用户 + set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'], + FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3) + # 设置部门负责人 + set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"]) # 设置二级科室负责人 + get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'], + FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 2) + set_stockShelf_Linkman()#设置库区联系人 + #新建科室产品分配 + dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3']) + + updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库 + # # # 低值 + 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() + updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 + # 二级科室领用出库 + # 低值拣货执行 + pick_execute() + second_dept_one_key_in(5) + second_dept_one_key_in(5) + second_dept_one_key_in(5) + commonFuc().check_text_exist_result_text('succees', 'succees') +except: + commonFuc().check_text_exist_result_text('error', '1') diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index ca21eace..9a4025a0 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -2444,17 +2444,17 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码 hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) stockName = commonFuc().analysis_json('stockName', data1) sourceId = commonFuc().analysis_json('sourceId', data1) - price= commonFuc().analysis_json('price', data1) - inStockTime= commonFuc().analysis_json('inStockTime', data1) - purModeText=commonFuc().analysis_json('purModeText', data1) - version=commonFuc().analysis_json('version', data1) - unitName=commonFuc().analysis_json('unitName', data1) + price = commonFuc().analysis_json('price', data1) + inStockTime = commonFuc().analysis_json('inStockTime', data1) + purModeText = commonFuc().analysis_json('purModeText', data1) + version = commonFuc().analysis_json('version', data1) + unitName = commonFuc().analysis_json('unitName', data1) # ==============================获取条码信息 - url= commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_out_use_buyInfo_url") - url=url+PICK_ID + url = url + PICK_ID result = commonFuc().http_get(url, headers) - pickerId = commonFuc().analysis_json('pickId', commonFuc().analysis_json('data',result)) + pickerId = commonFuc().analysis_json('pickId', commonFuc().analysis_json('data', result)) url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_out_pickScan_url") @@ -2501,7 +2501,7 @@ def pickScan2(PICK_ID, udi_code, type=1): # 二级库出库拣货扫码 # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) - return areaCode,pickerId + return areaCode, pickerId def get_branch_name(): @@ -2668,14 +2668,14 @@ def out_warehouse_review(PICK_ID): # 出库复核 print('request_body', request_body) # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) - print('herpService_stock_review_pass_submit_urlresult', result) + print('herpService_stock_review_pass_submit_url_result', result) # ========出库复核提交 def second_dept_one_key_in(type=2): - if type==2: + if type == 2: updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库 - elif type==5: + elif type == 5: updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是二级库 module = "b5_spd3_core_business_flow" # # 登录获取用户id等信息，使用创建的用户登录===========开始 @@ -2755,6 +2755,7 @@ def second_dept_one_key_in(type=2): print('一键入库result', result) # 一键入库==================================================== + def login_platform(): module = "a3_mdm3_hs" from air_case.mdm_login.登录外网系统.登录资源管控平台 import login_system diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 820010ef..f98b5a24 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406030038 - cname: 国药集团公司mvYxk + e_id: CR202406040038 + cname: 国药集团公司*0SeL diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 5cfa7d8d..e549cd73 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院#vYfi - h_name: 湖南省人民医院#vYfi + h_id: 湖南省人民医院1T32R + h_name: 湖南省人民医院1T32R diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 971a9697..230f3cfe 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406030011_1 + MSPid: MSP2406040011_1 hosId: h0347 - hosGoodsId: h034700003967 - provGoodsid: provGood-99221148 - goodsAuditBillId: MSP2406030011 - targetId: MSP2406030011_1 + hosGoodsId: h034700003978 + provGoodsid: provGood-99221163 + goodsAuditBillId: MSP2406040011 + targetId: MSP2406040011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 291849e6..11b3434b 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,44 +2,44 @@ list_a: - &id001 settleMonth: '202406' - pid: OBh0347202406030036 - hosGoodsId: h034700003964 - goodsCode: '00003964' - goodsName: 一次性注射器_低值qjUa2 + pid: OBh0347202406040004 + hosGoodsId: h034700003975 + goodsCode: '00003975' + goodsName: 一次性注射器_低值T*zY) goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 - leftSettleAmount: 19999.98 + leftSettleAmount: 0.0 batchCode: kindName: factName: cacheleftAmount: 19999.98 purMode: 10 - waitInvoicingNum: 200.0 + waitInvoicingNum: 0.0 invoicingPrice: normalContractId: normalContract: '1' detailList: - - pid: OBh0347202406030036 + - pid: OBh0347202406040004 settleMonth: '202406' - hosGoodsId: h034700003964 + hosGoodsId: h034700003975 batchCode: '333' - distrDetailId: '03837957' - distrId: PSh0347202406030034 - distrOrderNo: PSh0347202406030034 + distrDetailId: '03838005' + distrId: PSh0347202406040005 + distrOrderNo: PSh0347202406040005 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: p1e267 - branchId: h0347-3649 - balanceDetId: OBh0347202406030036-000001 + provId: p1e26b + branchId: h0347-3651 + balanceDetId: OBh0347202406040004-000001 purMode: 10 - barCode: 013649000003964010333112406031724121021UT240603001405 + barCode: 013651000003975010333112406041724121121UT240604000202 batchId: price: maxQty: @@ -52,14 +52,14 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202406OBh0347202406030036h034700003964 - - pid: OBh0347202406030036 + viewId: 202406OBh0347202406040004h034700003975 + - pid: OBh0347202406040004 settleMonth: '202406' - hosGoodsId: h034700003964 + hosGoodsId: h034700003975 batchCode: '333' - distrDetailId: '03837954' - distrId: PSh0347202406030031 - distrOrderNo: PSh0347202406030031 + distrDetailId: '03838005' + distrId: PSh0347202406040005 + distrOrderNo: PSh0347202406040005 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -68,11 +68,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e267 - branchId: h0347-3649 - balanceDetId: OBh0347202406030036-000002 + provId: p1e26b + branchId: h0347-3651 + balanceDetId: OBh0347202406040004-000002 purMode: 10 - barCode: 013649000003964010333112406031724121021UT240603001403 + barCode: 013651000003975010333112406041724121121UT240604000230 batchId: price: maxQty: @@ -85,10 +85,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202406OBh0347202406030036h034700003964 - unique: 202406OBh0347202406030036h034700003964 + viewId: 202406OBh0347202406040004h034700003975 + unique: 202406OBh0347202406040004h034700003975 onlineKind: '10' - viewId: 202406OBh0347202406030036h034700003964 + viewId: 202406OBh0347202406040004h034700003975 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 5f0abbed..1262eea5 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3649 - branch_name: 东土城路院区kBIb2 + branch_id: h0347-3651 + branch_name: 东土城路院区AGtZC 科室信息: - dept2_id: f8eb781292cd452eabd5ca99f8867aff + dept2_id: fce41341f4d441239326a6f655be8a1a dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 8ce87cb1..bb6ae254 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试QBz5q - username2: 自动化测试QBz5q + username1: 自动化测试jBGY( + username2: 自动化测试jBGY( diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 378cec56..9dc3feea 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: f6e2b5eb722b42e18bcc93ef29371337 + dept1_id: 18a8cca255594645bfc699ba3a486ee0 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index 038c3b40..69927f6e 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: f6e2b5eb722b42e18bcc93ef29371337 - stockAreaId: eb359aa3c32942f8a00e9c761312a853 + dept1_id: 18a8cca255594645bfc699ba3a486ee0 + stockAreaId: 1c5ffc1a8c734ea0ae7089fcfbf6d5a0 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index b58338e7..71df7fe4 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: f6e2b5eb722b42e18bcc93ef29371337 - deptid2: f8eb781292cd452eabd5ca99f8867aff - deptid3: fe1b462bb9ee4ce0b818977f2cd1ea76 - deptid4: 3c2a3eb7fb0d437fb7b395ef8469246b - deptid5: 9252920c3ff247fbbe034564fc6e9270 + deptid1: 18a8cca255594645bfc699ba3a486ee0 + deptid2: fce41341f4d441239326a6f655be8a1a + deptid3: 8b3cd57be7454d8999752d058884d67a + deptid4: d45cbed17f194629a710075be34dff28 + deptid5: c4e48d18f4234797a040924db4390279 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index 94b91434..656a6238 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: eb359aa3c32942f8a00e9c761312a853 - shelfCode: areah03472181 + shelfid: 1c5ffc1a8c734ea0ae7089fcfbf6d5a0 + shelfCode: areah03472193 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 1189fe2e..41882576 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e267 + e_corpId: p1e26b h_corpId: h0347 - e_username: 国药集团公司mvYxk + e_username: 国药集团公司*0SeL h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 638b5f98..f81dc2c3 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406030007_1 + MSPid: MSP2406040007_1 hosId: h0347 - hosGoodsId: h034700003963 - provGoodsid: provGood-99221144 - goodsAuditBillId: MSP2406030007 - targetId: MSP2406030007_1 + hosGoodsId: h034700003974 + provGoodsid: provGood-99221159 + goodsAuditBillId: MSP2406040007 + targetId: MSP2406040007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 628d5b35..4d6ca858 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,12 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406030070 - distrBillId2: PSh0347202406030070 + distrBillId1: PSh0347202406040025 + distrBillId2: PSh0347202406040025 高值配送单号: - distrBillId1: PSh0347202406030071 - distrBillId2: PSh0347202406030071 + distrBillId1: PSh0347202406040026 + distrBillId2: PSh0347202406040026 试剂配送单号: - distrBillId1: PSh0347202406030072 - distrBillId2: PSh0347202406030072 -高值跟台配送单号: - distrBillId1: PSh0347202406030073 - distrBillId2: PSh0347202406030073 + distrBillId1: PSh0347202406040027 + distrBillId2: PSh0347202406040027 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 534c6e75..014da297 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024060325270 - orderNo2: PLAN2024060325270 + orderNo1: PLAN2024060425397 + orderNo2: PLAN2024060425397 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 32cb5343..fb618049 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024060325268 - orderNo2: PLAN2024060325268 + orderNo1: PLAN2024060425399 + orderNo2: PLAN2024060425399 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 862263fc..1ea6d742 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,33 +3,34 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3649 + branchId: h0347-3651 deptId: taskType: 1 - sourceOrgId: p1e267 - sourceOrgName: 国药集团公司mvYxk - sourceOrderNo: PSh0347202406030073 - billMode: '25' + sourceOrgId: p1e26b + sourceOrgName: 国药集团公司*0SeL + sourceOrderNo: PSh0347202406040027 + billMode: '66' stockKind: purMode: - sourceId: PSh0347202406030073 + sourceId: PSh0347202406040027 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: SSSQ202406030285 - purOrderNo: SSTZ202406030261 - recOrgId: f8eb781292cd452eabd5ca99f8867aff + planOrderNo: PLAN2024060425399 + purOrderNo: CG2024060417726 + recOrgId: fce41341f4d441239326a6f655be8a1a recOrgName: 二级检验科002 - billRelationJson: '{"operationApplyOrderNo":"SSSQ202406030285","operationNoticeBillId":"Nh034720240603000002","distrBillId":"PSh0347202406030073","operationNoticeOrderNo":"SSTZ202406030261","distrOrderNo":"PSh0347202406030073","operationApplyBillId":"Oh034720240603000002"}' - taskDate: '2024-06-03 14:30:05' + billRelationJson: '{"buyBillId":"Bh03472024060400019","planBillId":"Ph034720240604022044","planOrderNo":"PLAN2024060425399","buyOrderNo":"BUY2024060404611","purOrderNo":"CG2024060417726","purBillId":"Ch034720240604000080","purBillDate":"2024-06-04 + 08:48:54","distrBillId":"PSh0347202406040027","distrOrderNo":"PSh0347202406040027"}' + taskDate: '2024-06-04 08:49:41' taskDateStart: taskDateEnd: billModeList: viewIdList: - supplierFlag: false + supplierFlag: true tbStatus: 20 - remark: + remark: '' list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 308eac84..24788197 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -1,13 +1,13 @@ 验收单详情信息: list_a: - &id001 - - purMode: 20 - unitName: 1支 - hosGoodsId: h034700003963 + - purMode: 60 + unitName: 100支/100 + hosGoodsId: h034700003976 mdmGoodsCode: - spdGoodsCode: '11660901' - goodsCode: '00003963' - goodsName: 高值牙钻机^A%aM + spdGoodsCode: '11660921' + goodsCode: '00003976' + goodsName: 新型冠状病毒检测试剂KngvT goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -16,27 +16,27 @@ goodsDi: miCode: miDjmc: - certificateCode: + certificateCode: '' rfidFlag: 0 pkgDefId: - pkgDefName: - pkgDefQty: 1.0 - batchCode: '2222' - expdtDate: '2024-12-10' - productDate: '2024-06-03' - provName: 国药集团公司mvYxk + pkgDefName: '100' + pkgDefQty: 100.0 + batchCode: '4444' + expdtDate: '2024-12-11' + productDate: '2024-06-04' + provName: 国药集团公司*0SeL provId: - viewId: '03837996' + viewId: '03838027' verifyFlag: 0 hasSterilize: 0 - id: '03837996' + id: '03838027' detailRelationJson: - extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00003976","purMode":60,"goodsName":"新型冠状病毒检测试剂KngvT","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660921","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 distrPkgQty: 1.0 - distrQty: 1.0 + distrQty: 100.0 price: 99.9999 checkQty: 0.0 checkPkgQty: 0 @@ -44,7 +44,7 @@ initQty: totalQty: rowNum: - settlement: 3 + settlement: 1 hdiBarcodeList: detailId: pkgCode: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 0bd29346..5f2855c9 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024060300048 - CHECK_NO2: CHECKh03472024060300048 + CHECK_NO1: CHECKh03472024060400018 + CHECK_NO2: CHECKh03472024060400018 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 36394738..60d44972 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -11,28 +11,28 @@ recType: stockKind: purMode: - sourceId: CHECKh03472024060300002 + sourceId: CHECKh03472024060400002 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: f6e2b5eb722b42e18bcc93ef29371337 + deptId: 18a8cca255594645bfc699ba3a486ee0 deptName: - branchId: h0347-3649 + branchId: h0347-3651 branchName: taskType: 1 - sourceOrgId: p1e267 - sourceOrgName: 国药集团公司mvYxk - sourceOrderNo: YS240603002 - taskSourceNo: PSh0347202406030005 - areaCode: areah03472181 + sourceOrgId: p1e26b + sourceOrgName: 国药集团公司*0SeL + sourceOrderNo: YS240604002 + taskSourceNo: PSh0347202406040005 + areaCode: areah03472193 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-06-03 07:13:10' + taskDate: '2024-06-04 07:13:21' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index ef73b2d6..5a10483f 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: CHECKh034720240603000020001 + - id: CHECKh034720240604000020001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024060300002 - hosGoodsId: h034700003964 + pid: CHECKh03472024060400002 + hosGoodsId: h034700003975 batchCode: '333' - expdtDate: '2024-12-10' - productDate: '2024-06-03' + expdtDate: '2024-12-11' + productDate: '2024-06-04' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03837924' + srcBatchId: '03838005' srcBatchPrice: 99.9999 - shelfCode: areah03472181-2-01-01 + shelfCode: areah03472193-2-01-01 shelfKind: - barcodeId: UT240603000201 + barcodeId: UT240604000201 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202406030005 - distrDetailId: '03837924' + distrId: PSh0347202406040005 + distrDetailId: '03838005' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000039643332024-12-10100支/100 + viewId: h0347000039753332024-12-11100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03837924' - mdmGoodsCode: '11660902' - goodsCode: '00003964' + sourceDetailId: '03838005' + mdmGoodsCode: '11660920' + goodsCode: '00003975' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3649 - purBillId: Ch034720240603000043 - provId: p1e267 - provName: 国药集团公司mvYxk + branchId: h0347-3651 + purBillId: Ch034720240604000043 + provId: p1e26b + provName: 国药集团公司*0SeL subSendFlag: 10 - exeProvId: p1e267 - exeProvName: 国药集团公司mvYxk - purDetailId: f5e9653dd03145c2abb8b3ae9dca98bb - goodsName: 一次性注射器_低值qjUa2 + exeProvId: p1e26b + exeProvName: 国药集团公司*0SeL + purDetailId: 3f72e4a7b5c348d4b2f225b1e3085ee0 + goodsName: 一次性注射器_低值T*zY) goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: f01689fa3fef495db5b42af937a62c36 - supplyId: 29ea957e99fd49efb2521a28faa0efb2 - subProvId: p1e267 - subProvName: 国药集团公司mvYxk + pkgDefId: 99ff61b624d544dfb4c563de0140fb75 + supplyId: 725e86bb8ec94f6fa1ca3287fbfd383d + subProvId: p1e26b + subProvName: 国药集团公司*0SeL subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00003964' + goodsCode: '00003975' purMode: 10 - goodsName: 一次性注射器_低值qjUa2 + goodsName: 一次性注射器_低值T*zY) ygptCode: '' transCond: '' storageCond: '' - erpCode: '11660902' + erpCode: '11660920' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 7c84342f..36af9060 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,52 +1,53 @@ 条码信息: list_a: - &id001 - id: '8800000001060869' - snCode: '8800000001060869' - ssccCode: '010839000182590620' - pkgCodeSee: '0100000000003963102221124060317241210218800000001060869' - hosGoodsId: h034700003963 - hosGoodsCode: '00003963' - goodsCode: '00003963' - goodsName: 高值牙钻机^A%aM + id: UT240604000203 + snCode: UT240604000203 + ssccCode: '010839000182861720' + pkgCodeSee: 013651000003975010333112406041724121121UT240604000203 + hosGoodsId: h034700003975 + hosGoodsCode: '00003975' + goodsCode: '00003975' + goodsName: 一次性注射器_低值T*zY) goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 - purMode: 20 - batchCode: '222' - productDate: '2024-06-03' - expdtDate: '2024-12-10' - pkgDefName: - pkgDefQty: 1.0 - stockId: 6b6ca005ff174cf28bdfb475f7e57aad + purMode: 10 + batchCode: '333' + productDate: '2024-06-04' + expdtDate: '2024-12-11' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 2534a8daf941473daa55db31b56d76af stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472179 + areaCode: areah03472192 lockStatus: 0 - unitName: 1支 - shelfCode: areah03472179-A-01-01 + unitName: 100支/100 + shelfCode: areah03472192-A-01-01 shelfNo: A01-A-01-01 - pkgDefId: - extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024060317558", "distrBillId": "PSh0347202406030047", - "inStockTime": "2024-06-03 13:08:45", "useFrequency": 1, "distrDetailId": "03837970", - "certificateCode": "", "multiChargeFlag": 0}' + pkgDefId: 99ff61b624d544dfb4c563de0140fb75 + extInfo: '{"pkgDefId": "99ff61b624d544dfb4c563de0140fb75", "pkgDefQty": 100, "purBillId": + "CG2024060417689", "pkgDefName": "100", "distrBillId": "PSh0347202406040005", + "inStockTime": "2024-06-04 07:30:01", "distrDetailId": "03838005", "certificateCode": + ""}' bottleId: - pkgType: '20' + pkgType: '16' miDjmc: '' miCode: '' transferRatio: 1.0 qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司mvYxk - provId: p1e267 - inStockDate: '2024-06-03 13:08:44' + provName: 国药集团公司*0SeL + provId: p1e26b + inStockDate: '2024-06-04 07:30:01' mfrCode: made: 德国 price: - barName: 1支 - purModeText: 高值耗材 - codeType: 20 + barName: 100支/100 + purModeText: 低值耗材 + codeType: 16 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index fa23ec3b..da97a431 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: h034700003963 - hosGoodsCode: '00003963' - provId: p1e267 - subProvId: p1e267 - subProvName: 国药集团公司mvYxk - goodsName: 高值牙钻机^A%aM + - hosGoodsId: h034700003974 + hosGoodsCode: '00003974' + provId: p1e26b + subProvId: p1e26b + subProvName: 国药集团公司*0SeL + goodsName: 高值牙钻机RqFjg 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 bd777738..f91ca937 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406030008_1 + MSPid: MSP2406040008_1 hosId: h0347 - hosGoodsId: h034700003964 - provGoodsid: provGood-99221145 - goodsAuditBillId: MSP2406030008 - targetId: MSP2406030008_1 + hosGoodsId: h034700003975 + provGoodsid: provGood-99221160 + goodsAuditBillId: MSP2406040008 + targetId: MSP2406040008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 05736807..06c4b764 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: '8800000001060546' - snCode: '8800000001060546' - ssccCode: '010839000182497028' - pkgCodeSee: '01000000000039631022221124060317241210218800000001060546' - hosGoodsId: h034700003963 - hosGoodsCode: '00003963' - goodsCode: '00003963' - goodsName: 高值牙钻机^A%aM + id: '8800000001062074' + snCode: '8800000001062074' + ssccCode: '010839000182951520' + pkgCodeSee: '01000000000039741022221124060417241211218800000001062074' + hosGoodsId: h034700003974 + hosGoodsCode: '00003974' + goodsCode: '00003974' + goodsName: 高值牙钻机RqFjg goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-06-03' - expdtDate: '2024-12-10' + productDate: '2024-06-04' + expdtDate: '2024-12-11' pkgDefName: pkgDefQty: 1.0 - stockId: 6b6ca005ff174cf28bdfb475f7e57aad + stockId: 2534a8daf941473daa55db31b56d76af stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472179 + areaCode: areah03472192 lockStatus: 0 unitName: 1支 - shelfCode: areah03472179-A-01-01 + shelfCode: areah03472192-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406030014", "inStockTime": - "2024-06-03 07:25:58", "useFrequency": 1, "distrDetailId": "03837933", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406040014", "inStockTime": + "2024-06-04 07:27:07", "useFrequency": 1, "distrDetailId": "03838014", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司mvYxk - provId: p1e267 - inStockDate: '2024-06-03 07:25:58' + provName: 国药集团公司*0SeL + provId: p1e26b + inStockDate: '2024-06-04 07:27:07' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 616f093f..3c1e22d3 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: h034700003965 + - hosGoodsId: h034700003976 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂9jSFk + goodsName: 新型冠状病毒检测试剂KngvT goodsSpec: G-31891 - mdmGoodsCode: '11660903' - goodsCode: '00003965' + mdmGoodsCode: '11660921' + goodsCode: '00003976' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -16,22 +16,22 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 200.0 + qty: 400.0 goodsImg: [] - pkgDefId: 568e14ff69ff4d9a9489b94a09190c34 + pkgDefId: db3a9047c8e1443cb1de3b11b72f2e98 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: f8eb781292cd452eabd5ca99f8867aff + deptId: fce41341f4d441239326a6f655be8a1a deptName: areaCode: areaName: - targetDeptId: f6e2b5eb722b42e18bcc93ef29371337 + targetDeptId: 18a8cca255594645bfc699ba3a486ee0 targetDeptName: 设备科001 - targetStockId: a55bfa0cbbed47b5bcf9dcf0d30daf76 - targetStockName: 东土城路院区kBIb2中心库房 + targetStockId: b93365f5041c40058e45e346f7014ba3 + targetStockName: 东土城路院区AGtZC中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,9 +39,9 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司mvYxk - noRecPkgQty: 5.0 - noRecQty: 500.0 + provName: 国药集团公司*0SeL + noRecPkgQty: 1.0 + noRecQty: 100.0 autoUnpack: consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index e4d72055..e30a8921 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: c944528a3ec248a8ae33e23ccc117c82 - lastModified: '2024-06-03 14:37:32' - version: 8 - createTime: '2024-06-03 10:22:51' - createUser: h0347_UID-051310 - lastModifiedUser: h0347_UID-051310 - stockId: 16bf1408984440fa92786a65ff0068e5 - shelfCode: areah03472182 + - id: 478cb7e75b6b473cb0702cccf4e19f83 + lastModified: '2024-06-04 09:01:46' + version: 1 + createTime: '2024-06-04 09:01:30' + createUser: h0347_UID-051312 + lastModifiedUser: h0347_UID-051312 + stockId: 7ae0f42212544d588c2cd439155edb09 + shelfCode: areah03472194 shelfName: 默认库区 address: 二级科室005 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051310 + linkman: h0347_UID-051312 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 9252920c3ff247fbbe034564fc6e9270 + deptId: c4e48d18f4234797a040924db4390279 areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index fcb1f0e4..3fc82bb8 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406030009_1 + MSPid: MSP2406040009_1 hosId: h0347 - hosGoodsId: h034700003965 - provGoodsid: provGood-99221146 - goodsAuditBillId: MSP2406030009 - targetId: MSP2406030009_1 + hosGoodsId: h034700003976 + provGoodsid: provGood-99221161 + goodsAuditBillId: MSP2406040009 + targetId: MSP2406040009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 1d8805bc..b0bf84c2 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406030010_1 + MSPid: MSP2406040010_1 hosId: h0347 - hosGoodsId: h034700003966 - provGoodsid: provGood-99221147 - goodsAuditBillId: MSP2406030010 - targetId: MSP2406030010_1 + hosGoodsId: h034700003977 + provGoodsid: provGood-99221162 + goodsAuditBillId: MSP2406040010 + targetId: MSP2406040010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 971a9697..230f3cfe 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406030011_1 + MSPid: MSP2406040011_1 hosId: h0347 - hosGoodsId: h034700003967 - provGoodsid: provGood-99221148 - goodsAuditBillId: MSP2406030011 - targetId: MSP2406030011_1 + hosGoodsId: h034700003978 + provGoodsid: provGood-99221163 + goodsAuditBillId: MSP2406040011 + targetId: MSP2406040011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 2cd4e1eb..61d3bc19 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 568e14ff69ff4d9a9489b94a09190c34 - unitPackageid2: 568e14ff69ff4d9a9489b94a09190c34 + unitPackageid1: db3a9047c8e1443cb1de3b11b72f2e98 + unitPackageid2: db3a9047c8e1443cb1de3b11b72f2e98 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index b1570e69..3b740267 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024060325269 - orderNo2: PLAN2024060325269 + orderNo1: PLAN2024060425398 + orderNo2: PLAN2024060425398 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 74393844..598ac9d0 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,38 +1,53 @@ 配送订单信息: list_a: - &id001 - - id: Nh034720240603000002 - orderNo: SSTZ202406030261 - sourceOrderNo: SSSQ202406030285 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区kBIb2 - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-06-04' - operDoctor: 李* - patientName: 张* - status: 10 - statusText: 待确认 + - id: Ch034720240604000080 + lastModified: '2024-06-04 08:48:54' version: 0 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试QBz5q - distPriority: 0 - distPriorityText: - distId: - distNo: + createTime: '2024-06-04 08:48:54' + createUser: h0347_UID-051312 + lastModifiedUser: + orderNo: CG2024060417726 + billMode: '66' + recType: HDI + hosId: h0347 + branchId: h0347-3651 + deptId: + deptName: + recOrgId: fce41341f4d441239326a6f655be8a1a + recOrgName: 二级检验科002 + areaCode: + areaName: + billExpdtDate: + sourceId: Ph034720240604022044 + sourceType: + inSettlement: + recUser: + recPhone: + recAddr: 二级检验科002 + provId: p1e26b + provName: 国药集团公司*0SeL + subSendFlag: + exeProvId: p1e26b + exeProvName: 国药集团公司*0SeL + billRelationJson: + extInfo: + barcodeFlag: 1 + pkgFlag: + remark: '' + priority: + closeStatus: 0 + closeDate: + upStatus: + tbStatus: 30 hosVersion: 3 - createTime: '2024-06-03 14:29:25' - sumQty: - sumAmount: - operationPkg: 0 - provId: p1e267 - provName: 国药集团公司mvYxk - subProvId: '' - subProvName: '' - recDeptId: f8eb781292cd452eabd5ca99f8867aff + billType: CGD + hosName: 邹城市人民医院(test) + branchName: 东土城路院区AGtZC + sumQty: 100.0 + sumPkgQty: 1.0 + sumAmount: '9999.9900' + planOrderNo: PLAN2024060425399 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 7c1bd3fe..c31c4a51 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,70 +1,87 @@ 配送订单详细信息: list_a: - &id001 - id: Nh034720240603000002 - orderNo: SSTZ202406030261 - sourceOrderNo: SSSQ202406030285 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区kBIb2 - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-06-04' - operDoctor: 李* - patientName: 张* - status: 20 - statusText: 待配送 - version: 1 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试QBz5q - distPriority: 0 - distPriorityText: 否 - distId: - distNo: - hosVersion: 3 - createTime: '2024-06-03 14:29:25' - sumQty: 1 - sumAmount: '99.9999' - operationPkg: 0 - provId: p1e267 - provName: 国药集团公司mvYxk - subProvId: '' - subProvName: '' - recDeptId: f8eb781292cd452eabd5ca99f8867aff - list_b: - - *id001 - list_c: - - *id001 -配送订单详细信息2: - list_a: - - &id001 - - id: h034720240603000002 - hosGoodsId: h034700003963 - goodsNum: 1 + - id: 020ff597cf044add8d7b8229d0614c59 + lastModified: + version: + createTime: + createUser: + lastModifiedUser: + pid: Ch034720240604000080 + orderNo: CG2024060417726 + sourceId: 145339c4b2724a728ebdbcd57c486f9d + hosGoodsId: h034700003976 + mdmGoodsCode: '11660921' + goodsCode: '00003976' + purMode: 60 price: '99.9999' - inSettlement: 3 - inSettlementText: 消耗结算 - goodsName: 高值牙钻机^A%aM - goodsSpec: G-31891 - goodsCode: '00003963' - goodsMfrsId: mfrs-11229 - goodsMfrsName: 德国歌德公司 Geuder AG + supplyId: 2239c523f5af45888d5dfb5babc6616d + pkgDefId: db3a9047c8e1443cb1de3b11b72f2e98 + pkgDefName: '100' + pkgDefQty: 100.0 + pkgQty: 1.0 + qty: 100.0 + conPkgQty: 1.0 + conQty: 100.0 + checkPkgQty: 0.0 + checkQty: 0.0 + distrPkgQty: 0.0 + distrQty: 0.0 + notSendQty: 0.0 + notSendPkgQty: 0.0 + inSettlement: 1 + closeType: 1 + detailRelationJson: '{"planBillId":"Ph034720240604022044","buyDetailId":"Bh034720240604000190001","planDetailId":"145339c4b2724a728ebdbcd57c486f9d"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00003976","purMode":60,"goodsName":"新型冠状病毒检测试剂KngvT"}' + remark: + tbStatus: + hosVersion: unit: 支 - subProvId: p1e267 - subProvName: 国药集团公司mvYxk - totalAmount: '99.9999' - spdGoodsCode: '11660901' - barCodeMng: 2 - erpCode: '11660901' + goodsName: 新型冠状病毒检测试剂KngvT + mfrsId: mfrs-11229 + mfrsName: 德国歌德公司 Geuder AG + goodsGg: G-31891 + mdmGoodsSpecCode: '11660921' + erpCode: '11660921' + 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: '36510000039760' multiChargeFlag: 0 useFrequency: 1 chargeUnit: - hitCode: '12' - hitPrice: '99.999900' - diUse: - goodsDi: + amount: '9999.9900' + unitName: 100支/100 + subProvId: p1e26b + subProvName: 国药集团公司*0SeL + subPrice: 99.9999 + replPkgQty: 1.0 + replQty: 100.0 + ybDefId: + logicId: + provGoodsId: + sendFlag: + curQry: list_b: - *id001 list_c: diff --git a/report/summary.html b/report/summary.html index f4413700..dfe0af3d 100644 --- a/report/summary.html +++ b/report/summary.html @@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 1 - 0分19秒 + 2分2秒 100.0% @@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 a_b5流程十二请领业务流_二级库向二级库 成功 - 19.713 + 122.777 xiaohesheng -- GitLab