diff --git "a/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" index 1286f03746142c23867f697744dac965ceeff83c..0520908b31f48a1da4dbd4d0f8ca493fd6a6cabe 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b8\346\265\201\347\250\213\345\215\201\344\272\224\351\200\200\345\272\223\344\270\232\345\212\241_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223\351\200\200\345\272\223.py" @@ -36,7 +36,7 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库 commonFuc().get_business_data(module, "X-APP-CODE")) if type == 2: - udi_code = get_udi2(2) # 获取条码 低值1 高值2 试剂3 + udi_code = get_udi3(2) # 获取条码 低值1 高值2 试剂3 # 高值退库出库 url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, @@ -168,7 +168,7 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库 print('result', result) elif type == 1: print('低值耗材或者试剂退库出库') - udi_code = get_udi2(1) # 获取条码 低值1 高值2 试剂3 + udi_code = get_udi3(1) # 获取条码 低值1 高值2 试剂3 url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_pick_scan_url") # 从message18文件中获取信息 @@ -295,7 +295,7 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库 print('低值产品退库出库,result', result) elif type == 3: print('试剂产品退库出库') - udi_code = get_udi2(3) # 获取条码 低值1 高值2 试剂3 + udi_code = get_udi3(3) # 获取条码 低值1 高值2 试剂3 url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_pick_scan_url") # 从message18文件中获取信息 diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 3170b1fd98a484a42e79e96e5f9113f5c855d732..1ec0ce09d626d88fa5d5765e793b29bb724c120a 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -681,6 +681,72 @@ def get_udi2(type=1): # 二级科室库存明细查询获取条码 break return pkgCodeSee +def get_udi3(type=1): # 三级科室库存明细查询获取条码 + # type=1低值 2高值 3试剂 + module = "b5_spd3_core_business_flow" + token, projectCode1, uxid1, corpId1, info1 = call_login() + url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, + "herpService_stock_barcode_page_url") + print('get_udi', 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 = 'request_body' + deptName3 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid3"] + stockId3 = get_stockId(deptName3 + '库房', 3) + deptid3 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'] + if type == 1: + hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'] + GoodsId = hosGoodsId.replace(get_hosid(), '') + request_body = commonFuc().get_business_data(module, "payload17_2", GoodsId, get_branch_id(), deptid3,stockId3) + elif type == 2: + hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'] + GoodsId = hosGoodsId.replace(get_hosid(), '') + request_body = commonFuc().get_business_data(module, "payload17_2_1", GoodsId, get_branch_id(), deptid3,stockId3) + + 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_2", GoodsId, get_branch_id(), deptid3,stockId3) + + elif type == 4: # 试剂单瓶条码 + hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'] + GoodsId = hosGoodsId.replace(get_hosid(), '') + request_body = commonFuc().get_business_data(module, "payload17_3", GoodsId, get_branch_id(), deptid3,stockId3) + print('getudi_request_body', request_body) + + # # # # 发送请求 + result = commonFuc().http_post(url, request_body, headers) + # import pdb + # pdb.set_trace() + print('aaaaaaaaaaaaaaaaresult', result) + data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) + + print('条码库存result', result) + pkgCodeSee = 'pkgCodeSee' + for i in data1: + lockStatus = commonFuc().analysis_json('lockStatus', i) + if lockStatus == 0: + print('lockStatus', lockStatus) + pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', i) + pkgcode = commonFuc().analysis_json('pkgCodeSee', i) + # # 将条码信息写入文件 + list_a = [] + list_b = [] + list_c = [] + list_a.append(i) + list_b.append(i) + list_c.append(i) + # 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, 'message18') + break + return pkgCodeSee def get_udi(type=1): # 退货出库扫条码 # type=1低值 2高值 3试剂 diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index 169efccf531dadbdb4820285fe628602d4fc0aa4..292d91ba16cd6b258242b6571996d44da1172987 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202407020038 - cname: 国药集团公司kGTpV + e_id: CR202407030038 + cname: 国药集团公司MPah7 diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index e05b08b983ac967124e8388680edd1c7b2c97a39..ab73b20c00869fff30fa1d6fea0385cc1060029b 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院W1A@i - h_name: 湖南省人民医院W1A@i + h_id: 湖南省人民医院!^KoE + h_name: 湖南省人民医院!^KoE diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 929e9ba6327ce48ab895d75c82f18b6d2ee4d06f..bf008852f3239776fa61be40fe994123f4c90d5a 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407020011_1 + MSPid: MSP2407030011_1 hosId: h0347 - hosGoodsId: h034700004356 - provGoodsid: provGood-99221551 - goodsAuditBillId: MSP2407020011 - targetId: MSP2407020011_1 + hosGoodsId: h034700004382 + provGoodsid: provGood-99221577 + goodsAuditBillId: MSP2407030011 + targetId: MSP2407030011_1 diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message index e615844e3310d0d9b47e761a166d677924741fe5..a58940817808c94bbe70b3bbc4e4cbe913594d4c 100644 --- a/data/a6_mdm3_si/message +++ b/data/a6_mdm3_si/message @@ -2,10 +2,10 @@ list_a: - &id001 settleMonth: '202407' - pid: OBh0347202407020009 - hosGoodsId: h034700004353 - goodsCode: '00004353' - goodsName: 一次性注射器_低值NaZMe + pid: OBh0347202407030004 + hosGoodsId: h034700004379 + goodsCode: '00004379' + goodsName: 一次性注射器_低值KBYLs goodsGg: G-31891 mfrsName: 德国歌德公司 Geuder AG unit: 支 @@ -20,14 +20,14 @@ normalContractId: normalContract: '1' detailList: - - pid: OBh0347202407020009 + - pid: OBh0347202407030004 settleMonth: '202407' - accountDate: '2024-07-02' - hosGoodsId: h034700004353 + accountDate: '2024-07-03' + hosGoodsId: h034700004379 batchCode: '333' - distrDetailId: '03839046' - distrId: PSh0347202407020009 - distrOrderNo: PSh0347202407020009 + distrDetailId: '03839114' + distrId: PSh0347202407030002 + distrOrderNo: PSh0347202407030002 settlePrice: 99.9999 maxSettleQty: -100.0 maxSettleAmount: -9999.99 @@ -36,11 +36,11 @@ leftSettleQty: -100.0 leftSettleAmount: -9999.99 hosId: h0347 - provId: p1e2e8 - branchId: h0347-3712 - balanceDetId: OBh0347202407020009-000001 + provId: p1e2ec + branchId: h0347-3714 + balanceDetId: OBh0347202407030004-000001 purMode: 10 - barCode: 013712000004353010333112407021725010821UT240702000208 + barCode: 013714000004379010333112407031725010921UT240703000002 batchId: price: maxQty: @@ -53,15 +53,15 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202407020009h034700004353 - - pid: OBh0347202407020009 + viewId: 202407OBh0347202407030004h034700004379 + - pid: OBh0347202407030004 settleMonth: '202407' - accountDate: '2024-07-02' - hosGoodsId: h034700004353 + accountDate: '2024-07-03' + hosGoodsId: h034700004379 batchCode: '333' - distrDetailId: '03839086' - distrId: PSh0347202407020049 - distrOrderNo: PSh0347202407020049 + distrDetailId: '03839114' + distrId: PSh0347202407030002 + distrOrderNo: PSh0347202407030002 settlePrice: 99.9999 maxSettleQty: 100.0 maxSettleAmount: 9999.99 @@ -70,11 +70,11 @@ leftSettleQty: 100.0 leftSettleAmount: 9999.99 hosId: h0347 - provId: p1e2e8 - branchId: h0347-3712 - balanceDetId: OBh0347202407020009-000002 + provId: p1e2ec + branchId: h0347-3714 + balanceDetId: OBh0347202407030004-000002 purMode: 10 - barCode: 013712000004353010333112407021725010821UT240702001613 + barCode: 013714000004379010333112407031725010921UT240703000025 batchId: price: maxQty: @@ -87,10 +87,10 @@ volumeFlag: onlineKind: invoicePrice: 99.9999 - viewId: 202407OBh0347202407020009h034700004353 - unique: 202407OBh0347202407020009h034700004353 + viewId: 202407OBh0347202407030004h034700004379 + unique: 202407OBh0347202407030004h034700004379 onlineKind: '10' - viewId: 202407OBh0347202407020009h034700004353 + viewId: 202407OBh0347202407030004h034700004379 list_b: - *id001 list_c: diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index b31e58a6e34b9733e610c33ff9210b1187c718c5..309f1a6caef38cca195c209754c075e122354439 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3712 - branch_name: 东土城路院区$!ZNd + branch_id: h0347-3714 + branch_name: 东土城路院区QJH)# 科室信息: - dept2_id: 08398b8842854e85b738846cbcbb97f7 + dept2_id: b8cbdc0117e8499cb1ccac00cb6166ca dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index 462da3b3d2e102e702ce14013a510bde8a903494..38eb340eaf996bf638d2ef2c08400079864a9e4c 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试0oUY# - username2: 自动化测试0oUY# + username1: 自动化测试lPIo0 + username2: 自动化测试lPIo0 diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index 6d80dcbe68ce5a9dee07fff92ea802b5724bea87..c5f8bc6694cf04032e29dfbb1595afb7f7d05694 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 533beea90bd8402fa62377a5a84befd6 + dept1_id: 0b61ab7ea9b746a3844426111c5ec6db dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index a181f0488e61ac0ff550eebf11119e1205c9cfc9..99026e5ca56ade13aeb134119d0b9f5008a56820 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,9 +1,9 @@ 所有科室id: - deptid1: 533beea90bd8402fa62377a5a84befd6 - deptid2: 08398b8842854e85b738846cbcbb97f7 - deptid3: 90ffdd89a239466983c18d20c1730a3d - deptid4: 271b96c808c94c4092c0d0c8f55aa397 - deptid5: 5e2a2dfd8379430e8d7c76ad095c74da + deptid1: 0b61ab7ea9b746a3844426111c5ec6db + deptid2: b8cbdc0117e8499cb1ccac00cb6166ca + deptid3: f10f9bac7ca3421093f6f20e4f71d1ca + deptid4: 3e5f25d08e33424288d9d0f223eb3b00 + deptid5: fe6d1b6f141d4f0490bbaae4fd23de77 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index cab8433db2b0d53792e1566dbaa48a7b18673902..83c7274569980cf09e34e27fab06c2fe7151b5de 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: 59aebd42a2f7415aa83296b106026ae6 - shelfCode: areah03472553 + shelfid: 8125a0cfb1d74982abbd67e19f2547e8 + shelfCode: areah03472565 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index 07f55c2b419c18a01396a2315c01b162cadda6e7..a31348a2062efb79db2ed241cc2c7d456426571c 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e2e8 + e_corpId: p1e2ec h_corpId: h0347 - e_username: 国药集团公司kGTpV + e_username: 国药集团公司MPah7 h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 93ad117665a8cdc801a0cb0efcb084fd568c4c1d..d8e4b1ede97033e9417e0351e68e9bff074a0658 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407020007_1 + MSPid: MSP2407030007_1 hosId: h0347 - hosGoodsId: h034700004352 - provGoodsid: provGood-99221547 - goodsAuditBillId: MSP2407020007 - targetId: MSP2407020007_1 + hosGoodsId: h034700004378 + provGoodsid: provGood-99221573 + goodsAuditBillId: MSP2407030007 + targetId: MSP2407030007_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index 79be2cc57e39026c6ac9474e1762558ae86e54b0..da4c7995ce72b8e917b4f46125eaf9b5a60394b2 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,9 +1,9 @@ 低值配送单号: - distrBillId1: PSh0347202407020072 - distrBillId2: PSh0347202407020072 + distrBillId1: PSh0347202407030021 + distrBillId2: PSh0347202407030021 高值配送单号: - distrBillId1: PSh0347202407020073 - distrBillId2: PSh0347202407020073 + distrBillId1: PSh0347202407030022 + distrBillId2: PSh0347202407030022 试剂配送单号: - distrBillId1: PSh0347202407020074 - distrBillId2: PSh0347202407020074 + distrBillId1: PSh0347202407030023 + distrBillId2: PSh0347202407030023 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 5a0d9e1c40728cb40b3ba339089e1a798d99923d..3002fe05fe58ad8129ff7ab01b2b04cfafd979b1 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024070231020 - orderNo2: PLAN2024070231020 + orderNo1: PLAN2024070331116 + orderNo2: PLAN2024070331116 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index b9ddf7fdeffd4ee785ce55de68ec97f8c2a8f130..8851946bd9728fe341b6793bbc75861acf82b4e2 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024070231021 - orderNo2: PLAN2024070231021 + orderNo1: PLAN2024070331114 + orderNo2: PLAN2024070331114 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index cbd229bf5fa11215bf324dbb26ae0776f2d36a14..600efa7d5a43012194316bc3ee01ee8e049871b3 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-3712 + branchId: h0347-3714 deptId: taskType: 1 - sourceOrgId: p1e2e8 - sourceOrgName: 国药集团公司kGTpV - sourceOrderNo: PSh0347202407020074 + sourceOrgId: p1e2ec + sourceOrgName: 国药集团公司MPah7 + sourceOrderNo: PSh0347202407030023 billMode: '66' stockKind: purMode: - sourceId: PSh0347202407020074 + sourceId: PSh0347202407030023 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: PLAN2024070231021 - purOrderNo: CG2024070220362 - recOrgId: 08398b8842854e85b738846cbcbb97f7 + planOrderNo: PLAN2024070331114 + purOrderNo: CG2024070320422 + recOrgId: b8cbdc0117e8499cb1ccac00cb6166ca recOrgName: 二级检验科002 - billRelationJson: '{"buyBillId":"Bh03472024070200115","planBillId":"Ph034720240702027666","planOrderNo":"PLAN2024070231021","buyOrderNo":"BUY2024070205552","purOrderNo":"CG2024070220362","purBillId":"Ch034720240702000158","purBillDate":"2024-07-02 - 16:49:14","distrBillId":"PSh0347202407020074","distrOrderNo":"PSh0347202407020074"}' - taskDate: '2024-07-02 16:50:11' + billRelationJson: '{"buyBillId":"Bh03472024070300022","planBillId":"Ph034720240703027759","planOrderNo":"PLAN2024070331114","buyOrderNo":"BUY2024070305586","purOrderNo":"CG2024070320422","purBillId":"Ch034720240703000051","purBillDate":"2024-07-03 + 07:42:40","distrBillId":"PSh0347202407030023","distrOrderNo":"PSh0347202407030023"}' + taskDate: '2024-07-03 07:42:58' taskDateStart: taskDateEnd: billModeList: diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14 index 9b50502de6d9d35a34bec25abc7b360786c75e42..81d2aaf85720ca2f80592845e99f13fcc8ca55f2 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: h034700004354 + hosGoodsId: h034700004380 mdmGoodsCode: - spdGoodsCode: '11661307' - goodsCode: '00004354' - goodsName: 新型冠状病毒检测试剂j(r&Q + spdGoodsCode: '11661333' + goodsCode: '00004380' + goodsName: 新型冠状病毒检测试剂Gg(sT goodsGg: G-31891 mfrsId: mfrsName: 德国歌德公司 Geuder AG @@ -22,16 +22,16 @@ pkgDefName: '100' pkgDefQty: 100.0 batchCode: '4444' - expdtDate: '2025-01-08' - productDate: '2024-07-02' - provName: 国药集团公司kGTpV + expdtDate: '2025-01-09' + productDate: '2024-07-03' + provName: 国药集团公司MPah7 provId: - viewId: '03839111' + viewId: '03839135' verifyFlag: 0 hasSterilize: 0 - id: '03839111' + id: '03839135' detailRelationJson: - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004354","purMode":60,"goodsName":"新型冠状病毒检测试剂j(r&Q","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661307","ybDefId":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004380","purMode":60,"goodsName":"新型冠状病毒检测试剂Gg(sT","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661333","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 c1fa206398a75fc2711a603fa630044bb84e9592..797e266b452ae60a37cade19c7cee3e9fa44e2b0 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024070200055 - CHECK_NO2: CHECKh03472024070200055 + CHECK_NO1: CHECKh03472024070300023 + CHECK_NO2: CHECKh03472024070300023 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index d76461e2578ec02f34ec06d75b89fda8f48924f3..1f277c826810c22243b6725f22e2ce6e81977bef 100644 --- a/data/b5_spd3_core_business_flow/message16 +++ b/data/b5_spd3_core_business_flow/message16 @@ -5,144 +5,34 @@ lastModified: version: createTime: - createUser: h0347_UID-051378 + createUser: h0347_UID-051380 lastModifiedUser: - billMode: '16' + billMode: '66' recType: stockKind: purMode: - sourceId: CHECKh03472024070200030 - sourceType: PSD - sourceVersion: 0 + sourceId: DRh034720240703000050 + sourceType: CK_TK + sourceVersion: 1 batchList: billRelationJson: hosId: h0347 - deptId: 533beea90bd8402fa62377a5a84befd6 + deptId: 0b61ab7ea9b746a3844426111c5ec6db deptName: - branchId: h0347-3712 + branchId: h0347-3714 branchName: - taskType: 1 - sourceOrgId: p1e2e8 - sourceOrgName: 国药集团公司kGTpV - sourceOrderNo: YS240702030 - taskSourceNo: PSh0347202407020049 - areaCode: areah03472553 - areaName: 自动化测试 + taskType: 2 + sourceOrgId: b8cbdc0117e8499cb1ccac00cb6166ca + sourceOrgName: 二级检验科002 + sourceOrderNo: DN20240703000050 + taskSourceNo: DN20240703000050 + areaCode: + areaName: goodsName: goodsGg: startDate: endDate: - taskDate: '2024-07-02 15:10:10' - pkgTaskId: - pkgFlag: - remark: '' - goodsSpec: - areaList: - areaDefaultFlag: - excludeDeptIds: - deptIds: - sourceReplId: - defaultAreaCode: - defaultAreaName: - sourceNo: - distrOrderNo: - deptBuyer: - stockName: - dataDeptIds: - oldDeptName: - oldOrderNo: - allowRejectFlag: - targetCodingType: 0 - pdaFlag: - createUserName: - createUserIds: - - id: - lastModified: - version: - createTime: - createUser: h0347_UID-051378 - lastModifiedUser: - billMode: '20' - recType: - stockKind: - purMode: - sourceId: CHECKh03472024070200010 - sourceType: PSD - sourceVersion: 0 - batchList: - billRelationJson: - hosId: h0347 - deptId: 533beea90bd8402fa62377a5a84befd6 - deptName: - branchId: h0347-3712 - branchName: - taskType: 1 - sourceOrgId: p1e2e8 - sourceOrgName: 国药集团公司kGTpV - sourceOrderNo: YS240702010 - taskSourceNo: PSh0347202407020026 - areaCode: areah03472553 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-07-02 14:20:29' - pkgTaskId: - pkgFlag: - remark: '' - goodsSpec: - areaList: - areaDefaultFlag: - excludeDeptIds: - deptIds: - sourceReplId: - defaultAreaCode: - defaultAreaName: - sourceNo: - distrOrderNo: - deptBuyer: - stockName: - dataDeptIds: - oldDeptName: - oldOrderNo: - allowRejectFlag: - targetCodingType: 0 - pdaFlag: - createUserName: - createUserIds: - - id: - lastModified: - version: - createTime: - createUser: h0347_UID-051378 - lastModifiedUser: - billMode: '16' - recType: - stockKind: - purMode: - sourceId: CHECKh03472024070200009 - sourceType: PSD - sourceVersion: 0 - batchList: - billRelationJson: - hosId: h0347 - deptId: 533beea90bd8402fa62377a5a84befd6 - deptName: - branchId: h0347-3712 - branchName: - taskType: 1 - sourceOrgId: p1e2e8 - sourceOrgName: 国药集团公司kGTpV - sourceOrderNo: YS240702009 - taskSourceNo: PSh0347202407020022 - areaCode: areah03472553 - areaName: 自动化测试 - goodsName: - goodsGg: - startDate: - endDate: - taskDate: '2024-07-02 14:17:51' + taskDate: '2024-07-03 07:55:08' pkgTaskId: pkgFlag: remark: '' diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index c6ad12a35c8342324114f8bfcb2f34dc1e285219..ed9acf1f2d3de84d46118856dc51213b6545edcc 100644 --- a/data/b5_spd3_core_business_flow/message17 +++ b/data/b5_spd3_core_business_flow/message17 @@ -1,36 +1,36 @@ 验收单库存详情信息: list_a: - &id001 - - id: CHECKh034720240702000300001 + - id: DRh0347202407030000500001 lastModified: version: createTime: createUser: lastModifiedUser: rowIdx: - purMode: 10 + purMode: 60 unitName: 100支/100 - pid: CHECKh03472024070200030 - hosGoodsId: h034700004353 - batchCode: '333' - expdtDate: '2025-01-08' - productDate: '2024-07-02' + pid: DRh034720240703000050 + hosGoodsId: h034700004380 + batchCode: '4444' + expdtDate: '2025-01-09' + productDate: '2024-07-03' batchPrice: 99.9999 settlement: 1 - batchType: 20 - srcBatchId: '03839086' + batchType: 40 + srcBatchId: Ph034724070300015 srcBatchPrice: 99.9999 - shelfCode: areah03472553-2-01-01 + shelfCode: areah03472565-2-01-01 shelfKind: - barcodeId: UT240702001515 + barcodeId: UT240703000206 subBarcodeId: - qty: 10000.0 - pkgQty: 100 - distrId: PSh0347202407020049 - distrDetailId: '03839086' - pkgDefQty: 100.0 - pkgDefName: '100' - viewId: h0347000043533332025-01-08100支/100 + qty: 100.0 + pkgQty: 1 + distrId: PSh0347202407030014 + distrDetailId: '03839126' + pkgDefQty: + pkgDefName: + viewId: h03470000438044442025-01-09100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,53 +38,60 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03839086' - mdmGoodsCode: '11661306' - goodsCode: '00004353' - tbStatus: 1 - billMode: '16' - hosId: h0347 - branchId: h0347-3712 - purBillId: Ch034720240702000130 - provId: p1e2e8 - provName: 国药集团公司kGTpV - subSendFlag: 10 - exeProvId: p1e2e8 - exeProvName: 国药集团公司kGTpV - purDetailId: 696f8bba0d41492b91b41c69957c873e - goodsName: 一次性注射器_低值NaZMe + sourceDetailId: PICKh03472407030022660001 + mdmGoodsCode: '11661333' + goodsCode: '00004380' + tbStatus: + billMode: + hosId: + branchId: + purBillId: Ch034720240703000042 + provId: p1e2ec + provName: + subProvId: p1e2ec + purDetailId: + goodsName: 新型冠状病毒检测试剂Gg(sT goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 - purPrice: 99.9999 - pkgDefId: ee7fb81570664e758bd2642f4dab3ed3 - supplyId: b3ebe033970a41aa865bb3cbe364e3fe - subProvId: p1e2e8 - subProvName: 国药集团公司kGTpV - subPrice: 99.9999 - distrPrice: 99.9999 - distrPkgQty: 100.0 - distrQty: 10000.0 + sourceBatchId: Ph034724070300015 + targetBatchId: Ph034724070300015 + pkgDefId: certificateCode: '' productCertCode: - detailRelationJson: extInfo: psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00004353' - purMode: 10 - goodsName: 一次性注射器_低值NaZMe + goodsCode: '00004380' + purMode: 60 + goodsName: 新型冠状病毒检测试剂Gg(sT ygptCode: '' transCond: '' storageCond: '' - erpCode: '11661306' + erpCode: '11661333' ybDefId: '' - purTaskId: - multiChargeFlag: + contractId: '' + normalContractId: '' + fcatId: '' + fcatName: '' + goodsKindId: '' + goodsKindName: '' + miTwentysevenCode: '' + focus_control: '0' + focus_control_type: + rtnQty: + hisChargeNo: trustMrfsName: + pkgCodeSee: + chargeFlag: + stockKind: CK_TK + sourceDeptId: b8cbdc0117e8499cb1ccac00cb6166ca + targetDeptId: 0b61ab7ea9b746a3844426111c5ec6db + ableDelFlag: + pickType: KS_TK list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 26d1cf71f55b55a55f6cef671b5a515ce1cf7a42..8b5a46b3b4b0abbc25dc27cfd8b4680b2787fbb8 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,52 +1,53 @@ 条码信息: list_a: - &id001 - id: UT2407020007030001 - snCode: UT2407020007030001 - ssccCode: '010839000019095618' - pkgCodeSee: 0137120000043540104444112407021725010821UT240702000703 - hosGoodsId: h034700004354 - hosGoodsCode: '00004354' - goodsCode: '00004354' - goodsName: 新型冠状病毒检测试剂j(r&Q + id: UT240703000202 + snCode: UT240703000202 + ssccCode: '010839000186852724' + pkgCodeSee: 0137140000043800104444112407031725010921UT240703000202 + hosGoodsId: h034700004380 + hosGoodsCode: '00004380' + goodsCode: '00004380' + goodsName: 新型冠状病毒检测试剂Gg(sT goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 60 batchCode: '4444' - productDate: '2024-07-02' - expdtDate: '2025-01-08' - pkgDefName: - pkgDefQty: 1.0 - stockId: 75bd1e5c39dd4fff9389707ba69fba03 - stockName: 二级检验科002库房 + productDate: '2024-07-03' + expdtDate: '2025-01-09' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: 9c7f6b5560ae401dbe71a268899fde58 + stockName: 三级检测组003库房 areaName: 默认库区 - areaCode: areah03472550 + areaCode: areah03472564 lockStatus: 0 - unitName: 1支 - shelfCode: areah03472550-A-01-01 + unitName: 100支/100 + shelfCode: areah03472564-A-01-01 shelfNo: A01-A-01-01 - pkgDefId: - extInfo: '{"pkgUdi": "0137120000043540104444112407021725010821UT240702000703", - "pkgDefId": "", "pkgDefQty": 1, "pkgDefName": "", "inStockTime": "2024-07-02 - 15:00:58", "pkgBarcodeId": "UT240702000703"}' - bottleId: UT2407020007030001 - pkgType: '67' + pkgDefId: e2411ffda9f44439a3c3eccbd0139a8e + extInfo: '{"pkgDefId": "e2411ffda9f44439a3c3eccbd0139a8e", "pkgDefQty": 100, "purBillId": + "CG2024070320407", "pkgDefName": "100", "distrBillId": "PSh0347202407030008", + "inStockTime": "2024-07-03 07:50:47", "distrDetailId": "03839120", "certificateCode": + ""}' + bottleId: + pkgType: '66' miDjmc: '' miCode: '' transferRatio: 1.0 qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司kGTpV - provId: p1e2e8 - inStockDate: '2024-07-02 15:00:58' + provName: 国药集团公司MPah7 + provId: p1e2ec + inStockDate: '2024-07-03 07:50:46' mfrCode: made: 德国 price: - barName: 1支 + barName: 100支/100 purModeText: 检验试剂 - codeType: 67 + codeType: 66 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19 index bba8e8ea37b8c30451e2c7f3d7a68fbd29ffd7f8..a4b4b2355975dcce0a24036577f34eb40974c12d 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: h034700004352 - hosGoodsCode: '00004352' - provId: p1e2e8 - subProvId: p1e2e8 - subProvName: 国药集团公司kGTpV - goodsName: 高值牙钻机q*iy$ + - hosGoodsId: h034700004378 + hosGoodsCode: '00004378' + provId: p1e2ec + subProvId: p1e2ec + subProvName: 国药集团公司MPah7 + goodsName: 高值牙钻机HTILW 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 a705600696789118d2fda48d8ee94bb88e078e8e..c7f94497118eccbd91add20ce3672a794568ba92 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407020008_1 + MSPid: MSP2407030008_1 hosId: h0347 - hosGoodsId: h034700004353 - provGoodsid: provGood-99221548 - goodsAuditBillId: MSP2407020008 - targetId: MSP2407020008_1 + hosGoodsId: h034700004379 + provGoodsid: provGood-99221574 + goodsAuditBillId: MSP2407030008 + targetId: MSP2407030008_1 diff --git a/data/b5_spd3_core_business_flow/message20 b/data/b5_spd3_core_business_flow/message20 index 79c02168b02db6d364b1d6396af2b782456b3ae2..3b42d4e5ee21991a56bf43ff4add903157cd950f 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: '8800000001074872' - snCode: '8800000001074872' - ssccCode: '010839000186819925' - pkgCodeSee: '01000000000043521022221124070217250108218800000001074872' - hosGoodsId: h034700004352 - hosGoodsCode: '00004352' - goodsCode: '00004352' - goodsName: 高值牙钻机q*iy$ + id: '8800000001074985' + snCode: '8800000001074985' + ssccCode: '010839000186852427' + pkgCodeSee: '01000000000043781022221124070317250109218800000001074985' + hosGoodsId: h034700004378 + hosGoodsCode: '00004378' + goodsCode: '00004378' + goodsName: 高值牙钻机HTILW goodsSpec: G-31891 goodsMfrsName: 德国歌德公司 Geuder AG unit: 支 purMode: 20 batchCode: '2222' - productDate: '2024-07-02' - expdtDate: '2025-01-08' + productDate: '2024-07-03' + expdtDate: '2025-01-09' pkgDefName: pkgDefQty: 1.0 - stockId: 75bd1e5c39dd4fff9389707ba69fba03 + stockId: 9b75871c07194f6bab2c73397d47a57d stockName: 二级检验科002库房 areaName: 默认库区 - areaCode: areah03472550 + areaCode: areah03472563 lockStatus: 0 unitName: 1支 - shelfCode: areah03472550-A-01-01 + shelfCode: areah03472563-A-01-01 shelfNo: A01-A-01-01 pkgDefId: - extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407020053", "inStockTime": - "2024-07-02 15:30:31", "useFrequency": 1, "distrDetailId": "03839090", "multiChargeFlag": + extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407030005", "inStockTime": + "2024-07-03 07:15:57", "useFrequency": 1, "distrDetailId": "03839117", "multiChargeFlag": 0}' bottleId: pkgType: '25' @@ -38,9 +38,9 @@ qty: 1 shelfKind: 0 shelfKindName: 普通货位 - provName: 国药集团公司kGTpV - provId: p1e2e8 - inStockDate: '2024-07-02 15:30:30' + provName: 国药集团公司MPah7 + provId: p1e2ec + inStockDate: '2024-07-03 07:15:56' mfrCode: made: 德国 price: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index bc2eaf4624bfea63709ed34a3a6fc670df8f4df0..f7d3fb1050151296c755868b11efbf287b3ae5fc 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: h034700004354 + - hosGoodsId: h034700004380 purMode: 60 grantRule: id: - goodsName: 新型冠状病毒检测试剂j(r&Q + goodsName: 新型冠状病毒检测试剂Gg(sT goodsSpec: G-31891 - mdmGoodsCode: '11661307' - goodsCode: '00004354' + mdmGoodsCode: '11661333' + goodsCode: '00004380' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -16,22 +16,22 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 1200.0 + qty: 600.0 goodsImg: [] - pkgDefId: 96c4ca2199a14150a1cdabff56136aaf + pkgDefId: e2411ffda9f44439a3c3eccbd0139a8e buyPkgQty: unitName: 100支/100 price: 99.9999 hosId: branchId: - deptId: 08398b8842854e85b738846cbcbb97f7 + deptId: b8cbdc0117e8499cb1ccac00cb6166ca deptName: areaCode: areaName: - targetDeptId: 533beea90bd8402fa62377a5a84befd6 + targetDeptId: 0b61ab7ea9b746a3844426111c5ec6db targetDeptName: 设备科001 - targetStockId: fe0b489d59cd48d08960e5096a714487 - targetStockName: 东土城路院区$!ZNd中心库房 + targetStockId: f896eeb8ca244a9e8509dff52540dd52 + targetStockName: 东土城路院区QJH)#中心库房 purchaseFlag: 1 tempFlag: 0 grantWay: 3 @@ -39,9 +39,9 @@ codingType: 0 purModeText: 检验试剂 goodsGeneralName: 检测试剂 - provName: 国药集团公司kGTpV - noRecPkgQty: 15.0 - noRecQty: 1500.0 + provName: 国药集团公司MPah7 + noRecPkgQty: 1.0 + noRecQty: 100.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22 index 4d16c4cbad2373b57155f9f1a64a87041540ee88..5df574265aa8ed001baee35549ed66cfd8e99eb2 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: b3aa53e872c14aaeb7e79ba367af6c65 - lastModified: '2024-07-02 16:19:45' - version: 11 - createTime: '2024-07-02 07:03:40' - createUser: h0347_UID-051378 - lastModifiedUser: h0347_UID-051378 - stockId: 75bd1e5c39dd4fff9389707ba69fba03 - shelfCode: areah03472550 + - id: a6122c5d20ea4a5f80e9185f7d221a26 + lastModified: '2024-07-03 07:16:23' + version: 1 + createTime: '2024-07-03 07:03:45' + createUser: h0347_UID-051380 + lastModifiedUser: h0347_UID-051380 + stockId: 9b75871c07194f6bab2c73397d47a57d + shelfCode: areah03472563 shelfName: 默认库区 address: 二级检验科002 shelfType: @@ -18,13 +18,13 @@ parentId: levelCode: tbStatus: 1 - linkman: h0347_UID-051378 + linkman: h0347_UID-051380 recPhone: None delFlag: 0 shelfNo: A01 shelfKind: 0 hosId: - deptId: 08398b8842854e85b738846cbcbb97f7 + deptId: b8cbdc0117e8499cb1ccac00cb6166ca areaCode: areaName: stockName: diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index 0de3dc2627b3d66b270789e48dbd5970b557967d..1cb178a340cd25cd74f3871e5ac358ca228b50e9 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407020009_1 + MSPid: MSP2407030009_1 hosId: h0347 - hosGoodsId: h034700004354 - provGoodsid: provGood-99221549 - goodsAuditBillId: MSP2407020009 - targetId: MSP2407020009_1 + hosGoodsId: h034700004380 + provGoodsid: provGood-99221575 + goodsAuditBillId: MSP2407030009 + targetId: MSP2407030009_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 9b5aa730b013886cc6fabdadd5180fef344d888e..d18c4bfd4a421cab4cc860a0b6df27acdd925d2c 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407020010_1 + MSPid: MSP2407030010_1 hosId: h0347 - hosGoodsId: h034700004355 - provGoodsid: provGood-99221550 - goodsAuditBillId: MSP2407020010 - targetId: MSP2407020010_1 + hosGoodsId: h034700004381 + provGoodsid: provGood-99221576 + goodsAuditBillId: MSP2407030010 + targetId: MSP2407030010_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 929e9ba6327ce48ab895d75c82f18b6d2ee4d06f..bf008852f3239776fa61be40fe994123f4c90d5a 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2407020011_1 + MSPid: MSP2407030011_1 hosId: h0347 - hosGoodsId: h034700004356 - provGoodsid: provGood-99221551 - goodsAuditBillId: MSP2407020011 - targetId: MSP2407020011_1 + hosGoodsId: h034700004382 + provGoodsid: provGood-99221577 + goodsAuditBillId: MSP2407030011 + targetId: MSP2407030011_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 3dd5bb50179e2f0f0dc80337f26aed8ce4edaadf..cb1ea488453b628aaf813efe196e6b81cb7d0e09 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 96c4ca2199a14150a1cdabff56136aaf - unitPackageid2: 96c4ca2199a14150a1cdabff56136aaf + unitPackageid1: e2411ffda9f44439a3c3eccbd0139a8e + unitPackageid2: e2411ffda9f44439a3c3eccbd0139a8e diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 3b905dfc97c7e9d424e65de2acba1eb359feb3f6..c6b21f5128cd9755cb78c15a34c074a54b24fc2a 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024070231019 - orderNo2: PLAN2024070231019 + orderNo1: PLAN2024070331115 + orderNo2: PLAN2024070331115 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index eb7d516f08095430ea26ecd43c414f0b8955f95f..5c4dc6eae8b240a6d91e5ef7841c470ce0a7530a 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: Ch034720240702000158 - lastModified: '2024-07-02 16:49:14' + - id: Ch034720240703000051 + lastModified: '2024-07-03 07:42:40' version: 0 - createTime: '2024-07-02 16:49:14' - createUser: h0347_UID-051378 + createTime: '2024-07-03 07:42:40' + createUser: h0347_UID-051380 lastModifiedUser: - orderNo: CG2024070220362 + orderNo: CG2024070320422 billMode: '66' recType: HDI hosId: h0347 - branchId: h0347-3712 + branchId: h0347-3714 deptId: deptName: - recOrgId: 08398b8842854e85b738846cbcbb97f7 + recOrgId: b8cbdc0117e8499cb1ccac00cb6166ca recOrgName: 二级检验科002 areaCode: areaName: billExpdtDate: - sourceId: Ph034720240702027666 + sourceId: Ph034720240703027759 sourceType: inSettlement: recUser: recPhone: recAddr: 自动化测试 - provId: p1e2e8 - provName: 国药集团公司kGTpV + provId: p1e2ec + provName: 国药集团公司MPah7 subSendFlag: - exeProvId: p1e2e8 - exeProvName: 国药集团公司kGTpV + exeProvId: p1e2ec + exeProvName: 国药集团公司MPah7 billRelationJson: extInfo: barcodeFlag: 1 @@ -43,11 +43,11 @@ hosVersion: 3 billType: CGD hosName: 邹城市人民医院(test) - branchName: 东土城路院区$!ZNd + branchName: 东土城路院区QJH)# sumQty: 100.0 sumPkgQty: 1.0 sumAmount: '9999.9900' - planOrderNo: PLAN2024070231021 + planOrderNo: PLAN2024070331114 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 2deb8fbdae58d60f980e12dbe342c3c6aaa5f72d..fbe67e762789a1de6853de5bc5f9e498fa9b5997 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: 2cc1941cede74b17af348f0c5be1eaa5 + - id: 0598c819eeb241d1af9ac77b7c0c212a lastModified: version: createTime: createUser: lastModifiedUser: - pid: Ch034720240702000158 - orderNo: CG2024070220362 - sourceId: 418b068872dd4474a0b38b97e15b1778 - hosGoodsId: h034700004354 - mdmGoodsCode: '11661307' - goodsCode: '00004354' + pid: Ch034720240703000051 + orderNo: CG2024070320422 + sourceId: 0c6f3e165de0422882ceff0ca7aec13a + hosGoodsId: h034700004380 + mdmGoodsCode: '11661333' + goodsCode: '00004380' purMode: 60 price: '99.9999' - supplyId: 0f816c0134484a158ea0d09a275c4c0e - pkgDefId: 96c4ca2199a14150a1cdabff56136aaf + supplyId: 52d7233dd2e0439ebf8401ae1a3509f3 + pkgDefId: e2411ffda9f44439a3c3eccbd0139a8e pkgDefName: '100' pkgDefQty: 100.0 pkgQty: 1.0 @@ -31,18 +31,18 @@ notSendPkgQty: 0.0 inSettlement: 1 closeType: 1 - detailRelationJson: '{"planBillId":"Ph034720240702027666","buyDetailId":"Bh034720240702001150001","planDetailId":"418b068872dd4474a0b38b97e15b1778"}' - extInfo: '{"goodsGg":"G-31891","goodsCode":"00004354","purMode":60,"goodsName":"新型冠状病毒检测试剂j(r&Q"}' + detailRelationJson: '{"planBillId":"Ph034720240703027759","buyDetailId":"Bh034720240703000220001","planDetailId":"0c6f3e165de0422882ceff0ca7aec13a"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00004380","purMode":60,"goodsName":"新型冠状病毒检测试剂Gg(sT"}' remark: tbStatus: hosVersion: unit: 支 - goodsName: 新型冠状病毒检测试剂j(r&Q + goodsName: 新型冠状病毒检测试剂Gg(sT mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG goodsGg: G-31891 - mdmGoodsSpecCode: '11661307' - erpCode: '11661307' + mdmGoodsSpecCode: '11661333' + erpCode: '11661333' made: 德国 goodsDi: '01123456789012' miDjmc: @@ -66,14 +66,14 @@ transCond: '' storageCond: '' diType: gs1 - diUse: '37120000043540' + diUse: '37140000043800' multiChargeFlag: 0 useFrequency: 1 chargeUnit: amount: '9999.9900' unitName: 100支/100 - subProvId: p1e2e8 - subProvName: 国药集团公司kGTpV + subProvId: p1e2ec + subProvName: 国药集团公司MPah7 subPrice: 99.9999 replPkgQty: 1.0 replQty: 100.0 diff --git a/report/summary.html b/report/summary.html index ba922307c66cffdbfadb67037a94279f27453e4b..5f92abaa2a92995ba9e2c0c9d8dd9eceb57e68f0 100644 --- a/report/summary.html +++ b/report/summary.html @@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 1 - 1 - 0分50秒 - 100.0% + 0 + 0分37秒 + 0.0% @@ -94,8 +94,8 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 a_b8流程十五退库业务_三级库向二级库退库 - 成功 - 50.064 + 失败 + 37.721 xiaohesheng