diff --git "a/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py" "b/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py" index f85e9bea82423cfb0c31df4f8cdfa7602efb3c45..c0d64220be050792a75a2fc1af8122f2889df4be 100644 --- "a/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py" +++ "b/air_case/b5_spd3_core_business_flow/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.air/a_a7\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2273_\345\206\205\347\275\221\351\252\214\346\224\266\345\205\245\345\272\223\347\273\223\347\256\227.py" @@ -153,12 +153,19 @@ def check_accept_order(type=1): 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 # ==============================查看订单详情================== # ========设置验收全部合格 @@ -193,11 +200,13 @@ def check_accept_order(type=1): 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, viewId, settlement, - recTemperature, recHumidity) + sourceType, tbStatus, createUser, sourceNo, viewId, hosGoodsId,viewId, settlement, + checkQty,distrPkgQty,checkPkgQty,recTemperature, recHumidity) print('request_body', '提交验收单', request_body) # 发送请求 diff --git a/common/db/sql/sql_del_branch_info.py b/common/db/sql/sql_del_branch_info.py index 4cdcbd0427d175815b0c5c8960c98e449cb1deeb..fff2d575e13329764f607c8bed95a96f895d2285 100644 --- a/common/db/sql/sql_del_branch_info.py +++ b/common/db/sql/sql_del_branch_info.py @@ -276,6 +276,7 @@ class delData(object): cursor.close() def Delete_business_Data(self): + # 删除业务数据,包括采购,出入库,结算等 connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2", @@ -344,7 +345,7 @@ class delData(object): cursor.execute("commit;") # 验收单 - sql1 = "delete from mcms_check where branch_id ='%s';"%branch_id + sql1 = "delete from mcms_check where branch_id ='%s';" % branch_id sql2 = "delete from mcms_check_batch where hos_goods_id in('%s','%s','%s')" % ( hosGoodsId1, hosGoodsId2, hosGoodsId3) cursor.execute(sql1) @@ -362,7 +363,7 @@ class delData(object): cursor.execute("commit;") # 单据 sql1 = "delete from mcms_psi where target_branch_id='%s';" % branch_id - sql6="delete from mcms_psi where target_dept_name like '%国药集团公司_____';" + sql6 = "delete from mcms_psi where target_dept_name like '%国药集团公司_____';" sql2 = "delete from mcms_psi_batch where hos_goods_id in('%s','%s','%s');" % ( hosGoodsId1, hosGoodsId2, hosGoodsId3) sql3 = "delete from mcms_psi_dept where target_branch_id='%s';" % branch_id @@ -437,6 +438,7 @@ class delData(object): print('业务数据,包括采购,出入库,结算等数据删除成功') cursor.close() + def Delete_yb_logic_stock(self): connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_platform_test2", @@ -454,12 +456,29 @@ class delData(object): charset="utf8") cursor = connection.cursor() branch_id = FileUtils().r_info8('b2_herp3_bs', "院区新增", 'message')['branch_id'] - sql1 = "delete FROM yb_direct WHERE branch_id ='%s';"%branch_id + sql1 = "delete FROM yb_direct WHERE branch_id ='%s';" % branch_id print(sql1) cursor.execute(sql1) cursor.execute("commit;") print('内网边仓删除成功') cursor.close() + def get_branch_id(self): + # 获取院区数据 + connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2", + charset="utf8") + cursor = connection.cursor() + # 获取库区version + sql = "select id from mcms_branch_info;" + print(sql) + cursor.execute(sql) + results = cursor.fetchall() + for row in results: + print("id:", row[0]) + + # print(new_str1) + print(results) + cursor.close() + # return new_str1 # delData().Delete_branch_by_id() # delData().Delete_goods_change_info() # delData().Delete_sys_config() @@ -469,7 +488,7 @@ class delData(object): # delData().Delete_user() # delData().Del_goods_info(i) # delData().Del_supply_relation() - # delData().Delete_business_Data() # delData().Del_reporter_data() -# delData().Delete_yb_logic_stock() \ No newline at end of file +# delData().Delete_yb_logic_stock() +# delData().get_branch_id() \ No newline at end of file diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message index b6bb1f9820cb0956da3727487e090badc6f9c12e..bffbc196d46fd143d3b52786dcb2ad4532a24d91 100644 --- a/data/a2_mdm3_ea/message +++ b/data/a2_mdm3_ea/message @@ -1,3 +1,3 @@ 企业信息: - e_id: CR202405230077 - cname: 国药集团公司p0t4h + e_id: CR202405240038 + cname: 国药集团公司oJCHn diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message index 9a25ed9b3b22a177a536a611cd7d952eadcae7dd..28c518e047bea5b1471eba6e57c8a669e5617885 100644 --- a/data/a3_mdm3_hs/message +++ b/data/a3_mdm3_hs/message @@ -1,3 +1,3 @@ 医院信息: - h_id: 湖南省人民医院ycaWg - h_name: 湖南省人民医院ycaWg + h_id: 湖南省人民医院#I4Ev + h_name: 湖南省人民医院#I4Ev diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2 index 114ea3a76de57fbafda1412c941ddbb6836b9fcf..b10eaab1f70209bdf3761b1dd0186cac4b86401e 100644 --- a/data/a5_mdm3_pdm/message2 +++ b/data/a5_mdm3_pdm/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405230021_1 + MSPid: MSP2405240010_1 hosId: h0347 - hosGoodsId: h034700003750 - provGoodsid: provGood-99220883 - goodsAuditBillId: MSP2405230021 - targetId: MSP2405230021_1 + hosGoodsId: h034700003765 + provGoodsid: provGood-99220898 + goodsAuditBillId: MSP2405240010 + targetId: MSP2405240010_1 diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message index 4d8bf433500a164ab48eede2b3595a82808c11ad..bf7e65e6d93043d632c64d0333bec6b98d0011fe 100644 --- a/data/b2_herp3_bs/message +++ b/data/b2_herp3_bs/message @@ -1,6 +1,6 @@ 院区新增: - branch_id: h0347-3623 - branch_name: 东土城路院区CU2K! + branch_id: h0347-3627 + branch_name: 东土城路院区WDUvl 科室信息: - dept2_id: ae5633c54a4741c08e1b76d10025ebf5 + dept2_id: 1c14108179f54e28bce5b1df6b33fc57 dept2_name: 二级检验科002 diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3 index f9ad969d3e7c1ea5aae078e51380f2c75ac36c0c..44ff4b36e819e2a8d4e2794b8c0a6af7fadf4c22 100644 --- a/data/b2_herp3_bs/message3 +++ b/data/b2_herp3_bs/message3 @@ -1,3 +1,3 @@ 用户名信息: - username1: 自动化测试tsjSE - username2: 自动化测试tsjSE + username1: 自动化测试3(GIe + username2: 自动化测试3(GIe diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4 index ad5c81bcfd69735b5d50938455023f5eb9a3f8c2..8ec8e952af1549ac41c0987a974aeac251106036 100644 --- a/data/b2_herp3_bs/message4 +++ b/data/b2_herp3_bs/message4 @@ -1,3 +1,3 @@ 一级科室信息: - dept1_id: 550f4768e0f74ccbb706d3afa3d63a59 + dept1_id: f3f1209531c84bddafbe05bd5d6585f0 dept1_name: 设备科001 diff --git a/data/b2_herp3_bs/message5 b/data/b2_herp3_bs/message5 index bcf8a2532d31f46e49dffdfcd391b06e290913f5..82f0fb50fd754cf57357d2f78e39bf4c81e2121d 100644 --- a/data/b2_herp3_bs/message5 +++ b/data/b2_herp3_bs/message5 @@ -1,3 +1,3 @@ 部门和库区信息: - dept1_id: 550f4768e0f74ccbb706d3afa3d63a59 - stockAreaId: c882f4f961c44e0485e136aa21249588 + dept1_id: f3f1209531c84bddafbe05bd5d6585f0 + stockAreaId: ee2b9bb497544e5896ee916ba37449fb diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6 index ab61973a91d282240bc8bc65704bbd9ff40f30cd..2290b7d4fc80077c8058d33535ebc1341afafdeb 100644 --- a/data/b2_herp3_bs/message6 +++ b/data/b2_herp3_bs/message6 @@ -1,8 +1,8 @@ 所有科室id: - deptid1: 550f4768e0f74ccbb706d3afa3d63a59 - deptid2: ae5633c54a4741c08e1b76d10025ebf5 - deptid3: e0ee64931b334b9580c8e5713914acdc - deptid4: b690d4c142d34b8daa90557bd1695326 + deptid1: f3f1209531c84bddafbe05bd5d6585f0 + deptid2: 1c14108179f54e28bce5b1df6b33fc57 + deptid3: f972064d25184d298b82978d807c563d + deptid4: 4226aff73a8d44ab973620a539cc33e9 所有科室name: deptid1: 设备科001 deptid2: 二级检验科002 diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7 index ba99d84d5b3d602847bf1d6526c650aa81fc32c3..3651df326317ad0b20c39395ef3c30764f15ff23 100644 --- a/data/b2_herp3_bs/message7 +++ b/data/b2_herp3_bs/message7 @@ -1,4 +1,4 @@ shelfinfo: - shelfid: c882f4f961c44e0485e136aa21249588 - shelfCode: areah03472030 + shelfid: ee2b9bb497544e5896ee916ba37449fb + shelfCode: areah03472053 areaName: 自动化测试 diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data index 9eb232c05e5902929c96b07e05656930fde33fd8..3cf39184070a6ae06710dc663856fac012dbc765 100644 --- a/data/b5_spd3_core_business_flow/data +++ b/data/b5_spd3_core_business_flow/data @@ -74,7 +74,8 @@ json_headers2: { "payload": {"pageNum": 1,"pageSize":50,"queryObject":{"hosId":"%s","branchId":"%s","sourceOrderNo":"%s","sourceOrgName":"","sourceType":"","taskType":0}} "payload1": {"sourceId":"%s","sourceType":"%s","billMode":"%s","branchId":"%s"} "payload2": {"sourceBillId":"%s","viewIdList":["%s"],"scanStatus":1} -"payload3": {"billMode":"%s","branchId":"%s","checkAll":1,"deptId":"%s","deptName":"%s","hosId":"%s","provId":"%s","provName":"%s","recOrgId":"%s","recOrgName":"%s","resendStatus":null,"rejectReason":null,"sourceId":"%s","sourceVersion":"%s","sourceType":"%s","tbStatus":"%s","createUser":"%s","sourceNo":"%s","sterilizeList":[],"remark":"","rejectFlag":0,"detailList":[{"id":"%s","viewId":"%s","settlement":"%s","checkQty":100,"recTemperature":"%s","recHumidity":"%s"}]} +"payload3": {"billMode":"%s","branchId":"%s","checkAll":1,"deptId":"%s","deptName":"%s","hosId":"%s","provId":"%s","provName":"%s","recOrgId":"%s","recOrgName":"%s","resendStatus":null,"rejectReason":null,"rejectRemark":null,"sourceId":"%s","sourceVersion":"%s","sourceType":"%s","tbStatus":"%s","createUser":"%s","sourceNo":"%s","sterilizeList":[],"remark":"","rejectFlag":0,"detailList":[{"id":"%s","hosGoodsId":"%s","viewId":"%s","settlement":"%s","checkQty":"%s","distrPkgQty":"%s","checkPkgQty":"%s","recTemperature":"%s","recHumidity":"%s"}]} +"payload3_1_bak": {"billMode":"%s","branchId":"%s","checkAll":1,"deptId":"%s","deptName":"%s","hosId":"%s","provId":"%s","provName":"%s","recOrgId":"%s","recOrgName":"%s","resendStatus":null,"rejectReason":null,"sourceId":"%s","sourceVersion":"%s","sourceType":"%s","tbStatus":"%s","createUser":"%s","sourceNo":"%s","sterilizeList":[],"remark":"","rejectFlag":0,"detailList":[{"id":"%s","viewId":"%s","settlement":"%s","checkQty":100,"recTemperature":"%s","recHumidity":"%s"}]} "payload4": {"targetDeptId":"%s","targetAreaCode":"%s","hosId":"%s","sourceId":"%s","sourceType":"%s","pkgTaskId":null} "payload5": {"batchList":[{"viewId":"%s","shelfCode":"%s"}],"sourceId":"%s","sourceType":"%s","sourceVersion":"%s","targetDeptId":"%s","targetDeptName":"%s","targetAreaCode":"%s","targetAreaName":"%s","pkgTaskId":null} "payload6": {"pageNum":1,"pageSize":50,"orderBy":"","queryObject":{"branchId":"%s","taskType":0,"stockKind":"","sourceOrgName":"","hosId":"%s"}} diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message index c25aab3f1d56015332465ca0202a26c31224bfda..89b79b90a2ba6f0a1141d786b1e27f04aa07c2c8 100644 --- a/data/b5_spd3_core_business_flow/message +++ b/data/b5_spd3_core_business_flow/message @@ -1,5 +1,5 @@ 供货关系申请2: - e_corpId: p1e236 + e_corpId: p1e23c h_corpId: h0347 - e_username: 国药集团公司p0t4h + e_username: 国药集团公司oJCHn h_name: test001 diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1 index 515e304536dcfa89b14bb99ca010e991b2ac5644..234a4cf0eaea78443daef552112bc80def199e7c 100644 --- a/data/b5_spd3_core_business_flow/message1 +++ b/data/b5_spd3_core_business_flow/message1 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405230017_1 + MSPid: MSP2405240006_1 hosId: h0347 - hosGoodsId: h034700003746 - provGoodsid: provGood-99220879 - goodsAuditBillId: MSP2405230017 - targetId: MSP2405230017_1 + hosGoodsId: h034700003761 + provGoodsid: provGood-99220894 + goodsAuditBillId: MSP2405240006 + targetId: MSP2405240006_1 diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10 index af6a4044396e38dc3b3dd1cb4f24cc5b69fb9e3c..6ca4beaef4e51513a69ed171d31aeac6b0f42e61 100644 --- a/data/b5_spd3_core_business_flow/message10 +++ b/data/b5_spd3_core_business_flow/message10 @@ -1,12 +1,9 @@ 低值配送单号: - distrBillId1: - distrBillId2: + distrBillId1: PSh0347202405240033 + distrBillId2: PSh0347202405240033 高值配送单号: - distrBillId1: - distrBillId2: + distrBillId1: PSh0347202405240035 + distrBillId2: PSh0347202405240035 试剂配送单号: - distrBillId1: - distrBillId2: -高值跟台配送单号: - distrBillId1: - distrBillId2: + distrBillId1: PSh0347202405240036 + distrBillId2: PSh0347202405240036 diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 77d7527106735401a358f6b28b107a73cdde7f2e..fd10c3174bd455ff8ab4240b84b01b4902623248 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024052323711 - orderNo2: PLAN2024052323711 + orderNo1: PLAN2024052423841 + orderNo2: PLAN2024052423841 diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12 index 886a62ce7b7a15124771558b1c0e59f7c77fbd3b..96068853f25f6c04f7bd22e827982cba04599f85 100644 --- a/data/b5_spd3_core_business_flow/message12 +++ b/data/b5_spd3_core_business_flow/message12 @@ -1,3 +1,3 @@ 采购计划单号试剂: - orderNo1: PLAN2024052323712 - orderNo2: PLAN2024052323712 + orderNo1: PLAN2024052423842 + orderNo2: PLAN2024052423842 diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13 index ceaf6e92d70ceee25152a34713f3d9ca061be2e0..d2610c8c2bc9a561458d34e1baaea862025c027b 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-3616 + branchId: h0347-3627 deptId: taskType: 1 - sourceOrgId: p1e223 - sourceOrgName: 国药集团公司f$F5C - sourceOrderNo: PSh0347202405220014 - billMode: '25' + sourceOrgId: p1e23c + sourceOrgName: 国药集团公司oJCHn + sourceOrderNo: PSh0347202405240036 + billMode: '66' stockKind: purMode: - sourceId: PSh0347202405220014 + sourceId: PSh0347202405240036 sourceDetailId: sourceType: PSD sourceTypeName: 配送单 sourceVersion: 1 - planOrderNo: SSSQ202405220265 - purOrderNo: SSTZ202405220241 - recOrgId: 7aa9a7c18aa1440ba5c88f459c2d17c8 - recOrgName: 二级检验科002 - billRelationJson: '{"operationApplyOrderNo":"SSSQ202405220265","operationNoticeBillId":"Nh034720240522000001","distrBillId":"PSh0347202405220014","operationNoticeOrderNo":"SSTZ202405220241","distrOrderNo":"PSh0347202405220014","operationApplyBillId":"Oh034720240522000001"}' - taskDate: '2024-05-22 07:23:04' + planOrderNo: PLAN2024052423842 + purOrderNo: CG2024052416651 + recOrgId: f3f1209531c84bddafbe05bd5d6585f0 + recOrgName: 设备科001 + billRelationJson: '{"planBillId":"Ph034720240524020487","planOrderNo":"PLAN2024052423842","purOrderNo":"CG2024052416651","purBillId":"Ch034720240524000091","purBillDate":"2024-05-24 + 10:37:52","distrBillId":"PSh0347202405240036","distrOrderNo":"PSh0347202405240036"}' + taskDate: '2024-05-24 10:38:08' taskDateStart: taskDateEnd: billModeList: viewIdList: supplierFlag: false 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 463a7a8aabaedfa2b6736b723b4d635f60bbf9dc..4fda07a3ca990e86007f8b89709fee3c68fff12e 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: h034700003680 + - purMode: 60 + unitName: 100支/100 + hosGoodsId: h034700003763 mdmGoodsCode: - spdGoodsCode: '11660572' - goodsCode: '00003680' - goodsName: 高值牙钻机(0rN$ + spdGoodsCode: '11660655' + goodsCode: '00003763' + goodsName: 新型冠状病毒检测试剂JO67D 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-11-28' - productDate: '2024-05-22' - provName: 国药集团公司f$F5C + pkgDefName: '100' + pkgDefQty: 100.0 + batchCode: '4444' + expdtDate: '2024-11-30' + productDate: '2024-05-24' + provName: 国药集团公司oJCHn provId: - viewId: '03837545' + viewId: '03837648' verifyFlag: 0 hasSterilize: 0 - id: '03837545' + id: '03837648' detailRelationJson: - extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00003763","purMode":60,"goodsName":"新型冠状病毒检测试剂JO67D","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660655","ybDefId":""}' recTemperature: 20 recHumidity: 30 distrPrice: 99.9999 - distrPkgQty: 1.0 - distrQty: 1.0 + distrPkgQty: 100.0 + distrQty: 10000.0 price: 99.9999 checkQty: 0.0 checkPkgQty: 0 @@ -44,7 +44,7 @@ initQty: totalQty: rowNum: - settlement: 3 + settlement: 1 hdiBarcodeList: detailId: pkgCode: @@ -55,7 +55,7 @@ trustMrfsName: multiChargeFlag: 0 useFrequency: 1 - codingType: 0 + codingType: list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15 index a77dc38045dd5e438be817d7dc5b912f2763b4de..4e7f5377d59a4a13e73af36505993520d910bec2 100644 --- a/data/b5_spd3_core_business_flow/message15 +++ b/data/b5_spd3_core_business_flow/message15 @@ -1,3 +1,3 @@ 验收单号: - CHECK_NO1: CHECKh03472024052200007 - CHECK_NO2: CHECKh03472024052200007 + CHECK_NO1: CHECKh03472024052400324 + CHECK_NO2: CHECKh03472024052400324 diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16 index 310ae9a90ad6165e7d87906889caf474ed12ba31..e32f530491c29106d9296753fe6571a053fbcf87 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: CHECKh03472024052200004 + sourceId: CHECKh03472024052400322 sourceType: PSD sourceVersion: 0 batchList: billRelationJson: hosId: h0347 - deptId: 9b15c86f70a64f2ab83e207bde345419 + deptId: f3f1209531c84bddafbe05bd5d6585f0 deptName: - branchId: h0347-3616 + branchId: h0347-3627 branchName: taskType: 1 - sourceOrgId: p1e223 - sourceOrgName: 国药集团公司f$F5C - sourceOrderNo: YS240522004 - taskSourceNo: PSh0347202405220005 - areaCode: areah03471987 + sourceOrgId: p1e23c + sourceOrgName: 国药集团公司oJCHn + sourceOrderNo: YS240524322 + taskSourceNo: PSh0347202405240027 + areaCode: areah03472053 areaName: 自动化测试 goodsName: goodsGg: startDate: endDate: - taskDate: '2024-05-22 07:11:35' + taskDate: '2024-05-24 10:33:15' pkgTaskId: pkgFlag: remark: '' @@ -52,6 +52,111 @@ oldDeptName: oldOrderNo: allowRejectFlag: + targetCodingType: 0 + - id: + lastModified: + version: + createTime: + createUser: + lastModifiedUser: + billMode: '16' + recType: + stockKind: + purMode: + sourceId: CHECKh03472024052400321 + sourceType: PSD + sourceVersion: 0 + batchList: + billRelationJson: + hosId: h0347 + deptId: f3f1209531c84bddafbe05bd5d6585f0 + deptName: + branchId: h0347-3627 + branchName: + taskType: 1 + sourceOrgId: p1e23c + sourceOrgName: 国药集团公司oJCHn + sourceOrderNo: YS240524321 + taskSourceNo: PSh0347202405240023 + areaCode: areah03472053 + areaName: 自动化测试 + goodsName: + goodsGg: + startDate: + endDate: + taskDate: '2024-05-24 10:20:24' + pkgTaskId: + pkgFlag: + remark: '' + goodsSpec: + areaList: + areaDefaultFlag: + excludeDeptIds: + deptIds: + sourceReplId: + defaultAreaCode: + defaultAreaName: + sourceNo: + distrOrderNo: + deptBuyer: + stockName: + dataDeptIds: + oldDeptName: + oldOrderNo: + allowRejectFlag: + targetCodingType: 0 + - id: + lastModified: + version: + createTime: + createUser: + lastModifiedUser: + billMode: '20' + recType: + stockKind: + purMode: + sourceId: CHECKh03472024052400273 + sourceType: PSD + sourceVersion: 0 + batchList: + billRelationJson: + hosId: h0347 + deptId: f3f1209531c84bddafbe05bd5d6585f0 + deptName: + branchId: h0347-3627 + branchName: + taskType: 1 + sourceOrgId: p1e23c + sourceOrgName: 国药集团公司oJCHn + sourceOrderNo: YS240524273 + taskSourceNo: PSh0347202405240016 + areaCode: areah03472053 + areaName: 自动化测试 + goodsName: + goodsGg: + startDate: + endDate: + taskDate: '2024-05-24 10:02:25' + pkgTaskId: + pkgFlag: + remark: '' + goodsSpec: + areaList: + areaDefaultFlag: + excludeDeptIds: + deptIds: + sourceReplId: + defaultAreaCode: + defaultAreaName: + sourceNo: + distrOrderNo: + deptBuyer: + stockName: + dataDeptIds: + oldDeptName: + oldOrderNo: + allowRejectFlag: + targetCodingType: 0 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17 index 9106fe4f07333b47ebd7ecd0a2292ff7c59d3198..8574c7e99cc76e3f3e62f56da48ccc06aeab5637 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: CHECKh034720240522000040001 + - id: CHECKh034720240524003220001 lastModified: version: createTime: @@ -10,27 +10,27 @@ rowIdx: purMode: 10 unitName: 100支/100 - pid: CHECKh03472024052200004 - hosGoodsId: h034700003681 + pid: CHECKh03472024052400322 + hosGoodsId: h034700003762 batchCode: '333' - expdtDate: '2024-11-28' - productDate: '2024-05-22' + expdtDate: '2024-11-30' + productDate: '2024-05-24' batchPrice: 99.9999 settlement: 1 batchType: 20 - srcBatchId: '03837536' + srcBatchId: '03837639' srcBatchPrice: 99.9999 - shelfCode: areah03471987-2-01-01 + shelfCode: areah03472053-2-01-01 shelfKind: - barcodeId: UT240522000201 + barcodeId: UT240524000901 subBarcodeId: qty: 10000.0 pkgQty: 100 - distrId: PSh0347202405220005 - distrDetailId: '03837536' + distrId: PSh0347202405240027 + distrDetailId: '03837639' pkgDefQty: 100.0 pkgDefName: '100' - viewId: h0347000036813332024-11-28100支/100 + viewId: h0347000037623332024-11-30100支/100 codingType: batchFlag: hasSterilize: 0 @@ -38,31 +38,31 @@ sterilizePassQty: sterilizeRejectQty: orderNo: - sourceDetailId: '03837536' - mdmGoodsCode: '11660573' - goodsCode: '00003681' + sourceDetailId: '03837639' + mdmGoodsCode: '11660654' + goodsCode: '00003762' tbStatus: 1 billMode: '16' hosId: h0347 - branchId: h0347-3616 - purBillId: Ch034720240522000046 - provId: p1e223 - provName: 国药集团公司f$F5C + branchId: h0347-3627 + purBillId: Ch034720240524000065 + provId: p1e23c + provName: 国药集团公司oJCHn subSendFlag: 10 - exeProvId: p1e223 - exeProvName: 国药集团公司f$F5C - purDetailId: aa65a35933a94bcb8637db868b06f3c6 - goodsName: 一次性注射器_低值@s2rQ + exeProvId: p1e23c + exeProvName: 国药集团公司oJCHn + purDetailId: 188774e4698143e093c93a44508f4219 + goodsName: 一次性注射器_低值(GH)x goodsGg: G-31891 mfrsId: mfrs-11229 mfrsName: 德国歌德公司 Geuder AG made: 德国 unit: 支 purPrice: 99.9999 - pkgDefId: 3bb922f9c8084ade9a4bcfd5ae891dff - supplyId: 7e0c480dcd6441c2b945b77806c97050 - subProvId: p1e223 - subProvName: 国药集团公司f$F5C + pkgDefId: 088c5c85bcce4e13819302c37470253e + supplyId: cee60bfbae36451baddaeb710869bc05 + subProvId: p1e23c + subProvName: 国药集团公司oJCHn subPrice: 99.9999 distrPrice: 99.9999 distrPkgQty: 100.0 @@ -74,13 +74,13 @@ psiPrice: 99.9999 ext: goodsGg: G-31891 - goodsCode: '00003681' + goodsCode: '00003762' purMode: 10 - goodsName: 一次性注射器_低值@s2rQ + goodsName: 一次性注射器_低值(GH)x ygptCode: '' transCond: '' storageCond: '' - erpCode: '11660573' + erpCode: '11660654' ybDefId: '' purTaskId: multiChargeFlag: diff --git a/data/b5_spd3_core_business_flow/message2 b/data/b5_spd3_core_business_flow/message2 index 3484ec27f9948cf1ea84a7e7deede1d9b42ffcfa..18b0ba4e1e4f543c33e987168e135bae4c8a1362 100644 --- a/data/b5_spd3_core_business_flow/message2 +++ b/data/b5_spd3_core_business_flow/message2 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405230018_1 + MSPid: MSP2405240007_1 hosId: h0347 - hosGoodsId: h034700003747 - provGoodsid: provGood-99220880 - goodsAuditBillId: MSP2405230018 - targetId: MSP2405230018_1 + hosGoodsId: h034700003762 + provGoodsid: provGood-99220895 + goodsAuditBillId: MSP2405240007 + targetId: MSP2405240007_1 diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3 index af602410b2aa9e9770a1c6f3f26be03a50207704..a7e8e7a1ff5319ecb57f0c08b390bd7637fe8af5 100644 --- a/data/b5_spd3_core_business_flow/message3 +++ b/data/b5_spd3_core_business_flow/message3 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405230019_1 + MSPid: MSP2405240008_1 hosId: h0347 - hosGoodsId: h034700003748 - provGoodsid: provGood-99220881 - goodsAuditBillId: MSP2405230019 - targetId: MSP2405230019_1 + hosGoodsId: h034700003763 + provGoodsid: provGood-99220896 + goodsAuditBillId: MSP2405240008 + targetId: MSP2405240008_1 diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4 index 436c5aae345df1c39b58f2729d6dae3fdc7f2401..6bc7e3dac1926372afcfc4acee0d9b599cb07937 100644 --- a/data/b5_spd3_core_business_flow/message4 +++ b/data/b5_spd3_core_business_flow/message4 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405230020_1 + MSPid: MSP2405240009_1 hosId: h0347 - hosGoodsId: h034700003749 - provGoodsid: provGood-99220882 - goodsAuditBillId: MSP2405230020 - targetId: MSP2405230020_1 + hosGoodsId: h034700003764 + provGoodsid: provGood-99220897 + goodsAuditBillId: MSP2405240009 + targetId: MSP2405240009_1 diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5 index 114ea3a76de57fbafda1412c941ddbb6836b9fcf..b10eaab1f70209bdf3761b1dd0186cac4b86401e 100644 --- a/data/b5_spd3_core_business_flow/message5 +++ b/data/b5_spd3_core_business_flow/message5 @@ -1,7 +1,7 @@ 产品审核信息: - MSPid: MSP2405230021_1 + MSPid: MSP2405240010_1 hosId: h0347 - hosGoodsId: h034700003750 - provGoodsid: provGood-99220883 - goodsAuditBillId: MSP2405230021 - targetId: MSP2405230021_1 + hosGoodsId: h034700003765 + provGoodsid: provGood-99220898 + goodsAuditBillId: MSP2405240010 + targetId: MSP2405240010_1 diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6 index 539f7418cd22fb245669203da9de2074971c0fac..63c27e117618ee5ea1d2a7e02ef611a5d36d22b5 100644 --- a/data/b5_spd3_core_business_flow/message6 +++ b/data/b5_spd3_core_business_flow/message6 @@ -1,3 +1,3 @@ 产品包装信息: - unitPackageid1: 34d51b55c8434b6ea91f694bc70fc67c - unitPackageid2: 34d51b55c8434b6ea91f694bc70fc67c + unitPackageid1: c45825629a4947f09e489ad172d82c94 + unitPackageid2: c45825629a4947f09e489ad172d82c94 diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7 index 296ba67a4c82936aa1d9847f20c5d8fb7055ae47..1b5fe062c3971f3131c9a62fd54339c3763ba5cb 100644 --- a/data/b5_spd3_core_business_flow/message7 +++ b/data/b5_spd3_core_business_flow/message7 @@ -1,3 +1,3 @@ 采购计划单号: - orderNo1: PLAN2024052323710 - orderNo2: PLAN2024052323710 + orderNo1: PLAN2024052423840 + orderNo2: PLAN2024052423840 diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8 index 9445c89198e53814d8e7a671d831ede6caf01fb1..9fec1f3a593515f9ce95e7dee8d02d2e211e1c63 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: Nh034720240523000002 - orderNo: SSTZ202405230245 - sourceOrderNo: SSSQ202405230269 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区VEo6Z - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-05-24' - operDoctor: 李* - patientName: 张* - status: 10 - statusText: 待确认 + - id: Ch034720240524000091 + lastModified: '2024-05-24 10:37:52' version: 0 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试SDUov - distPriority: 0 - distPriorityText: - distId: - distNo: + createTime: '2024-05-24 10:37:52' + createUser: h0347_UID-051288 + lastModifiedUser: + orderNo: CG2024052416651 + billMode: '66' + recType: YND + hosId: h0347 + branchId: h0347-3627 + deptId: + deptName: + recOrgId: f3f1209531c84bddafbe05bd5d6585f0 + recOrgName: 设备科001 + areaCode: + areaName: + billExpdtDate: + sourceId: Ph034720240524020487 + sourceType: + inSettlement: + recUser: + recPhone: + recAddr: 自动化测试 + provId: p1e23c + provName: 国药集团公司oJCHn + subSendFlag: + exeProvId: p1e23c + exeProvName: 国药集团公司oJCHn + billRelationJson: + extInfo: + barcodeFlag: 1 + pkgFlag: + remark: '' + priority: + closeStatus: 0 + closeDate: + upStatus: + tbStatus: 30 hosVersion: 3 - createTime: '2024-05-23 10:59:02' - sumQty: - sumAmount: - operationPkg: 0 - provId: p1e236 - provName: 国药集团公司p0t4h - subProvId: '' - subProvName: '' - recDeptId: 9eec5df64b514a65a35ad6d4b5b875f0 + billType: CGD + hosName: 邹城市人民医院(test) + branchName: 东土城路院区WDUvl + sumQty: 10000.0 + sumPkgQty: 100.0 + sumAmount: '999999.0000' + planOrderNo: PLAN2024052423842 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9 index 9c7f7e7f3f90ddeeb37f076f6c83729fdf748b24..014b87346ec924ffcd78f8b9de262a4f1c4f6c2e 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: Nh034720240523000002 - orderNo: SSTZ202405230245 - sourceOrderNo: SSSQ202405230269 - hosId: h0347 - hosName: 邹城市人民医院(test) - branchName: 东土城路院区VEo6Z - recDeptName: 二级检验科002 - operName: 血管扩张术 - operDate: '2024-05-24' - operDoctor: 李* - patientName: 张* - status: 20 - statusText: 待配送 - version: 1 - patientInHosId: '123456' - surDeptName: '' - remark: 自动化测试 - createUserName: 自动化测试SDUov - distPriority: 0 - distPriorityText: 否 - distId: - distNo: - hosVersion: 3 - createTime: '2024-05-23 10:59:02' - sumQty: 1 - sumAmount: '99.9999' - operationPkg: 0 - provId: p1e236 - provName: 国药集团公司p0t4h - subProvId: '' - subProvName: '' - recDeptId: 9eec5df64b514a65a35ad6d4b5b875f0 - list_b: - - *id001 - list_c: - - *id001 -配送订单详细信息2: - list_a: - - &id001 - - id: h034720240523000002 - hosGoodsId: h034700003746 - goodsNum: 1 + - id: eb232b6179aa4d679172d5082d1f6dee + lastModified: + version: + createTime: + createUser: + lastModifiedUser: + pid: Ch034720240524000091 + orderNo: CG2024052416651 + sourceId: b905a7b30fae47a18a54d8be4ae2c54b + hosGoodsId: h034700003763 + mdmGoodsCode: '11660655' + goodsCode: '00003763' + purMode: 60 price: '99.9999' - inSettlement: 3 - inSettlementText: 消耗结算 - goodsName: - goodsSpec: - goodsCode: - goodsMfrsId: - goodsMfrsName: - unit: - subProvId: p1e236 - subProvName: 国药集团公司p0t4h - totalAmount: '99.9999' - spdGoodsCode: - barCodeMng: - erpCode: - multiChargeFlag: - useFrequency: - chargeUnit: - hitCode: - hitPrice: - diUse: + supplyId: 65f6a25c1ea64e48966e89c40d1ddec0 + pkgDefId: c45825629a4947f09e489ad172d82c94 + pkgDefName: '100' + pkgDefQty: 100.0 + pkgQty: 100.0 + qty: 10000.0 + conPkgQty: 100.0 + conQty: 10000.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":"Ph034720240524020487","planDetailId":"b905a7b30fae47a18a54d8be4ae2c54b"}' + extInfo: '{"goodsGg":"G-31891","goodsCode":"00003763","purMode":60,"goodsName":"新型冠状病毒检测试剂JO67D"}' + remark: + tbStatus: + hosVersion: + unit: 支 + goodsName: 新型冠状病毒检测试剂JO67D + mfrsId: mfrs-11229 + mfrsName: 德国歌德公司 Geuder AG + goodsGg: G-31891 + mdmGoodsSpecCode: '11660655' + erpCode: '11660655' + 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: '36270000037630' + multiChargeFlag: 0 + useFrequency: 1 + chargeUnit: + amount: '999999.0000' + unitName: 100支/100 + subProvId: p1e23c + subProvName: 国药集团公司oJCHn + subPrice: 99.9999 + replPkgQty: 100.0 + replQty: 10000.0 + ybDefId: + logicId: + provGoodsId: + sendFlag: + curQry: list_b: - *id001 list_c: diff --git a/report/summary.html b/report/summary.html index 8fd1aea16f1e58d62c5e4a1792792500151582c7..b3c2db98ce3f4f5fec111e977966952212c73320 100644 --- a/report/summary.html +++ b/report/summary.html @@ -56,7 +56,7 @@