优化

air_case/cmdc_fresenius_group/验证新增名称相同套包限制.air/验证新增名称相同套包限制.py

@@ -54,7 +54,13 @@ api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 result["api_time"] = api_time
 
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict10")
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+if result["code"] == "FRESENIUS_GROUP_ERROR":
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict10")
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict11_1")
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
\ No newline at end of file

air_case/cmdc_fresenius_group/验证新增结构相同的套包.air/验证新增结构相同的套包.py

@@ -45,7 +45,14 @@ api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 result["api_time"] = api_time
 
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict11")
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+if result["code"] == "FRESENIUS_GROUP_ERROR":
+
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict11")
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict11_1")
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
\ No newline at end of file

data/cmdc_fresenius_group/data

@@ -106,7 +106,7 @@ checkDict10: {"success":false,"code":"FRESENIUS_GROUP_ERROR","message":"该行
 "payload11": {"manufacturerGroupName":"","manufacturerGroupCode":"","groupName":"","products":[{"productCode":"14615827","productName":"麦迪康牌灭菌指示包装袋(卷)","manufacturer":"AMD Medicom Inc.麦迪康(加拿大)公司","manufacturerCode":"7050567","optionStr":"9560 平面灭菌卷250mmx200m","storageCondition":"999","activityUnitAmount":null,"price":9999999.99,"measuringUnit":"卷","materialCode":"MED0869560-0040001","description":"","quantity":"1","manufacturerProductNo":null,"manufacturerProductDesc":null,"produceRegisterNum":null,"productLineName":"麦迪康","productLineCode":"2012"},{"productCode":"10700237","productName":"一次性使用灭菌橡胶外科手套","manufacturer":"TG MEDICAL SDN. BHD.","manufacturerCode":"7007634","optionStr":"/(SFBCS1144C-0080050无粉6.5号)","storageCondition":"999","activityUnitAmount":null,"price":9999999.99,"measuringUnit":"副","materialCode":"SFBCS1144C-0080050","description":"","quantity":"1","manufacturerProductNo":null,"manufacturerProductDesc":null,"produceRegisterNum":"国械注进20172661704","productLineName":"麦迪康","productLineCode":"2012"}],"productLineName":"麦迪康","status":0,"groupType":3}
 #预期结果
 checkDict11: {"success":false,"code":"FRESENIUS_GROUP_ERROR","message":"已存在相同结构的套包，不允许重复录入","data":null,"freshToken":null}
-
+checkDict11_1: {"success":false,"code":"ERROR","message":"找不到商品信息"}
 
 #测试场景十二：验证套包内商品非同一产品线限制
 "url12": "/order/public/saveFreseniusGroup"