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 8efb435b73759e6bf891f60e5974ac4084b10e11..a5ad01aa4aed1fe1a46929e7d3df2ce9e13a0ed8 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"
@@ -304,6 +304,510 @@ def add_new_deptinfo():
FileUtils().w_info8(info1, module, '所有科室name', titlename, 'message6')
+def purchase_module_process():
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(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等信息，使用创建的用户登录============结束
+ # 采购计划列表查询暂存数据列表查询
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_purPlan_listVoPage_url")
+ print('采购计划列表查询暂存数据列表查询', 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, "payload56", get_hosid())
+ print('采购计划列表查询暂存数据', request_body)
+ # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('采购计划列表查询暂存数据,result', result)
+ data = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+ for i in data:
+ pid = commonFuc().analysis_json('id', i)
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_purPlan_listVo_url")
+ # #请求体
+ request_body = commonFuc().get_business_data(module, "payload57", pid)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('herpService_purPlan_listVo_url_result', result)
+ data1 = commonFuc().analysis_json('data', result)
+ id1 = commonFuc().analysis_json('pid', data1)
+ closeStatus = commonFuc().analysis_json('closeStatus', data1)
+ id2 = commonFuc().analysis_json('id', data1)
+ inSettlement = 1
+ planPkgQty = commonFuc().analysis_json('planPkgQty', data1)
+ planPkgQty = int(float(planPkgQty))
+ pkgDefQty = commonFuc().analysis_json('pkgDefQty', data1)
+ pkgDefQty = int(float(pkgDefQty))
+ provId = commonFuc().analysis_json('provId', data1)
+ provName = commonFuc().analysis_json('provName', data1)
+ subProvId = commonFuc().analysis_json('subProvId', data1)
+ subProvName = commonFuc().analysis_json('subProvName', data1)
+ hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1)
+ purMode = commonFuc().analysis_json('purMode', data1)
+ version = commonFuc().analysis_json('version', data1)
+ pkgDefId = commonFuc().analysis_json('pkgDefId', data1)
+ purTaskId = commonFuc().analysis_json('purTaskId', data1)
+ sourceId = commonFuc().analysis_json('sourceId', data1)
+ codingType = commonFuc().analysis_json('codingType', data1)
+ tempFlag = commonFuc().analysis_json('tempFlag', data1)
+ orderNo = commonFuc().analysis_json('orderNo', data1)
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_purPlan_submitPurPlan_url")
+ print('采购计划提交', 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"))
+ # # 请求体
+ if purMode == 60:
+ request_body = commonFuc().get_business_data(module, "payload58", id1, closeStatus, id2, provId, provName,
+ subProvId,
+ subProvName, hosGoodsId, purMode, pkgDefId, sourceId)
+ titlename = ('orderNo1', 'orderNo2')
+ info = (orderNo, orderNo)
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '采购计划单号试剂', titlename, 'message12')
+ # =====================
+ elif purMode == 10:
+ request_body = commonFuc().get_business_data(module, "payload58", id1, closeStatus, id2, provId, provName,
+ subProvId,
+ subProvName, hosGoodsId, purMode, pkgDefId, sourceId)
+ print('orderNo', orderNo)
+ titlename = ('orderNo1', 'orderNo2')
+ info = (orderNo, orderNo)
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '采购计划单号', titlename, 'message7')
+ else: # purMode=20
+ request_body = commonFuc().get_business_data(module, "payload58_1", id1, id2, provId, provName,
+ subProvId,
+ subProvName, hosGoodsId, sourceId)
+ titlename = ('orderNo1', 'orderNo2')
+ info = (orderNo, orderNo)
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '采购计划单号高值', titlename, 'message11')
+
+ print('采购计划提交request_body', request_body)
+ # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('采购计划提交', result)
+
+
+def order_dp(type=1):
+ # # 登录获取用户id等信息，使用创建的用户登录===========开始
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
+ # print(info)
+ username = info['e_username']
+
+ password = commonFuc().get_business_data("b2_herp3_bs", "password1")
+ # username = '001f90380'
+ # password='1qaz!QAZ'
+ print('username,password', username, password)
+ # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login(username, password, 1)
+ # 登录获取用户id等信息，使用创建的用户登录============结束
+
+ # =========================查询待确认订单======================
+ module = "a6_mdm3_dp"
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "purchase_page_url")
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ projectCode)
+ branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
+ hos_id = branch_id[0:5]
+ exeProvId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
+
+ if type == 1:
+ orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7')["orderNo1"]
+ print(orderNo1)
+ elif type == 2:
+ orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11')["orderNo1"]
+ print(orderNo1)
+ elif type == 3:
+ orderNo1 = FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')["orderNo1"]
+ print(orderNo1)
+ else:
+ orderNo1 = 'orderNo1'
+ request_body = commonFuc().get_business_data(module, "payload1_1_1", orderNo1, hos_id, exeProvId)
+ # print('request_body',request_body)
+ # 发送请求
+ while True:
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ total = commonFuc().analysis_json('total', data)
+ if total == 1:
+ break
+ else:
+ time.sleep(6)
+
+ data1 = commonFuc().analysis_json('data', data)
+ id1 = commonFuc().analysis_json('id', data1[0])
+ print('id1', id1)
+
+ data = commonFuc().analysis_json('data', result)
+ data1 = commonFuc().analysis_json('data', data)
+ 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, 'b5_spd3_core_business_flow', '配送订单信息', titlename, 'message8')
+ # 从message8文件中获取信息
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单信息", 'message8')
+ # print('info', info)
+ list_a = info['list_a']
+ list_a = ','.join(map(str, list_a))
+ import json
+ new_request_body = list_a.replace("'", '"')
+ new_request_body1 = new_request_body.replace("None", 'null')
+ print(new_request_body1)
+ list_a2 = json.loads(new_request_body1)
+ # print('list_a', list_a)
+ billMode = "billMode"
+ createUser = 'createUser'
+ hosId = 'hosId'
+ provId = 'provId'
+ for i in list_a2:
+ billMode = i["billMode"]
+ createUser = i["createUser"]
+ hosId = i['hosId']
+ provId = i['provId']
+ break
+
+ # =========================查询待确认订单======================
+ # ==============================确认订单==================
+ module = "a6_mdm3_dp"
+
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "ensure_url")
+
+ request_body = commonFuc().get_business_data(module, "payload2", id1, uxid)
+
+ # print('request_body',request_body)
+ # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ if code == 0:
+ commonFuc().check_text_exist(code, result)
+ else:
+ commonFuc().check_text_exist('error', result)
+ # ==============================确认订单==================
+ # ==============================配送==================
+
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "detail_id_url")
+
+ request_body = commonFuc().get_business_data(module, "payload4", id1)
+
+ # print('request_body',request_body)
+ # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('resulta3获取订单详细信息中的子表id_3_0医院', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ total = commonFuc().analysis_json('total', data)
+
+ commonFuc().check_text_exist(code, result)
+ data1 = commonFuc().analysis_json('data', data)
+ id2 = commonFuc().analysis_json('id', data1[0])
+ print(id1, id2)
+ data1 = commonFuc().analysis_json('data', data)
+ 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, 'b5_spd3_core_business_flow', '配送订单详细信息', titlename, 'message9')
+
+ # ==================a3获取订单详细信息中的子表id_3_0医院
+ # ==================订单配送========================
+ module = "a6_mdm3_dp"
+ # a1订单配送列表数据查询_全部
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submit_url")
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ projectCode)
+ # 从message9文件中获取信息
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "配送订单详细信息", 'message9')
+ print('info从message9文件中获取信息', info)
+ list_a = info['list_a']
+ hosGoodsId = 'hosGoodsId'
+ mdmGoodsCode = 'mdmGoodsCode'
+ goodsCode = 'goodsCode'
+ pkgDefId = 'pkgDefId'
+ erpCode = 'erpCode'
+ for i in list_a:
+ print('aaaaaaaaaaaaaaaaaaaaaaaaaaaa', i)
+ for j in i:
+ print('bbbbbbbbbbbbbbbbbbb', j)
+ hosGoodsId = j['hosGoodsId']
+ mdmGoodsCode = j['mdmGoodsCode']
+ goodsCode = j['goodsCode']
+ pkgDefId = j['pkgDefId']
+ erpCode = j['erpCode']
+ break
+ # # #获取日期
+ productDate = timeUtils().get_time_hms(5)
+ expdtDate = timeUtils().get_time_add(190, 2)
+ if type == 1:
+ request_body = commonFuc().get_business_data(module, "payload9_2_1_1_1", id1, id1, hosId, provId, billMode,
+ createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
+ goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2)
+ elif type == 2:
+ request_body = commonFuc().get_business_data(module, "payload9_2_1_2_1", id1, id1, hosId, provId, billMode,
+ createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
+ goodsCode, productDate, expdtDate, erpCode, id2)
+ elif type == 3:
+ request_body = commonFuc().get_business_data(module, "payload9_2_1_3_1", id1, id1, hosId, provId, billMode,
+ createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
+ goodsCode, pkgDefId, productDate, expdtDate, erpCode, id2)
+
+ print('request_body', request_body)
+ # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ id1 = commonFuc().analysis_json('id', data)
+ info = (id1, id1)
+ titlename = ('distrBillId1', 'distrBillId2')
+ # 将配送订单信息息写入到文件中
+ if type == 1:
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '低值配送单号', titlename, 'message10')
+ elif type == 2:
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '高值配送单号', titlename, 'message10')
+ elif type == 3:
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '试剂配送单号', titlename, 'message10')
+ if code == 0:
+ commonFuc().check_text_exist(code, result)
+ else:
+ commonFuc().check_text_exist('error', result)
+
+
+def check_accept_order(type=1):
+ # # 登录获取用户id等信息，使用创建的用户登录===========开始
+ info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+ # print(info)
+ username = info['username1']
+
+ password = commonFuc().get_business_data("b2_herp3_bs", "password")
+ # username = '001f90380'
+ # password='1qaz!QAZ'
+ print('username,password', username, password)
+ # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login(username, password, 2)
+ # 登录获取用户id等信息，使用创建的用户登录============结束
+
+ # =========================查询待验收订单======================
+ module = "b5_spd3_core_business_flow"
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_page_url")
+ print('url', url)
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ projectCode)
+ branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
+ hos_id = branch_id[0:5]
+ if type == 1:
+ sourceOrderNo = FileUtils().r_info8(module, '低值配送单号', 'message10')["distrBillId1"]
+ elif type == 2:
+ sourceOrderNo = FileUtils().r_info8(module, '高值配送单号', 'message10')["distrBillId1"]
+ elif type == 3:
+ sourceOrderNo = FileUtils().r_info8(module, '试剂配送单号', 'message10')["distrBillId1"]
+ else:
+ sourceOrderNo = FileUtils().r_info8(module, '低值配送单号', 'message10')["distrBillId1"]
+ request_body = commonFuc().get_business_data(module, "payload", hos_id, branch_id, sourceOrderNo)
+ print('request_body', request_body)
+ # 发送请求
+ while True:
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ total = commonFuc().analysis_json('total', data)
+ if total == 1:
+ break
+ else:
+ time.sleep(6)
+
+ data = commonFuc().analysis_json('data', result)
+ data1 = commonFuc().analysis_json('data', data)
+ 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, 'b5_spd3_core_business_flow', '验收单信息', titlename, 'message13')
+ # 从message13文件中获取信息
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单信息", 'message13')
+ # print('info', info)
+ list_a = info['list_a']
+ print('list_a', list_a)
+ sourceType = "sourceType"
+ billMode = 'billMode'
+ recOrgId = 'recOrgId'
+ recOrgName = 'recOrgName'
+ sourceOrgId = 'sourceOrgId'
+ sourceOrgName = 'sourceOrgName'
+ sourceVersion = 'sourceVersion'
+ tbStatus = 'tbStatus'
+ for i in list_a:
+ print('i', i)
+ for j in i:
+ sourceType = j["sourceType"]
+ billMode = j["billMode"]
+ recOrgId = j['recOrgId']
+ recOrgName = j['recOrgName']
+ sourceOrgId = j['sourceOrgId']
+ sourceOrgName = j['sourceOrgName']
+ sourceVersion = j['sourceVersion']
+ tbStatus = j['tbStatus']
+ break
+
+ # =========================查询待验收订单======================
+ # ==============================查看订单详情==================
+
+ sourceId = sourceOrderNo
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_detail_url")
+ print('url', url)
+ request_body = commonFuc().get_business_data(module, "payload1", sourceId, sourceType, billMode, branch_id)
+
+ # print('request_body',request_body)
+ # 发送请求
+ while True:
+ time.sleep(6)
+ result = commonFuc().http_post(url, request_body, headers)
+ code = commonFuc().analysis_json('code', result)
+ if code == 0:
+ break
+ else:
+ print('验收单数据未同步完成，等待6秒')
+ print('result', result)
+ # 断言
+ data = commonFuc().analysis_json('data', result)
+ list_a = []
+ list_b = []
+ list_c = []
+ list_a.append(data)
+ list_b.append(data)
+ list_c.append(data)
+ # 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, 'b5_spd3_core_business_flow', '验收单详情信息', titlename, 'message14')
+ # 读取viewId
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单详情信息", 'message14')
+ # print('info', info)
+ list_a = info['list_a']
+ print('list_a', list_a)
+ viewId = "viewId"
+ settlement = 'settlement'
+ recTemperature = 'recTemperature'
+ recHumidity = 'recHumidity'
+ hosGoodsId = 'hosGoodsId'
+ distrQty = 'distrQty'
+ distrPkgQty = 'distrPkgQty'
+ for i in list_a:
+ for j in i:
+ viewId = j["viewId"]
+ settlement = j["settlement"]
+ recTemperature = j['recTemperature']
+ recHumidity = j['recHumidity']
+ hosGoodsId = j['hosGoodsId']
+ distrQty = j['distrQty']
+ distrPkgQty = j['distrPkgQty']
+
+ break
+ # ==============================查看订单详情==================
+ # ========设置验收全部合格
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url")
+ print('check_barcode_save_url', url)
+ sourceBillId = sourceId
+ request_body = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId)
+
+ print('设置验收全部合格request_body', request_body)
+ # 发送请求
+ time.sleep(6)
+
+ while True:
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ data = commonFuc().analysis_json('data', result)
+ code = commonFuc().analysis_json('code', result)
+ print(code)
+ if code == 0 and data == 1:
+ break
+ else:
+ print('设置产品合格出现问题')
+ time.sleep(6)
+ continue
+
+ # ========设置验收全部合格
+ # =============提交验收单========================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_submit_url")
+ deptId = recOrgId
+ deptName = recOrgName
+ provId = sourceOrgId
+ provName = sourceOrgName
+ createUser = uxid
+ sourceNo = sourceId
+ checkQty = distrQty
+ checkPkgQty = distrPkgQty
+ time.sleep(6)
+ request_body = commonFuc().get_business_data(module, "payload3", billMode, branch_id, deptId, deptName, hos_id,
+ provId, provName, recOrgId, recOrgName, sourceId, sourceVersion,
+ sourceType, tbStatus, createUser, sourceNo, viewId, hosGoodsId, viewId,
+ settlement,
+ checkQty, distrPkgQty, checkPkgQty, recTemperature, recHumidity)
+
+ print('request_body', '提交验收单', request_body)
+ # 发送请求
+ while True:
+ time.sleep(3)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ CHECK_NO = commonFuc().analysis_json('data', result)
+ code = commonFuc().analysis_json('code', result)
+ if code == 0:
+ break
+
+ info = (CHECK_NO, CHECK_NO)
+ titlename = ('CHECK_NO1', 'CHECK_NO2')
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15')
+
+
try:
# add_dept2() # 新增一个二级科室
# add_new_deptinfo() # 写入科室信息到文件中
@@ -312,6 +816,7 @@ try:
# set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'],2)
# 设置部门负责人
# set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人
+ # 从下面开始,上面的暂时注释
goods_move2() # 设置产品出库渠道为直送
updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
# # 低值
@@ -321,10 +826,21 @@ try:
# # 试剂
second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
BuyCarSubmit() # 请领车提交
- for i in range(6): #三个单据共审批6次
+ 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_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
new file mode 100644
index 0000000000000000000000000000000000000000..efaaf85be52fbf346bc023e8599b821a528f5b17
--- /dev/null
+++ "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
@@ -0,0 +1,314 @@
+# -*- encoding=utf8 -*-
+import json
+import traceback
+
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+from air_case.public1.public1.public1 import *
+from common.db.sql.sql_del_branch_info import delData
+
+from common.fileUtls import FileUtils
+from common.run_cmd_script import execute_command
+from common.timeUtils import timeUtils
+from airtest.core.api import using
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,spd_core1,a_b4流程十一请领业务流_二级库向直送,id2302,id2302-15,sit,on
+核心业务流:a_b4流程十一请领业务流_二级库向二级库
+python runner_test.py tag id2302-15 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')['deptid2']
+ deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+ # 高值
+ # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+ request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode)
+ print('我要请领_手工请领_列表查询', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('我要请领_手工请领_列表查询,result', result)
+ data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+ goodsName = commonFuc().analysis_json('goodsName', data1)
+ goodsSpec = commonFuc().analysis_json('goodsSpec', data1)
+ mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1)
+ goodsCode = commonFuc().analysis_json('goodsCode', data1)
+ unit = commonFuc().analysis_json('unit', data1)
+ purMode = commonFuc().analysis_json('purMode', data1)
+ goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1)
+ unitName = commonFuc().analysis_json('unitName', data1)
+ price = commonFuc().analysis_json('price', data1)
+ deptId = commonFuc().analysis_json('deptId', data1)
+ # areaCode=commonFuc().analysis_json('areaCode',data1)
+ areaName = '默认库区'
+ targetDeptId = commonFuc().analysis_json('targetDeptId', data1)
+ targetDeptName = commonFuc().analysis_json('targetDeptName', data1)
+ targetStockId = commonFuc().analysis_json('targetStockId', data1)
+ targetStockName = commonFuc().analysis_json('targetStockName', data1)
+ purModeText = commonFuc().analysis_json('purModeText', data1)
+ goodsGeneralName = commonFuc().analysis_json('goodsGeneralName', data1)
+ provName = commonFuc().analysis_json('provName', data1)
+ pkgDefId = commonFuc().analysis_json('pkgDefId', data1)
+ # 信息写入文件
+ list_a = []
+ list_b = []
+ list_c = []
+ list_a.append(data1)
+ list_b.append(data1)
+ list_c.append(data1)
+ # print('list_a', len(list_a), list_a)
+ info = (list_a, list_b, list_c)
+ titlename = ('list_a', 'list_b', 'list_c')
+ FileUtils().w_info8(info, module, '二级库请领产品信息', titlename, 'message21')
+ # 我要请领_手工请领_列表查询===========================
+ # 添加到请领车=============================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_createBuyCar_url")
+ print('添加到请领车=================', url)
+ if type == 1:
+ request_body = commonFuc().get_business_data(module, "payload40", hosGoodsId, goodsName, goodsSpec,
+ mdmGoodsCode,
+ goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price,
+ deptId,
+ areaCode, areaName, targetDeptId, targetDeptName, targetStockId,
+ targetStockName, purModeText, goodsGeneralName, provName)
+ elif type == 2:
+ request_body = commonFuc().get_business_data(module, "payload41", hosGoodsId, goodsName, goodsSpec,
+ mdmGoodsCode,
+ goodsCode, unit, purMode, goodsMfrsName, unitName, price, deptId,
+ areaCode, areaName, targetDeptId, targetDeptName, targetStockId,
+ targetStockName, purModeText, goodsGeneralName, provName)
+ elif type == 3:
+ request_body = commonFuc().get_business_data(module, "payload42", hosGoodsId, goodsName, goodsSpec,
+ mdmGoodsCode,
+ goodsCode, unit, purMode, goodsMfrsName, pkgDefId, unitName, price,
+ deptId,
+ areaCode, areaName, targetDeptId, targetDeptName, targetStockId,
+ targetStockName, purModeText, goodsGeneralName, provName)
+ request_body = get_process_list(request_body)
+ print('添加到请领车', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('添加到请领车,result', result)
+ # 添加到请领车=============================================
+
+
+def BuyCarSubmit():
+ module = "b5_spd3_core_business_flow"
+ # # 登录获取用户id等信息，使用创建的用户登录===========开始
+ info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+ username = info['username1']
+ password = commonFuc().get_business_data("b2_herp3_bs", "password")
+ print('username,password', username, password)
+ # # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login(username, password, 2)
+ # 登录获取用户id等信息，使用创建的用户登录============结束
+ # 我要请领_手工请领_列表查询===========================
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ commonFuc().get_business_data(module, "X-APP-CODE"))
+ # 请领车查询===============================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_queryBuyCarPage_url")
+ print('请领车查询=================', url)
+ deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+ deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+ areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+ request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2)
+
+ print('请领车查询', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('请领车查询,result', result)
+ data = commonFuc().analysis_json('data', result)
+ list_id = []
+ for i in data:
+ id = commonFuc().analysis_json('id', i)
+ list_id.append(id)
+ # 请领车查询===============================================
+ # 请领车提交===============================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_validBuyCarSubmit_url")
+ print('请领车提交=================', url)
+
+ billExpdtDate = timeUtils().get_time_add(30, 2)
+ print('billExpdtDate', billExpdtDate)
+ request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0],
+ list_id[1], list_id[2])
+
+ print('请领车提交', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('请领车提交,result', result)
+ # 请领车提交===============================================
+ # 创建领车交易=================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "herpService_buy_createBuyBill_url")
+ print('创建领车交易=================', url)
+
+ billExpdtDate = timeUtils().get_time_add(30, 2)
+ request_body = commonFuc().get_business_data(module, "payload44", billExpdtDate, get_branch_id(), list_id[0],
+ list_id[1], list_id[2])
+
+ print('创建领车交易', 'request_body', request_body)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('创建领车交易,result', result)
+ currentTaskList = commonFuc().analysis_json('currentTaskList', commonFuc().analysis_json('data', result))
+
+
+def add_dept2():
+ module = 'b2_herp3_bs'
+ # 内网登录
+ username = commonFuc().get_business_data(module, "username")
+ # print('医院名称',username)
+ password = commonFuc().get_business_data(module, "password")
+ # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ # print( token,projectCode,uxid,corpId,info)
+ # c3_新增科室_特殊科室_二级库房
+ branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_insert_url")
+
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ commonFuc().get_business_data(module, "X-APP-CODE"))
+
+ # #请求体
+ request_body = commonFuc().get_business_data(module, "payload15_2", get_branch_id(), get_hosid())
+ print(request_body)
+ # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+
+
+def add_new_deptinfo():
+ module = "b2_herp3_bs"
+ # 内网登录
+ username = commonFuc().get_business_data(module, "username")
+ # print('医院名称',username)
+ password = commonFuc().get_business_data(module, "password")
+ # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ # print( token,projectCode,uxid,corpId,info)
+ # b9_科室管理_科室登记_科室查询
+ branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "deptPage_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, "payload13", branch_id)
+ print(request_body)
+ # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ data = commonFuc().analysis_json('data', result)
+ total = commonFuc().analysis_json('total', data)
+ if total == 5:
+ commonFuc().check_text_exist(0, result)
+ else:
+ commonFuc().check_text_exist('error', result)
+ # 将deptid写入文件
+ data1 = commonFuc().analysis_json('data', data)
+ print('data1', data1)
+ info = []
+ for i in data1:
+ deptid = commonFuc().analysis_json('id', i)
+ info.append(deptid)
+ titlename = ['deptid1', 'deptid2', 'deptid3', 'deptid4', 'deptid5']
+
+ FileUtils().w_info8(info, module, '所有科室id', titlename, 'message6')
+ info1 = []
+ for i in data1:
+ ename = commonFuc().analysis_json('ename', i)
+ info1.append(ename)
+ FileUtils().w_info8(info1, module, '所有科室name', titlename, 'message6')
+
+
+try:
+ add_dept2() # 新增一个二级科室
+ add_new_deptinfo() # 写入科室信息到文件中
+ grants_user_new() # 新增授权
+ # 同步库房信息
+ execute_command("python runner_test.py tag id2263-221 debug sit")
+ # 设置部门用户
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
+ # 设置部门负责人
+ set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人
+ get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
+ set_stockShelf_Linkman()#设置库区联系人
+ #新建科室产品分配
+ dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'])
+ #编辑产品请领目标为二级检验科002
+
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是新二级库
+ # # 低值
+ 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()
+
+ # for i in range(3): # 三个单据共审批3次
+ # approval_center()
+
+ # 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/public1/public1/public1.py b/air_case/public1/public1/public1.py
index 667882d5d096ac781acef0240664088b68dde950..8f8a6e8693630f8151bab10a28f0081ff5478800 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -1449,7 +1449,80 @@ def get_listUserMgrRangePage(type=1): # 查询权限id
for i in data1:
if i['mgrRangeName'] == list2[3]:
return commonFuc().analysis_json('id', i)
+def get_listUserMgrRangePage1(type=1): # 查询权限id
+ module = 'b2_herp3_bs'
+ username = FileUtils().r_info8(module, '用户名信息', 'message3')["username1"]
+ ## print('医院名称',username)
+ password = commonFuc().get_business_data(module, "password")
+ # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ # 获取请求头信息
+ 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('b5_spd3_core_business_flow',
+ "platformService_listUserMgrRangePage_url")
+
+ request_body = commonFuc().get_business_data('b5_spd3_core_business_flow', "payload23", uxid)
+ result = commonFuc().http_post(url, request_body, headers)
+ data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+ print('data1', data1)
+ list2 = []
+ mgrRangeName_list = []
+ for i in data1:
+ mgrRangeName = i['mgrRangeName']
+ mgrRangeName_list.append(mgrRangeName)
+ print('mgrRangeName_list', mgrRangeName_list)
+ for i in mgrRangeName_list:
+ print(i)
+ if i == '设备科001':
+ list2.append(i)
+
+ for i in mgrRangeName_list:
+ if i == '二级检验科002':
+ list2.append(i)
+ else:
+ continue
+ for i in mgrRangeName_list:
+ if i == '三级检测组003':
+ list2.append(i)
+ else:
+ continue
+ for i in mgrRangeName_list:
+ if i == '科室004':
+ list2.append(i)
+ else:
+ continue
+ for i in mgrRangeName_list:
+ if i == '二级科室005':
+ list2.append(i)
+ else:
+ continue
+ print('list2', list2)
+
+ if type == 1:
+ for i in data1:
+ if i['mgrRangeName'] == list2[0]:
+ return commonFuc().analysis_json('id', i)
+ elif type == 2:
+ for i in data1:
+ if i['mgrRangeName'] == list2[1]:
+ return commonFuc().analysis_json('id', i)
+ elif type == 3:
+ for i in data1:
+ if i['mgrRangeName'] == list2[2]:
+ return commonFuc().analysis_json('id', i)
+ elif type == 4:
+ for i in data1:
+ if i['mgrRangeName'] == list2[3]:
+ return commonFuc().analysis_json('id', i)
+ elif type == 5:
+ for i in data1:
+ if i['mgrRangeName'] == list2[4]:
+ return commonFuc().analysis_json('id', i)
def get_stockAreaId_new(dept_id, deptName, type=1):
module = "b2_herp3_bs"
@@ -2654,3 +2727,70 @@ def grants_user_new():
commonFuc().check_text_exist(0, result)
else:
commonFuc().check_text_exist('error', result)
+
+def dept_goods_distribute(detpid): # 科室添加产品信息(产品是从外网同步过来的)
+ module = "b2_herp3_bs"
+ # 内网登录
+ username = commonFuc().get_business_data(module, "username")
+ # print('医院名称',username)
+ password = commonFuc().get_business_data(module, "password")
+ # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+
+ #
+ url = commonFuc().get_api_add_port_url()+commonFuc().get_business_data(module, "basic_mcmsGoodsInfo_insert")
+ print('basic_mcmsGoodsInfo_insert',url)
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ commonFuc().get_business_data(module, "X-APP-CODE"))
+ list2 = []
+ i = 1
+ while True:
+ if i == 1000:
+ print('6000秒过去了，产品还没过来，检查同步是否正常')
+ break
+ try:
+ for i in range(1, 6):
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "产品审核信息", 'message%s' % i)
+ hosGoodsId = info['hosGoodsId']
+ list2.append(hosGoodsId)
+ except:
+ print('产品没有同步过来，等待6秒')
+ time.sleep(6)
+ i = i + 1
+ continue
+ else:
+ break
+
+ dept2_id =detpid
+ j=1
+ for i in list2:
+ # 请求体
+ if j==1:
+ request_body = commonFuc().get_business_data(module, "payload58_6_3", dept2_id, i,20)
+ elif j==2:
+ request_body = commonFuc().get_business_data(module, "payload58_6_3", dept2_id, i, 10)
+ elif j==3:
+ request_body = commonFuc().get_business_data(module, "payload58_6_3", dept2_id, i, 60)
+ else:
+ request_body = commonFuc().get_business_data(module, "payload58_6_3", dept2_id, i,20)
+ j=j+1
+ request_body = '[' + str(request_body) + ']'
+ new_request_body = request_body.replace("'", '"')
+ print(new_request_body)
+ import json
+ request_body_json = json.loads(new_request_body)
+ # # # 发送请求
+ result = commonFuc().http_post(url, request_body_json, headers)
+ print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaa', result)
+ # 断言
+ # checkDict=commonFuc().get_business_data(module,'checkDict10')
+ # commonFuc().check_result(checkDict,result)
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ if code == 0 and data == 1:
+ commonFuc().check_text_exist(0, result)
+ else:
+ commonFuc().check_text_exist('error', result)
diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message
index dcc57650722cc21d830adf65c8444ab5c09c0ca4..51b8b810c95a8cca23f27c5a25b9a1c954e5af3c 100644
--- a/data/a2_mdm3_ea/message
+++ b/data/a2_mdm3_ea/message
@@ -1,3 +1,3 @@
企业信息:
- e_id: CR202405280038
- cname: 国药集团公司m!4a&
+ e_id: CR202405290038
+ cname: 国药集团公司0zl25
diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message
index 5969933842408e8b46455cfa19747732ae1483b5..628d507a8a6c81659427883373e3b93643d8c58d 100644
--- a/data/a3_mdm3_hs/message
+++ b/data/a3_mdm3_hs/message
@@ -1,3 +1,3 @@
医院信息:
- h_id: 湖南省人民医院gnA7p
- h_name: 湖南省人民医院gnA7p
+ h_id: 湖南省人民医院5Lx8I
+ h_name: 湖南省人民医院5Lx8I
diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2
index 89628e0b0c0ddf86fb2566cb5948efc7971896c0..e10ea55e40062f46b4163520a8999309dfdbb626 100644
--- a/data/a5_mdm3_pdm/message2
+++ b/data/a5_mdm3_pdm/message2
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405280011_1
+ MSPid: MSP2405290011_1
hosId: h0347
- hosGoodsId: h034700003824
- provGoodsid: provGood-99220957
- goodsAuditBillId: MSP2405280011
- targetId: MSP2405280011_1
+ hosGoodsId: h034700003842
+ provGoodsid: provGood-99221005
+ goodsAuditBillId: MSP2405290011
+ targetId: MSP2405290011_1
diff --git a/data/a6_mdm3_dp/data b/data/a6_mdm3_dp/data
index 61edeec08d3f46e9910391de9363ecc6eaab1593..65f7e4d9df0f308bafc2fddb29c810f5a05a42f4 100644
--- a/data/a6_mdm3_dp/data
+++ b/data/a6_mdm3_dp/data
@@ -101,6 +101,10 @@ json_headers2: {
"payload9_2_1_2": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":null,"provGoodsId":null,"replPkgQty":100,"settlement":1,"batchCode":"222","productDate":"%s","expdtDate":"%s","distrPkgQty":100,"disabledFlag":0,"distrQty":100,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}
"payload9_2_1_3": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":"%s","provGoodsId":null,"replPkgQty":100,"settlement":1,"batchCode":"4444","productDate":"%s","expdtDate":"%s","distrPkgQty":100,"disabledFlag":0,"distrQty":10000,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}
+"payload9_2_1_1_1": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":"%s","provGoodsId":null,"replPkgQty":1,"settlement":1,"batchCode":"333","productDate":"%s","expdtDate":"%s","distrPkgQty":1,"disabledFlag":0,"distrQty":100,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}
+"payload9_2_1_2_1": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":null,"provGoodsId":null,"replPkgQty":1,"settlement":1,"batchCode":"222","productDate":"%s","expdtDate":"%s","distrPkgQty":1,"disabledFlag":0,"distrQty":1,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}
+"payload9_2_1_3_1": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":1,"version":0,"hosId":"%s","provId":"%s","billMode":"%s","hosVersion":3,"createUser":"%s","createUserName":"%s","lastModifiedUser":"%s","detailList":[{"sourceDetailId":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","certificateCode":"","pkgDefId":"%s","provGoodsId":null,"replPkgQty":1,"settlement":1,"batchCode":"4444","productDate":"%s","expdtDate":"%s","distrPkgQty":1,"disabledFlag":0,"distrQty":100,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":"%s"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}
+
"payload9_3": {"id":"","purBillId":"%s","sourceId":"%s","sourceVersion":"%s","version":0,"billMode":"66","hosVersion":2,"createUser":"GYQX-SPD:user-19669","createUserName":"浙江高仰医疗","lastModifiedUser":"GYQX-SPD:user-19669","detailList":[{"sourceDetailId":"%s","hosGoodsId":"h0028|hosGood-880444","mdmGoodsCode":null,"goodsCode":"880444","certificateCode":"京械注准203420915218","pkgDefId":"h0028000217","provGoodsId":"provGood-1939432","replPkgQty":6,"settlement":0,"batchCode":"1","productDate":"2023-12-01","expdtDate":"2023-12-31","distrPkgQty":1,"disabledFlag":0,"distrQty":10,"ext":{"ygptCode":"","transCond":"0-15℃","storageCond":"0-30℃","erpCode":"11658060"},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}
"payload9_4": {"pageNum":1,"pageSize":50,"orderBy":"last_modified desc, order_no desc","queryObject":{"dateValue":["",""],"provId":"p10d95","pageType":2,"hosIdList":["h0347","h0028"],"tabIdx":"3","startDate":"","endDate":""}}
"payload9_5": {"pageNum":1,"pageSize":50,"orderBy":"create_time desc","queryObject":{"dateValue":["",""],"provId":"p10d95","pageType":2,"hosIdList":["h0347","h0028"],"tabIdx":"1","startDate":"","endDate":""}}
diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message
index 892e12bd87704e18d22ede0222d68b0c0eddc42b..94fa9eb9060cbfe4162bf6a53c96f62f1d74a93a 100644
--- a/data/a6_mdm3_si/message
+++ b/data/a6_mdm3_si/message
@@ -2,10 +2,10 @@
list_a:
- &id001
settleMonth: '202406'
- pid: OBh0347202405280004
- hosGoodsId: h034700003821
- goodsCode: '00003821'
- goodsName: 一次性注射器_低值$@6MA
+ pid: OBh0347202405290004
+ hosGoodsId: h034700003839
+ goodsCode: '00003839'
+ goodsName: 一次性注射器_低值uXIDv
goodsGg: G-31891
mfrsName: 德国歌德公司 Geuder AG
unit: 支
@@ -16,17 +16,17 @@
cacheleftAmount: 19999.98
purMode: 10
waitInvoicingNum: 0.0
- invoicingPrice: 99.9999
+ invoicingPrice:
normalContractId:
normalContract: '1'
detailList:
- - pid: OBh0347202405280004
+ - pid: OBh0347202405290004
settleMonth: '202406'
- hosGoodsId: h034700003821
+ hosGoodsId: h034700003839
batchCode: '333'
- distrDetailId: '03837761'
- distrId: PSh0347202405280005
- distrOrderNo: PSh0347202405280005
+ distrDetailId: '03837779'
+ distrId: PSh0347202405290005
+ distrOrderNo: PSh0347202405290005
settlePrice: 99.9999
maxSettleQty: -100.0
maxSettleAmount: -9999.99
@@ -35,11 +35,11 @@
leftSettleQty: -100.0
leftSettleAmount: -9999.99
hosId: h0347
- provId: p1e250
- branchId: h0347-3637
- balanceDetId: OBh0347202405280004-000001
+ provId: p1e254
+ branchId: h0347-3639
+ balanceDetId: OBh0347202405290004-000001
purMode: 10
- barCode: 013637000003821010333112405281724120421UT240528000202
+ barCode: 013639000003839010333112405291724120521UT240529000202
batchId:
price:
maxQty:
@@ -51,14 +51,14 @@
oneFcatName:
volumeFlag:
onlineKind:
- viewId: 202406OBh0347202405280004h034700003821
- - pid: OBh0347202405280004
+ viewId: 202406OBh0347202405290004h034700003839
+ - pid: OBh0347202405290004
settleMonth: '202406'
- hosGoodsId: h034700003821
+ hosGoodsId: h034700003839
batchCode: '333'
- distrDetailId: '03837761'
- distrId: PSh0347202405280005
- distrOrderNo: PSh0347202405280005
+ distrDetailId: '03837779'
+ distrId: PSh0347202405290005
+ distrOrderNo: PSh0347202405290005
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
@@ -67,11 +67,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
- provId: p1e250
- branchId: h0347-3637
- balanceDetId: OBh0347202405280004-000002
+ provId: p1e254
+ branchId: h0347-3639
+ balanceDetId: OBh0347202405290004-000002
purMode: 10
- barCode: 013637000003821010333112405281724120421UT240528000205
+ barCode: 013639000003839010333112405291724120521UT240529000216
batchId:
price:
maxQty:
@@ -83,10 +83,10 @@
oneFcatName:
volumeFlag:
onlineKind:
- viewId: 202406OBh0347202405280004h034700003821
- unique: 202406OBh0347202405280004h034700003821
+ viewId: 202406OBh0347202405290004h034700003839
+ unique: 202406OBh0347202405290004h034700003839
onlineKind: '10'
- viewId: 202406OBh0347202405280004h034700003821
+ viewId: 202406OBh0347202405290004h034700003839
list_b:
- *id001
list_c:
diff --git a/data/b2_herp3_bs/data b/data/b2_herp3_bs/data
index 1fbd5e77c5af123f59c9cb18f8a5e7341c783f5c..80422484a3465be1ca51045dd2a800678f89fce0 100644
--- a/data/b2_herp3_bs/data
+++ b/data/b2_herp3_bs/data
@@ -211,8 +211,7 @@ json_headers2: {
"payload13": {"pageNum": 1,"pageSize": 50,"orderBy": "code asc","queryObject": {"ename": "","branchId": "院区id", "branchId": "%s", "hosId": "医院id", "hosId": "h0347" }}
"payload14": {"branchId":"%s","cname":"","ename":"设备科001","erpCode":"001","address":"设备科001","contactWay":"13401003250","deptKind":1,"deptCate":1,"deptLevel":"1","flag":"1","hisDeptCodes":"","deptType":"1","packetType":"0","corpId":"h0347","corpKind":1}
"payload15": {"branchId":"%s","cname":"","ename":"二级检验科002","erpCode":"002","address":"二级检验科002","contactWay":"13401003250","deptKind":7,"deptCate":1,"deptLevel":"2","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1}
-"payload15_2": {"branchId":"%s","cname":"","ename":"二级科室005","erpCode":"005","address":"二级科室005","contactWay":"13401003250","deptKind":7,"deptCate":1,"deptLevel":"2","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"%s","corpKind":1}
-
+"payload15_2": {"ordinal":1,"branchId":"%s","cname":"","ename":"二级科室005","erpCode":"005","address":"二级科室005","contactWay":"13401003250","deptKind":2,"deptCate":1,"deptLevel":"2","flag":"1","ext1":"","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"%s","corpKind":1}
"payload16": {"branchId":"%s","pid":"%s","cname":"","ename":"三级检测组003","erpCode":"003","address":"三级检测组003","contactWay":"12401003250","deptKind":7,"deptCate":1,"deptLevel":"3","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1}
"payload17": {"branchId":"%s","pid":"%s","cname":"","ename":"科室004","erpCode":"004","address":"三级科室004","contactWay":"三级科室004","deptKind":5,"deptCate":1,"deptLevel":"4","flag":"1","hisDeptCodes":"","deptType":"0","packetType":"0","corpId":"h0347","corpKind":1}
diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message
index 9b47dab3b37414a277df7b0b2f565d1e541622db..1054c9d7d50772f53726ceec21b5c7baf2e7fecf 100644
--- a/data/b2_herp3_bs/message
+++ b/data/b2_herp3_bs/message
@@ -1,6 +1,6 @@
院区新增:
- branch_id: h0347-3637
- branch_name: 东土城路院区Sn%cM
+ branch_id: h0347-3639
+ branch_name: 东土城路院区#c@$a
科室信息:
- dept2_id: f501a45fae784e2c88418821134c4f43
+ dept2_id: fc8822ba29a94295a3c3d27a5affbae4
dept2_name: 二级检验科002
diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3
index 55358e8c63b209491bc2b5d0d74a00f81a7a9bfe..6b902af12832f1671112a2442a6bbcabb4e558b7 100644
--- a/data/b2_herp3_bs/message3
+++ b/data/b2_herp3_bs/message3
@@ -1,3 +1,3 @@
用户名信息:
- username1: 自动化测试a4dQM
- username2: 自动化测试a4dQM
+ username1: 自动化测试0kQe7
+ username2: 自动化测试0kQe7
diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4
index a76e1dd6703a1939050e62d388b2154503bb0599..f6ccfb3d1ffd75b61bd1380660696076d39a82e3 100644
--- a/data/b2_herp3_bs/message4
+++ b/data/b2_herp3_bs/message4
@@ -1,3 +1,3 @@
一级科室信息:
- dept1_id: 92e5407265e14d48a555d92bb2f455c5
+ dept1_id: 437e9b776c4e4d1aabb42b5ab8066224
dept1_name: 设备科001
diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5
index 9d6e3aff6cb1c856c1ae839185602b3ef6f938cf..18e3a2809108a7297d3c7f14e6d57db142c35df7 100644
--- a/data/b2_herp3_bs/message5
+++ b/data/b2_herp3_bs/message5
@@ -1,3 +1,3 @@
部门和库区信息:
- dept1_id: 92e5407265e14d48a555d92bb2f455c5
- stockAreaId: ed992a93989a430f91632badcce6dfab
+ dept1_id: 437e9b776c4e4d1aabb42b5ab8066224
+ stockAreaId: db3baaad8fff4c2ea4194a5dc238943e
diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6
index c3ff242280846ae1cd65fa1a655d036de1754296..b3a42f06a9b07e8ef0232354febcbb5a77432884 100644
--- a/data/b2_herp3_bs/message6
+++ b/data/b2_herp3_bs/message6
@@ -1,9 +1,9 @@
所有科室id:
- deptid1: 92e5407265e14d48a555d92bb2f455c5
- deptid2: f501a45fae784e2c88418821134c4f43
- deptid3: 614df6f53e8740d1892b6f282a8d3f62
- deptid4: f639916c6df24c65bdc77b58ae08a2f7
- deptid5: e4d8b214250d44e18633f3cea5a72422
+ deptid1: 437e9b776c4e4d1aabb42b5ab8066224
+ deptid2: fc8822ba29a94295a3c3d27a5affbae4
+ deptid3: 3d52fc27d77b47dc8bea7b57cbd21bd5
+ deptid4: 8ab822e5c93840c0a0549b38639efa9e
+ deptid5: e510310e705c4a328395ae3ccf8d0cc3
所有科室name:
deptid1: 设备科001
deptid2: 二级检验科002
diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7
index 4198361ad1056f8f80b4e07817eb8a579e74900e..e0a71cbdd235516511369fbb06d252dd90e588ea 100644
--- a/data/b2_herp3_bs/message7
+++ b/data/b2_herp3_bs/message7
@@ -1,4 +1,4 @@
shelfinfo:
- shelfid: ed992a93989a430f91632badcce6dfab
- shelfCode: areah03472105
+ shelfid: db3baaad8fff4c2ea4194a5dc238943e
+ shelfCode: areah03472117
areaName: 自动化测试
diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data
index 7ab3e16762a8364243f596eb3f08f26c99a042f3..9ec4032187bb34bbdd0a5b29eb095ae54ff3630d 100644
--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -56,6 +56,10 @@
"herpService_mcmsBranchGoodsInfo_page_url": "/api/herpService/basic/mcmsBranchGoodsInfo/page"
"platformService_basic_logic_save_url": "/api/platformService/basic/logic/save"
"herpService_queryBuyPage_url": "/api/herpService/buy/queryBuyPage"
+"herpService_purPlan_listVoPage_url": "/api/herpService/purPlan/listVoPage"
+"herpService_purPlan_listVo_url": "/api/herpService/purPlan/listVo"
+"herpService_purPlan_submitPurPlan_url": "/api/herpService/purPlan/submitPurPlan"
+
"username": "xhs1009"
"username2": "test001"
@@ -137,3 +141,7 @@ json_headers2: {
"payload54": {"logicInfo":{"logicName":"自动化测试12345","simpleName":"自动","stockId":"ST2023122800001","hosId":"%s","mgrMode":"0","purBranchId":"%s","leader":"自动化测试","phone":"自动化测试","tbStatus":1,"delFlag":0,"branchIds":["%s"],"createUser":"%s","lastModifiedUser":"%s"},"mgrRange":{"userId":"%s","corpId":"%s","mgrRangeName":"自动化测试12345","mgrRangeKind":2,"defaultFlag":1,"projectCode":"warehouse","createUser":"%s","lastModifiedUser":"%s","extStr1":"3.0实体仓"}}
"payload55": {"orderBy":"mdb.order_no asc","pageNum":1,"pageSize":50,"queryObject":{"permission":true,"deptId":"","orderNo":"","branchId":"%s","goodsName":"","startDate":"","endDate":"","queryFlag":true}}
+"payload56": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"","hosId":"%s","status":"0","createUser":"","startTime":null,"endTime":null}}
+"payload57": {"pid":"%s","hosGoodsName":"","hosGoodsSpec":"","provName":"","purModes":[],"subProvName":""}
+"payload58": {"id":"%s","planDetailList":[{"closeStatus":"%s","id":"%s","inSettlement":1,"planPkgQty":1,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":"%s","version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":"%s","codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload58_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":1,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":"%s","codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message
index 5c39bad1e925f6f201cd34a2c20fb73fa7723b0c..10800a063e006e483883cffe4fe5c7c99acc64a7 100644
--- a/data/b5_spd3_core_business_flow/message
+++ b/data/b5_spd3_core_business_flow/message
@@ -1,5 +1,5 @@
供货关系申请2:
- e_corpId: p1e250
+ e_corpId: p1e254
h_corpId: h0347
- e_username: 国药集团公司m!4a&
+ e_username: 国药集团公司0zl25
h_name: test001
diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1
index c7dffb2045b76d52ffb657d6365cfe0ce0796693..12c687403400ab9352910af0260bee39b38104a8 100644
--- a/data/b5_spd3_core_business_flow/message1
+++ b/data/b5_spd3_core_business_flow/message1
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405280007_1
+ MSPid: MSP2405290007_1
hosId: h0347
- hosGoodsId: h034700003820
- provGoodsid: provGood-99220953
- goodsAuditBillId: MSP2405280007
- targetId: MSP2405280007_1
+ hosGoodsId: h034700003838
+ provGoodsid: provGood-99221001
+ goodsAuditBillId: MSP2405290007
+ targetId: MSP2405290007_1
diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10
index ff56b4ad9a8e2f3d2c8abbc13269c2259d440b0b..971784c4524bd674fdc9d827e90699dac5f6b8e3 100644
--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
@@ -1,12 +1,9 @@
低值配送单号:
- distrBillId1: PSh0347202405280011
- distrBillId2: PSh0347202405280011
+ distrBillId1: PSh0347202405290024
+ distrBillId2: PSh0347202405290024
高值配送单号:
- distrBillId1: PSh0347202405280012
- distrBillId2: PSh0347202405280012
+ distrBillId1: PSh0347202405290025
+ distrBillId2: PSh0347202405290025
试剂配送单号:
- distrBillId1: PSh0347202405280013
- distrBillId2: PSh0347202405280013
-高值跟台配送单号:
- distrBillId1: PSh0347202405280014
- distrBillId2: PSh0347202405280014
+ distrBillId1: PSh0347202405290026
+ distrBillId2: PSh0347202405290026
diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11
index ba518fea3977c79cfe8911679d0f606ab0ef76ad..92c202f509af8e80360c13831eea2d5434292a62 100644
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
@@ -1,3 +1,3 @@
采购计划单号高值:
- orderNo1: PLAN2024052824379
- orderNo2: PLAN2024052824379
+ orderNo1: PLAN2024052924542
+ orderNo2: PLAN2024052924542
diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12
index d876bd8faac582a4f9984c80bc7669f7aee22712..7560043bd890d89efb59db67fd4cbd3bb4070f03 100644
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
@@ -1,3 +1,3 @@
采购计划单号试剂:
- orderNo1: PLAN2024052824380
- orderNo2: PLAN2024052824380
+ orderNo1: PLAN2024052924540
+ orderNo2: PLAN2024052924540
diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13
index 5f55dfaf614e805f9de7b6b5869b4e4fb183f48f..65734e2c5eedf9427f1ea48b0d374e18c104e902 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-3637
+ branchId: h0347-3639
deptId:
taskType: 1
- sourceOrgId: p1e250
- sourceOrgName: 国药集团公司m!4a&
- sourceOrderNo: PSh0347202405280014
- billMode: '25'
+ sourceOrgId: p1e254
+ sourceOrgName: 国药集团公司0zl25
+ sourceOrderNo: PSh0347202405290026
+ billMode: '66'
stockKind:
purMode:
- sourceId: PSh0347202405280014
+ sourceId: PSh0347202405290026
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
- planOrderNo: SSSQ202405280278
- purOrderNo: SSTZ202405280254
- recOrgId: f501a45fae784e2c88418821134c4f43
+ planOrderNo: PLAN2024052924540
+ purOrderNo: CG2024052917116
+ recOrgId: fc8822ba29a94295a3c3d27a5affbae4
recOrgName: 二级检验科002
- billRelationJson: '{"operationApplyOrderNo":"SSSQ202405280278","operationNoticeBillId":"Nh034720240528000001","distrBillId":"PSh0347202405280014","operationNoticeOrderNo":"SSTZ202405280254","distrOrderNo":"PSh0347202405280014","operationApplyBillId":"Oh034720240528000001"}'
- taskDate: '2024-05-28 07:24:30'
+ billRelationJson: '{"buyBillId":"Bh03472024052900037","planBillId":"Ph034720240529021185","planOrderNo":"PLAN2024052924540","buyOrderNo":"BUY2024052904395","purOrderNo":"CG2024052917116","purBillId":"Ch034720240529000093","purBillDate":"2024-05-29
+ 10:58:20","distrBillId":"PSh0347202405290026","distrOrderNo":"PSh0347202405290026"}'
+ taskDate: '2024-05-29 10:58:49'
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 90d55462819161fde3f09d5fcc4568917c09d047..5ace9f20d2bbcb859541d5b94a056df708160886 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: h034700003820
+ - purMode: 60
+ unitName: 100支/100
+ hosGoodsId: h034700003840
mdmGoodsCode:
- spdGoodsCode: '11660712'
- goodsCode: '00003820'
- goodsName: 高值牙钻机&d14I
+ spdGoodsCode: '11660762'
+ goodsCode: '00003840'
+ goodsName: 新型冠状病毒检测试剂Q4GWE
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-04'
- productDate: '2024-05-28'
- provName: 国药集团公司m!4a&
+ pkgDefName: '100'
+ pkgDefQty: 100.0
+ batchCode: '4444'
+ expdtDate: '2024-12-05'
+ productDate: '2024-05-29'
+ provName: 国药集团公司0zl25
provId:
- viewId: '03837770'
+ viewId: '03837799'
verifyFlag: 0
hasSterilize: 0
- id: '03837770'
+ id: '03837799'
detailRelationJson:
- extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
+ extInfo: '{"goodsGg":"G-31891","goodsCode":"00003840","purMode":60,"goodsName":"新型冠状病毒检测试剂Q4GWE","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660762","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 2fd856839b4ce6725c8639d492401b9e2bcbf368..4d8ac5e179275f7e5d8c355ef2ea17786e36ad16 100644
--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
@@ -1,3 +1,3 @@
验收单号:
- CHECK_NO1: CHECKh03472024052800004
- CHECK_NO2: CHECKh03472024052800004
+ CHECK_NO1: CHECKh03472024052900014
+ CHECK_NO2: CHECKh03472024052900014
diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16
index 785485a16cc060d694eb28404906286c8ac9c5cf..839428bcc159af1531b2f0fbcb800891c445f9ac 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: CHECKh03472024052800001
+ sourceId: CHECKh03472024052900001
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
- deptId: 92e5407265e14d48a555d92bb2f455c5
+ deptId: 437e9b776c4e4d1aabb42b5ab8066224
deptName:
- branchId: h0347-3637
+ branchId: h0347-3639
branchName:
taskType: 1
- sourceOrgId: p1e250
- sourceOrgName: 国药集团公司m!4a&
- sourceOrderNo: YS240528001
- taskSourceNo: PSh0347202405280005
- areaCode: areah03472105
+ sourceOrgId: p1e254
+ sourceOrgName: 国药集团公司0zl25
+ sourceOrderNo: YS240529001
+ taskSourceNo: PSh0347202405290005
+ areaCode: areah03472117
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
- taskDate: '2024-05-28 07:12:54'
+ taskDate: '2024-05-29 07:11:37'
pkgTaskId:
pkgFlag:
remark: ''
diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17
index 2de7651b620b116d5f811b9c753ed1394c6b56a1..07da3489969381273292d99743755ca0ed769af5 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: CHECKh034720240528000010001
+ - id: CHECKh034720240529000010001
lastModified:
version:
createTime:
@@ -10,27 +10,27 @@
rowIdx:
purMode: 10
unitName: 100支/100
- pid: CHECKh03472024052800001
- hosGoodsId: h034700003821
+ pid: CHECKh03472024052900001
+ hosGoodsId: h034700003839
batchCode: '333'
- expdtDate: '2024-12-04'
- productDate: '2024-05-28'
+ expdtDate: '2024-12-05'
+ productDate: '2024-05-29'
batchPrice: 99.9999
settlement: 1
batchType: 20
- srcBatchId: '03837761'
+ srcBatchId: '03837779'
srcBatchPrice: 99.9999
- shelfCode: areah03472105-2-01-01
+ shelfCode: areah03472117-2-01-01
shelfKind:
- barcodeId: UT240528000201
+ barcodeId: UT240529000201
subBarcodeId:
qty: 10000.0
pkgQty: 100
- distrId: PSh0347202405280005
- distrDetailId: '03837761'
+ distrId: PSh0347202405290005
+ distrDetailId: '03837779'
pkgDefQty: 100.0
pkgDefName: '100'
- viewId: h0347000038213332024-12-04100支/100
+ viewId: h0347000038393332024-12-05100支/100
codingType:
batchFlag:
hasSterilize: 0
@@ -38,31 +38,31 @@
sterilizePassQty:
sterilizeRejectQty:
orderNo:
- sourceDetailId: '03837761'
- mdmGoodsCode: '11660713'
- goodsCode: '00003821'
+ sourceDetailId: '03837779'
+ mdmGoodsCode: '11660761'
+ goodsCode: '00003839'
tbStatus: 1
billMode: '16'
hosId: h0347
- branchId: h0347-3637
- purBillId: Ch034720240528000045
- provId: p1e250
- provName: 国药集团公司m!4a&
+ branchId: h0347-3639
+ purBillId: Ch034720240529000045
+ provId: p1e254
+ provName: 国药集团公司0zl25
subSendFlag: 10
- exeProvId: p1e250
- exeProvName: 国药集团公司m!4a&
- purDetailId: c5d958b397c14a89ab7454af46278761
- goodsName: 一次性注射器_低值$@6MA
+ exeProvId: p1e254
+ exeProvName: 国药集团公司0zl25
+ purDetailId: cf66ea79c4284c4e99414a37c0b9860b
+ goodsName: 一次性注射器_低值uXIDv
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
made: 德国
unit: 支
purPrice: 99.9999
- pkgDefId: b961ff6cadd540cbb9e3f472b0a842b9
- supplyId: b29314ef2f0248cd93c68815b5e4db01
- subProvId: p1e250
- subProvName: 国药集团公司m!4a&
+ pkgDefId: 6ba2ce29602b4f98bf36c2ff549ff87f
+ supplyId: 2612372ba3b14dea87d47bf9204618b4
+ subProvId: p1e254
+ subProvName: 国药集团公司0zl25
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
@@ -74,13 +74,13 @@
psiPrice: 99.9999
ext:
goodsGg: G-31891
- goodsCode: '00003821'
+ goodsCode: '00003839'
purMode: 10
- goodsName: 一次性注射器_低值$@6MA
+ goodsName: 一次性注射器_低值uXIDv
ygptCode: ''
transCond: ''
storageCond: ''
- erpCode: '11660713'
+ erpCode: '11660761'
ybDefId: ''
purTaskId:
multiChargeFlag:
diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18
index eb795e4a0734f92707346adbd682f354bca660ce..6fc358e43bb415464b94024744b204a13d6f06b4 100644
--- a/data/b5_spd3_core_business_flow/message18
+++ b/data/b5_spd3_core_business_flow/message18
@@ -1,33 +1,33 @@
条码信息:
list_a:
- &id001
- id: UT240528000701
- snCode: UT240528000701
- ssccCode: '010839000181731529'
- pkgCodeSee: 0136370000038220104444112405281724120421UT240528000701
- hosGoodsId: h034700003822
- hosGoodsCode: '00003822'
- goodsCode: '00003822'
- goodsName: 新型冠状病毒检测试剂W$X@h
+ id: UT240529000701
+ snCode: UT240529000701
+ ssccCode: '010839000181857625'
+ pkgCodeSee: 0136390000038400104444112405291724120521UT240529000701
+ hosGoodsId: h034700003840
+ hosGoodsCode: '00003840'
+ goodsCode: '00003840'
+ goodsName: 新型冠状病毒检测试剂Q4GWE
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit: 支
purMode: 60
batchCode: '4444'
- productDate: '2024-05-28'
- expdtDate: '2024-12-04'
+ productDate: '2024-05-29'
+ expdtDate: '2024-12-05'
pkgDefName: '100'
pkgDefQty: 100.0
- stockId: 6013b97f6b3846cb92321ec93ea41465
- stockName: 东土城路院区Sn%cM中心库房
+ stockId: dc43bac0ca044382a359912414230887
+ stockName: 东土城路院区#c@$a中心库房
areaName: 自动化测试
- areaCode: areah03472105
+ areaCode: areah03472117
lockStatus: 0
unitName: 100支/100
- shelfCode: areah03472105-2-01-01
+ shelfCode: areah03472117-2-01-01
shelfNo: 自动化测试-2-01-01
- pkgDefId: 1e7a1a46d7da4e15957252379ebb8362
- extInfo: '{"distrDetailId":"03837769","distrBillId":"PSh0347202405280013","certificateCode":"","purBillId":"CG2024052817019","pkgDefQty":100,"pkgDefId":"1e7a1a46d7da4e15957252379ebb8362","pkgDefName":"100"}'
+ pkgDefId: 0cae3151b7c847e2b0dcb46e88579a95
+ extInfo: '{"distrDetailId":"03837787","distrBillId":"PSh0347202405290013","certificateCode":"","purBillId":"CG2024052917094","pkgDefQty":100,"pkgDefId":"0cae3151b7c847e2b0dcb46e88579a95","pkgDefName":"100"}'
bottleId:
pkgType: '66'
miDjmc: ''
@@ -36,8 +36,8 @@
qty: 1
shelfKind: 0
shelfKindName: 普通货位
- provName: 国药集团公司m!4a&
- provId: p1e250
+ provName: 国药集团公司0zl25
+ provId: p1e254
inStockDate:
mfrCode:
made: 德国
diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19
index 8015f4be7f886aa8abb56de55ca01aeb55a991f5..0d08096544dab48c866692a222a7ab1551a7d64d 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: h034700003820
- hosGoodsCode: '00003820'
- provId: p1e250
- subProvId: p1e250
- subProvName: 国药集团公司m!4a&
- goodsName: 高值牙钻机&d14I
+ - hosGoodsId: h034700003838
+ hosGoodsCode: '00003838'
+ provId: p1e254
+ subProvId: p1e254
+ subProvName: 国药集团公司0zl25
+ goodsName: 高值牙钻机lJHhM
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 ccbcb36ed7c2d8673dfbbf4d5c4df4b4802bf4aa..46da89b971c34cd5309e102240d3db31603b338e 100644
--- a/data/b5_spd3_core_business_flow/message2
+++ b/data/b5_spd3_core_business_flow/message2
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405280008_1
+ MSPid: MSP2405290008_1
hosId: h0347
- hosGoodsId: h034700003821
- provGoodsid: provGood-99220954
- goodsAuditBillId: MSP2405280008
- targetId: MSP2405280008_1
+ hosGoodsId: h034700003839
+ provGoodsid: provGood-99221002
+ goodsAuditBillId: MSP2405290008
+ targetId: MSP2405290008_1
diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20
index 2a97e6dae07cd7973226e83cfa54683181715333..8e6ad6eca409261f3c7d7b56316cc68fc28059c7 100644
--- a/data/b5_spd3_core_business_flow/message20
+++ b/data/b5_spd3_core_business_flow/message20
@@ -1,33 +1,33 @@
二级库条码信息:
list_a:
- &id001
- id: '8800000001057946'
- snCode: '8800000001057946'
- ssccCode: '010839000181741528'
- pkgCodeSee: '01000000000038201022221124052817241204218800000001057946'
- hosGoodsId: h034700003820
- hosGoodsCode: '00003820'
- goodsCode: '00003820'
- goodsName: 高值牙钻机&d14I
+ id: '8800000001058407'
+ snCode: '8800000001058407'
+ ssccCode: '010839000181867624'
+ pkgCodeSee: '01000000000038381022221124052917241205218800000001058407'
+ hosGoodsId: h034700003838
+ hosGoodsCode: '00003838'
+ goodsCode: '00003838'
+ goodsName: 高值牙钻机lJHhM
goodsSpec: G-31891
goodsMfrsName: 德国歌德公司 Geuder AG
unit: 支
purMode: 20
batchCode: '2222'
- productDate: '2024-05-28'
- expdtDate: '2024-12-04'
+ productDate: '2024-05-29'
+ expdtDate: '2024-12-05'
pkgDefName:
pkgDefQty: 1.0
- stockId: 07cd6250706e4d908a1d2b3fc0c01948
+ stockId: 80e5a444804b49378b68e9b60bab862d
stockName: 二级检验科002库房
areaName: 默认库区
- areaCode: areah03472104
+ areaCode: areah03472116
lockStatus: 0
unitName: 1支
- shelfCode: areah03472104-A-01-01
+ shelfCode: areah03472116-A-01-01
shelfNo: A01-A-01-01
pkgDefId:
- extInfo: '{"distrDetailId":"03837770","distrBillId":"PSh0347202405280014","pkgDefQty":1,"multiChargeFlag":0,"useFrequency":1}'
+ extInfo: '{"distrDetailId":"03837788","distrBillId":"PSh0347202405290014","pkgDefQty":1,"multiChargeFlag":0,"useFrequency":1}'
bottleId:
pkgType: '25'
miDjmc: ''
@@ -36,9 +36,9 @@
qty: 1
shelfKind: 0
shelfKindName: 普通货位
- provName: 国药集团公司m!4a&
- provId: p1e250
- inStockDate: '2024-05-28 07:25:43'
+ provName: 国药集团公司0zl25
+ provId: p1e254
+ inStockDate: '2024-05-29 07:24:47'
mfrCode:
made: 德国
price:
diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21
index 6fce6c456221e60252bb82257921a7116899d154..48bb237040a3934a55070c1346e76f43a7e281d0 100644
--- a/data/b5_spd3_core_business_flow/message21
+++ b/data/b5_spd3_core_business_flow/message21
@@ -1,14 +1,15 @@
二级库请领产品信息:
list_a:
- &id001
- - id:
- hosGoodsId: h034700003822
- goodsName: 新型冠状病毒检测试剂W$X@h
+ - hosGoodsId: h034700003840
+ purMode: 60
+ grantRule:
+ id:
+ goodsName: 新型冠状病毒检测试剂Q4GWE
goodsSpec: G-31891
- mdmGoodsCode: '11660714'
- goodsCode: '00003822'
+ mdmGoodsCode: '11660762'
+ goodsCode: '00003840'
unit: 支
- purMode: 60
goodsMfrsName: 德国歌德公司 Geuder AG
miDjmc: ''
miCode: ''
@@ -17,20 +18,20 @@
pkgQty:
qty: 100.0
goodsImg: []
- pkgDefId: 1e7a1a46d7da4e15957252379ebb8362
+ pkgDefId: 0cae3151b7c847e2b0dcb46e88579a95
buyPkgQty:
unitName: 100支/100
price: 99.9999
hosId:
branchId:
- deptId: f501a45fae784e2c88418821134c4f43
+ deptId: fc8822ba29a94295a3c3d27a5affbae4
deptName:
areaCode:
areaName:
- targetDeptId: 92e5407265e14d48a555d92bb2f455c5
+ targetDeptId: 437e9b776c4e4d1aabb42b5ab8066224
targetDeptName: 设备科001
- targetStockId: 6013b97f6b3846cb92321ec93ea41465
- targetStockName: 东土城路院区Sn%cM中心库房
+ targetStockId: dc43bac0ca044382a359912414230887
+ targetStockName: 东土城路院区#c@$a中心库房
purchaseFlag: 1
tempFlag: 0
grantWay: 3
@@ -38,10 +39,12 @@
codingType: 0
purModeText: 检验试剂
goodsGeneralName: 检测试剂
- provName: 国药集团公司m!4a&
- noRecPkgQty: 1.0
- noRecQty: 100.0
+ provName: 国药集团公司0zl25
+ noRecPkgQty: 10.0
+ noRecQty: 1000.0
autoUnpack:
+ consumeQty:
+ consumePkgQty:
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22
index f1a027eff61c7dbd6fa16223bec5e83fade33849..99b2230a9dfd727505c7fdf0b563cede22595632 100644
--- a/data/b5_spd3_core_business_flow/message22
+++ b/data/b5_spd3_core_business_flow/message22
@@ -1,16 +1,16 @@
库区信息:
list_a:
- &id001
- - id: d4cd1fb46da64aafa35819ece1b2e335
- lastModified: '2024-05-28 07:26:05'
- version: 1
- createTime: '2024-05-28 07:05:02'
- createUser: h0347_UID-051298
- lastModifiedUser: h0347_UID-051298
- stockId: 07cd6250706e4d908a1d2b3fc0c01948
- shelfCode: areah03472104
+ - id: 1c1dca0aaae643839eb2433c4bbad07b
+ lastModified: '2024-05-29 16:45:02'
+ version: 2
+ createTime: '2024-05-29 15:27:40'
+ createUser: h0347_UID-051300
+ lastModifiedUser: h0347_UID-051300
+ stockId: 6ab13ffb7c7d41b184c9f6a6b5c0b59c
+ shelfCode: areah03472121
shelfName: 默认库区
- address: 二级检验科002
+ address: 二级科室005
shelfType:
stockType: 0
defaultFlag: 1
@@ -18,13 +18,13 @@
parentId:
levelCode:
tbStatus: 1
- linkman: h0347_UID-051298
+ linkman: h0347_UID-051300
recPhone: None
delFlag: 0
shelfNo: A01
shelfKind: 0
hosId:
- deptId: f501a45fae784e2c88418821134c4f43
+ deptId: e510310e705c4a328395ae3ccf8d0cc3
areaCode:
areaName:
stockName:
diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3
index 2aba5e89357834aa84b5866af115fa57bea4e78a..0b291cebabbd08359c961b19687e49312b697d8d 100644
--- a/data/b5_spd3_core_business_flow/message3
+++ b/data/b5_spd3_core_business_flow/message3
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405280009_1
+ MSPid: MSP2405290009_1
hosId: h0347
- hosGoodsId: h034700003822
- provGoodsid: provGood-99220955
- goodsAuditBillId: MSP2405280009
- targetId: MSP2405280009_1
+ hosGoodsId: h034700003840
+ provGoodsid: provGood-99221003
+ goodsAuditBillId: MSP2405290009
+ targetId: MSP2405290009_1
diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4
index 14d0c0e16ed59a72ce37ae9dac411fc3ef4e3233..4a5972508049983d0066bf0462c01c3f0a1dd77d 100644
--- a/data/b5_spd3_core_business_flow/message4
+++ b/data/b5_spd3_core_business_flow/message4
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405280010_1
+ MSPid: MSP2405290010_1
hosId: h0347
- hosGoodsId: h034700003823
- provGoodsid: provGood-99220956
- goodsAuditBillId: MSP2405280010
- targetId: MSP2405280010_1
+ hosGoodsId: h034700003841
+ provGoodsid: provGood-99221004
+ goodsAuditBillId: MSP2405290010
+ targetId: MSP2405290010_1
diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5
index 89628e0b0c0ddf86fb2566cb5948efc7971896c0..e10ea55e40062f46b4163520a8999309dfdbb626 100644
--- a/data/b5_spd3_core_business_flow/message5
+++ b/data/b5_spd3_core_business_flow/message5
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405280011_1
+ MSPid: MSP2405290011_1
hosId: h0347
- hosGoodsId: h034700003824
- provGoodsid: provGood-99220957
- goodsAuditBillId: MSP2405280011
- targetId: MSP2405280011_1
+ hosGoodsId: h034700003842
+ provGoodsid: provGood-99221005
+ goodsAuditBillId: MSP2405290011
+ targetId: MSP2405290011_1
diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6
index 869be77c06e62ff8a1c3dde7aad6096c08e56ca4..f4c717c2eba612cf26350118aabef5fa90f8f3d9 100644
--- a/data/b5_spd3_core_business_flow/message6
+++ b/data/b5_spd3_core_business_flow/message6
@@ -1,3 +1,3 @@
产品包装信息:
- unitPackageid1: 1e7a1a46d7da4e15957252379ebb8362
- unitPackageid2: 1e7a1a46d7da4e15957252379ebb8362
+ unitPackageid1: 0cae3151b7c847e2b0dcb46e88579a95
+ unitPackageid2: 0cae3151b7c847e2b0dcb46e88579a95
diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7
index 6bb407d57322b61e764e2c3efe3f82fbab67a3db..7f11865a60a1d44ad8778365df57a729c5d1382b 100644
--- a/data/b5_spd3_core_business_flow/message7
+++ b/data/b5_spd3_core_business_flow/message7
@@ -1,3 +1,3 @@
采购计划单号:
- orderNo1: PLAN2024052824378
- orderNo2: PLAN2024052824378
+ orderNo1: PLAN2024052924541
+ orderNo2: PLAN2024052924541
diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8
index fb0c87fcdd04609801f1d0548bf4115045549507..4bea8aebfe14e6a1959939c00335a7e2a4f08009 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: Nh034720240528000001
- orderNo: SSTZ202405280254
- sourceOrderNo: SSSQ202405280278
- hosId: h0347
- hosName: 邹城市人民医院(test)
- branchName: 东土城路院区Sn%cM
- recDeptName: 二级检验科002
- operName: 血管扩张术
- operDate: '2024-05-29'
- operDoctor: 李*
- patientName: 张*
- status: 10
- statusText: 待确认
+ - id: Ch034720240529000093
+ lastModified: '2024-05-29 10:58:20'
version: 0
- patientInHosId: '123456'
- surDeptName: ''
- remark: 自动化测试
- createUserName: 自动化测试a4dQM
- distPriority: 0
- distPriorityText:
- distId:
- distNo:
+ createTime: '2024-05-29 10:58:20'
+ createUser: h0347_UID-051300
+ lastModifiedUser:
+ orderNo: CG2024052917116
+ billMode: '66'
+ recType: HDI
+ hosId: h0347
+ branchId: h0347-3639
+ deptId:
+ deptName:
+ recOrgId: fc8822ba29a94295a3c3d27a5affbae4
+ recOrgName: 二级检验科002
+ areaCode:
+ areaName:
+ billExpdtDate:
+ sourceId: Ph034720240529021185
+ sourceType:
+ inSettlement:
+ recUser:
+ recPhone:
+ recAddr: 二级检验科002
+ provId: p1e254
+ provName: 国药集团公司0zl25
+ subSendFlag:
+ exeProvId: p1e254
+ exeProvName: 国药集团公司0zl25
+ billRelationJson:
+ extInfo:
+ barcodeFlag: 1
+ pkgFlag:
+ remark: ''
+ priority:
+ closeStatus: 0
+ closeDate:
+ upStatus:
+ tbStatus: 30
hosVersion: 3
- createTime: '2024-05-28 07:24:18'
- sumQty:
- sumAmount:
- operationPkg: 0
- provId: p1e250
- provName: 国药集团公司m!4a&
- subProvId: ''
- subProvName: ''
- recDeptId: f501a45fae784e2c88418821134c4f43
+ billType: CGD
+ hosName: 邹城市人民医院(test)
+ branchName: 东土城路院区#c@$a
+ sumQty: 100.0
+ sumPkgQty: 1.0
+ sumAmount: '9999.9900'
+ planOrderNo: PLAN2024052924540
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9
index cf52c9045b54384a680b1343dbc4a6ce4f44e943..1f311f4566d3865600d8c221db5377b0f45fb5f6 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: Nh034720240528000001
- orderNo: SSTZ202405280254
- sourceOrderNo: SSSQ202405280278
- hosId: h0347
- hosName: 邹城市人民医院(test)
- branchName: 东土城路院区Sn%cM
- recDeptName: 二级检验科002
- operName: 血管扩张术
- operDate: '2024-05-29'
- operDoctor: 李*
- patientName: 张*
- status: 20
- statusText: 待配送
- version: 1
- patientInHosId: '123456'
- surDeptName: ''
- remark: 自动化测试
- createUserName: 自动化测试a4dQM
- distPriority: 0
- distPriorityText: 否
- distId:
- distNo:
- hosVersion: 3
- createTime: '2024-05-28 07:24:18'
- sumQty: 1
- sumAmount: '99.9999'
- operationPkg: 0
- provId: p1e250
- provName: 国药集团公司m!4a&
- subProvId: ''
- subProvName: ''
- recDeptId: f501a45fae784e2c88418821134c4f43
- list_b:
- - *id001
- list_c:
- - *id001
-配送订单详细信息2:
- list_a:
- - &id001
- - id: h034720240528000001
- hosGoodsId: h034700003820
- goodsNum: 1
+ - id: 194b229d30b84e4ab63466f9f4e0b3ce
+ lastModified:
+ version:
+ createTime:
+ createUser:
+ lastModifiedUser:
+ pid: Ch034720240529000093
+ orderNo: CG2024052917116
+ sourceId: 7db715c2ee314a60a50852abfa46ce3f
+ hosGoodsId: h034700003840
+ mdmGoodsCode: '11660762'
+ goodsCode: '00003840'
+ purMode: 60
price: '99.9999'
- inSettlement: 3
- inSettlementText: 消耗结算
- goodsName: 高值牙钻机&d14I
- goodsSpec: G-31891
- goodsCode: '00003820'
- goodsMfrsId: mfrs-11229
- goodsMfrsName: 德国歌德公司 Geuder AG
+ supplyId: 6a9e390a99c748da81a3a38230f4d61f
+ pkgDefId: 0cae3151b7c847e2b0dcb46e88579a95
+ 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":"Ph034720240529021185","buyDetailId":"Bh034720240529000370001","planDetailId":"7db715c2ee314a60a50852abfa46ce3f"}'
+ extInfo: '{"goodsGg":"G-31891","goodsCode":"00003840","purMode":60,"goodsName":"新型冠状病毒检测试剂Q4GWE"}'
+ remark:
+ tbStatus:
+ hosVersion:
unit: 支
- subProvId: p1e250
- subProvName: 国药集团公司m!4a&
- totalAmount: '99.9999'
- spdGoodsCode: '11660712'
- barCodeMng: 2
- erpCode: '11660712'
+ goodsName: 新型冠状病毒检测试剂Q4GWE
+ mfrsId: mfrs-11229
+ mfrsName: 德国歌德公司 Geuder AG
+ goodsGg: G-31891
+ mdmGoodsSpecCode: '11660762'
+ erpCode: '11660762'
+ 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: '36390000038400'
multiChargeFlag: 0
useFrequency: 1
chargeUnit:
- hitCode: '12'
- hitPrice: '99.999900'
- diUse:
- goodsDi:
+ amount: '9999.9900'
+ unitName: 100支/100
+ subProvId: p1e254
+ subProvName: 国药集团公司0zl25
+ 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 55cf859ea1dcd1f5b0db0f64b6d0095604aabd0d..60fe493c9410d2201098eac92127275c163517b2 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
| 1 |
1 |
- 0分50秒 |
+ 0分37秒 |
100.0% |
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
- | a_b4流程十一请领业务流_二级库向直送 |
+ a_b5流程十二请领业务流_二级库向二级库 |
成功 |
- 50.434 |
+ 37.263 |
xiaohesheng |