From bcc5882b48cf1596dd4629afef8c36d68ed691c6 Mon Sep 17 00:00:00 2001
From: liguangyu06 <1666071293@qq.com>
Date: Wed, 31 Jan 2024 14:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=96=B0=E5=A2=9E=EF=BC=9A?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B7=B2=E6=8E=A8=E9=80=81=E9=85=8D=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...41\351\252\214\351\252\214\350\257\201.py" | 62 +++++++++++++++++++
 data/cmdc_order_list/data                     | 10 ++-
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 "air_case/cmdc_order_list/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.air/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.py"

diff --git "a/air_case/cmdc_order_list/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.air/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.py" "b/air_case/cmdc_order_list/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.air/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.py"
new file mode 100644
index 00000000..6504fa0b
--- /dev/null
+++ "b/air_case/cmdc_order_list/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.air/\345\220\210\345\271\266\345\267\262\346\216\250\351\200\201\351\205\215\350\264\247\345\215\225\346\240\241\351\252\214\351\252\214\350\257\201.py"
@@ -0,0 +1,62 @@
+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc合并已推送配货单校验验证,2295,2295-19,sit,bs
+主数据平台:后台运营系统合并接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import random
+import json
+
+module = "cmdc_order_list"
+
+# 第一步登录后台运营系统获取token
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后Cmdc_access_token
+cmdc_access_token = CmdcDoLogin(username, password).get_token()
+headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
+
+# 第二步获取已完成推送的配货单信息
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url19_1")
+request_body = commonFuc().get_business_data(module, "payload19_1")
+# 发送请求
+result = requests.get(url, params=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 生成随机数
+dis_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取配货单信息
+distribution_jde_ds_id = result["data"]["list"][dis_random]["distributionJdeDsId"]
+distribution_jde_ds_code = result["data"]["list"][dis_random]["distributionJdeDsCode"]
+
+# 第三步进行合并操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url19")
+request_body = commonFuc().get_business_data(module, "payload19", distribution_jde_ds_id)
+
+"""
+
+ 场景: 合并已推送配货单校验验证
+ 用例名称：合并已推送配货单校验验证
+ 输出：{"success":false,"code":"ERROR","message":"%s配货状态错误","data":null,"freshToken":null}
+"""
+
+# 发送请求
+result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+
+result = json.loads(result.content)
+# 将接口响应时间添加至result
+result["api_time"] = api_time
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict19", distribution_jde_ds_code)
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+
diff --git a/data/cmdc_order_list/data b/data/cmdc_order_list/data
index d45cc921..30499897 100644
--- a/data/cmdc_order_list/data
+++ b/data/cmdc_order_list/data
@@ -141,8 +141,14 @@ checkDict17: {"success":true,"code":"200","message":"OK","data":{"status":0,"cou
 #预期结果
 checkDict18: {"success":false,"code":"ERROR","message":"至少两个才能合并","data":null,"freshToken":null}
 
-
-
+#测试场景十九：合并已推送配货单校验验证
+"url19": "/order/distributiondsJdeDs/merge"
+"payload19": {"ids":"%s"}
+#预期结果
+checkDict19: {"success":false,"code":"ERROR","message":"%s配货状态错误","data":null,"freshToken":null}
+# 获取已推送的配货单
+"url19_1": "/order/distributiondsJdeDs/getDistributiondsJdeDsList"
+"payload19_1": {"demandCode":null,"distributionJdeDsCode":null,"pushType":2,"mergeSign":null,"customerInfo":null,"productCode":null,"soCode":null,"optionStr":null,"materialCode":null,"mergeTimeStart":null,"mergeTimeEnd":null,"submitTimeStart":null,"submitTimeEnd":null,"auditTimeStart":null,"auditTimeEnd":null,"mergeCode":null,"code":null,"jdeType":null,"activityType":null,"fieldName":1,"filedSort":2,"isGroup":0,"pageNumber":1,"pageSize":10}
 
 
 
-- 
GitLab