diff --git "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" index 7d3c070c969a294f2e3bda6dd0f91cee8408c503..34e5278b8e637d31bdd5f5c5badb00be3cb9c2d2 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" @@ -163,8 +163,7 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库 orgCode1 = get_orgCode() orgName1 = get_orgName() print(orgCode1, orgName1) - # import pdb - # pdb.set_trace() + request_body = commonFuc().get_business_data(module, "payload50_1_3", stockId, stockName2, areaCode, areaName, uxid, userLoginCode, cname, get_hosid(), get_branch_id(), @@ -302,59 +301,31 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库 print('result', result) elif type == 3: print('检验试剂消耗出库') - #这里思路要改一改,前面已经扫码发放,需要去查询一个单瓶试剂条码 - udi_code = get_udi2(3) # 试剂整瓶条码 - data1 = pickScan4(udi_code)#扫码不发放 + udi_code=get_udi2(4)#试剂单瓶条码 # 从message18文件中获取信息 info = FileUtils().r_info8(module, "条码信息", 'message18') - list_a = info['list_a'] - areaCode = commonFuc().analysis_json('areaCode', list_a) - udi_code = get_udi2(4,udi_code,areaCode)#试剂单瓶条码 - print('试剂data1',data1) - # 获取必要信息 - areaCode = commonFuc().analysis_json('areaCode', data1) + data1 = info['list_a'] UTid = commonFuc().analysis_json('id', data1) - createTime = commonFuc().analysis_json('id', data1) stockId = commonFuc().analysis_json('stockId', data1) areaCode = commonFuc().analysis_json('areaCode', data1) areaName = commonFuc().analysis_json('areaName', data1) shelfCode = commonFuc().analysis_json('shelfCode', data1) - codeType = commonFuc().analysis_json('codeType', data1) - tagType = commonFuc().analysis_json('tagType', data1) hosGoodsId = commonFuc().analysis_json('hosGoodsId', data1) - mdmGoodsCode = commonFuc().analysis_json('mdmGoodsCode', data1) goodsCode = commonFuc().analysis_json('goodsCode', data1) - goodsDi = commonFuc().analysis_json('goodsDi', data1) barName = commonFuc().analysis_json('barName', data1) batchCode = commonFuc().analysis_json('batchCode', data1) expdtDate = commonFuc().analysis_json('expdtDate', data1) productDate = commonFuc().analysis_json('productDate', data1) - pkgCode = commonFuc().analysis_json('pkgCode', data1) pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', data1) ssccCode = commonFuc().analysis_json('ssccCode', data1) - tbStatus = commonFuc().analysis_json('tbStatus', data1) - ext = commonFuc().analysis_json('ext', data1) - distrDetailId = commonFuc().analysis_json('distrDetailId', ext) - distrBillId = commonFuc().analysis_json('distrBillId', ext) - purBillId = commonFuc().analysis_json('purBillId', ext) - pkgDefQty = commonFuc().analysis_json('pkgDefQty', ext) - pkgDefId = commonFuc().analysis_json('pkgDefId', ext) - pkgDefName = commonFuc().analysis_json('pkgDefName', ext) purMode = commonFuc().analysis_json('purMode', data1) goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', data1) goodsSpec = commonFuc().analysis_json('goodsSpec', data1) unit = commonFuc().analysis_json('unit', data1) goodsName = commonFuc().analysis_json('goodsName', data1) - pkgDefId = commonFuc().analysis_json('pkgDefId', data1) - # pkgDefQty=commonFuc().analysis_json('pkgDefQty',data1) - pkgDefName = commonFuc().analysis_json('pkgDefName', data1) - printNum = commonFuc().analysis_json('printNum', data1) made = commonFuc().analysis_json('made', data1) hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', data1) - sourceId = commonFuc().analysis_json('sourceId', data1) - price = commonFuc().analysis_json('price', data1) purModeText = commonFuc().analysis_json('purModeText', data1) - version = commonFuc().analysis_json('version', data1) unitName = commonFuc().analysis_json('unitName', data1) # ==============================获取条码信息 # 从message18文件中获取信息 @@ -414,6 +385,8 @@ def second_dept_consume_Out_Stock(type): # 二级库消耗出库 print('request_body', request_body) # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) + # import pdb + # pdb.set_trace() print('result', result) @@ -441,11 +414,11 @@ def sCan_grant(type=1): # 获取条码and扫码发放高值不能发放 try: updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 - # sCan_grant(1)#低值扫码发放 - sCan_grant(3) # 试剂扫码发放 + sCan_grant(1)#低值扫码发放 + # sCan_grant(3) # 试剂扫码发放 # second_dept_consume_Out_Stock(2)#高值消耗出库 # second_dept_consume_Out_Stock(1) # 低值消耗出库 - second_dept_consume_Out_Stock(3) # 试剂消耗出库 + # second_dept_consume_Out_Stock(3) # 试剂消耗出库 commonFuc().check_text_exist_result_text('succees', 'succees') except: diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index bd6ad3d1d08a6facda285dee21a9037ad5f48de0..b2bad2aff979acabc60d53b218efb76bc59841a2 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -596,7 +596,7 @@ def get_udi1(type=1): # 库存明细查询获取条码 # return pkgcode -def get_udi2(type=1,udi_code=None,areacode=None): # 二级科室库存明细查询获取条码 +def get_udi2(type=1): # 二级科室库存明细查询获取条码 # type=1低值 2高值 3试剂 module = "b5_spd3_core_business_flow" token, projectCode1, uxid1, corpId1, info1 = call_login() @@ -623,26 +623,17 @@ def get_udi2(type=1,udi_code=None,areacode=None): # 二级科室库存明细查 elif type == 3: hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'] GoodsId = hosGoodsId.replace(get_hosid(), '') - request_body = commonFuc().get_business_data(module, "payload17_2", GoodsId, get_branch_id(), deptid2) + request_body = commonFuc().get_business_data(module, "payload17_2_2", GoodsId, get_branch_id(), deptid2) elif type == 4:#试剂单瓶条码 hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'] GoodsId = hosGoodsId.replace(get_hosid(), '') - ssccCode=udi_code - request_body = commonFuc().get_business_data(module, "payload17_3", areacode,GoodsId, get_branch_id(),ssccCode, deptid2) + request_body = commonFuc().get_business_data(module, "payload17_3",GoodsId, get_branch_id(), deptid2) print('getudi_request_body', request_body) # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) - # import pdb - # pdb.set_trace() # 设置断点 - # pkgcode = data1['pkgCodeSee'] - # pkgcode1 = pkgcode[0:20] - # pkgcode2 = pkgcode[21:len(pkgcode)] - # print(pkgcode1, pkgcode2) - # 013530000003170010333\x1D112404261724110221UT240426000001802 - # print('aaaaaaaaaaaaaaaaa', data1[0]['pkgCodeSee']) - # pkgcode='pkgcode' + print('条码库存result', result) pkgCodeSee = 'pkgCodeSee' for i in data1: @@ -2678,7 +2669,7 @@ def pickScan3(udi_code, type=1): # 二级库扫码发放(高值产品不能扫 # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) - + return data1 def get_branch_name(): return FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_name"] diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 81e59c374f9414c19e585d1ae1d94c6171f8deb0..1ebf1b5cea6b51c5ec76648f414d805a4278a2ff 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202406060038 - cname: 国药集团公司LK05j + e_id: CR202406070038 + cname: 国药集团公司N2)Tj diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 627cb71bb9cb4d6e644db002cc45ab5c5e9df705..6aef48273959ad6bd4b5b967621754eec9e5a88a 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院J8y$I - h_name: 湖南省人民医院J8y$I + h_id: 湖南省人民医院@(3ZH + h_name: 湖南省人民医院@(3ZH diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 3fcbff4224bf3494da86d1d5e836dbc3f432d433..7faf8c4bd1f28be46f4cac66b43e4cb55c80a6fd 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406060011_1 + MSPid: MSP2406070011_1 hosId: h0347 - hosGoodsId: h034700004012 - provGoodsid: provGood-99221199 - goodsAuditBillId: MSP2406060011 - targetId: MSP2406060011_1 + hosGoodsId: h034700004023 + provGoodsid: provGood-99221210 + goodsAuditBillId: MSP2406070011 + targetId: MSP2406070011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index 4615e5e76f1382ba668d50c2cbd8aaa4a95a495c..c9f27bb061494ab969972edd9000a51ba57137ba 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202406' - pid: OBh0347202406060004 - hosGoodsId: h034700004009 - goodsCode: '00004009' - goodsName: 一次性注射器_低值vYh04 + pid: OBh0347202406070004 + hosGoodsId: h034700004020 + goodsCode: '00004020' + goodsName: 一次性注射器_低值0LB8W goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,13 +20,13 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202406060004 + - pid: OBh0347202406070004 settleMonth: '202406' - hosGoodsId: h034700004009 + hosGoodsId: h034700004020 batchCode: '333' - distrDetailId: '03838141' - distrId: PSh0347202406060005 - distrOrderNo: PSh0347202406060005 + distrDetailId: '03838202' + distrId: PSh0347202406070005 + distrOrderNo: PSh0347202406070005 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -35,11 +35,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e276 - branchId: h0347-3655 - balanceDetId: OBh0347202406060004-000001 + provId: p1e27a + branchId: h0347-3657 + balanceDetId: OBh0347202406070004-000001 purMode: 10 - barCode: 013655000004009010333112406061724121321UT240606000202 + barCode: 013657000004020010333112406071724121421UT240607000202 batchId: price: maxQty: @@ -52,14 +52,14 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202406OBh0347202406060004h034700004009 - - pid: OBh0347202406060004 + viewId: 202406OBh0347202406070004h034700004020 + - pid: OBh0347202406070004 settleMonth: '202406' - hosGoodsId: h034700004009 + hosGoodsId: h034700004020 batchCode: '333' - distrDetailId: '03838141' - distrId: PSh0347202406060005 - distrOrderNo: PSh0347202406060005 + distrDetailId: '03838202' + distrId: PSh0347202406070005 + distrOrderNo: PSh0347202406070005 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -68,11 +68,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e276 - branchId: h0347-3655 - balanceDetId: OBh0347202406060004-000002 + provId: p1e27a + branchId: h0347-3657 + balanceDetId: OBh0347202406070004-000002 purMode: 10 - barCode: 013655000004009010333112406061724121321UT240606000242 + barCode: 013657000004020010333112406071724121421UT240607000228 batchId: price: maxQty: @@ -85,10 +85,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202406OBh0347202406060004h034700004009 - unique: 202406OBh0347202406060004h034700004009 + viewId: 202406OBh0347202406070004h034700004020 + unique: 202406OBh0347202406070004h034700004020 onlineKind: '10' - viewId: 202406OBh0347202406060004h034700004009 + viewId: 202406OBh0347202406070004h034700004020 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 1a4a8de9f9640c086d9a0590723a86e9f8d188b1..23f665506837a40a769923a1dd249f753b144e9f 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3655 - branch_name: 东土城路院区nzo#r + branch_id: h0347-3657 + branch_name: 东土城路院区LYKEM 科室信息: - dept2_id: 82394e14fcd94eb6ad2474304cb2a808 + dept2_id: 7d4e304548bd4324bcd974e107ddeabd dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index ed5d3b0942b7b34d9272115374f08cca9148e458..161d09b7b282bbd6cbc63d77de34cc6cf740b979 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试IVw7F - username2: 自动化测试IVw7F + username1: 自动化测试GgXe) + username2: 自动化测试GgXe) diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index b345bee57bfb0f3894d6a45a56be5f904cc0bd2b..cd571bf61f95ec0bde463a12aceb7d5715a3dc2d 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 25bc0309da024bf1b59a735cf2cd68d4 + dept1_id: 54e182305e5c47d6a96a753b0f142161 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index b3ee4217fb6db8b7692f3f5ed7ac3c007be22a30..75c844dcb461037a59970062e213b155ae5e9837 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: 25bc0309da024bf1b59a735cf2cd68d4 - stockAreaId: ae0cdd2a649e49c69bb8deb191544b93 + dept1_id: 54e182305e5c47d6a96a753b0f142161 + stockAreaId: 4e8fb56b1e854ed49bda53ac23c61161 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index 21fec1d721d63706da73eb09f0e4f83ad3f13ddb..5125252b4103fc55b50afb17a2d92f3258421782 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,10 +1,12 @@ 所有科室id: - deptid1: 25bc0309da024bf1b59a735cf2cd68d4 - deptid2: 82394e14fcd94eb6ad2474304cb2a808 - deptid3: e5b1a058c0784d9680c342098f40759a - deptid4: 3f866ead661f4e84a987691920b6a461 + deptid1: 54e182305e5c47d6a96a753b0f142161 + deptid2: 7d4e304548bd4324bcd974e107ddeabd + deptid3: 3425e255bd6e47799fa449c538a60ff2 + deptid4: e793883a324646a292cef5b86b0aeb67 + deptid5: 98a5b46840ab42e5937af48bd3884072 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 deptid3: 三级检测组003 deptid4: 科室004 + deptid5: 二级科室005 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index eacd0a9243985710eedbfa83509551d5ecd2b76a..8f1d0dbce8e1f44d144736458af3f04763a45dd4 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: ae0cdd2a649e49c69bb8deb191544b93 - shelfCode: areah03472220 + shelfid: 4e8fb56b1e854ed49bda53ac23c61161 + shelfCode: areah03472231 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index afe3dede16dd78fa09dae7c0d9ffa8bb35b4b7bd..54b0c9312d1fcc2e77866439c71a1151abe9a5d2 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -105,9 +105,10 @@ json_headers2: { "payload16": {"invoiceBillIdList":["%s"],"payChannelEnum":"YGPT","hosId":"%s"} "payload17": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["","","","","",""],"goodsName":"%s","branchId":"%s","purModes":[],"ssccCode":"","deptId":"","deptQuery":false,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":""}} "payload17_1": {"pageNum":1,"pageSize":50,"queryObject":{"goodsName":"%s","branchId":"%s","purModes":[""],"ssccCode":"","deptId":"","deptQuery":false,"stockId":"","bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} -"payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["66"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} -"payload17_3": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["%s",""],"goodsName":"%s","branchId":"%s","ssccCode":"%s","deptId":"%s","deptQuery":true,"bottleId":"","billModes":null,"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} +"payload17_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["10"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} "payload17_2_1": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["20"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} +"payload17_2_2": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","purModes":["60"],"ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["66"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} +"payload17_3": {"pageNum":1,"pageSize":50,"queryObject":{"areacodelist":["",""],"goodsName":"%s","branchId":"%s","ssccCode":"","deptId":"%s","deptQuery":true,"bottleId":"","billModes":["67"],"provId":"","goodsSpec":"","batchCode":"","mfrCode":"","jskFlag":0}} "payload18": {"areaCode":"%s","code":"%s","pickType":"TH","stockId":"%s"} "payload19": {"areaCode":"%s","reasonKind":"1","remark":"","barCodeList":[{"id":"%s","lastModified":null,"version":null,"createTime":"%s","createUser":null,"lastModifiedUser":null,"snCode":"%s","hosId":"%s","branchId":null,"stockId":"%s","areaCode":"%s","areaName":"%s","shelfCode":"%s","codeType":"%s","tagType":"%s","hosGoodsId":"%s","mdmGoodsCode":"%s","goodsCode":"%s","goodsDi":"%s","barName":"%s","batchCode":"%s","expdtDate":"%s","productDate":"%s","mfrCode":null,"mfrCodeSee":null,"pkgCode":"%s","pkgCodeSee":"%s","ssccCode":"%s","extInfo":null,"outId":null,"tbStatus":"%s","ext":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":"%s","deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"%s","provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","provHosGoodsId":null,"sourceType":null,"taskDate":null,"sourceOrderNo":null,"taskType":null,"detailId":null,"branchGoodsPkgDefList":null,"unitName":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"subSendFlag":"%s","onlyKey":"%s2fa9d44bf3b443f184ea457066259ee13332024-11-02100p1e171p1e171"}],"areaName":"%s","hosId":"%s","branchId":"%s","deptId":"%s","deptName":"%s","stockId":"%s","pickType":"TH"} diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 79158d1e2f743cec7c644f7792fd90444c7e4fb6..362a385bcd2884d444feb4bdd736988df0eb6170 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e276 + e_corpId: p1e27a h_corpId: h0347 - e_username: 国药集团公司LK05j + e_username: 国药集团公司N2)Tj h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index bce0e998e963e6aebef7391999b968e3571bbcbe..756618cd627646dc71f96bd47477e6cb5b630e9e 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406060007_1 + MSPid: MSP2406070007_1 hosId: h0347 - hosGoodsId: h034700004008 - provGoodsid: provGood-99221195 - goodsAuditBillId: MSP2406060007 - targetId: MSP2406060007_1 + hosGoodsId: h034700004019 + provGoodsid: provGood-99221206 + goodsAuditBillId: MSP2406070007 + targetId: MSP2406070007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 7a303c4cf5f96afe4f1337eb3f50d465ac21a396..1b880f50a407a46041a14d04c0c3fa2a60250353 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202406060059 - distrBillId2: PSh0347202406060059 + distrBillId1: PSh0347202406070021 + distrBillId2: PSh0347202406070021 高值配送单号: - distrBillId1: PSh0347202406060060 - distrBillId2: PSh0347202406060060 + distrBillId1: PSh0347202406070022 + distrBillId2: PSh0347202406070022 试剂配送单号: - distrBillId1: PSh0347202406060061 - distrBillId2: PSh0347202406060061 + distrBillId1: PSh0347202406070023 + distrBillId2: PSh0347202406070023 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index f4d0c0b6cc01e2679377a796a5ee87a06ff9e41d..979dc65ed14ff3e04c8b4fc0af91b1eb6ce2b9d2 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024060625838 - orderNo2: PLAN2024060625838 + orderNo1: PLAN2024060726145 + orderNo2: PLAN2024060726145 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 9cd8c1cdef01db20e99d0ba56df0ae8bdb0c720b..08f967322e6d7ea676a4743fa0993c4cb624fc15 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024060625839 - orderNo2: PLAN2024060625839 + orderNo1: PLAN2024060726143 + orderNo2: PLAN2024060726143 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index 0dd20388d155b314b41a14fc21c7d705abaae380..d82649057c46dd48f1e4cbfc46720ea3d930e25e 100644 --- a/data/b5_spd3_core_business_flow/message13 +++ b/data/b5_spd3_core_business_flow/message13 @@ -3,27 +3,27 @@ - &id001 - id: hosId: h0347 - branchId: h0347-3655 + branchId: h0347-3657 deptId: taskType: 1 - sourceOrgId: p1e276 - sourceOrgName: 国药集团公司LK05j - sourceOrderNo: PSh0347202406060061 + sourceOrgId: p1e27a + sourceOrgName: 国药集团公司N2)Tj + sourceOrderNo: PSh0347202406070023 billMode: '66' stockKind: purMode: - sourceId: PSh0347202406060061 + sourceId: PSh0347202406070023 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024060625839 - purOrderNo: CG2024060618002 - recOrgId: 82394e14fcd94eb6ad2474304cb2a808 + planOrderNo: PLAN2024060726143 + purOrderNo: CG2024060718087 + recOrgId: 7d4e304548bd4324bcd974e107ddeabd recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024060600056","planBillId":"Ph034720240606022484","planOrderNo":"PLAN2024060625839","buyOrderNo":"BUY2024060604778","purOrderNo":"CG2024060618002","purBillId":"Ch034720240606000117","purBillDate":"2024-06-06 - 16:04:49","distrBillId":"PSh0347202406060061","distrOrderNo":"PSh0347202406060061"}' - taskDate: '2024-06-06 16:05:23' + billRelationJson: '{"buyBillId":"Bh03472024060700014","planBillId":"Ph034720240607022788","planOrderNo":"PLAN2024060726143","buyOrderNo":"BUY2024060704797","purOrderNo":"CG2024060718087","purBillId":"Ch034720240607000078","purBillDate":"2024-06-07 + 07:38:40","distrBillId":"PSh0347202406070023","distrOrderNo":"PSh0347202406070023"}' + taskDate: '2024-06-07 07:39:23' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index be8b46fec5f3617172bbf61089be9d3ca464464a..dc81be339080e97460458fe4655885e218a34306 100644 --- a/data/b5_spd3_core_business_flow/message14 +++ b/data/b5_spd3_core_business_flow/message14 @@ -3,11 +3,11 @@ - &id001 - purMode: 60 unitName: 100支/100 - hosGoodsId: h034700004010 + hosGoodsId: h034700004021 mdmGoodsCode: - spdGoodsCode: '11660958' - goodsCode: '00004010' - goodsName: 新型冠状病毒检测试剂20zyQ + spdGoodsCode: '11660969' + goodsCode: '00004021' + goodsName: 新型冠状病毒检测试剂%k$56 goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2024-12-13' - productDate: '2024-06-06' - provName: 国药集团公司LK05j + expdtDate: '2024-12-14' + productDate: '2024-06-07' + provName: 国药集团公司N2)Tj provId: - viewId: '03838197' + viewId: '03838220' verifyFlag: 0 hasSterilize: 0 - id: '03838197' + id: '03838220' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660958","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004021","purMode":60,"goodsName":"新型冠状病毒检测试剂%k$56","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660969","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index 08d82b3e0ee6eae6daccdbb34cd9cf98c492d3ef..b1c946f112cd7688f86f573daf8bf82f2c6e64e7 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024060600054 - CHECK_NO2: CHECKh03472024060600054 + CHECK_NO1: CHECKh03472024060700014 + CHECK_NO2: CHECKh03472024060700014 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 5576d4a540e33905199d3aacff870212412c959b..b8c91c4bb8929fa393dcc42924c78e297a673e6a 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: CHECKh03472024060600002 + sourceId: CHECKh03472024060700002 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: 25bc0309da024bf1b59a735cf2cd68d4 + deptId: 54e182305e5c47d6a96a753b0f142161 deptName: - branchId: h0347-3655 + branchId: h0347-3657 branchName: taskType: 1 - sourceOrgId: p1e276 - sourceOrgName: 国药集团公司LK05j - sourceOrderNo: YS240606002 - taskSourceNo: PSh0347202406060005 - areaCode: areah03472220 + sourceOrgId: p1e27a + sourceOrgName: 国药集团公司N2)Tj + sourceOrderNo: YS240607002 + taskSourceNo: PSh0347202406070005 + areaCode: areah03472231 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-06-06 07:12:57' + taskDate: '2024-06-07 07:12:33' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 55fa540229774b5e2cff8c6e491968fad9dd5c88..961b34f32c7dde0bbb675ee1084a0a16dc9d29a6 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: CHECKh034720240606000020001 + - id: CHECKh034720240607000020001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024060600002 - hosGoodsId: h034700004009 + pid: CHECKh03472024060700002 + hosGoodsId: h034700004020 batchCode: '333' - expdtDate: '2024-12-13' - productDate: '2024-06-06' + expdtDate: '2024-12-14' + productDate: '2024-06-07' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03838141' + srcBatchId: '03838202' srcBatchPrice: 99.9999 - shelfCode: areah03472220-2-01-01 + shelfCode: areah03472231-2-01-01 shelfKind: - barcodeId: UT240606000201 + barcodeId: UT240607000201 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202406060005 - distrDetailId: '03838141' + distrId: PSh0347202406070005 + distrDetailId: '03838202' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000040093332024-12-13100支/100 + viewId: h0347000040203332024-12-14100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03838141' - mdmGoodsCode: '11660957' - goodsCode: '00004009' + sourceDetailId: '03838202' + mdmGoodsCode: '11660968' + goodsCode: '00004020' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3655 - purBillId: Ch034720240606000045 - provId: p1e276 - provName: 国药集团公司LK05j + branchId: h0347-3657 + purBillId: Ch034720240607000043 + provId: p1e27a + provName: 国药集团公司N2)Tj subSendFlag: 10 - exeProvId: p1e276 - exeProvName: 国药集团公司LK05j - purDetailId: bfd436c0c58744199f537fa7b7d98922 - goodsName: 一次性注射器_低值vYh04 + exeProvId: p1e27a + exeProvName: 国药集团公司N2)Tj + purDetailId: 9fff1311b8934cdebaeb4f81a9a9b305 + goodsName: 一次性注射器_低值0LB8W goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: e0b21bdcd917429980f0f5aa6cbc98d0 - supplyId: eccc6447512f4253b7711981866d28dd - subProvId: p1e276 - subProvName: 国药集团公司LK05j + pkgDefId: a1fd6c2617e743cc80af9b3cb402410c + supplyId: 67ef7c7c477b435fbb6fedb74da6e78a + subProvId: p1e27a + subProvName: 国药集团公司N2)Tj subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004009' + goodsCode: '00004020' purMode: 10 - goodsName: 一次性注射器_低值vYh04 + goodsName: 一次性注射器_低值0LB8W ygptCode: '' transCond: '' storageCond: '' - erpCode: '11660957' + erpCode: '11660968' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 705764832576dd8d27e71a6235d4ba331a140076..3e1f75196d78b88f97933a4514a2a801289fd70c 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,53 +1,52 @@ 条码信息: list_a: - &id001 - id: UT240606000994 - snCode: UT240606000994 - ssccCode: '010839000183255023' - pkgCodeSee: 0136550000040100104444112406061724121321UT240606000994 - hosGoodsId: h034700004010 - hosGoodsCode: '00004010' - goodsCode: '00004010' - goodsName: 新型冠状病毒检测试剂20zyQ + id: UT2406070008020004 + snCode: UT2406070008020004 + ssccCode: '010839000018756411' + pkgCodeSee: 0136570000040210104444112406071724121421UT240607000802 + hosGoodsId: h034700004021 + hosGoodsCode: '00004021' + goodsCode: '00004021' + goodsName: 新型冠状病毒检测试剂%k$56 goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 60 batchCode: '4444' - productDate: '2024-06-06' - expdtDate: '2024-12-13' - pkgDefName: '100' - pkgDefQty: 100.0 - stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6 + productDate: '2024-06-07' + expdtDate: '2024-12-14' + pkgDefName: + pkgDefQty: 1.0 + stockId: f168bb66339849be826b92dd76e53c9d stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472218 + areaCode: areah03472230 lockStatus: 0 - unitName: 100支/100 - shelfCode: areah03472218-A-01-01 + unitName: 1支 + shelfCode: areah03472230-A-01-01 shelfNo: A01-A-01-01 - pkgDefId: 60abe88ab2b5432da8f7e75a74e92584 - extInfo: '{"pkgDefId": "60abe88ab2b5432da8f7e75a74e92584", "pkgDefQty": 100, "purBillId": - "CG2024060617987", "pkgDefName": "100", "distrBillId": "PSh0347202406060046", - "inStockTime": "2024-06-06 14:43:08", "distrDetailId": "03838182", "certificateCode": - ""}' - bottleId: - pkgType: '66' + pkgDefId: + extInfo: '{"pkgUdi": "0136570000040210104444112406071724121421UT240607000802", + "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-06-07 + 08:26:58", "pkgBarcodeId": "UT240607000802"}' + bottleId: UT2406070008020004 + pkgType: '67' miDjmc: '' miCode: '' transferRatio: 1.0 qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司LK05j - provId: p1e276 - inStockDate: '2024-06-06 14:43:08' + provName: 国药集团公司N2)Tj + provId: p1e27a + inStockDate: '2024-06-07 08:26:58' mfrCode: made: 德国 price: - barName: 100支/100 + barName: 1支 purModeText: 检验试剂 - codeType: 66 + codeType: 67 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index ad794b9db71244525fbaf0a45ea6113b5c003507..98e527d2918e559d9e040b89123737c6498b0ba6 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: h034700004008 - hosGoodsCode: '00004008' - provId: p1e276 - subProvId: p1e276 - subProvName: 国药集团公司LK05j - goodsName: 高值牙钻机fW59I + - hosGoodsId: h034700004019 + hosGoodsCode: '00004019' + provId: p1e27a + subProvId: p1e27a + subProvName: 国药集团公司N2)Tj + goodsName: 高值牙钻机jLOtI 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 9749759fcd2352e386c8a1dfc442c3ba2db4a292..3ce1729caeadb6154a579b1c4d2d39327e489daf 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406060008_1 + MSPid: MSP2406070008_1 hosId: h0347 - hosGoodsId: h034700004009 - provGoodsid: provGood-99221196 - goodsAuditBillId: MSP2406060008 - targetId: MSP2406060008_1 + hosGoodsId: h034700004020 + provGoodsid: provGood-99221207 + goodsAuditBillId: MSP2406070008 + targetId: MSP2406070008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 938c54de02e69893c09b677ede590ccc21728cbc..aa18c79db6cac93600c20044a30a944d34152fd6 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: '8800000001063057' - snCode: '8800000001063057' - ssccCode: '010839000183230921' - pkgCodeSee: '01000000000040081022221124060617241213218800000001063057' - hosGoodsId: h034700004008 - hosGoodsCode: '00004008' - goodsCode: '00004008' - goodsName: 高值牙钻机fW59I + id: '8800000001063510' + snCode: '8800000001063510' + ssccCode: '010839000183376629' + pkgCodeSee: '01000000000040191022221124060717241214218800000001063510' + hosGoodsId: h034700004019 + hosGoodsCode: '00004019' + goodsCode: '00004019' + goodsName: 高值牙钻机jLOtI goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-06-06' - expdtDate: '2024-12-13' + productDate: '2024-06-07' + expdtDate: '2024-12-14' pkgDefName: pkgDefQty: 1.0 - stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6 + stockId: f168bb66339849be826b92dd76e53c9d stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472218 + areaCode: areah03472230 lockStatus: 0 unitName: 1支 - shelfCode: areah03472218-A-01-01 + shelfCode: areah03472230-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406060014", "inStockTime": - "2024-06-06 07:24:55", "useFrequency": 1, "distrDetailId": "03838150", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202406070014", "inStockTime": + "2024-06-07 07:24:49", "useFrequency": 1, "distrDetailId": "03838211", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司LK05j - provId: p1e276 - inStockDate: '2024-06-06 07:24:54' + provName: 国药集团公司N2)Tj + provId: p1e27a + inStockDate: '2024-06-07 07:24:48' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 6fabb402e358313b1a2f57d25f03ed7a03e71705..f62d39d4811949aa4e96e60c99e42ab6a0591c65 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: h034700004010 + - hosGoodsId: h034700004021 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂20zyQ + goodsName: 新型冠状病毒检测试剂%k$56 goodsSpec: G-31891 - mdmGoodsCode: '11660958' - goodsCode: '00004010' + mdmGoodsCode: '11660969' + goodsCode: '00004021' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -16,22 +16,22 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 1198.0 + qty: 300.0 goodsImg: [] - pkgDefId: 60abe88ab2b5432da8f7e75a74e92584 + pkgDefId: 6b59ecdb3df2446f930143a20befab12 buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 82394e14fcd94eb6ad2474304cb2a808 + deptId: 7d4e304548bd4324bcd974e107ddeabd deptName: areaCode: areaName: - targetDeptId: 25bc0309da024bf1b59a735cf2cd68d4 + targetDeptId: 54e182305e5c47d6a96a753b0f142161 targetDeptName: 设备科001 - targetStockId: 2ca86f5a96044b21899027321759fc3e - targetStockName: 东土城路院区nzo#r中心库房 + targetStockId: eec09a30b9f64f8c853d421fc299bcd9 + targetStockName: 东土城路院区LYKEM中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,7 +39,7 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司LK05j + provName: 国药集团公司N2)Tj noRecPkgQty: 1.0 noRecQty: 100.0 autoUnpack: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index 8a868830e98075c7db2231828dcf843ee57d09d9..34dcc309ca3b1caf8dfd16f63299ef7a1108676f 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: 6c5a12c8d1d3406ca731e006c3f7076b - lastModified: '2024-06-06 07:25:19' + - id: 320d9a9310fa4276bc9434f3ee9058a0 + lastModified: '2024-06-07 07:25:13' version: 1 - createTime: '2024-06-06 07:04:42' - createUser: h0347_UID-051316 - lastModifiedUser: h0347_UID-051316 - stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6 - shelfCode: areah03472218 + createTime: '2024-06-07 07:04:31' + createUser: h0347_UID-051318 + lastModifiedUser: h0347_UID-051318 + stockId: f168bb66339849be826b92dd76e53c9d + shelfCode: areah03472230 shelfName: 默认库区 address: 二级检验科002 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051316 + linkman: h0347_UID-051318 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 82394e14fcd94eb6ad2474304cb2a808 + deptId: 7d4e304548bd4324bcd974e107ddeabd areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 9293698d98db6f57aee9476026b45961ad079e32..ed4b6aec0d43c2dcdec3585a2dacbc4065b78b3f 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406060009_1 + MSPid: MSP2406070009_1 hosId: h0347 - hosGoodsId: h034700004010 - provGoodsid: provGood-99221197 - goodsAuditBillId: MSP2406060009 - targetId: MSP2406060009_1 + hosGoodsId: h034700004021 + provGoodsid: provGood-99221208 + goodsAuditBillId: MSP2406070009 + targetId: MSP2406070009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index da2106399ccf133711fcc0f4babfe613bfafb37b..04db5637e76bd2527cebfa4018d7ff049e7d9101 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406060010_1 + MSPid: MSP2406070010_1 hosId: h0347 - hosGoodsId: h034700004011 - provGoodsid: provGood-99221198 - goodsAuditBillId: MSP2406060010 - targetId: MSP2406060010_1 + hosGoodsId: h034700004022 + provGoodsid: provGood-99221209 + goodsAuditBillId: MSP2406070010 + targetId: MSP2406070010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 3fcbff4224bf3494da86d1d5e836dbc3f432d433..7faf8c4bd1f28be46f4cac66b43e4cb55c80a6fd 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2406060011_1 + MSPid: MSP2406070011_1 hosId: h0347 - hosGoodsId: h034700004012 - provGoodsid: provGood-99221199 - goodsAuditBillId: MSP2406060011 - targetId: MSP2406060011_1 + hosGoodsId: h034700004023 + provGoodsid: provGood-99221210 + goodsAuditBillId: MSP2406070011 + targetId: MSP2406070011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index a1ad2640cb9e564856458c9af90c710256b88aa8..17e6f9b62ed2344762bd9ff578856d7f1789ec58 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 60abe88ab2b5432da8f7e75a74e92584 - unitPackageid2: 60abe88ab2b5432da8f7e75a74e92584 + unitPackageid1: 6b59ecdb3df2446f930143a20befab12 + unitPackageid2: 6b59ecdb3df2446f930143a20befab12 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 9c1daad9cd6251c33e69a349b939db83e1f5cf75..c08c9005cd00540d9d25775ac4c41b8c9d90492c 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024060625837 - orderNo2: PLAN2024060625837 + orderNo1: PLAN2024060726144 + orderNo2: PLAN2024060726144 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index faa2a68905a9ce6be6148eb07b63e810a11b4217..ac451878caba932509f6f1dee16fa2cfab831cfa 100644 --- a/data/b5_spd3_core_business_flow/message8 +++ b/data/b5_spd3_core_business_flow/message8 @@ -1,35 +1,35 @@ 配送订单信息: list_a: - &id001 - - id: Ch034720240606000117 - lastModified: '2024-06-06 16:04:49' + - id: Ch034720240607000078 + lastModified: '2024-06-07 07:38:40' version: 0 - createTime: '2024-06-06 16:04:49' - createUser: h0347_UID-051316 + createTime: '2024-06-07 07:38:40' + createUser: h0347_UID-051318 lastModifiedUser: - orderNo: CG2024060618002 + orderNo: CG2024060718087 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3655 + branchId: h0347-3657 deptId: deptName: - recOrgId: 82394e14fcd94eb6ad2474304cb2a808 + recOrgId: 7d4e304548bd4324bcd974e107ddeabd recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240606022484 + sourceId: Ph034720240607022788 sourceType: inSettlement: recUser: recPhone: recAddr: 二级检验科002 - provId: p1e276 - provName: 国药集团公司LK05j + provId: p1e27a + provName: 国药集团公司N2)Tj subSendFlag: - exeProvId: p1e276 - exeProvName: 国药集团公司LK05j + exeProvId: p1e27a + exeProvName: 国药集团公司N2)Tj billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区nzo#r + branchName: 东土城路院区LYKEM sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024060625839 + planOrderNo: PLAN2024060726143 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 58ba40c9da8268658f852b233c94a1cb6a1f2df7..143bb8c12da70fe2d1820846a19f937e730f8c30 100644 --- a/data/b5_spd3_core_business_flow/message9 +++ b/data/b5_spd3_core_business_flow/message9 @@ -1,22 +1,22 @@ 配送订单详细信息: list_a: - &id001 - - id: bcf54e1f97c44b45a27aab2196b85d5a + - id: cec1b8fbe4fd4e79b2b714175312c46b lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240606000117 - orderNo: CG2024060618002 - sourceId: ac632ff3271f4ec19bfa562555e8b993 - hosGoodsId: h034700004010 - mdmGoodsCode: '11660958' - goodsCode: '00004010' + pid: Ch034720240607000078 + orderNo: CG2024060718087 + sourceId: 504bd33289024a1ca2771f60639330e5 + hosGoodsId: h034700004021 + mdmGoodsCode: '11660969' + goodsCode: '00004021' purMode: 60 price: '99.9999' - supplyId: 2b706b4703354212a6ded9bef264f540 - pkgDefId: 60abe88ab2b5432da8f7e75a74e92584 + supplyId: eeedd46c787a4f75b9d024bfbf3bde1f + pkgDefId: 6b59ecdb3df2446f930143a20befab12 pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240606022484","buyDetailId":"Bh034720240606000560001","planDetailId":"ac632ff3271f4ec19bfa562555e8b993"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ"}' + detailRelationJson: '{"planBillId":"Ph034720240607022788","buyDetailId":"Bh034720240607000140001","planDetailId":"504bd33289024a1ca2771f60639330e5"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004021","purMode":60,"goodsName":"新型冠状病毒检测试剂%k$56"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂20zyQ + goodsName: 新型冠状病毒检测试剂%k$56 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11660958' - erpCode: '11660958' + mdmGoodsSpecCode: '11660969' + erpCode: '11660969' made: 德国 goodsDi: miDjmc: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '36550000040100' + diUse: '36570000040210' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e276 - subProvName: 国药集团公司LK05j + subProvId: p1e27a + subProvName: 国药集团公司N2)Tj subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 diff --git a/report/summary.html b/report/summary.html index c658d66ced7fd5a89cdbc90c42207c57701804ca..f5016ccbe1048816e9f5f85ee01fd35c48615860 100644 --- a/report/summary.html +++ b/report/summary.html @@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 1 - 0分28秒 + 0分13秒 100.0% @@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 a_b7流程十四退库业务_消耗退库 成功 - 28.403 + 13.676 xiaohesheng