流程二脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_a1_流程一外网企业注册审批_数据库验证.air/a_a1_流程一外网企业注册审批_数据库验证.py

@@ -23,8 +23,11 @@ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a1_流程一
 using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air')
 from a_a1_流程一外网企业注册审批 import test1
 
-try:
+def main():
     test1()
+
+try:
+    main()
     commonFuc().check_text_exist_result_text('succees','succees')
 except:
-    commonFuc().check_text_exist_result_text('error','succees')
+    commonFuc().check_text_exist_result_text('error','succees')
\ No newline at end of file

air_case/b6_spd3_core_business_flow_database_check/execute.air/execute.py

+# -*- encoding=utf8 -*-
+import json
+import traceback
+
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+from air_case.public1.public1.public1 import *
+from common.db.sql.sql_del_branch_info import delData
+
+from common.fileUtls import FileUtils
+from common.run_cmd_script import execute_command
+from common.timeUtils import timeUtils
+from airtest.core.api import using
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,id2303-22,sit,on
+python runner_test.py tag id2303-22 debug mdm3
+"""
+pro_path = commonFuc().get_pro_path2()
+
+
+# print('pro_path', pro_path)
+def flow1():
+    # ==================调用流程一开始
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a1_流程一外网企业注册审批_数据库验证.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a1_流程一外网企业注册审批_数据库验证.air')
+    from a_a1_流程一外网企业注册审批_数据库验证 import main
+    main()
+# ==================调用流程一结束
+def flow2():
+    # ==================调用流程二开始
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a2_流程二供货关系申请提交审批.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a2_流程二供货关系申请提交审批.air')
+    from a_a2_流程二供货关系申请提交审批 import main
+    main()
+# ==================调用流程二结束
+def flow3():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a3_流程三_产品导入和审批.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a3_流程三_产品导入和审批.air')
+    from a_a3_流程三_产品导入和审批 import main
+    main()
+def flow4():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a4_流程四_基础模块设置.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a4_流程四_基础模块设置.air')
+    from a_a4_流程四_基础模块设置 import main
+    main()
+
+
+def flow5():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air')
+    from a_a5流程五_中心库入库结算_正结算1_提交采购计划 import main
+    main()
+def flow6():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a6流程五_中心库入库结算_正结算2_外网配送.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a6流程五_中心库入库结算_正结算2_外网配送.air')
+    from a_a6流程五_中心库入库结算_正结算2_外网配送 import main
+    main()
+
+def flow7():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
+    from a_a7流程五_中心库入库结算_正结算3_内网验收入库结算 import main
+    main()
+
+def flow8():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a8流程五_中心库入库结算_正结算3_外网开票.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a8流程五_中心库入库结算_正结算3_外网开票.air')
+    from a_a8流程五_中心库入库结算_正结算3_外网开票 import main
+    main()
+def flow9():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_a9流程六_中心库入库结算_负结算.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_a9流程六_中心库入库结算_负结算.air')
+    from a_a9流程六_中心库入库结算_负结算 import main
+    main()
+def flow10():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b0流程七_中心库入库结算_正负结算.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b0流程七_中心库入库结算_正负结算.air')
+    from a_b0流程七_中心库入库结算_正负结算 import main
+    main()
+def flow11():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b1流程八_高值跟台业务流程.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b1流程八_高值跟台业务流程.air')
+    from a_b1流程八_高值跟台业务流程 import main
+    main()
+def flow12():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b2流程九请领业务流_二级库向中心库.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b2流程九请领业务流_二级库向中心库.air')
+    from a_b2流程九请领业务流_二级库向中心库 import main
+    main()
+def flow13():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b3流程十请领业务流_二级库向边仓.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b3流程十请领业务流_二级库向边仓.air')
+    from a_b3流程十请领业务流_二级库向边仓 import main
+    main()
+
+
+def flow14():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送.air')
+    from a_b4流程十一请领业务流_二级库向直送 import main
+    main()
+
+
+def flow15():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b5流程十二请领业务流_二级库向二级库.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b5流程十二请领业务流_二级库向二级库.air')
+    from a_b5流程十二请领业务流_二级库向二级库 import main
+    main()
+
+
+def flow16():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b6流程十三请领业务流_三级库向二级库.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b6流程十三请领业务流_三级库向二级库.air')
+    from a_b6流程十三请领业务流_三级库向二级库 import main
+    main()
+
+
+def flow17():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b7流程十四退库业务_消耗退库.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b7流程十四退库业务_消耗退库.air')
+    from a_b7流程十四退库业务_消耗退库 import main
+    main()
+
+
+def flow18():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b8流程十五退库业务_三级库向二级库退库.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b8流程十五退库业务_三级库向二级库退库.air')
+    from a_b8流程十五退库业务_三级库向二级库退库 import main
+    main()
+
+
+def flow19():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_b9流程十六退库业务_二级库向一级库退库.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_b9流程十六退库业务_二级库向一级库退库.air')
+    from a_b9流程十六退库业务_二级库向一级库退库 import main
+    main()
+
+
+def flow20():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_c0流程十七退货业务_中心库退供应商.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_c0流程十七退货业务_中心库退供应商.air')
+    from a_c0流程十七退货业务_中心库退供应商 import main
+    main()
+
+
+def flow21():
+    sys.path.append(pro_path + r'/air_case/b6_spd3_core_business_flow_database_check/a_c1流程十八中心库业务_拆包功能.air')
+    using(pro_path + r'//air_case/b6_spd3_core_business_flow_database_check/a_c1流程十八中心库业务_拆包功能.air')
+    from a_c1流程十八中心库业务_拆包功能 import main
+    main()
+
+
+# try:
+#     flow1()
+#     flow2()
+#     flow3()
+#     flow4()
+#     flow5()
+#     flow6()
+#     flow7()
+#     flow8()
+#     flow9()
+#     flow10()
+#     flow11()
+#     flow12()
+#     flow13()
+#     flow14()
+#     flow15()
+#     flow16()
+#     flow17()
+#     flow18()
+#     flow19()
+#     flow20()
+#     flow21()
+#
+#     commonFuc().check_text_exist_result_text('succees', 'succees')
+# except:
+#     commonFuc().check_text_exist_result_text('error', 'succees')

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202411050093
-  cname: 国药集团公司C9U^w
+  e_id: CR202411050123
+  cname: 国药集团公司PmXHC

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院qKD8i
-  h_name: 湖南省人民医院qKD8i
+  h_id: 湖南省人民医院C4@WF
+  h_name: 湖南省人民医院C4@WF

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2410310026_1
+  MSPid: MSP2411050026_1
   hosId: h0347
-  hosGoodsId: h034700005764
-  provGoodsid: provGood-99223075
-  goodsAuditBillId: MSP2410310026
-  targetId: MSP2410310026_1
+  hosGoodsId: h034700005854
+  provGoodsid: provGood-99223165
+  goodsAuditBillId: MSP2411050026
+  targetId: MSP2411050026_1

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3753
-  branch_name: 东土城路院区sp$9*
+  branch_id: h0347-3766
+  branch_name: 东土城路院区Tr0*&
 科室信息:
-  dept2_id: 4e47f180e69f4fb88a79fc4b2d211635
+  dept2_id: ada56899acf048d8bf2173b34cd29ece
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试v&gPa
-  username2: 自动化测试v&gPa
+  username1: 自动化测试DTfIQ
+  username2: 自动化测试DTfIQ

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: e336188c385b4a06ab5faf019ace76d1
+  dept1_id: 8dbbd8d215ae489792079befc60ab904
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: e336188c385b4a06ab5faf019ace76d1
-  deptid2: 4e47f180e69f4fb88a79fc4b2d211635
-  deptid3: 02cf414884c44df9bb26226383956e2f
-  deptid4: 5cb698bce4864bf8a2613395123a51de
-  deptid5: a91ffd8a0f19405cad4a39216acb3db7
+  deptid1: 8dbbd8d215ae489792079befc60ab904
+  deptid2: ada56899acf048d8bf2173b34cd29ece
+  deptid3: 868255a47d62495b9ec6c70c9c70ab8d
+  deptid4: 8d37bfa8c8584fe897659cdfe436e8d3
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002
   deptid3: 三级检测组003
   deptid4: 科室004
-  deptid5: 二级科室005

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: c0ee1024d14e469d9dcb8d80e774b31d
-  shelfCode: areah03472600
+  shelfid: 7e2d4d3dc3094d5baf949c0b2c413f99
+  shelfCode: areah03472662
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e4f5
+  e_corpId: p1e4f6
   h_corpId: h0347
-  e_username: 国药集团公司C9U^w
+  e_username: 国药集团公司Mmh4l
   h_name: test_1

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2410310022_1
+  MSPid: MSP2411050022_1
   hosId: h0347
-  hosGoodsId: h034700005760
-  provGoodsid: provGood-99223071
-  goodsAuditBillId: MSP2410310022
-  targetId: MSP2410310022_1
+  hosGoodsId: h034700005850
+  provGoodsid: provGood-99223161
+  goodsAuditBillId: MSP2411050022
+  targetId: MSP2411050022_1

data/b5_spd3_core_business_flow/message2

 产品审核信息:
-  MSPid: MSP2410310023_1
+  MSPid: MSP2411050023_1
   hosId: h0347
-  hosGoodsId: h034700005761
-  provGoodsid: provGood-99223072
-  goodsAuditBillId: MSP2410310023
-  targetId: MSP2410310023_1
+  hosGoodsId: h034700005851
+  provGoodsid: provGood-99223162
+  goodsAuditBillId: MSP2411050023
+  targetId: MSP2411050023_1

data/b5_spd3_core_business_flow/message3

 产品审核信息:
-  MSPid: MSP2410310024_1
+  MSPid: MSP2411050024_1
   hosId: h0347
-  hosGoodsId: h034700005762
-  provGoodsid: provGood-99223073
-  goodsAuditBillId: MSP2410310024
-  targetId: MSP2410310024_1
+  hosGoodsId: h034700005852
+  provGoodsid: provGood-99223163
+  goodsAuditBillId: MSP2411050024
+  targetId: MSP2411050024_1

data/b5_spd3_core_business_flow/message4

 产品审核信息:
-  MSPid: MSP2410310025_1
+  MSPid: MSP2411050025_1
   hosId: h0347
-  hosGoodsId: h034700005763
-  provGoodsid: provGood-99223074
-  goodsAuditBillId: MSP2410310025
-  targetId: MSP2410310025_1
+  hosGoodsId: h034700005853
+  provGoodsid: provGood-99223164
+  goodsAuditBillId: MSP2411050025
+  targetId: MSP2411050025_1

data/b5_spd3_core_business_flow/message5

 产品审核信息:
-  MSPid: MSP2410310026_1
+  MSPid: MSP2411050026_1
   hosId: h0347
-  hosGoodsId: h034700005764
-  provGoodsid: provGood-99223075
-  goodsAuditBillId: MSP2410310026
-  targetId: MSP2410310026_1
+  hosGoodsId: h034700005854
+  provGoodsid: provGood-99223165
+  goodsAuditBillId: MSP2411050026
+  targetId: MSP2411050026_1

data/b6_spd3_core_business_flow_database_check/data

@@ -524,11 +524,11 @@
 
 
 #检查产品信息表数据_审批后
-"check_mcms_goods_info_after_approval1": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "牙钻机", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "0", "pur_mode": 20, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
-"check_mcms_goods_info_after_approval2": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
-"check_mcms_goods_info_after_approval3": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "检测试剂", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "0", "pur_mode": 60, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
-"check_mcms_goods_info_after_approval4": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
-"check_mcms_goods_info_after_approval5": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 "}'
+"check_mcms_goods_info_after_approval1": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "牙钻机", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "0", "pur_mode": 20, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 ","bid_code":null,"goods_check_status":30,"goods_check_user":null,"goods_check_msg":null}'
+"check_mcms_goods_info_after_approval2": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 ","bid_code":null,"goods_check_status":30,"goods_check_user":null,"goods_check_msg":null}'
+"check_mcms_goods_info_after_approval3": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "检测试剂", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "0", "pur_mode": 60, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 ","bid_code":null,"goods_check_status":30,"goods_check_user":null,"goods_check_msg":null}'
+"check_mcms_goods_info_after_approval4": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 ","bid_code":null,"goods_check_status":30,"goods_check_user":null,"goods_check_msg":null}'
+"check_mcms_goods_info_after_approval5": '{"id": "%s", "hos_goods_code": "%s", "hos_id": "%s", "prov_id": "%s", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "%s", "mdm_goods_spec_code": "%s", "spd_goods_code": "%s", "goods_name": "%s", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "%s", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s, "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None, "remark": "无 ","bid_code":null,"goods_check_status":30,"goods_check_user":null,"goods_check_msg":null}'
 
 #检查供应关系表
 "check_supply_relation": '{"id": "%s", "hos_id": "%s", "prov_id": "%s", "sub_prov_id": "%s", "client_type": "1", "invitation_code": None, "contact_way": "%s", "contact_user": "%s", "tb_status": 20, "active_flag": "1", "auditor": "%s", "audit_time": %s, "audit_comment": None, "version": 1, "create_user": "GYQX-SPD:user-19669", "create_time": %s, "last_modified_user": "h0347:UID-042066", "last_modified": %s}'

report/summary.html

@@ -75,9 +75,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
 
         <tr width="600">
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分8秒</td>
+            <td class='details-col-elapsed'>5</td>
+            <td class='details-col-elapsed'>5</td>
+            <td class='details-col-elapsed'>0分3秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,9 +93,37 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
+            <td class="details-col-elapsed"><a href='../log/医院注册_正常注册_私立医院/log.html' target='_blank'>医院注册_正常注册_私立医院</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">8.296</td>
+            <td class="details-col-elapsed">0.349</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/医院注册_注册时医院已存在/log.html' target='_blank'>医院注册_注册时医院已存在</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">0.443</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/医院注册正常注册公立医院/log.html' target='_blank'>医院注册正常注册公立医院</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">0.327</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/注册医院审核通过/log.html' target='_blank'>注册医院审核通过</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">1.543</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/注册医院审核驳回/log.html' target='_blank'>注册医院审核驳回</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">1.077</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>