diff --git "a/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py" "b/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py"
index d890f2c12955f0d3813191e7f2f5b910e8195279..203fa48d003ea16b80ffafd74bea41f7071a5952 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py"
@@ -25,8 +25,11 @@ def test1():
execute_command("python runner_test.py tag id2248 debug mdm3")
#医院注册审核
execute_command("python runner_test.py tag id2249 debug mdm3")
-try:
- test1()
- commonFuc().check_text_exist_result_text('succees','succees')
-except:
- commonFuc().check_text_exist_result_text('error','succees')
+def main():
+ try:
+ test1()
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', 'succees')
+
+# main()
\ No newline at end of file
diff --git "a/air_case/b5_spd3_core_business_flow/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.air/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.py" "b/air_case/b5_spd3_core_business_flow/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.air/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.py"
index ba221d86939ede1895ed062d012ccf6d1caee2b5..3373754d09bda677c92495642b090117db256bc3 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.air/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.air/a_a2_\346\265\201\347\250\213\344\272\214\344\276\233\350\264\247\345\205\263\347\263\273\347\224\263\350\257\267\346\217\220\344\272\244\345\256\241\346\211\271.py"
@@ -164,15 +164,18 @@ def supply_and_marketing_apply2():
e_corpId=corpId
e_username=username
return e_corpId,h_corpId,e_username,h_name
-try:
- h_login()#医院登录
- e_login(1)#企业登录
- #供应关系申请-客户类型医院
- FileUtils().w_info1(supply_and_marketing_apply(), module, '供货关系申请')
- submitSupplyRelation_pass()
- #供应关系申请-客户类型厂商
- FileUtils().w_info1(supply_and_marketing_apply2(), module, '供货关系申请2')
- submitSupplyRelation_pass()
- commonFuc().check_text_exist_result_text('succees','succees')
-except:
- print('a_a2_流程二供货关系申请提交审批,出现异常,请检查')
\ No newline at end of file
+def main():
+ try:
+ h_login()#医院登录
+ e_login(1)#企业登录
+ #供应关系申请-客户类型医院
+ FileUtils().w_info1(supply_and_marketing_apply(), module, '供货关系申请')
+ submitSupplyRelation_pass()
+ #供应关系申请-客户类型厂商
+ FileUtils().w_info1(supply_and_marketing_apply2(), module, '供货关系申请2')
+ submitSupplyRelation_pass()
+ commonFuc().check_text_exist_result_text('succees','succees')
+ print('流程二结束')
+ except:
+ print('a_a2_流程二供货关系申请提交审批,出现异常,请检查')
+# main()
\ No newline at end of file
diff --git "a/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py" "b/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py"
index 460c31028087d351d45c43351517b2a9fb27fa3a..d47357c5d7e2fbe419961ed547ec238cf13e80ff 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.air/a_a3_\346\265\201\347\250\213\344\270\211_\344\272\247\345\223\201\345\257\274\345\205\245\345\222\214\345\256\241\346\211\271.py"
@@ -373,31 +373,34 @@ def supplyProvHosGoods_add_DI():
# print('产品数据删除出现异常')
# 删除上次新增的产品，避免产生过多的重复数据====这里不能每天删除，万一导入产品功能出现问题会影响后续脚本
# 每隔一段时间来删除重复的产品数据即可，内外网同步删除
-try:
- # ==============分割线 暂时注释===============
- add_goods()#直销高值
- select1('message1')
- apply()
- add_goods1()#直销低值
- select1('message2')
- apply()
- add_goods2()#直销试剂
- select1('message3')
- apply()
- add_goods3()#集配
- select1('message4')
- apply()
- add_goods4()#定向 "isSubprov": "1"
- select1('message5')
- apply()
- #20240618外网在配送的时候增加了DI验证，加入维护di的脚本
- supplyProvHosGoods_add_DI()
- # ==============分割线 暂时注释===============
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- print('新增产品信息出现异常,后续的脚本必然无法走通,需要检查程序或者脚本或者环境是否出现问题')
- commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功')
-else:
- # 删除今天之前的产品信息(包含内外网)
- delData().Del_goods_info_all()
- commonFuc().check_text_exist_result_text('succees', 'succees')
+def main():
+ try:
+ # ==============分割线 暂时注释===============
+ add_goods()#直销高值
+ select1('message1')
+ apply()
+ add_goods1()#直销低值
+ select1('message2')
+ apply()
+ add_goods2()#直销试剂
+ select1('message3')
+ apply()
+ add_goods3()#集配
+ select1('message4')
+ apply()
+ add_goods4()#定向 "isSubprov": "1"
+ select1('message5')
+ apply()
+ #20240618外网在配送的时候增加了DI验证，加入维护di的脚本
+ supplyProvHosGoods_add_DI()
+ # ==============分割线 暂时注释===============
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ print('新增产品信息出现异常,后续的脚本必然无法走通,需要检查程序或者脚本或者环境是否出现问题')
+ commonFuc().check_text_exist_result_text('产品新增失败', '产品新增成功')
+ else:
+ # 删除今天之前的产品信息(包含内外网)
+ delData().Del_goods_info_all()
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ print('流程三结束')
+# main()
\ No newline at end of file
diff --git "a/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py" "b/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
index 289c1b1cc6671ca13f1a14af5aa6144f55c0d7f5..f952e86fb359f35bec95564b3763b95f415e656f 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
@@ -292,19 +292,20 @@ def add_StockArea():#添加货位
commonFuc().check_text_exist(0, result)
else:
commonFuc().check_text_exist('error', result)
-
-try:
- # ==============删除业务数据和报表数据
- # delData().Delete_business_Data()#删除业务数据
- # delData().Del_reporter_data() # 删除报表数据
- #==============删除业务数据和报表数据
- test1()
- test2()# 科室添加产品信息(产品是从外网同步过来的)
- dept_query_all()# 科室查询，将科室id写入文件中
- grants_user()#给用户授权
- set_dept_lead1() #设置一级科室负责人
- add_StockArea()#添加库区
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except Exception as e:
- commonFuc().check_text_exist_result_text('succees','error')
- print("发生异常：", str(e))
\ No newline at end of file
+def main():
+ try:
+ # ==============删除业务数据和报表数据
+ # delData().Delete_business_Data()#删除业务数据
+ # delData().Del_reporter_data() # 删除报表数据
+ #==============删除业务数据和报表数据
+ test1()
+ test2()# 科室添加产品信息(产品是从外网同步过来的)
+ dept_query_all()# 科室查询，将科室id写入文件中
+ grants_user()#给用户授权
+ set_dept_lead1() #设置一级科室负责人
+ add_StockArea()#添加库区
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ print('流程四结束')
+ except Exception as e:
+ commonFuc().check_text_exist_result_text('succees','error')
+ print("发生异常：", str(e))
\ No newline at end of file
diff --git "a/air_case/b5_spd3_core_business_flow/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py" "b/air_case/b5_spd3_core_business_flow/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py"
index 1bd79eeffe69b5b9d2b008005cc3756bf824c3a9..3f0316892b19c930266e14b9faf9a9194547bd3a 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\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\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py"
@@ -454,47 +454,45 @@ def reagent_purchase_plan():
commonFuc().check_text_exist(0, result)
else:
commonFuc().check_text_exist('error', result)
-def main(type=1):
- if type==1:
- try:
- # 获取低值的hosGoodsId
- hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
- get_GoodsPkgDef(hosGoodsId) # 获取单元包id
- except:
- print('流程五获取hosGoodsId出现错误,请检查脚本或者数据')
- try:
- low_vaule_purchase_plan()
- except Exception as e:
- print('低值采购计划提交出现错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- traceback.print_exc()
- #审批
- try:
- approval_center()
- except Exception as e:
- print('审批采购计划出现错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- try:
- hight_vaule_purchase_plan()
- except Exception as e:
- print('高值采购计划出现错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- try:
- approval_center()
- except Exception as e:
- print('审批采购计划出现错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- try:
- reagent_purchase_plan()
- except Exception as e:
- print('试剂采购计划出现错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- try:
- approval_center()
- except Exception as e:
- print('审批采购计划出现错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- commonFuc().check_text_exist_result_text('succees','succees')
- else:
- print('type=2时不执行任何内容')
-main()
\ No newline at end of file
+def main():
+ try:
+ # 获取低值的hosGoodsId
+ hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+ get_GoodsPkgDef(hosGoodsId) # 获取单元包id
+ except:
+ print('流程五获取hosGoodsId出现错误,请检查脚本或者数据')
+ try:
+ low_vaule_purchase_plan()
+ except Exception as e:
+ print('低值采购计划提交出现错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ traceback.print_exc()
+ #审批
+ try:
+ approval_center()
+ except Exception as e:
+ print('审批采购计划出现错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ try:
+ hight_vaule_purchase_plan()
+ except Exception as e:
+ print('高值采购计划出现错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ try:
+ approval_center()
+ except Exception as e:
+ print('审批采购计划出现错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ try:
+ reagent_purchase_plan()
+ except Exception as e:
+ print('试剂采购计划出现错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ try:
+ approval_center()
+ except Exception as e:
+ print('审批采购计划出现错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ commonFuc().check_text_exist_result_text('succees','succees')
+
+# main()
\ No newline at end of file
diff --git "a/air_case/b5_spd3_core_business_flow/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py" "b/air_case/b5_spd3_core_business_flow/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py"
index 21e727e85376e713317e3d14803db09f067b2a9b..3604b0692413fd52cda87d5a52fabc784855f455 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.air/a_a6\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\2272_\345\244\226\347\275\221\351\205\215\351\200\201.py"
@@ -258,14 +258,14 @@ def order_dp(type=1):
commonFuc().check_text_exist('error', result)
# ==================订单配送=====================================
-
-try:
- order_dp(1)# 1低值
- order_dp(2)#2高值
- order_dp(3)#3试剂
-except Exception as e:
- print('订单配送发生错误,请检查脚本或者数据')
- print("发生异常：", str(e))
- traceback.print_exc()
-else:
- commonFuc().check_text_exist_result_text('succees','succees')
\ No newline at end of file
+def main():
+ try:
+ order_dp(1)# 1低值
+ order_dp(2)#2高值
+ order_dp(3)#3试剂
+ except Exception as e:
+ print('订单配送发生错误,请检查脚本或者数据')
+ print("发生异常：", str(e))
+ traceback.print_exc()
+ else:
+ commonFuc().check_text_exist_result_text('succees','succees')
\ No newline at end of file
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 c65b8b39ceada1de9964b5ba4ec754f195e48cf0..a81e7553d634749fa2ce4d8a4d5bb874642ef5b8 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"
@@ -404,21 +404,22 @@ def putaway():
# # ================== 生成结算单==============================
-try:
- # 验收
- check_accept_order(1) # 低值
- check_accept_order(2) # 高值
- check_accept_order(3) # 试剂
- # 入库上架
- putaway()
- putaway()
- putaway()
- OBD_ID = settle()# 生成结算单
- # 调用审批结算单
- approval_center(OBD_ID)
-except Exception as e:
- print('脚本出现异常，请检查脚本或者数据')
- print("发生异常：", str(e))
- traceback.print_exc()
-else:
- commonFuc().check_text_exist_result_text('succees', 'succees')
+def main():
+ try:
+ # 验收
+ check_accept_order(1) # 低值
+ check_accept_order(2) # 高值
+ check_accept_order(3) # 试剂
+ # 入库上架
+ putaway()
+ putaway()
+ putaway()
+ OBD_ID = settle()# 生成结算单
+ # 调用审批结算单
+ approval_center(OBD_ID)
+ except Exception as e:
+ print('脚本出现异常，请检查脚本或者数据')
+ print("发生异常：", str(e))
+ traceback.print_exc()
+ else:
+ commonFuc().check_text_exist_result_text('succees', 'succees')
diff --git "a/air_case/b5_spd3_core_business_flow/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.py" "b/air_case/b5_spd3_core_business_flow/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.py"
index af18b29d577ae9784a4cacc86044c63f6125ae30..4ad0620a0402a3a7ebfd8963fae645d511019c34 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.air/a_a8\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\244\226\347\275\221\345\274\200\347\245\250.py"
@@ -26,376 +26,375 @@ import time
module = "b5_spd3_core_business_flow"
-def invoice():
- # # 登录获取用户id等信息，使用创建的用户登录===========开始
- info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
- # print(info)
- username = info['e_username']
- password = commonFuc().get_business_data("b2_herp3_bs", "password1")
- token, projectCode, uxid, corpId, info = login(username, password)
- # print(token, projectCode, uxid, corpId, info)
- # 登录获取用户id等信息，使用创建的用户登录============结束
- module = "a6_mdm3_si"
- # 发票录入列表查询=================================================
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listGoodsPage_url")
- print('发票录入列表查询url', url)
- # 获取请求头信息
- headers = commonFuc().get_business_data(module, "json_headers2",
- commonFuc().get_business_data(module, "json_contentType"), token,
- projectCode)
+# def invoice():
+# # # 登录获取用户id等信息，使用创建的用户登录===========开始
+# info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
+# # print(info)
+# username = info['e_username']
+# password = commonFuc().get_business_data("b2_herp3_bs", "password1")
+# token, projectCode, uxid, corpId, info = login(username, password)
+# # print(token, projectCode, uxid, corpId, info)
+# # 登录获取用户id等信息，使用创建的用户登录============结束
+# module = "a6_mdm3_si"
+# # 发票录入列表查询=================================================
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listGoodsPage_url")
+# print('发票录入列表查询url', url)
+# # 获取请求头信息
+# headers = commonFuc().get_business_data(module, "json_headers2",
+# commonFuc().get_business_data(module, "json_contentType"), token,
+# projectCode)
+#
+# request_body = commonFuc().get_business_data(module, "payload2_1_1", get_hosid(), get_branch_id())
+#
+# # print('request_body',request_body)
+# # 发送请求
+# i = 1
+# while True:
+# time.sleep(6)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', result)
+# try:
+# data = commonFuc().analysis_json('data', result)
+# total = commonFuc().analysis_json('total', data)
+# if total == 0:
+# print('数据暂时未同步过来，或者内网没有生成结算单')
+# i = i + 1
+# if i >= 100:
+# print('600秒过去了，数据还未查询出来，调用一下内网结算函数')
+# settle()
+# approval_center()
+# continue
+# else:
+# break
+# except:
+# continue
+#
+# # 将发票信息写入文件
+# data = commonFuc().analysis_json('data', result)
+# data1 = commonFuc().analysis_json('data', data)
+# list_a = []
+# list_b = []
+# list_c = []
+# list_a.append(data1[0])
+# list_b.append(data1[0])
+# list_c.append(data1[0])
+# # 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, 'message')
+# # 发票录入列表查询=================================================
+# # ===========发票暂存=======================================
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "saveCacheBatch_url")
+# print(url)
+# # 从文件中获取必要信息
+# info = FileUtils().r_info8(module, "结算开票信息", 'message')
+# # print('info', info)
+# list_a = info['list_a']
+# print('list_a', list_a, type(list_a), len(list_a))
+# pid = 'pid'
+# settleMonth = "settleMonth"
+# hosGoodsId = 'hosGoodsId'
+# batchCode = 'batchCode'
+# distrDetailId = 'distrDetailId'
+# distrId = 'distrId'
+# distrOrderNo = 'distrOrderNo'
+# settlePrice = 'settlePrice'
+# maxSettleQty = 'maxSettleQty'
+# maxSettleAmount = 'maxSettleAmount'
+# curSettleQty = 'curSettleQty'
+# curSettleAmount = 'curSettleAmount'
+# leftSettleQty = 'leftSettleQty'
+# leftSettleAmount = 'leftSettleAmount'
+# hosId = 'hosId'
+# provId = 'provId'
+# branchId = 'branchId'
+# balanceDetId = 'balanceDetId'
+# purMode = 'purMode'
+# barCode = 'barCode'
+# viewId = 'viewId'
+# for i in list_a:
+# pid = i['pid']
+# settleMonth = i['settleMonth']
+# hosGoodsId = i['hosGoodsId']
+# detailList = i['detailList']
+# for j in detailList:
+# batchCode = j['batchCode']
+# distrDetailId = j['distrDetailId']
+# distrId = j['distrId']
+# distrOrderNo = j['distrOrderNo']
+# settlePrice = j['settlePrice']
+# # maxSettleQty = j['leftSettleQty']
+# # maxSettleAmount = j['leftSettleAmount']
+# # curSettleQty = j['curSettleQty']
+# # curSettleAmount = j['curSettleAmount']
+# # leftSettleQty = j['leftSettleQty']
+# leftSettleAmount = j['leftSettleAmount']
+# hosId = j['hosId']
+# provId = j['provId']
+# branchId = j['branchId']
+# balanceDetId = j['balanceDetId']
+# purMode = j['purMode']
+# barCode = j['barCode']
+# viewId = j['viewId']
+# break
+# list2 = []
+# detailList = None
+# for i in list_a:
+# detailList = i['detailList']
+# list2 = detailList
+# for k in list2:
+# maxSettleQty = k['leftSettleQty']
+# maxSettleAmount = k['settlePrice']
+# curSettleQty = k['curSettleQty']
+# curSettleAmount = k['curSettleAmount']
+# leftSettleQty = k['leftSettleQty']
+#
+# request_body = commonFuc().get_business_data(module, "payload3_1_1_1", pid, settleMonth, hosGoodsId, batchCode,
+# distrDetailId, distrId, distrOrderNo, settlePrice, maxSettleQty,
+# maxSettleAmount, curSettleQty, curSettleAmount, leftSettleQty,
+# leftSettleAmount, hosId,
+# provId,
+# branchId, balanceDetId, purMode, barCode, viewId)
+# print('request_body', request_body)
+#
+# request_body_json = get_process_list(request_body)
+# result = commonFuc().http_post(url, request_body_json, headers)
+# print('发票暂存result', result)
+# # ===========发票暂存===============================================
+# # ==============发票缓存提交===========================================
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submitCache_url")
+# hosVersion = 3
+# hosName = commonFuc().get_business_data(module, 'hosName')
+# invoiceQty = leftSettleQty
+# invoiceAmount = leftSettleAmount
+# invoiceDate = timeUtils().get_time_hms(5)
+# request_body = commonFuc().get_business_data(module, "payload3_2_2_2_1", hosName, invoiceQty, invoiceAmount,
+# invoiceDate, hosId, provId,hosVersion)
+# print('发票缓存提交request_body', request_body)
+# # 发送请求
+# result = commonFuc().http_post(url, request_body, headers)
+# print('发票缓存提交result', result)
+# VI_id = commonFuc().analysis_json('billIds',
+# commonFuc().analysis_json('data', result))
+# VI_id= ' '.join(VI_id)
+# print('VI_id',VI_id)
+# # ==============发票缓存提交===========================================
+# # ===============预开票列表查询====================================
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url1")
+# request_body = commonFuc().get_business_data(module, "payload3_3_1")
+# print('预开票列表查询request_body', request_body)
+# # 发送请求
+# result = commonFuc().http_post(url, request_body, headers)
+# print('预开票列表查询', 'result', result)
+#
+# provName= commonFuc().analysis_json('provName',
+# commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+# sumAmount= commonFuc().analysis_json('sumAmount',
+# commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
+#
+# # ===============预开票列表查询====================================
+# # ===============预开票提交====================================
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "mcmsOutBalance_submitInvoice_url")
+# lastModified = timeUtils().get_time_hms(1)
+# createTime = timeUtils().get_time_hms(1)
+# invoiceTitle = hosName
+# settleMonths=settleMonth
+# request_body = commonFuc().get_business_data(module, "payload3_3_2", VI_id, lastModified, createTime, uxid,
+# get_hosid(), provId, provName, invoiceAmount, invoiceDate,
+# settleMonths, invoiceQty, hosName, invoiceTitle, sumAmount)
+# print('预开票提交request_body', request_body)
+# # 发送请求
+# result = commonFuc().http_post(url, request_body, headers)
+# print('预开票提交', 'result', result)
+# # ===============预开票提交====================================
+# # ===============发票确认列表查询
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url1")
+#
+# request_body = commonFuc().get_business_data(module, "payload3_3")
+#
+# # 发送请求
+# result = commonFuc().http_post(url, request_body, headers)
+# print('发票确认列表查询result', result)
+# data = commonFuc().analysis_json('data', result)
+# data1 = commonFuc().analysis_json('data', data)
+# id1 = commonFuc().analysis_json('id', data1[0])
+# print(id1)
+#
+# # ===============发票确认列表查询
+# # ===============发票确认
+# url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "invoiceUpdateStatus_url")
+#
+# request_body = commonFuc().get_business_data(module, "payload3_4", id1)
+#
+# # 发送请求
+# result = commonFuc().http_post(url, request_body, headers)
+# print('发票确认result', result)
+# # ===============发票确认
+# # ==============内网发票核对============
+# module = "b5_spd3_core_business_flow"
+# # # 登录获取用户id等信息，使用创建的用户登录===========开始
+# info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+# username = info['username1']
+# password = commonFuc().get_business_data("b2_herp3_bs", "password")
+# print('username,password', username, password)
+# # # 获取token和projectCode
+# token, projectCode, uxid, corpId, info = login(username, password, 2)
+# # 登录获取用户id等信息，使用创建的用户登录============结束
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsInvoice_listVoPage_url")
+# print('url', url)
+# # 获取请求头信息
+# headers = commonFuc().get_business_data(module, "json_headers2",
+# commonFuc().get_business_data(module, "json_contentType"), token,
+# projectCode)
+# request_body = commonFuc().get_business_data(module, "payload9", timeUtils().get_time_hms(5),
+# timeUtils().get_time_hms(5), get_hosid(), get_hosid())
+# print('request_body', request_body)
+# # 发送请求
+# i = 1
+# while True:
+# time.sleep(6)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', result)
+# try:
+# data = commonFuc().analysis_json('data', result)
+# total = commonFuc().analysis_json('total', data)
+# if total == 0:
+# print('数据暂时未同步过来')
+# i = i + 1
+# if i >= 100:
+# print('600秒过去了，数据还未查询出来，检查一下脚本或者被测软件')
+# continue
+# else:
+# break
+# except:
+# continue
+#
+# print('result', '内网发票核对', result)
+# data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+# VI_id = commonFuc().analysis_json('id', data1[0])
+# print('VI_id', VI_id)
+# # ==============发票列表查询
+# # ==============发票核对提交
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_invoiceUpdateStatusList_url")
+# print('url', url)
+# request_body = commonFuc().get_business_data(module, "payload10", VI_id, get_hosid())
+# print('request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', result)
+# # ==============发票核对提交
+# # ==============内网发票核对============
+# # ==============内网发票提交开始
+# # 列表查询
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_listVoPage_url")
+# print('内网发票提交url', url)
+# request_body = commonFuc().get_business_data(module, "payload11", timeUtils().get_time_hms(5),
+# timeUtils().get_time_hms(5), get_hosid(), get_hosid())
+# print('内网发票提交request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', '内网发票提交列表查询结果', result)
+# data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+# total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
+# VI_id2='VI_id2'
+# if total == 0:
+# print('检查被测程序，发票提交列表查询数据是否正确')
+# else:
+# for i in range(total):
+# VI_id2 = commonFuc().analysis_json('id', data1[i])
+# if VI_id2 == VI_id:
+# break
+# print('VI_id2', VI_id2)
+# # ==============发票提交,下一步归档
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_invoiceUpdateStatusList_url")
+# print('url', url)
+# request_body = commonFuc().get_business_data(module, "payload12", VI_id, get_hosid())
+# print('request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', '发票提交,下一步归档', result)
+# # ==============发票提交，下一步归档
+# # ==============发票归档列表查询
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_listVoPage_url")
+# print('url', url)
+# request_body = commonFuc().get_business_data(module, "payload13", timeUtils().get_time_hms(5),
+# timeUtils().get_time_hms(5), get_hosid(), get_hosid())
+# print('request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', '发票归档列表查询', result)
+# data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+# total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
+# VI_id3='VI_id3'
+# if total == 0:
+# print('检查被测程序，发票归档列表查询查询数据是否正确')
+# else:
+# for i in range(total):
+# VI_id3 = commonFuc().analysis_json('id', data1[i])
+# if VI_id3 == VI_id2:
+# break
+# print('VI_id3', VI_id3)
+# # ==============发票归档列表查询
+# # ==================发票归档提交
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_invoiceUpdateStatusList_url")
+# print('url', url)
+# request_body = commonFuc().get_business_data(module, "payload14", VI_id, get_hosid())
+# print('request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', '发票归档提交,下一步付款', result)
+# # ==================发票归档提交
+# # ==================付款单列表查询
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_listVoPage_url")
+# print('url', url)
+# request_body = commonFuc().get_business_data(module, "payload15", get_hosid(), get_hosid())
+# print('request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', '付款单列表查询', result)
+# data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
+# total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
+# VI_id4='VI_id4'
+# if total == 0:
+# print('检查被测程序，发票归档列表查询查询数据是否正确')
+# else:
+# for i in range(total):
+# VI_id4 = commonFuc().analysis_json('id', data1[i])
+# if VI_id4 == VI_id3:
+# break
+# print('VI_id4', VI_id4)
+# # ==================付款单列表查询
+# # ==================付款提交
+# url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+# "mcmsInvoice_genPaymentBills_url")
+# print('url', url)
+# request_body = commonFuc().get_business_data(module, "payload16", VI_id, get_hosid())
+# print('request_body', request_body)
+# result = commonFuc().http_post(url, request_body, headers)
+# print('result', '付款提交', result)
+# # 断言
+# code = commonFuc().analysis_json('code', result)
+# data = commonFuc().analysis_json('data', result)
+# if code == 0 and data == 1:
+# commonFuc().check_text_exist(0, result)
+# else:
+# commonFuc().check_text_exist('error', result)
+# # ==================付款提交
+# # ==============内网发票提交
+# # ================发票查询列表页面验证
+#
+# # ================发票查询列表页面验证
- request_body = commonFuc().get_business_data(module, "payload2_1_1", get_hosid(), get_branch_id())
-
- # print('request_body',request_body)
- # 发送请求
- i = 1
- while True:
- time.sleep(6)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', result)
- try:
- data = commonFuc().analysis_json('data', result)
- total = commonFuc().analysis_json('total', data)
- if total == 0:
- print('数据暂时未同步过来，或者内网没有生成结算单')
- i = i + 1
- if i >= 100:
- print('600秒过去了，数据还未查询出来，调用一下内网结算函数')
- settle()
- approval_center()
- continue
- else:
- break
- except:
- continue
-
- # 将发票信息写入文件
- data = commonFuc().analysis_json('data', result)
- data1 = commonFuc().analysis_json('data', data)
- list_a = []
- list_b = []
- list_c = []
- list_a.append(data1[0])
- list_b.append(data1[0])
- list_c.append(data1[0])
- # 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, 'message')
- # 发票录入列表查询=================================================
- # ===========发票暂存=======================================
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "saveCacheBatch_url")
- print(url)
- # 从文件中获取必要信息
- info = FileUtils().r_info8(module, "结算开票信息", 'message')
- # print('info', info)
- list_a = info['list_a']
- print('list_a', list_a, type(list_a), len(list_a))
- pid = 'pid'
- settleMonth = "settleMonth"
- hosGoodsId = 'hosGoodsId'
- batchCode = 'batchCode'
- distrDetailId = 'distrDetailId'
- distrId = 'distrId'
- distrOrderNo = 'distrOrderNo'
- settlePrice = 'settlePrice'
- maxSettleQty = 'maxSettleQty'
- maxSettleAmount = 'maxSettleAmount'
- curSettleQty = 'curSettleQty'
- curSettleAmount = 'curSettleAmount'
- leftSettleQty = 'leftSettleQty'
- leftSettleAmount = 'leftSettleAmount'
- hosId = 'hosId'
- provId = 'provId'
- branchId = 'branchId'
- balanceDetId = 'balanceDetId'
- purMode = 'purMode'
- barCode = 'barCode'
- viewId = 'viewId'
- for i in list_a:
- pid = i['pid']
- settleMonth = i['settleMonth']
- hosGoodsId = i['hosGoodsId']
- detailList = i['detailList']
- for j in detailList:
- batchCode = j['batchCode']
- distrDetailId = j['distrDetailId']
- distrId = j['distrId']
- distrOrderNo = j['distrOrderNo']
- settlePrice = j['settlePrice']
- # maxSettleQty = j['leftSettleQty']
- # maxSettleAmount = j['leftSettleAmount']
- # curSettleQty = j['curSettleQty']
- # curSettleAmount = j['curSettleAmount']
- # leftSettleQty = j['leftSettleQty']
- leftSettleAmount = j['leftSettleAmount']
- hosId = j['hosId']
- provId = j['provId']
- branchId = j['branchId']
- balanceDetId = j['balanceDetId']
- purMode = j['purMode']
- barCode = j['barCode']
- viewId = j['viewId']
- break
- list2 = []
- detailList = None
- for i in list_a:
- detailList = i['detailList']
- list2 = detailList
- for k in list2:
- maxSettleQty = k['leftSettleQty']
- maxSettleAmount = k['settlePrice']
- curSettleQty = k['curSettleQty']
- curSettleAmount = k['curSettleAmount']
- leftSettleQty = k['leftSettleQty']
-
- request_body = commonFuc().get_business_data(module, "payload3_1_1_1", pid, settleMonth, hosGoodsId, batchCode,
- distrDetailId, distrId, distrOrderNo, settlePrice, maxSettleQty,
- maxSettleAmount, curSettleQty, curSettleAmount, leftSettleQty,
- leftSettleAmount, hosId,
- provId,
- branchId, balanceDetId, purMode, barCode, viewId)
- print('request_body', request_body)
-
- request_body_json = get_process_list(request_body)
- result = commonFuc().http_post(url, request_body_json, headers)
- print('发票暂存result', result)
- # ===========发票暂存===============================================
- # ==============发票缓存提交===========================================
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submitCache_url")
- hosVersion = 3
- hosName = commonFuc().get_business_data(module, 'hosName')
- invoiceQty = leftSettleQty
- invoiceAmount = leftSettleAmount
- invoiceDate = timeUtils().get_time_hms(5)
- request_body = commonFuc().get_business_data(module, "payload3_2_2_2_1", hosName, invoiceQty, invoiceAmount,
- invoiceDate, hosId, provId,hosVersion)
- print('发票缓存提交request_body', request_body)
- # 发送请求
- result = commonFuc().http_post(url, request_body, headers)
- print('发票缓存提交result', result)
- VI_id = commonFuc().analysis_json('billIds',
- commonFuc().analysis_json('data', result))
- VI_id= ' '.join(VI_id)
- print('VI_id',VI_id)
- # ==============发票缓存提交===========================================
- # ===============预开票列表查询====================================
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url1")
- request_body = commonFuc().get_business_data(module, "payload3_3_1")
- print('预开票列表查询request_body', request_body)
- # 发送请求
- result = commonFuc().http_post(url, request_body, headers)
- print('预开票列表查询', 'result', result)
-
- provName= commonFuc().analysis_json('provName',
- commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
- sumAmount= commonFuc().analysis_json('sumAmount',
- commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)))
-
- # ===============预开票列表查询====================================
- # ===============预开票提交====================================
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "mcmsOutBalance_submitInvoice_url")
- lastModified = timeUtils().get_time_hms(1)
- createTime = timeUtils().get_time_hms(1)
- invoiceTitle = hosName
- settleMonths=settleMonth
- request_body = commonFuc().get_business_data(module, "payload3_3_2", VI_id, lastModified, createTime, uxid,
- get_hosid(), provId, provName, invoiceAmount, invoiceDate,
- settleMonths, invoiceQty, hosName, invoiceTitle, sumAmount)
- print('预开票提交request_body', request_body)
- # 发送请求
- result = commonFuc().http_post(url, request_body, headers)
- print('预开票提交', 'result', result)
- # ===============预开票提交====================================
- # ===============发票确认列表查询
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url1")
-
- request_body = commonFuc().get_business_data(module, "payload3_3")
-
- # 发送请求
- result = commonFuc().http_post(url, request_body, headers)
- print('发票确认列表查询result', result)
- data = commonFuc().analysis_json('data', result)
- data1 = commonFuc().analysis_json('data', data)
- id1 = commonFuc().analysis_json('id', data1[0])
- print(id1)
-
- # ===============发票确认列表查询
- # ===============发票确认
- url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "invoiceUpdateStatus_url")
-
- request_body = commonFuc().get_business_data(module, "payload3_4", id1)
-
- # 发送请求
- result = commonFuc().http_post(url, request_body, headers)
- print('发票确认result', result)
- # ===============发票确认
- # ==============内网发票核对============
- module = "b5_spd3_core_business_flow"
- # # 登录获取用户id等信息，使用创建的用户登录===========开始
- info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
- username = info['username1']
- password = commonFuc().get_business_data("b2_herp3_bs", "password")
- print('username,password', username, password)
- # # 获取token和projectCode
- token, projectCode, uxid, corpId, info = login(username, password, 2)
- # 登录获取用户id等信息，使用创建的用户登录============结束
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsInvoice_listVoPage_url")
- print('url', url)
- # 获取请求头信息
- headers = commonFuc().get_business_data(module, "json_headers2",
- commonFuc().get_business_data(module, "json_contentType"), token,
- projectCode)
- request_body = commonFuc().get_business_data(module, "payload9", timeUtils().get_time_hms(5),
- timeUtils().get_time_hms(5), get_hosid(), get_hosid())
- print('request_body', request_body)
- # 发送请求
- i = 1
- while True:
- time.sleep(6)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', result)
- try:
- data = commonFuc().analysis_json('data', result)
- total = commonFuc().analysis_json('total', data)
- if total == 0:
- print('数据暂时未同步过来')
- i = i + 1
- if i >= 100:
- print('600秒过去了，数据还未查询出来，检查一下脚本或者被测软件')
- continue
- else:
- break
- except:
- continue
-
- print('result', '内网发票核对', result)
- data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
- VI_id = commonFuc().analysis_json('id', data1[0])
- print('VI_id', VI_id)
- # ==============发票列表查询
- # ==============发票核对提交
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_invoiceUpdateStatusList_url")
- print('url', url)
- request_body = commonFuc().get_business_data(module, "payload10", VI_id, get_hosid())
- print('request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', result)
- # ==============发票核对提交
- # ==============内网发票核对============
- # ==============内网发票提交开始
- # 列表查询
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_listVoPage_url")
- print('内网发票提交url', url)
- request_body = commonFuc().get_business_data(module, "payload11", timeUtils().get_time_hms(5),
- timeUtils().get_time_hms(5), get_hosid(), get_hosid())
- print('内网发票提交request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', '内网发票提交列表查询结果', result)
- data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
- total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
- VI_id2='VI_id2'
- if total == 0:
- print('检查被测程序，发票提交列表查询数据是否正确')
- else:
- for i in range(total):
- VI_id2 = commonFuc().analysis_json('id', data1[i])
- if VI_id2 == VI_id:
- break
- print('VI_id2', VI_id2)
- # ==============发票提交,下一步归档
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_invoiceUpdateStatusList_url")
- print('url', url)
- request_body = commonFuc().get_business_data(module, "payload12", VI_id, get_hosid())
- print('request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', '发票提交,下一步归档', result)
- # ==============发票提交，下一步归档
- # ==============发票归档列表查询
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_listVoPage_url")
- print('url', url)
- request_body = commonFuc().get_business_data(module, "payload13", timeUtils().get_time_hms(5),
- timeUtils().get_time_hms(5), get_hosid(), get_hosid())
- print('request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', '发票归档列表查询', result)
- data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
- total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
- VI_id3='VI_id3'
- if total == 0:
- print('检查被测程序，发票归档列表查询查询数据是否正确')
- else:
- for i in range(total):
- VI_id3 = commonFuc().analysis_json('id', data1[i])
- if VI_id3 == VI_id2:
- break
- print('VI_id3', VI_id3)
- # ==============发票归档列表查询
- # ==================发票归档提交
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_invoiceUpdateStatusList_url")
- print('url', url)
- request_body = commonFuc().get_business_data(module, "payload14", VI_id, get_hosid())
- print('request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', '发票归档提交,下一步付款', result)
- # ==================发票归档提交
- # ==================付款单列表查询
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_listVoPage_url")
- print('url', url)
- request_body = commonFuc().get_business_data(module, "payload15", get_hosid(), get_hosid())
- print('request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', '付款单列表查询', result)
- data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
- total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result))
- VI_id4='VI_id4'
- if total == 0:
- print('检查被测程序，发票归档列表查询查询数据是否正确')
+def main():
+ try:
+ OBH_ID = settle()
+ # 调用审批结算单
+ approval_center(OBH_ID)
+ invoice(2,OBH_ID)
+ except Exception as e:
+ print('脚本出现异常，请检查脚本或者数据')
+ print("发生异常：", str(e))
+ traceback.print_exc()
else:
- for i in range(total):
- VI_id4 = commonFuc().analysis_json('id', data1[i])
- if VI_id4 == VI_id3:
- break
- print('VI_id4', VI_id4)
- # ==================付款单列表查询
- # ==================付款提交
- url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
- "mcmsInvoice_genPaymentBills_url")
- print('url', url)
- request_body = commonFuc().get_business_data(module, "payload16", VI_id, get_hosid())
- print('request_body', request_body)
- result = commonFuc().http_post(url, request_body, headers)
- print('result', '付款提交', result)
- # 断言
- code = commonFuc().analysis_json('code', result)
- data = commonFuc().analysis_json('data', result)
- if code == 0 and data == 1:
- commonFuc().check_text_exist(0, result)
- else:
- commonFuc().check_text_exist('error', result)
- # ==================付款提交
- # ==============内网发票提交
- # ================发票查询列表页面验证
-
- # ================发票查询列表页面验证
-
-
-try:
- OBH_ID = settle()
- # 调用审批结算单
- approval_center(OBH_ID)
- from air_case.public1.public1.public1 import *
- invoice(2,OBH_ID)
-except Exception as e:
- print('脚本出现异常，请检查脚本或者数据')
- print("发生异常：", str(e))
- traceback.print_exc()
-else:
- commonFuc().check_text_exist_result_text('succees', 'succees')
+ commonFuc().check_text_exist_result_text('succees', 'succees')
diff --git "a/air_case/b5_spd3_core_business_flow/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.py" "b/air_case/b5_spd3_core_business_flow/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.py"
index 3232e583737784a0297f7c954e02a3d2142415a9..1243e38a8cffde74ebfa767db981179b1a1e1cfd 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.air/a_a9\346\265\201\347\250\213\345\205\255_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\350\264\237\347\273\223\347\256\227.py"
@@ -218,23 +218,23 @@ def center_warehouse_return():
print('herpService_stock_review_pass_submit_urlresult', result)
# ========出库复核提交
-
-try:
- # test1() # 提交采购计划 # 外网配送 # 内网验收入库结算
- # 先查询所有的部门信息写入文件
- dept_query_all()
- # 设置库房人员，根据传入的科室id和科室名称来设置库房
- # 中心库type=1 二级type=2三级type=3
- set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
- set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库
- center_warehouse_return()#中心库退货
- # center_warehouse_return()#中心库退货
- OBh_ID=settle() # 生成结算单
- # print(OBh_ID)
- # 调用审批结算单
- approval_center(OBh_ID)
- invoice(2,OBh_ID)#type=2 传递结算单号，外网查询开票
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ # test1() # 提交采购计划 # 外网配送 # 内网验收入库结算
+ # 先查询所有的部门信息写入文件
+ dept_query_all()
+ # 设置库房人员，根据传入的科室id和科室名称来设置库房
+ # 中心库type=1 二级type=2三级type=3
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库
+ center_warehouse_return()#中心库退货
+ # center_warehouse_return()#中心库退货
+ OBh_ID=settle() # 生成结算单
+ # print(OBh_ID)
+ # 调用审批结算单
+ approval_center(OBh_ID)
+ invoice(2,OBh_ID)#type=2 传递结算单号，外网查询开票
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.air/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.py" "b/air_case/b5_spd3_core_business_flow/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.air/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.py"
index c688d6dc03d81b8cbdb560c59c0f9fab9d171a5a..936d213d253667e76078e7ea394e8e2145243b3d 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.air/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.air/a_b0\346\265\201\347\250\213\344\270\203_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\350\264\237\347\273\223\347\256\227.py"
@@ -218,21 +218,21 @@ def center_warehouse_return():
print('herpService_stock_review_pass_submit_urlresult', result)
# ========出库复核提交
-
-try:
- # test1() # 提交采购计划 # 外网配送 # 内网验收入库结算
- # 先查询所有的部门信息写入文件
- dept_query_all()
- # 设置库房人员，根据传入的科室id和科室名称来设置库房
- # 中心库type=1 二级type=2三级type=3
- set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
- set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
- center_warehouse_return()#中心库退货
- OBh_ID=settle() # 生成结算单
- # print(OBh_ID)
- # 调用审批结算单
- approval_center(OBh_ID)
- invoice(3,OBh_ID)#type=2 传递结算单号，外网查询开票
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ # test1() # 提交采购计划 # 外网配送 # 内网验收入库结算
+ # 先查询所有的部门信息写入文件
+ dept_query_all()
+ # 设置库房人员，根据传入的科室id和科室名称来设置库房
+ # 中心库type=1 二级type=2三级type=3
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
+ center_warehouse_return()#中心库退货
+ OBh_ID=settle() # 生成结算单
+ # print(OBh_ID)
+ # 调用审批结算单
+ approval_center(OBh_ID)
+ invoice(3,OBh_ID)#type=2 传递结算单号，外网查询开票
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', 'succees')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py" "b/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
index f01cfee129cf4ace274fb50d8e1d848737467d65..162f06695b70660a6758031abfc39ed92bd91c55 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
@@ -322,25 +322,26 @@ def out_return_gt():
# 跟台退货出库确认========================
-try:
- set_dept_lead() # 设置二级科室负责人
- # # # # 设置默认科室,切换到二级科室,使用科室管理功能
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
- herpService_mcmsDeptGoodsInfo_getByProvIdPage()
- operationApply() # 手术跟台申请单提交
- approval_center() # 审批手术跟台申请单
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是中心库
- approval_center1() # 再次审批手术跟台申请单
- # # #内网查询手术通知单号
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是中心库
- orderno = Search_OrderNO() # 手术通知单接口查询单号
- print(orderno)
- height_value_order_dp(orderno) # 高值跟台外网配送
- check_accept_order() # 内网验收
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
- second_dept_in_warehouse() # 二级科室入库
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是中心库
- out_return_gt() # 跟台退货出库_中心库处理
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ set_dept_lead() # 设置二级科室负责人
+ # # # # 设置默认科室,切换到二级科室,使用科室管理功能
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+ herpService_mcmsDeptGoodsInfo_getByProvIdPage()
+ operationApply() # 手术跟台申请单提交
+ approval_center() # 审批手术跟台申请单
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是中心库
+ approval_center1() # 再次审批手术跟台申请单
+ # # #内网查询手术通知单号
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是中心库
+ orderno = Search_OrderNO() # 手术通知单接口查询单号
+ print(orderno)
+ height_value_order_dp(orderno) # 高值跟台外网配送
+ check_accept_order() # 内网验收
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+ second_dept_in_warehouse() # 二级科室入库
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 设置登录账号默认权限是中心库
+ out_return_gt() # 跟台退货出库_中心库处理
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py"
index d8bfa3c76b18d66c506da0bb4340572ae94fee7c..4a38a62bdf5d09d17631d75422c663dc70505118 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.air/a_b2\346\265\201\347\250\213\344\271\235\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\255\345\277\203\345\272\223.py"
@@ -390,43 +390,44 @@ def pick_execute(GoodsId,type=1):
result = commonFuc().http_post(url, request_body, headers)
print('herpService_stock_review_pass_submit_urlresult', result)
#复核===================================
-try:
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
- # 二级库区信息写入文件
- get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],
- FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
- # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
- # 设置库区联系人
- set_stockShelf_Linkman()
- # 低值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
- # 高值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
- # 试剂
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+def main():
+ try:
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+ # 二级库区信息写入文件
+ get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
+ # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
+ # 设置库区联系人
+ set_stockShelf_Linkman()
+ # 低值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+ # 高值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+ # 试剂
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
- BuyCarSubmit() # 请领车提交
- for i in range(6): # 三个单据共审批6次
- approval_center()
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库
- #获取拣货单列表个数
- for i in range(get_centeStock_pick_list_counts()):
- centeStock_pick()#中心库拣货
- #低值拣货执行
- hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
- GoodsId = hosGoodsId.replace(get_hosid(), '')
- pick_execute(GoodsId,1)
- # 高值拣货执行
- hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
- GoodsId = hosGoodsId.replace(get_hosid(), '')
- pick_execute(GoodsId,2)
- # 试剂拣货执行
- hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
- GoodsId = hosGoodsId.replace(get_hosid(), '')
- pick_execute(GoodsId, 3)
- second_dept_one_key_in()
- second_dept_one_key_in()
- second_dept_one_key_in()
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+ BuyCarSubmit() # 请领车提交
+ for i in range(6): # 三个单据共审批6次
+ approval_center()
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) #设置登录账号默认权限是中心库
+ #获取拣货单列表个数
+ for i in range(get_centeStock_pick_list_counts()):
+ centeStock_pick()#中心库拣货
+ #低值拣货执行
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ pick_execute(GoodsId,1)
+ # 高值拣货执行
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ pick_execute(GoodsId,2)
+ # 试剂拣货执行
+ hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
+ GoodsId = hosGoodsId.replace(get_hosid(), '')
+ pick_execute(GoodsId, 3)
+ second_dept_one_key_in()
+ second_dept_one_key_in()
+ second_dept_one_key_in()
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.py" "b/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.py"
index 4f6704f4c34981cdba8618c5e2f72dd3f1037581..fd8b63fa5164ea3192c0e70aaf35d5f234eda5c2 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.air/a_b3\346\265\201\347\250\213\345\215\201\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\350\276\271\344\273\223.py"
@@ -308,31 +308,29 @@ def check_buyWayText():
-def main1(type=1):
+def main():
try:
- if type==1:
- set_dept_lead() # 设置二级科室负责人
- # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0"
- add_logic_stock()
-
- # 设置产品出库渠道为边仓
- goods_move()
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
-
- # # # 低值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
- # # 高值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
- # # 试剂
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
- BuyCarSubmit() # 请领车提交
- for i in range(6): # 三个单据共审批6次
- approval_center()
- check_buyWayText()#验证出库渠道是否为边仓
- commonFuc().check_text_exist_result_text('succees', 'succees')
- else:
- print('aa')
+
+ set_dept_lead() # 设置二级科室负责人
+ # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0"
+ add_logic_stock()
+
+ # 设置产品出库渠道为边仓
+ goods_move()
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+
+ # # # 低值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+ # # 高值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+ # # 试剂
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+ BuyCarSubmit() # 请领车提交
+ for i in range(6): # 三个单据共审批6次
+ approval_center()
+ check_buyWayText()#验证出库渠道是否为边仓
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+
except:
commonFuc().check_text_exist_result_text('error', 'succees')
-main1()
\ No newline at end of file
diff --git "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py" "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py"
index ec2405a287cd543dd06ee3027c50286514f25f9e..c45c7eb2c8a147eb975d377db13f7bdcae5d2abd 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py"
@@ -807,41 +807,41 @@ def check_accept_order(type=1):
titlename = ('CHECK_NO1', 'CHECK_NO2')
FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15')
-
-try:
- # add_dept2() # 新增一个二级科室
- # add_new_deptinfo() # 写入科室信息到文件中
- # grants_user_new() #新增授权
- # 设置部门用户
- # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'],2)
- # 设置部门负责人
- # set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人
- # 从下面开始,上面的暂时注释
- goods_move2() # 设置产品出库渠道为直送
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
- for i in range(6):
- # # 低值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
- # # 高值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
- # # 试剂
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
- BuyCarSubmit() # 请领车提交
- for i in range(6): # 三个单据共审批6次
- approval_center()
- # 采购模块处理
- purchase_module_process()
- for i in range(3): # 三个单据共审批3次
- approval_center()
- order_dp(1) # 1低值
- order_dp(2) # 2高值
- order_dp(3) # 3试剂
- check_accept_order(1) # 低值
- check_accept_order(2) # 高值
- check_accept_order(3) # 试剂
- second_dept_one_key_in()
- second_dept_one_key_in()
- second_dept_one_key_in()
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ # add_dept2() # 新增一个二级科室
+ # add_new_deptinfo() # 写入科室信息到文件中
+ # grants_user_new() #新增授权
+ # 设置部门用户
+ # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'],2)
+ # 设置部门负责人
+ # set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人
+ # 从下面开始,上面的暂时注释
+ goods_move2() # 设置产品出库渠道为直送
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+ for i in range(6):
+ # # 低值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+ # # 高值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+ # # 试剂
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+ BuyCarSubmit() # 请领车提交
+ for i in range(6): # 三个单据共审批6次
+ approval_center()
+ # 采购模块处理
+ purchase_module_process()
+ for i in range(3): # 三个单据共审批3次
+ approval_center()
+ order_dp(1) # 1低值
+ order_dp(2) # 2高值
+ order_dp(3) # 3试剂
+ check_accept_order(1) # 低值
+ check_accept_order(2) # 高值
+ check_accept_order(3) # 试剂
+ second_dept_one_key_in()
+ second_dept_one_key_in()
+ second_dept_one_key_in()
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
index f9ef91f1b37f56d125b9f4d84e0a096b311f6a0f..b1a261c80754feb14e4f629a773e92cec263ec6c 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b5\346\265\201\347\250\213\345\215\201\344\272\214\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
@@ -402,45 +402,45 @@ def pick_execute():
# 复核===================================
-
-try:
- add_dept2() # 新增一个二级科室
- add_new_deptinfo() # 写入科室信息到文件中
- grants_user_new() # 新增授权
- # 同步库房信息
- execute_command("python runner_test.py tag id2263-221 debug sit")
- # 设置部门用户
- set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
- FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
- # 设置部门负责人
- set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人
- get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
- FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
- set_stockShelf_Linkman()#设置库区联系人
- #新建科室产品分配
- dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'])
- #编辑产品请领目标为二级检验科002
- currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
- targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
- edit_goods_target(currentDeptId, targetDeptId)
-
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是新二级库
- # # # 低值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
- # # # 高值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
- # # # 试剂
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
- BuyCarSubmit() # 请领车提交
- for i in range(6): # 三个单据共审批6次
- approval_center()
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库
- # 二级科室领用出库
- # 低值拣货执行
- pick_execute()
- second_dept_one_key_in(5)
- second_dept_one_key_in(5)
- second_dept_one_key_in(5)
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ add_dept2() # 新增一个二级科室
+ add_new_deptinfo() # 写入科室信息到文件中
+ grants_user_new() # 新增授权
+ # 同步库房信息
+ execute_command("python runner_test.py tag id2263-221 debug sit")
+ # 设置部门用户
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
+ # 设置部门负责人
+ set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"]) # 设置二级科室负责人
+ get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
+ set_stockShelf_Linkman()#设置库区联系人
+ #新建科室产品分配
+ dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'])
+ #编辑产品请领目标为二级检验科002
+ currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
+ targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+ edit_goods_target(currentDeptId, targetDeptId)
+
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(5)) # 设置登录账号默认权限是新二级库
+ # # # 低值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+ # # # 高值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+ # # # 试剂
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+ BuyCarSubmit() # 请领车提交
+ for i in range(6): # 三个单据共审批6次
+ approval_center()
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库
+ # 二级科室领用出库
+ # 低值拣货执行
+ pick_execute()
+ second_dept_one_key_in(5)
+ second_dept_one_key_in(5)
+ second_dept_one_key_in(5)
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
index a31ae1f0032785c91b451b7c2bd515177a53329f..324601b01c784a84edc53245c5c03077fc471c4c 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.air/a_b6\346\265\201\347\250\213\345\215\201\344\270\211\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\270\211\347\272\247\345\272\223\345\220\221\344\272\214\347\272\247\345\272\223.py"
@@ -326,37 +326,37 @@ def pick_execute():
result = commonFuc().http_post(url, request_body, headers)
print('提交拣货执行单,result1', result)
+def main():
+ try:
+ # 设置部门用户
+ set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3)
+ # 设置部门负责人
+ set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"]) # 设置二级科室负责人
+ get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],
+ FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3)
+ set_stockShelf_Linkman() # 设置库区联系人
+ #三级科室产品分配
+ dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'])
-try:
- # 设置部门用户
- set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],
- FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3)
- # 设置部门负责人
- set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"]) # 设置二级科室负责人
- get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],
- FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3)
- set_stockShelf_Linkman() # 设置库区联系人
- #三级科室产品分配
- dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'])
-
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库
- # # # 低值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
- # # # 高值
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
- # # # 试剂
- second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
- BuyCarSubmit() # 请领车提交
- for i in range(6): # 三个单据共审批6次
- approval_center()
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) #设置登录账号默认权限是二级库
- #二级科室领用出库
- # 低值拣货执行
- pick_execute()
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) #设置登录账号默认权限是三级库
- second_dept_one_key_in(3)
- second_dept_one_key_in(3)
- second_dept_one_key_in(3)
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error ', '1')
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库
+ # # # 低值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+ # # # 高值
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+ # # # 试剂
+ second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+ BuyCarSubmit() # 请领车提交
+ for i in range(6): # 三个单据共审批6次
+ approval_center()
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) #设置登录账号默认权限是二级库
+ #二级科室领用出库
+ # 低值拣货执行
+ pick_execute()
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) #设置登录账号默认权限是三级库
+ second_dept_one_key_in(3)
+ second_dept_one_key_in(3)
+ second_dept_one_key_in(3)
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error ', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py"
index 9f2e8a8103992db87324a9c940d9f2e584d1799a..68d909e6c87e0b7c869a5d75778035a8dbcb26dd 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py"
@@ -576,17 +576,17 @@ def second_dept_consume_in_Stock(type=1):
else:
commonFuc().check_text_exist_result_text('error', 'succees')
-
-try:
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库
- sCan_grant(1) # 低值扫码发放
- sCan_grant(3) # 试剂扫码发放
- second_dept_consume_Out_Stock(2) # 高值消耗出库
- second_dept_consume_in_Stock(2) # 高值消耗退货入库
- second_dept_consume_Out_Stock(1) # 低值消耗出库
- second_dept_consume_in_Stock(1) # 低值消耗退回入库
- second_dept_consume_Out_Stock(3) # 试剂消耗出库
- second_dept_consume_in_Stock(3) # 试剂消耗退回入库
- commonFuc().check_text_exist_result_text('SUCCESS', 'SUCCESS')
-except:
- commonFuc().check_text_exist_result_text('error', 'SUCCESS')
+def main():
+ try:
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库
+ sCan_grant(1) # 低值扫码发放
+ sCan_grant(3) # 试剂扫码发放
+ second_dept_consume_Out_Stock(2) # 高值消耗出库
+ second_dept_consume_in_Stock(2) # 高值消耗退货入库
+ second_dept_consume_Out_Stock(1) # 低值消耗出库
+ second_dept_consume_in_Stock(1) # 低值消耗退回入库
+ second_dept_consume_Out_Stock(3) # 试剂消耗出库
+ second_dept_consume_in_Stock(3) # 试剂消耗退回入库
+ commonFuc().check_text_exist_result_text('SUCCESS', 'SUCCESS')
+ except:
+ commonFuc().check_text_exist_result_text('error', 'SUCCESS')
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 0520908b31f48a1da4dbd4d0f8ca493fd6a6cabe..cea3d48876fc1cd2557d5fd5cbf403fdf9f8e779 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"
@@ -422,15 +422,15 @@ def second_dept_return_Out_Stock(type): # 三级库退库出库
result = commonFuc().http_post(url, request_body, headers)
print('试剂产品退库出库，result', result)
-
-try:
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库
- second_dept_return_Out_Stock(2) # 高值耗材退货出库
- second_dept_return_Out_Stock(1) # 低值耗材退货出库
- second_dept_return_Out_Stock(3) # 试剂耗材退货出库
- second_dept_one_key_in(2)
- second_dept_one_key_in(2)
- second_dept_one_key_in(2)
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(3)) # 设置登录账号默认权限是三级库
+ second_dept_return_Out_Stock(2) # 高值耗材退货出库
+ second_dept_return_Out_Stock(1) # 低值耗材退货出库
+ second_dept_return_Out_Stock(3) # 试剂耗材退货出库
+ second_dept_one_key_in(2)
+ second_dept_one_key_in(2)
+ second_dept_one_key_in(2)
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py"
index c06498b38c57359d4a1e19fcae87f0fff6110b52..556bcf19f4dd91bbef51b2af6d15faa7363577c8 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.air/a_b9\346\265\201\347\250\213\345\215\201\345\205\255\351\200\200\345\272\223\344\270\232\345\212\241_\344\272\214\347\272\247\345\272\223\345\220\221\344\270\200\347\272\247\345\272\223\351\200\200\345\272\223.py"
@@ -553,21 +553,21 @@ def second_dept_return_Out_Stock(type): # 二级库退库出库
result = commonFuc().http_post(url, request_body, headers)
print('试剂产品退库出库，result', result)
-
-try:
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
- second_dept_return_Out_Stock(2)#高值耗材退货出库
- approval_center()#审批
- putaway()#中心库上架
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
- second_dept_return_Out_Stock(1)#低值耗材退货出库
- approval_center() # 审批
- putaway() # 中心库上架
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
- second_dept_return_Out_Stock(3)#试剂耗材退货出库
- approval_center()#审批
- putaway()#中心库上架
- # ===============上面调通了================================
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
+ second_dept_return_Out_Stock(2)#高值耗材退货出库
+ approval_center()#审批
+ putaway()#中心库上架
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
+ second_dept_return_Out_Stock(1)#低值耗材退货出库
+ approval_center() # 审批
+ putaway() # 中心库上架
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))#设置登录账号默认权限是二级库
+ second_dept_return_Out_Stock(3)#试剂耗材退货出库
+ approval_center()#审批
+ putaway()#中心库上架
+ # ===============上面调通了================================
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py" "b/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py"
index a5b87a31330f678f7df65fa313cfb1f391f8742b..75222fba65427a280dfa76ba63fb80590060a58e 100644
--- "a/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.air/a_c0\346\265\201\347\250\213\345\215\201\344\270\203\351\200\200\350\264\247\344\270\232\345\212\241_\344\270\255\345\277\203\345\272\223\351\200\200\344\276\233\345\272\224\345\225\206.py"
@@ -626,12 +626,12 @@ def second_center_Stock_return_Out(type): # 中心库退供应商
result = commonFuc().http_post(url, request_body, headers)
print('herpService_stock_review_pass_submit_urlresult', result)
# ========出库复核提交
-
-try:
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库
- second_center_Stock_return_Out(2) #高值耗材退货出库
- second_center_Stock_return_Out(1) #低值耗材退货出库
- second_center_Stock_return_Out(3) #试剂耗材退货出库
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库
+ second_center_Stock_return_Out(2) #高值耗材退货出库
+ second_center_Stock_return_Out(1) #低值耗材退货出库
+ second_center_Stock_return_Out(3) #试剂耗材退货出库
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git "a/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py" "b/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py"
index 89264fa06e058483f7269cf664a1fa2e7552ce72..1ed43781f41b38f68e940d8ad42136aeb7b8bb64 100644
--- "a/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.air/a_c1\346\265\201\347\250\213\345\215\201\345\205\253\344\270\255\345\277\203\345\272\223\344\270\232\345\212\241_\346\213\206\345\214\205\345\212\237\350\203\275.py"
@@ -363,11 +363,11 @@ def center_Stock_unpack(type): # 扫码发放(高值不能扫码发放)
result = commonFuc().http_post(url, request_body, headers)
print('result', result)
-
-try:
- updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库
- center_Stock_unpack(1) # 低值耗材扫码发放
- center_Stock_unpack(3) # 试剂耗材扫码发放
- commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
- commonFuc().check_text_exist_result_text('error', '1')
+def main():
+ try:
+ updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) # 设置登录账号默认权限是二级库
+ center_Stock_unpack(1) # 低值耗材扫码发放
+ center_Stock_unpack(3) # 试剂耗材扫码发放
+ commonFuc().check_text_exist_result_text('succees', 'succees')
+ except:
+ commonFuc().check_text_exist_result_text('error', '1')
diff --git a/air_case/b5_spd3_core_business_flow/execute.air/execute.py b/air_case/b5_spd3_core_business_flow/execute.air/execute.py
index 846ae7a3ba574ece633d2f38229a4d8012cf1f50..9c87eb5a5a69878c922463b9e1e0905ccb8e93e5 100644
--- a/air_case/b5_spd3_core_business_flow/execute.air/execute.py
+++ b/air_case/b5_spd3_core_business_flow/execute.air/execute.py
@@ -17,14 +17,165 @@ __author__ = "xiaohesheng"
case_tag:api,id2302-22,sit,on
python runner_test.py tag id2302-22 debug mdm3
"""
+pro_path = commonFuc().get_pro_path2()
-try:
- pro_path = commonFuc().get_pro_path2()
- print('pro_path', pro_path)
+
+# print('pro_path', pro_path)
+def flow1():
+ # ==================调用流程一开始
sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air')
using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air')
- from a_a1_流程一外网企业注册审批 import test1
- test1()
- commonFuc().check_text_exist_result_text('succees','succees')
-except:
- commonFuc().check_text_exist_result_text('error','succees')
\ No newline at end of file
+ from a_a1_流程一外网企业注册审批 import main
+ main()
+# ==================调用流程一结束
+def flow2():
+ # ==================调用流程二开始
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air')
+ from a_a2_流程二供货关系申请提交审批 import main
+ main()
+# ==================调用流程二结束
+def flow3():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air')
+ from a_a3_流程三_产品导入和审批 import main
+ main()
+def flow4():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air')
+ from a_a4_流程四_基础模块设置 import main
+ main()
+
+
+def flow5():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air')
+ from a_a5流程五_中心库入库结算_正结算1_提交采购计划 import main
+ main()
+def flow6():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a6流程五_中心库入库结算_正结算2_外网配送.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a6流程五_中心库入库结算_正结算2_外网配送.air')
+ from a_a6流程五_中心库入库结算_正结算2_外网配送 import main
+ main()
+
+def flow7():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
+ from a_a7流程五_中心库入库结算_正结算3_内网验收入库结算 import main
+ main()
+
+def flow8():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a8流程五_中心库入库结算_正结算3_外网开票.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a8流程五_中心库入库结算_正结算3_外网开票.air')
+ from a_a8流程五_中心库入库结算_正结算3_外网开票 import main
+ main()
+def flow9():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air')
+ from a_a9流程六_中心库入库结算_负结算 import main
+ main()
+def flow10():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air')
+ from a_b0流程七_中心库入库结算_正负结算 import main
+ main()
+def flow11():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air')
+ from a_b1流程八_高值跟台业务流程 import main
+ main()
+def flow12():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air')
+ from a_b2流程九请领业务流_二级库向中心库 import main
+ main()
+def flow13():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
+ from a_b3流程十请领业务流_二级库向边仓 import main
+ main()
+
+
+def flow14():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air')
+ from a_b4流程十一请领业务流_二级库向直送 import main
+ main()
+
+
+def flow15():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air')
+ from a_b5流程十二请领业务流_二级库向二级库 import main
+ main()
+
+
+def flow16():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air')
+ from a_b6流程十三请领业务流_三级库向二级库 import main
+ main()
+
+
+def flow17():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air')
+ from a_b7流程十四退库业务_消耗退库 import main
+ main()
+
+
+def flow18():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air')
+ from a_b8流程十五退库业务_三级库向二级库退库 import main
+ main()
+
+
+def flow19():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air')
+ from a_b9流程十六退库业务_二级库向一级库退库 import main
+ main()
+
+
+def flow20():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_c0流程十七退货业务_中心库退供应商.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_c0流程十七退货业务_中心库退供应商.air')
+ from a_c0流程十七退货业务_中心库退供应商 import main
+ main()
+
+
+def flow21():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/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')
+# flow8()
\ No newline at end of file
diff --git a/air_case/b5_spd3_core_business_flow/onekey_execute.air/onekey_execute.py b/air_case/b5_spd3_core_business_flow/onekey_execute.air/onekey_execute.py
new file mode 100644
index 0000000000000000000000000000000000000000..b64fff7f10d73514f0f4021c3461afe5d2cc180b
--- /dev/null
+++ b/air_case/b5_spd3_core_business_flow/onekey_execute.air/onekey_execute.py
@@ -0,0 +1,180 @@
+# -*- 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,id2302-23,sit,on
+python runner_test.py tag id2302-23 debug mdm3
+"""
+pro_path = commonFuc().get_pro_path2()
+
+
+# print('pro_path', pro_path)
+def flow1():
+ # ==================调用流程一开始
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air')
+ from a_a1_流程一外网企业注册审批 import main
+ main()
+# ==================调用流程一结束
+def flow2():
+ # ==================调用流程二开始
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air')
+ from a_a2_流程二供货关系申请提交审批 import main
+ main()
+# ==================调用流程二结束
+def flow3():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a3_流程三_产品导入和审批.air')
+ from a_a3_流程三_产品导入和审批 import main
+ main()
+def flow4():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air')
+ from a_a4_流程四_基础模块设置 import main
+ main()
+
+
+def flow5():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a5流程五_中心库入库结算_正结算1_提交采购计划.air')
+ from a_a5流程五_中心库入库结算_正结算1_提交采购计划 import main
+ main()
+def flow6():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a6流程五_中心库入库结算_正结算2_外网配送.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a6流程五_中心库入库结算_正结算2_外网配送.air')
+ from a_a6流程五_中心库入库结算_正结算2_外网配送 import main
+ main()
+
+def flow7():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
+ from a_a7流程五_中心库入库结算_正结算3_内网验收入库结算 import main
+ main()
+
+def flow8():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a8流程五_中心库入库结算_正结算3_外网开票.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a8流程五_中心库入库结算_正结算3_外网开票.air')
+ from a_a8流程五_中心库入库结算_正结算3_外网开票 import main
+ main()
+def flow9():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air')
+ from a_a9流程六_中心库入库结算_负结算 import main
+ main()
+def flow10():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air')
+ from a_b0流程七_中心库入库结算_正负结算 import main
+ main()
+def flow11():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b1流程八_高值跟台业务流程.air')
+ from a_b1流程八_高值跟台业务流程 import main
+ main()
+def flow12():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air')
+ from a_b2流程九请领业务流_二级库向中心库 import main
+ main()
+def flow13():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
+ from a_b3流程十请领业务流_二级库向边仓 import main
+ main()
+
+
+def flow14():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air')
+ from a_b4流程十一请领业务流_二级库向直送 import main
+ main()
+
+
+def flow15():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air')
+ from a_b5流程十二请领业务流_二级库向二级库 import main
+ main()
+
+
+def flow16():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air')
+ from a_b6流程十三请领业务流_三级库向二级库 import main
+ main()
+
+
+def flow17():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air')
+ from a_b7流程十四退库业务_消耗退库 import main
+ main()
+
+
+def flow18():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air')
+ from a_b8流程十五退库业务_三级库向二级库退库 import main
+ main()
+
+
+def flow19():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air')
+ from a_b9流程十六退库业务_二级库向一级库退库 import main
+ main()
+
+
+def flow20():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_c0流程十七退货业务_中心库退供应商.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_c0流程十七退货业务_中心库退供应商.air')
+ from a_c0流程十七退货业务_中心库退供应商 import main
+ main()
+
+
+def flow21():
+ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air')
+ using(pro_path + r'//air_case/b5_spd3_core_business_flow/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')
diff --git a/common/common_func.py b/common/common_func.py
index 8e39919556534cad0d2b6fc3c962681e90e08bf9..7b0bf7cccba0807c46323811a0f560f56f6beb4f 100644
--- a/common/common_func.py
+++ b/common/common_func.py
@@ -8,7 +8,17 @@ from common.confop import confOP
from common.dubboUtils import GetDubboService2, InvokeDubboApi
from common.rw import Rw
-workspace = os.path.abspath(".")
+
+# import pdb
+# pdb.set_trace()
+curPath = os.path.abspath(os.path.dirname(__file__)) # 获取当前文件的所在目录的绝对路径
+# print('curPath',curPath)
+rootPath = os.path.split(curPath)[0]
+# print('rootPath',rootPath)
+
+workspace = os.path.abspath(rootPath)
+
+# workspace = os.path.abspath(".")
business_path = workspace + os.sep + "data" + os.sep
diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message
index 12df10d81a68696fb0910a22e9025fc1b0aa2c21..fd58ca7f70439325f58c64a55b2b8bd1793e2574 100644
--- a/data/a2_mdm3_ea/message
+++ b/data/a2_mdm3_ea/message
@@ -1,3 +1,3 @@
企业信息:
- e_id: CR202407040182
- cname: 国药集团公司ASrWh
+ e_id: CR202407050338
+ cname: 国药集团公司GxzLS
diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message
index a6ab52c732e6b7452cde254d863614f76ca05b6d..08bb86618bd4401667627c1cbc3b3b6c31112d8a 100644
--- a/data/a3_mdm3_hs/message
+++ b/data/a3_mdm3_hs/message
@@ -1,3 +1,3 @@
医院信息:
- h_id: 湖南省人民医院ejaH9
- h_name: 湖南省人民医院ejaH9
+ h_id: 湖南省人民医院nSOQy
+ h_name: 湖南省人民医院nSOQy
diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2
index 618163e26801a45176c43dfdcadaf293b7fc5309..2e9039e45279d20657e0a62723ad721f9be73fd4 100644
--- a/data/a5_mdm3_pdm/message2
+++ b/data/a5_mdm3_pdm/message2
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2407040052_1
+ MSPid: MSP2407050029_1
hosId: h0347
- hosGoodsId: h034700004436
- provGoodsid: provGood-99221632
- goodsAuditBillId: MSP2407040052
- targetId: MSP2407040052_1
+ hosGoodsId: h034700004465
+ provGoodsid: provGood-99221661
+ goodsAuditBillId: MSP2407050029
+ targetId: MSP2407050029_1
diff --git a/data/a6_mdm3_si/message b/data/a6_mdm3_si/message
index ad670d977fb4be1d8ef22c7db722d33896f09153..b69dd378a19d94f9bda66de8e198e38a76ed8b1d 100644
--- a/data/a6_mdm3_si/message
+++ b/data/a6_mdm3_si/message
@@ -2,45 +2,45 @@
list_a:
- &id001
settleMonth: '202407'
- pid: OBh0347202407040010
- hosGoodsId: h034700004433
- goodsCode: '00004433'
- goodsName: 一次性注射器_低值7QT@(
+ pid: OBh0347202407050007
+ hosGoodsId: h034700004462
+ goodsCode: '00004462'
+ goodsName: 一次性注射器_低值C2g9i
goodsGg: G-31891
mfrsName: 德国歌德公司 Geuder AG
unit: 支
- leftSettleAmount: 19999.98
+ leftSettleAmount: 0.0
batchCode:
kindName:
factName:
cacheleftAmount: 19999.98
purMode: 10
- waitInvoicingNum: 200.0
+ waitInvoicingNum: 0.0
invoicingPrice:
normalContractId:
normalContract: '1'
detailList:
- - pid: OBh0347202407040010
+ - pid: OBh0347202407050007
settleMonth: '202407'
- accountDate: '2024-07-04'
- hosGoodsId: h034700004433
+ accountDate: '2024-07-05'
+ hosGoodsId: h034700004462
batchCode: '333'
- distrDetailId: '03839233'
- distrId: PSh0347202407040093
- distrOrderNo: PSh0347202407040093
+ distrDetailId: '03839280'
+ distrId: PSh0347202407050026
+ distrOrderNo: PSh0347202407050026
settlePrice: 99.9999
- maxSettleQty: 100.0
- maxSettleAmount: 9999.99
- curSettleQty: 100.0
- curSettleAmount: 9999.99
- leftSettleQty: 100.0
- leftSettleAmount: 9999.99
+ maxSettleQty: -100.0
+ maxSettleAmount: -9999.99
+ curSettleQty: -100.0
+ curSettleAmount: -9999.99
+ leftSettleQty: -100.0
+ leftSettleAmount: -9999.99
hosId: h0347
- provId: p1e2fe
- branchId: h0347-3725
- balanceDetId: OBh0347202407040010-000001
+ provId: p1e31d
+ branchId: h0347-3729
+ balanceDetId: OBh0347202407050007-000001
purMode: 10
- barCode: 010112345678901210333112407041725011021UT240704000894
+ barCode: 010112345678901210333112407051725011121UT240705000214
batchId:
price:
maxQty:
@@ -53,15 +53,15 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
- viewId: 202407OBh0347202407040010h034700004433
- - pid: OBh0347202407040010
+ viewId: 202407OBh0347202407050007h034700004462
+ - pid: OBh0347202407050007
settleMonth: '202407'
- accountDate: '2024-07-04'
- hosGoodsId: h034700004433
+ accountDate: '2024-07-05'
+ hosGoodsId: h034700004462
batchCode: '333'
- distrDetailId: '03839233'
- distrId: PSh0347202407040093
- distrOrderNo: PSh0347202407040093
+ distrDetailId: '03839280'
+ distrId: PSh0347202407050026
+ distrOrderNo: PSh0347202407050026
settlePrice: 99.9999
maxSettleQty: 100.0
maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
leftSettleQty: 100.0
leftSettleAmount: 9999.99
hosId: h0347
- provId: p1e2fe
- branchId: h0347-3725
- balanceDetId: OBh0347202407040010-000002
+ provId: p1e31d
+ branchId: h0347-3729
+ balanceDetId: OBh0347202407050007-000002
purMode: 10
- barCode: 010112345678901210333112407041725011021UT240704000916
+ barCode: 010112345678901210333112407051725011121UT240705000251
batchId:
price:
maxQty:
@@ -87,10 +87,10 @@
volumeFlag:
onlineKind:
invoicePrice: 99.9999
- viewId: 202407OBh0347202407040010h034700004433
- unique: 202407OBh0347202407040010h034700004433
+ viewId: 202407OBh0347202407050007h034700004462
+ unique: 202407OBh0347202407050007h034700004462
onlineKind: '10'
- viewId: 202407OBh0347202407040010h034700004433
+ viewId: 202407OBh0347202407050007h034700004462
list_b:
- *id001
list_c:
diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message
index 91a34259e68df87cb5ddb3e6d3bff0dbeda7e0b8..4cca1b326221f809324be7531000e920774dbe22 100644
--- a/data/b2_herp3_bs/message
+++ b/data/b2_herp3_bs/message
@@ -1,6 +1,6 @@
院区新增:
- branch_id: h0347-3725
- branch_name: 东土城路院区ftZkF
+ branch_id: h0347-3729
+ branch_name: 东土城路院区)Gl$!
科室信息:
- dept2_id: f8324b9a0bff4ed7a43350b91a04426f
+ dept2_id: 232328e5ceb44b799efba96c512618bf
dept2_name: 二级检验科002
diff --git a/data/b2_herp3_bs/message3 b/data/b2_herp3_bs/message3
index d6c8d5ea740520baf2b91f27dd105ca10cb2190b..8a492a6295c03c2096e2648edd0020a4a12da714 100644
--- a/data/b2_herp3_bs/message3
+++ b/data/b2_herp3_bs/message3
@@ -1,3 +1,3 @@
用户名信息:
- username1: 自动化测试AZlIj
- username2: 自动化测试AZlIj
+ username1: 自动化测试pwnfB
+ username2: 自动化测试pwnfB
diff --git a/data/b2_herp3_bs/message4 b/data/b2_herp3_bs/message4
index 220dad4739e2da91a6e601d6d34af34ea96d0fb8..63b37ac610daf9ffadbfd049565371ead02081a0 100644
--- a/data/b2_herp3_bs/message4
+++ b/data/b2_herp3_bs/message4
@@ -1,3 +1,3 @@
一级科室信息:
- dept1_id: 3e559b76a8fc42819e9c1370d488cab8
+ dept1_id: d5e1acc8708f47a7b152e103204ee4cb
dept1_name: 设备科001
diff --git a/data/b2_herp3_bs/message6 b/data/b2_herp3_bs/message6
index e9f32f304a0a15125c18ca9925671f579f6e0afe..a003d4ce8afeecd91dc08260fc39b51b543ab377 100644
--- a/data/b2_herp3_bs/message6
+++ b/data/b2_herp3_bs/message6
@@ -1,12 +1,10 @@
所有科室id:
- deptid1: 3e559b76a8fc42819e9c1370d488cab8
- deptid2: f8324b9a0bff4ed7a43350b91a04426f
- deptid3: cc17aab4a5b74b14a5168897a9e6d8f3
- deptid4: 65f9bd02a2104011a8e11754db3a8a48
- deptid5: 8a687d0771fe40e49568fbfd6c2b3560
+ deptid1: d5e1acc8708f47a7b152e103204ee4cb
+ deptid2: 232328e5ceb44b799efba96c512618bf
+ deptid3: eefab2fb6d6e423da8e3df5e433a01a5
+ deptid4: 6cea679813db435099a2a3c0bcf1de0e
所有科室name:
deptid1: 设备科001
deptid2: 二级检验科002
deptid3: 三级检测组003
deptid4: 科室004
- deptid5: 二级科室005
diff --git a/data/b2_herp3_bs/message7 b/data/b2_herp3_bs/message7
index 94925abe4540c6e19182f07a02a25894dadb082b..fb1990a0399db80ced72b29291dca93f2eae6093 100644
--- a/data/b2_herp3_bs/message7
+++ b/data/b2_herp3_bs/message7
@@ -1,4 +1,4 @@
shelfinfo:
- shelfid: 2303b7e9bd6c4d49b3791eecea8a6bb5
- shelfCode: areah03472615
+ shelfid: 3b42810b4b854af5a2a95f104a2d7b6b
+ shelfCode: areah03472634
areaName: 自动化测试
diff --git a/data/b5_spd3_core_business_flow/message b/data/b5_spd3_core_business_flow/message
index bb9edcc27d2da5f68eacf7568f7c742dffa47d41..93661a052bcd53e3fb90cb1fa6114b005f10efa2 100644
--- a/data/b5_spd3_core_business_flow/message
+++ b/data/b5_spd3_core_business_flow/message
@@ -1,5 +1,5 @@
供货关系申请2:
- e_corpId: p1e2fe
+ e_corpId: p1e31d
h_corpId: h0347
- e_username: 国药集团公司ASrWh
+ e_username: 国药集团公司GxzLS
h_name: test001
diff --git a/data/b5_spd3_core_business_flow/message1 b/data/b5_spd3_core_business_flow/message1
index 83eafa699e67d7c83321ca14558aafadd17eaa1b..5bc88cd2c19da82cd9e6c2356ffcfad481051440 100644
--- a/data/b5_spd3_core_business_flow/message1
+++ b/data/b5_spd3_core_business_flow/message1
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2407040048_1
+ MSPid: MSP2407050025_1
hosId: h0347
- hosGoodsId: h034700004432
- provGoodsid: provGood-99221628
- goodsAuditBillId: MSP2407040048
- targetId: MSP2407040048_1
+ hosGoodsId: h034700004461
+ provGoodsid: provGood-99221657
+ goodsAuditBillId: MSP2407050025
+ targetId: MSP2407050025_1
diff --git a/data/b5_spd3_core_business_flow/message10 b/data/b5_spd3_core_business_flow/message10
index 5f24abb229578832af0f9653683cf1a5933f90b3..9e4c733fd4720944be6f5a565d9b9c35ce4736c7 100644
--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
@@ -1,9 +1,12 @@
低值配送单号:
- distrBillId1: PSh0347202407040112
- distrBillId2: PSh0347202407040112
+ distrBillId1: PSh0347202407050026
+ distrBillId2: PSh0347202407050026
高值配送单号:
- distrBillId1: PSh0347202407040113
- distrBillId2: PSh0347202407040113
+ distrBillId1: PSh0347202407050027
+ distrBillId2: PSh0347202407050027
试剂配送单号:
- distrBillId1: PSh0347202407040114
- distrBillId2: PSh0347202407040114
+ distrBillId1: PSh0347202407050028
+ distrBillId2: PSh0347202407050028
+高值跟台配送单号:
+ distrBillId1: PSh0347202407050029
+ distrBillId2: PSh0347202407050029
diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11
index 01d38ff18769d54826762beec55d5d02eac94082..918ba93f3cf72212344e7fe43228cd84a09005e2 100644
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
@@ -1,3 +1,3 @@
采购计划单号高值:
- orderNo1: PLAN2024070431307
- orderNo2: PLAN2024070431307
+ orderNo1: PLAN2024070531411
+ orderNo2: PLAN2024070531411
diff --git a/data/b5_spd3_core_business_flow/message12 b/data/b5_spd3_core_business_flow/message12
index 5c22c947bb6620b8993f7840b445d3dd8ea1e156..1a2bb4b60548b43845cf51c458c815a23a16a445 100644
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
@@ -1,3 +1,3 @@
采购计划单号试剂:
- orderNo1: PLAN2024070431308
- orderNo2: PLAN2024070431308
+ orderNo1: PLAN2024070531412
+ orderNo2: PLAN2024070531412
diff --git a/data/b5_spd3_core_business_flow/message13 b/data/b5_spd3_core_business_flow/message13
index 61bef5d31eabcc087a381efae3060a42e7b3713d..6a43301308d1eaa822266d4d7f22699c98704482 100644
--- a/data/b5_spd3_core_business_flow/message13
+++ b/data/b5_spd3_core_business_flow/message13
@@ -3,34 +3,33 @@
- &id001
- id:
hosId: h0347
- branchId: h0347-3725
+ branchId: h0347-3729
deptId:
taskType: 1
- sourceOrgId: p1e2fe
- sourceOrgName: 国药集团公司ASrWh
- sourceOrderNo: PSh0347202407040114
- billMode: '66'
+ sourceOrgId: p1e31d
+ sourceOrgName: 国药集团公司GxzLS
+ sourceOrderNo: PSh0347202407050029
+ billMode: '25'
stockKind:
purMode:
- sourceId: PSh0347202407040114
+ sourceId: PSh0347202407050029
sourceDetailId:
sourceType: PSD
sourceTypeName: 配送单
sourceVersion: 1
- planOrderNo: PLAN2024070431308
- purOrderNo: CG2024070420563
- recOrgId: f8324b9a0bff4ed7a43350b91a04426f
+ planOrderNo: SSSQ202407050327
+ purOrderNo: SSTZ202407050303
+ recOrgId: 232328e5ceb44b799efba96c512618bf
recOrgName: 二级检验科002
- billRelationJson: '{"buyBillId":"Bh03472024070400147","planBillId":"Ph034720240704027953","planOrderNo":"PLAN2024070431308","buyOrderNo":"BUY2024070405751","purOrderNo":"CG2024070420563","purBillId":"Ch034720240704000140","purBillDate":"2024-07-04
- 12:39:22","distrBillId":"PSh0347202407040114","distrOrderNo":"PSh0347202407040114"}'
- taskDate: '2024-07-04 12:39:54'
+ billRelationJson: '{"operationApplyOrderNo":"SSSQ202407050327","operationNoticeBillId":"Nh034720240705000002","distrBillId":"PSh0347202407050029","operationNoticeOrderNo":"SSTZ202407050303","distrOrderNo":"PSh0347202407050029","operationApplyBillId":"Oh034720240705000002"}'
+ taskDate: '2024-07-05 10:38:38'
taskDateStart:
taskDateEnd:
billModeList:
viewIdList:
- supplierFlag: true
+ supplierFlag: false
tbStatus: 20
- remark: ''
+ remark:
pdaFlag:
list_b:
- *id001
diff --git a/data/b5_spd3_core_business_flow/message14 b/data/b5_spd3_core_business_flow/message14
index 9af047239f599f3e113d85eda8ca6693349f6659..ecb57758a06c1b89797e117d6762a3fcf28499da 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: 60
- unitName: 100支/100
- hosGoodsId: h034700004434
+ - purMode: 20
+ unitName: 1支
+ hosGoodsId: h034700004461
mdmGoodsCode:
- spdGoodsCode: '11661387'
- goodsCode: '00004434'
- goodsName: 新型冠状病毒检测试剂)CVXH
+ spdGoodsCode: '11661414'
+ goodsCode: '00004461'
+ goodsName: 高值牙钻机rY4w$
goodsGg: G-31891
mfrsId:
mfrsName: 德国歌德公司 Geuder AG
@@ -16,27 +16,27 @@
goodsDi: '01123456789012'
miCode:
miDjmc:
- certificateCode: ''
+ certificateCode:
rfidFlag: 0
pkgDefId:
- pkgDefName: '100'
- pkgDefQty: 100.0
- batchCode: '4444'
- expdtDate: '2025-01-10'
- productDate: '2024-07-04'
- provName: 国药集团公司ASrWh
+ pkgDefName:
+ pkgDefQty: 1.0
+ batchCode: '2222'
+ expdtDate: '2025-01-11'
+ productDate: '2024-07-05'
+ provName: 国药集团公司GxzLS
provId:
- viewId: '03839254'
+ viewId: '03839283'
verifyFlag: 0
hasSterilize: 0
- id: '03839254'
+ id: '03839283'
detailRelationJson:
- extInfo: '{"goodsGg":"G-31891","goodsCode":"00004434","purMode":60,"goodsName":"新型冠状病毒检测试剂)CVXH","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661387","ybDefId":""}'
+ extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
recTemperature: 20
recHumidity: 30
distrPrice: 99.9999
distrPkgQty: 1.0
- distrQty: 100.0
+ distrQty: 1.0
price: 99.9999
checkQty: 0.0
checkPkgQty: 0
@@ -44,7 +44,7 @@
initQty:
totalQty:
rowNum:
- settlement: 1
+ settlement: 3
hdiBarcodeList:
detailId:
pkgCode:
diff --git a/data/b5_spd3_core_business_flow/message15 b/data/b5_spd3_core_business_flow/message15
index 246d3dfbf7764bd76aba8954f31f0ae82114c021..8db8a026573228e1b6b92a69b318087d0e9574bf 100644
--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
@@ -1,3 +1,3 @@
验收单号:
- CHECK_NO1: CHECKh03472024070400113
- CHECK_NO2: CHECKh03472024070400113
+ CHECK_NO1: CHECKh03472024070500034
+ CHECK_NO2: CHECKh03472024070500034
diff --git a/data/b5_spd3_core_business_flow/message16 b/data/b5_spd3_core_business_flow/message16
index fa704ee9fbdcecf002cfa49bc1c6832c43facc71..abe265a19a6e5ac73c2fffa6e811cc829d1bb1a3 100644
--- a/data/b5_spd3_core_business_flow/message16
+++ b/data/b5_spd3_core_business_flow/message16
@@ -5,34 +5,34 @@
lastModified:
version:
createTime:
- createUser: h0347_UID-051391
+ createUser: h0347_UID-051395
lastModifiedUser:
billMode: '16'
recType:
stockKind:
purMode:
- sourceId: CHECKh03472024070400092
+ sourceId: CHECKh03472024070500029
sourceType: PSD
sourceVersion: 0
batchList:
billRelationJson:
hosId: h0347
- deptId: 3e559b76a8fc42819e9c1370d488cab8
+ deptId: d5e1acc8708f47a7b152e103204ee4cb
deptName:
- branchId: h0347-3725
+ branchId: h0347-3729
branchName:
taskType: 1
- sourceOrgId: p1e2fe
- sourceOrgName: 国药集团公司ASrWh
- sourceOrderNo: YS240704092
- taskSourceNo: PSh0347202407040093
- areaCode: areah03472615
+ sourceOrgId: p1e31d
+ sourceOrgName: 国药集团公司GxzLS
+ sourceOrderNo: YS240705029
+ taskSourceNo: PSh0347202407050026
+ areaCode: areah03472634
areaName: 自动化测试
goodsName:
goodsGg:
startDate:
endDate:
- taskDate: '2024-07-04 12:06:38'
+ taskDate: '2024-07-05 10:19:37'
pkgTaskId:
pkgFlag:
remark: ''
diff --git a/data/b5_spd3_core_business_flow/message17 b/data/b5_spd3_core_business_flow/message17
index 47042c1158bbf167e07f9a3568fed47c3e3c99da..fc8a48b648c13628cbd18d36ee4fe4f3be40d8f8 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: CHECKh034720240704000920001
+ - id: CHECKh034720240705000290001
lastModified:
version:
createTime:
@@ -10,27 +10,27 @@
rowIdx:
purMode: 10
unitName: 100支/100
- pid: CHECKh03472024070400092
- hosGoodsId: h034700004433
+ pid: CHECKh03472024070500029
+ hosGoodsId: h034700004462
batchCode: '333'
- expdtDate: '2025-01-10'
- productDate: '2024-07-04'
+ expdtDate: '2025-01-11'
+ productDate: '2024-07-05'
batchPrice: 99.9999
settlement: 1
batchType: 20
- srcBatchId: '03839233'
+ srcBatchId: '03839280'
srcBatchPrice: 99.9999
- shelfCode: areah03472615-2-01-01
+ shelfCode: areah03472634-2-01-01
shelfKind:
- barcodeId: UT240704000853
+ barcodeId: UT240705000213
subBarcodeId:
qty: 10000.0
pkgQty: 100
- distrId: PSh0347202407040093
- distrDetailId: '03839233'
+ distrId: PSh0347202407050026
+ distrDetailId: '03839280'
pkgDefQty: 100.0
pkgDefName: '100'
- viewId: h0347000044333332025-01-10100支/100
+ viewId: h0347000044623332025-01-11100支/100
codingType:
batchFlag:
hasSterilize: 0
@@ -38,31 +38,31 @@
sterilizePassQty:
sterilizeRejectQty:
orderNo:
- sourceDetailId: '03839233'
- mdmGoodsCode: '11661386'
- goodsCode: '00004433'
+ sourceDetailId: '03839280'
+ mdmGoodsCode: '11661415'
+ goodsCode: '00004462'
tbStatus: 1
billMode: '16'
hosId: h0347
- branchId: h0347-3725
- purBillId: Ch034720240704000121
- provId: p1e2fe
- provName: 国药集团公司ASrWh
+ branchId: h0347-3729
+ purBillId: Ch034720240705000055
+ provId: p1e31d
+ provName: 国药集团公司GxzLS
subSendFlag: 10
- exeProvId: p1e2fe
- exeProvName: 国药集团公司ASrWh
- purDetailId: 288f2ff00593475584b663be8650ed56
- goodsName: 一次性注射器_低值7QT@(
+ exeProvId: p1e31d
+ exeProvName: 国药集团公司GxzLS
+ purDetailId: e35ec319b7fa458e96c1051ef8b5e4f9
+ goodsName: 一次性注射器_低值C2g9i
goodsGg: G-31891
mfrsId: mfrs-11229
mfrsName: 德国歌德公司 Geuder AG
made: 德国
unit: 支
purPrice: 99.9999
- pkgDefId: 0cef5dc580aa4b5dbe97ce2add7cbb21
- supplyId: 003da1b8dde74730bd8856b131cc5629
- subProvId: p1e2fe
- subProvName: 国药集团公司ASrWh
+ pkgDefId: db284f5e13594188b4aa09a5832293ec
+ supplyId: bec1283b1f3440539ef0962c6e9d92d4
+ subProvId: p1e31d
+ subProvName: 国药集团公司GxzLS
subPrice: 99.9999
distrPrice: 99.9999
distrPkgQty: 100.0
@@ -74,13 +74,13 @@
psiPrice: 99.9999
ext:
goodsGg: G-31891
- goodsCode: '00004433'
+ goodsCode: '00004462'
purMode: 10
- goodsName: 一次性注射器_低值7QT@(
+ goodsName: 一次性注射器_低值C2g9i
ygptCode: ''
transCond: ''
storageCond: ''
- erpCode: '11661386'
+ erpCode: '11661415'
ybDefId: ''
purTaskId:
multiChargeFlag:
diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18
index 23d79615d65e9410922d68ea8ca9ade0ad73815f..d114d43de8e81f689e625f85d1b838e5a15acbd2 100644
--- a/data/b5_spd3_core_business_flow/message18
+++ b/data/b5_spd3_core_business_flow/message18
@@ -1,53 +1,120 @@
条码信息:
list_a:
- &id001
- id: UT240704000953
- snCode: UT240704000953
- ssccCode: '010839000187002326'
- pkgCodeSee: 0101123456789012104444112407041725011021UT240704000953
- hosGoodsId: h034700004434
- hosGoodsCode: '00004434'
- goodsCode: '00004434'
- goodsName: 新型冠状病毒检测试剂)CVXH
- goodsSpec: G-31891
- goodsMfrsName: 德国歌德公司 Geuder AG
- unit: 支
- purMode: 60
- batchCode: '4444'
- productDate: '2024-07-04'
- expdtDate: '2025-01-10'
- pkgDefName: '100'
- pkgDefQty: 100.0
- stockId: 92286fa2798042d6af9879fdaf89c5ad
- stockName: 东土城路院区ftZkF中心库房
- areaName: 自动化测试
- areaCode: areah03472615
- lockStatus: 0
- unitName: 100支/100
- shelfCode: areah03472615-2-01-01
- shelfNo: 自动化测试-2-01-01
- pkgDefId: fa18f079634e4978a3231c4b669794e1
- extInfo: '{"pkgDefId": "fa18f079634e4978a3231c4b669794e1", "pkgDefQty": 100, "purBillId":
- "CG2024070420546", "pkgDefName": "100", "distrBillId": "PSh0347202407040095",
- "inStockTime": "2024-07-04 12:07:46", "distrDetailId": "03839235", "certificateCode":
- ""}'
- bottleId:
- pkgType: '66'
- miDjmc: ''
- miCode: ''
- transferRatio: 1.0
- qty: 1
- shelfKind: 0
- shelfKindName: 普通货位
- provName: 国药集团公司ASrWh
- provId: p1e2fe
- inStockDate:
- mfrCode:
- made: 德国
- price:
- barName: 100支/100
- purModeText: 检验试剂
- codeType: 66
+ - id: UT240705000214
+ lastModified:
+ version:
+ createTime: '2024-07-05 10:18:30'
+ createUser:
+ lastModifiedUser:
+ snCode: UT240705000214
+ hosId: h0347
+ branchId:
+ stockId: 9b3e40528eff4ed1bf4ee12b587e00d0
+ areaCode: areah03472634
+ areaName: 自动化测试
+ shelfCode: areah03472634-2-01-01
+ codeType: 16
+ tagType: 0
+ hosGoodsId: h034700004462
+ mdmGoodsCode: '11661415'
+ goodsCode: '00004462'
+ goodsDi: '01123456789012'
+ barName: 100支/100
+ batchCode: '333'
+ expdtDate: '2025-01-11'
+ productDate: '2024-07-05'
+ mfrCode:
+ mfrCodeSee:
+ pkgCode: "010112345678901210333\x1D112407051725011121UT240705000214"
+ pkgCodeSee: 010112345678901210333112407051725011121UT240705000214
+ ssccCode: '010839000187046429'
+ extInfo:
+ outId:
+ tbStatus: 20
+ goodsCodeDi:
+ barcodeId:
+ ext:
+ pkgDefId: db284f5e13594188b4aa09a5832293ec
+ pkgDefQty: 100
+ purBillId: CG2024070520620
+ pkgDefName: '100'
+ distrBillId: PSh0347202407050026
+ inStockTime: '2024-07-05 10:21:08'
+ distrDetailId: '03839280'
+ certificateCode: ''
+ sourceDetailId:
+ purMode: 10
+ purModes:
+ price:
+ pid:
+ goodsMfrsName: 德国歌德公司 Geuder AG
+ mfrsName:
+ goodsSpec: G-31891
+ unit: 支
+ goodsName: 一次性注射器_低值C2g9i
+ pkgDefId: db284f5e13594188b4aa09a5832293ec
+ pkgDefQty: 100
+ defaultPkgDefQty:
+ defaultQty:
+ defaultSurplusQty:
+ defaultPkgDefId:
+ purDetailId:
+ pkgDefName: '100'
+ printNum: 0
+ deptId:
+ deptName:
+ billId:
+ taskId:
+ made: 德国
+ provId: p1e31d
+ provName: 国药集团公司GxzLS
+ subProvId: p1e31d
+ subProvName: 国药集团公司GxzLS
+ provHosGoodsId:
+ sourceType:
+ taskDate:
+ sourceOrderNo:
+ taskType:
+ detailId:
+ branchGoodsPkgDefList:
+ unitName:
+ areaCodeList:
+ diType:
+ mdmGoodsSpecCode:
+ hosGoodsCode: '00004462'
+ supplyId:
+ inSettlement:
+ spdGoodsCode:
+ codeKind:
+ brand:
+ miCode:
+ transferRatio: 1.0
+ miDjmc:
+ tbStatusList:
+ purModeText:
+ stockName:
+ tbStatusText:
+ pkgType:
+ bottleId:
+ pkgStatus:
+ qty:
+ packUnit:
+ minSaleQty:
+ rfidFlag:
+ mfrCodeFlag:
+ scanStatus:
+ scanId:
+ multiChargeFlag:
+ useFrequency:
+ chargeUnit:
+ lockStatus:
+ remark:
+ hosBatchId:
+ settleFlag:
+ inStockTime:
+ verifyFlag:
+ subSendFlag: 10
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message19 b/data/b5_spd3_core_business_flow/message19
index 2dceaee8840cbeac2383dd64e04341ea6fea4fa1..98cb88e5e18018841de997499df53e2c8226a8b5 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: h034700004432
- hosGoodsCode: '00004432'
- provId: p1e2fe
- subProvId: p1e2fe
- subProvName: 国药集团公司ASrWh
- goodsName: 高值牙钻机8hjrB
+ - hosGoodsId: h034700004461
+ hosGoodsCode: '00004461'
+ provId: p1e31d
+ subProvId: p1e31d
+ subProvName: 国药集团公司GxzLS
+ goodsName: 高值牙钻机rY4w$
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 aa0866db1fa4c94cc3914149152ff514451f2888..568f4cd57c5e8c98b7e8132c5b7f3e9d82935077 100644
--- a/data/b5_spd3_core_business_flow/message2
+++ b/data/b5_spd3_core_business_flow/message2
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2407040049_1
+ MSPid: MSP2407050026_1
hosId: h0347
- hosGoodsId: h034700004433
- provGoodsid: provGood-99221629
- goodsAuditBillId: MSP2407040049
- targetId: MSP2407040049_1
+ hosGoodsId: h034700004462
+ provGoodsid: provGood-99221658
+ goodsAuditBillId: MSP2407050026
+ targetId: MSP2407050026_1
diff --git a/data/b5_spd3_core_business_flow/message22 b/data/b5_spd3_core_business_flow/message22
index d44cef3fc4c51cca69cf54a9406654995eba4abf..390f06de3f573926a7f2cbb1e3e487f534f3f310 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: c620cac823d34206acda9c65da3e5591
- lastModified: '2024-07-04 14:14:56'
- version: 5
- createTime: '2024-07-04 12:03:16'
- createUser: h0347_UID-051391
- lastModifiedUser: h0347_UID-051391
- stockId: a7a5bedfb8a3408fb17c4abdfd9da4d5
- shelfCode: areah03472614
+ - id: 2aeb6b71864042b8aece41d819c70542
+ lastModified: '2024-07-05 10:13:37'
+ version: 0
+ createTime: '2024-07-05 10:13:37'
+ createUser: UID-050151
+ lastModifiedUser: UID-050151
+ stockId: 6898e3a36c3c4b36bf1ea0648b26cba4
+ shelfCode: areah03472631
shelfName: 默认库区
address: 二级检验科002
shelfType:
@@ -18,13 +18,13 @@
parentId:
levelCode:
tbStatus: 1
- linkman: h0347_UID-051391
- recPhone: None
+ linkman:
+ recPhone:
delFlag: 0
shelfNo: A01
shelfKind: 0
hosId:
- deptId: f8324b9a0bff4ed7a43350b91a04426f
+ deptId: 232328e5ceb44b799efba96c512618bf
areaCode:
areaName:
stockName:
diff --git a/data/b5_spd3_core_business_flow/message3 b/data/b5_spd3_core_business_flow/message3
index 2186c65c600541dc3dc0a5937ab6f4d9014473e4..171eb8d9e726cc829e0a15c81ccd1504f8a54ca7 100644
--- a/data/b5_spd3_core_business_flow/message3
+++ b/data/b5_spd3_core_business_flow/message3
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2407040050_1
+ MSPid: MSP2407050027_1
hosId: h0347
- hosGoodsId: h034700004434
- provGoodsid: provGood-99221630
- goodsAuditBillId: MSP2407040050
- targetId: MSP2407040050_1
+ hosGoodsId: h034700004463
+ provGoodsid: provGood-99221659
+ goodsAuditBillId: MSP2407050027
+ targetId: MSP2407050027_1
diff --git a/data/b5_spd3_core_business_flow/message4 b/data/b5_spd3_core_business_flow/message4
index f745b7f4ef916d2ba7256eded3e7e7899d54248e..cb7b1cc1fa22dd7a898b7f85dbe9c83ea8418103 100644
--- a/data/b5_spd3_core_business_flow/message4
+++ b/data/b5_spd3_core_business_flow/message4
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2407040051_1
+ MSPid: MSP2407050028_1
hosId: h0347
- hosGoodsId: h034700004435
- provGoodsid: provGood-99221631
- goodsAuditBillId: MSP2407040051
- targetId: MSP2407040051_1
+ hosGoodsId: h034700004464
+ provGoodsid: provGood-99221660
+ goodsAuditBillId: MSP2407050028
+ targetId: MSP2407050028_1
diff --git a/data/b5_spd3_core_business_flow/message5 b/data/b5_spd3_core_business_flow/message5
index 618163e26801a45176c43dfdcadaf293b7fc5309..2e9039e45279d20657e0a62723ad721f9be73fd4 100644
--- a/data/b5_spd3_core_business_flow/message5
+++ b/data/b5_spd3_core_business_flow/message5
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2407040052_1
+ MSPid: MSP2407050029_1
hosId: h0347
- hosGoodsId: h034700004436
- provGoodsid: provGood-99221632
- goodsAuditBillId: MSP2407040052
- targetId: MSP2407040052_1
+ hosGoodsId: h034700004465
+ provGoodsid: provGood-99221661
+ goodsAuditBillId: MSP2407050029
+ targetId: MSP2407050029_1
diff --git a/data/b5_spd3_core_business_flow/message6 b/data/b5_spd3_core_business_flow/message6
index 4a29e2460fdca76fbb724839486adf35b4a27ca0..7584cff0bae9492d7ad487524ac5eaceb5431045 100644
--- a/data/b5_spd3_core_business_flow/message6
+++ b/data/b5_spd3_core_business_flow/message6
@@ -1,3 +1,3 @@
产品包装信息:
- unitPackageid1: fa18f079634e4978a3231c4b669794e1
- unitPackageid2: fa18f079634e4978a3231c4b669794e1
+ unitPackageid1: fdfa9805e01946bba3c5b8bd487a6dc7
+ unitPackageid2: fdfa9805e01946bba3c5b8bd487a6dc7
diff --git a/data/b5_spd3_core_business_flow/message7 b/data/b5_spd3_core_business_flow/message7
index 33e8dd3eafa0f2826efb7f68a195830b3382558d..b32ef0fc1b0e0fb82f06290724fc7e7c247dbc5a 100644
--- a/data/b5_spd3_core_business_flow/message7
+++ b/data/b5_spd3_core_business_flow/message7
@@ -1,3 +1,3 @@
采购计划单号:
- orderNo1: PLAN2024070431309
- orderNo2: PLAN2024070431309
+ orderNo1: PLAN2024070531410
+ orderNo2: PLAN2024070531410
diff --git a/data/b5_spd3_core_business_flow/message8 b/data/b5_spd3_core_business_flow/message8
index ff7c09586169fd935a0efdc6844910858b6ef4a1..3f3cec28c14aba8c19ffe892f04d312304b73576 100644
--- a/data/b5_spd3_core_business_flow/message8
+++ b/data/b5_spd3_core_business_flow/message8
@@ -1,53 +1,38 @@
配送订单信息:
list_a:
- &id001
- - id: Ch034720240704000140
- lastModified: '2024-07-04 12:39:22'
- version: 0
- createTime: '2024-07-04 12:39:22'
- createUser: h0347_UID-051391
- lastModifiedUser:
- orderNo: CG2024070420563
- billMode: '66'
- recType: HDI
+ - id: Nh034720240705000002
+ orderNo: SSTZ202407050303
+ sourceOrderNo: SSSQ202407050327
hosId: h0347
- branchId: h0347-3725
- deptId:
- deptName:
- recOrgId: f8324b9a0bff4ed7a43350b91a04426f
- recOrgName: 二级检验科002
- areaCode:
- areaName:
- billExpdtDate:
- sourceId: Ph034720240704027953
- sourceType:
- inSettlement:
- recUser:
- recPhone:
- recAddr: 自动化测试
- provId: p1e2fe
- provName: 国药集团公司ASrWh
- subSendFlag:
- exeProvId: p1e2fe
- exeProvName: 国药集团公司ASrWh
- billRelationJson:
- extInfo:
- barcodeFlag: 1
- pkgFlag:
- remark: ''
- priority:
- closeStatus: 0
- closeDate:
- upStatus:
- tbStatus: 30
- hosVersion: 3
- billType: CGD
hosName: 邹城市人民医院(test)
- branchName: 东土城路院区ftZkF
- sumQty: 100.0
- sumPkgQty: 1.0
- sumAmount: '9999.9900'
- planOrderNo: PLAN2024070431308
+ branchName: 东土城路院区)Gl$!
+ recDeptName: 二级检验科002
+ operName: 血管扩张术
+ operDate: '2024-07-06'
+ operDoctor: 李*
+ patientName: 张*
+ status: 10
+ statusText: 待确认
+ version: 0
+ patientInHosId: '123456'
+ surDeptName: ''
+ remark: 自动化测试
+ createUserName: 自动化测试pwnfB
+ distPriority: 0
+ distPriorityText:
+ distId:
+ distNo:
+ hosVersion: 3
+ createTime: '2024-07-05 10:37:52'
+ sumQty:
+ sumAmount:
+ operationPkg: 0
+ provId: p1e31d
+ provName: 国药集团公司GxzLS
+ subProvId: ''
+ subProvName: ''
+ recDeptId: 232328e5ceb44b799efba96c512618bf
list_b:
- *id001
list_c:
diff --git a/data/b5_spd3_core_business_flow/message9 b/data/b5_spd3_core_business_flow/message9
index 5c36d25e3e5e9b7f226454ca1eb9cc2759cfd84b..14584fe9a37f4bea3ef01774358200d42457c769 100644
--- a/data/b5_spd3_core_business_flow/message9
+++ b/data/b5_spd3_core_business_flow/message9
@@ -1,87 +1,70 @@
配送订单详细信息:
list_a:
- &id001
- - id: e74e6c1317764d2090021827bf92a73e
- lastModified:
- version:
- createTime:
- createUser:
- lastModifiedUser:
- pid: Ch034720240704000140
- orderNo: CG2024070420563
- sourceId: 5b53cfd509b24819bc51c208184de065
- hosGoodsId: h034700004434
- mdmGoodsCode: '11661387'
- goodsCode: '00004434'
- purMode: 60
+ id: Nh034720240705000002
+ orderNo: SSTZ202407050303
+ sourceOrderNo: SSSQ202407050327
+ hosId: h0347
+ hosName: 邹城市人民医院(test)
+ branchName: 东土城路院区)Gl$!
+ recDeptName: 二级检验科002
+ operName: 血管扩张术
+ operDate: '2024-07-06'
+ operDoctor: 李*
+ patientName: 张*
+ status: 20
+ statusText: 待配送
+ version: 1
+ patientInHosId: '123456'
+ surDeptName: ''
+ remark: 自动化测试
+ createUserName: 自动化测试pwnfB
+ distPriority: 0
+ distPriorityText: 否
+ distId:
+ distNo:
+ hosVersion: 3
+ createTime: '2024-07-05 10:37:52'
+ sumQty: 1
+ sumAmount: '99.9999'
+ operationPkg: 0
+ provId: p1e31d
+ provName: 国药集团公司GxzLS
+ subProvId: ''
+ subProvName: ''
+ recDeptId: 232328e5ceb44b799efba96c512618bf
+ list_b:
+ - *id001
+ list_c:
+ - *id001
+配送订单详细信息2:
+ list_a:
+ - &id001
+ - id: h034720240705000002
+ hosGoodsId: h034700004461
+ goodsNum: 1
price: '99.9999'
- supplyId: fb3c93a93de14ef79a3baa0998a2ecd9
- pkgDefId: fa18f079634e4978a3231c4b669794e1
- pkgDefName: '100'
- pkgDefQty: 100.0
- pkgQty: 1.0
- qty: 100.0
- conPkgQty: 1.0
- conQty: 100.0
- checkPkgQty: 0.0
- checkQty: 0.0
- distrPkgQty: 0.0
- distrQty: 0.0
- notSendQty: 0.0
- notSendPkgQty: 0.0
- inSettlement: 1
- closeType: 1
- detailRelationJson: '{"planBillId":"Ph034720240704027953","buyDetailId":"Bh034720240704001470001","planDetailId":"5b53cfd509b24819bc51c208184de065"}'
- extInfo: '{"goodsGg":"G-31891","goodsCode":"00004434","purMode":60,"goodsName":"新型冠状病毒检测试剂)CVXH"}'
- remark:
- tbStatus:
- hosVersion:
+ inSettlement: 3
+ inSettlementText: 消耗结算
+ goodsName: 高值牙钻机rY4w$
+ goodsSpec: G-31891
+ goodsCode: '00004461'
+ goodsMfrsId: mfrs-11229
+ goodsMfrsName: 德国歌德公司 Geuder AG
unit: 支
- goodsName: 新型冠状病毒检测试剂)CVXH
- mfrsId: mfrs-11229
- mfrsName: 德国歌德公司 Geuder AG
- goodsGg: G-31891
- mdmGoodsSpecCode: '11661387'
- erpCode: '11661387'
- made: 德国
- goodsDi: '01123456789012'
- 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:
- diUse: '01123456789012'
+ subProvId: p1e31d
+ subProvName: 国药集团公司GxzLS
+ totalAmount: '99.9999'
+ spdGoodsCode: '11661414'
+ barCodeMng: 2
+ erpCode: '11661414'
multiChargeFlag: 0
useFrequency: 1
chargeUnit:
- amount: '9999.9900'
- unitName: 100支/100
- subProvId: p1e2fe
- subProvName: 国药集团公司ASrWh
- subPrice: 99.9999
- replPkgQty: 1.0
- replQty: 100.0
- ybDefId:
- logicId:
- provGoodsId:
- sendFlag:
- curQry:
+ hitCode: '12'
+ hitPrice: '99.999900'
+ diUse:
+ goodsDi: '01123456789012'
list_b:
- *id001
list_c:
diff --git a/main1/main_text.py b/main1/main_text.py
new file mode 100644
index 0000000000000000000000000000000000000000..05fc92e8b2f8263dbfd26c72ae5ba67a868f0eb4
--- /dev/null
+++ b/main1/main_text.py
@@ -0,0 +1,177 @@
+
+import time
+import sys
+import os
+# print('根据当前文件获取当前文件所在目录的路径', os.path.dirname(__file__))
+from airtest.core.helper import using
+
+from common.common_func import commonFuc
+from common.db.sql.sql_del_branch_info import delData
+
+curPath = os.path.abspath(os.path.dirname(__file__)) # 获取当前文件的所在目录的绝对路径
+# print('将路径中的/换成\\', curPath) # C:\Users\Administrator\Desktop\temp\dbshop99\main
+# # #将当前文件的所在目录的绝对路径进行分离,分离成 ('C:\\Users\\Administrator\\Desktop\\temp\\dbshop99', 'main'),存到元组中
+# print('切割路径,切割成一个元组,将路径分离', os.path.split(curPath))
+rootPath = os.path.split(curPath)[0] # [0]表示元组中的为一个元素
+# print('当前项目的根目录', rootPath)
+sys.path.append(rootPath) # 将项目的根目录路径添加到环境变量中,然后在cmd命令行中就可以正常运行脚本
+import tkinter as tk
+from tkinter import *
+from common.run_cmd_script import execute_command
+pro_path = commonFuc().get_pro_path2()
+sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/execute.air')
+using(pro_path + r'//air_case/b5_spd3_core_business_flow/execute.air')
+def main_text():
+ # 创建窗口
+ root = tk.Tk()
+ # 获取屏幕宽高
+ window_width = root.winfo_screenwidth()
+ window_height = root.winfo_screenheight()
+ # 设置窗口大小
+ root.geometry('395x280')
+ # 刷新窗口参数
+ root.update()
+ # 计算窗口居中时左上角的坐标
+ x = (window_width - root.winfo_width()) // 2
+ y = (window_height - root.winfo_height()) // 2
+ # 设置窗口左上角的坐标
+ root.geometry("+{}+{}".format(x, y))
+ root.title (string ="核心业务流")
+ root.resizable(False,False)
+ # for a in ['n', 's', 'e', 'w', 'ne', 'nw', 'se', 'sw']:
+ # Button(root,
+ # text='anchor',
+ # anchor=a,
+ # width=30,
+ # height=4).pack()
+ def flow1():
+ print('调用流程一')
+ from execute import flow1
+ flow1()
+ # execute_command("python runner_test.py tag id2302-1 debug mdm3")
+ # sys.exit(0)
+ def flow2():
+ print('调用流程二')
+ from execute import flow2
+ flow2()
+ # execute_command("python runner_test.py tag id2302-2 debug mdm3")
+ # sys.exit(0)
+ def flow3():
+ from execute import flow3
+ flow3()
+ # execute_command("python runner_test.py tag id2302-3 debug mdm3")
+ # sys.exit(0)
+ def flow4():
+ # execute_command("python runner_test.py tag id2302-4 debug mdm3")
+ from execute import flow4
+ flow4()
+ # sys.exit(0)
+ def flow5():
+ # execute_command("python runner_test.py tag id2302-5,id2302-6,id2302-7,id2302-8 debug mdm3")
+ from execute import flow5,flow6,flow7,flow8
+ flow5()
+ flow6()
+ flow7()
+ flow8()
+ # sys.exit(0)
+ def flow6():
+ from execute import flow9
+ flow9()
+ # sys.exit(0)
+ def flow7():
+ from execute import flow10
+ flow10()
+ # sys.exit(0)
+ def flow8():
+ from execute import flow11
+ flow11()
+ # sys.exit(0)
+ def flow9():
+ from execute import flow12
+ flow12()
+ # sys.exit(0)
+ def flow10():
+ from execute import flow13
+ flow13()
+ # sys.exit(0)
+ def flow11():
+ from execute import flow14
+ flow14()
+ # sys.exit(0)
+ def flow12():
+ from execute import flow15
+ flow15()
+ # sys.exit(0)
+ def flow13():
+ from execute import flow16
+ flow16()
+ # sys.exit(0)
+ def flow14():
+ from execute import flow17
+ flow17()
+ # sys.exit(0)
+ def flow15():
+ from execute import flow18
+ flow18()
+ # sys.exit(0)
+ def flow16():
+ from execute import flow19
+ flow19()
+ # sys.exit(0)
+ def flow17():
+ from execute import flow20
+ flow20()
+ # sys.exit(0)
+ def flow18():
+ from execute import flow21
+ flow21()
+ # sys.exit(0)
+ def flow0():
+ execute_command("python runner_test.py tag id2302-23 debug mdm3")
+ sys.exit(0)
+ def exit():
+ print('退出')
+ sys.exit(0)
+ def del_data():
+ # 删除自动化脚本产生的数据
+ delData().Delete_branch_by_id()
+ delData().Delete_goods_change_info()
+ delData().Delete_probeInfo_other()
+ delData().Del_supply_relation()
+ delData().Delete_business_Data()
+ delData().Del_reporter_data()
+ delData().Delete_business_Data_All()
+ delData().Delete_business_Data_All2()
+ print('===================删除垃圾数据完毕============================')
+ # 文本显示的位置。
+ Button(root, text='流程一', width=8, height=4,command=flow1).grid(row=2,column=0)
+ Button(root, text='流程二', anchor='center', width=8, height=4,command=flow2).grid(row=2,column=2)
+ Button(root, text='流程三', anchor='center', width=8, height=4,command=flow3).grid(row=2,column=4)
+ Button(root, text='流程四', anchor='center', width=8, height=4,command=flow4).grid(row=2,column=6)
+ Button(root, text='流程五', anchor='center', width=8, height=4,command=flow5).grid(row=2,column=8)
+ Button(root, text='流程六', anchor='center', width=8, height=4,command=flow6).grid(row=2,column=10)
+ Button(root, text='流程七', anchor='center', width=8, height=4,command=flow7).grid(row=3,column=0)
+ Button(root, text='流程八', anchor='center', width=8, height=4,command=flow8).grid(row=3,column=2)
+ Button(root, text='流程九', anchor='center', width=8, height=4,command=flow9).grid(row=3,column=4)
+ Button(root, text='流程十', anchor='center', width=8, height=4,command=flow10).grid(row=3,column=6)
+ Button(root, text='流程十一', anchor='center', width=8, height=4,command=flow11).grid(row=3,column=8)
+ Button(root, text='流程十二', anchor='center', width=8, height=4,command=flow12).grid(row=3,column=10)
+ Button(root, text='流程十三', anchor='center', width=8, height=4,command=flow13).grid(row=4,column=0)
+ Button(root, text='流程十四', anchor='center', width=8, height=4,command=flow14).grid(row=4,column=2)
+ Button(root, text='流程十五', anchor='center', width=8, height=4,command=flow15).grid(row=4,column=4)
+ Button(root, text='流程十六', anchor='center', width=8, height=4,command=flow16).grid(row=4,column=6)
+ Button(root, text='流程十七', anchor='center', width=8, height=4,command=flow17).grid(row=4,column=8)
+ Button(root, text='流程十八', anchor='center', width=8, height=4,command=flow18).grid(row=4,column=10)
+ Button(root, text='一键执行', anchor='center', width=8, height=2,command=flow0).grid(row=5,column=2)
+ Button(root, text='删除垃圾数据', anchor='center', width=8, height=2,command=del_data).grid(row=5,column=4)
+ Button(root, text='退 出', anchor='center', width=8, height=2,command=exit).grid(row=5,column=8)
+
+ # Button(root, text='anchor', anchor='e', width=30, height=4).pack()
+ # Button(root, text='anchor', anchor='w', width=30, height=4).pack()
+ # Button(root, text='anchor', anchor='ne', width=30, height=4).pack()
+ # Button(root, text='anchor', anchor='nw', width=30, height=4).pack()
+ # Button(root, text='anchor', anchor='se', width=30, height=4).pack()
+ # Button(root, text='anchor', anchor='sw', width=30, height=4).pack()
+
+ root.mainloop()
+main_text()
\ No newline at end of file
diff --git a/report/summary.html b/report/summary.html
index 17bca226edde0c3c2a46fb49d8b54433c070539a..0d4e888032c6f21a5694514625892a295c3d8e74 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
| 1 |
0 |
- 0分3秒 |
+ 0分2秒 |
0.0% |
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
- | execute |
+ r_b6科室管理_科室人员查询_按科室查询人员_设置科室负责人 |
失败 |
- 3.259 |
+ 2.788 |
xiaohesheng |