diff --git a/000-LoginToken/3-WebLogin.robot b/000-LoginToken/3-WebLogin.robot index f75fa75..fb36dbc 100644 --- a/000-LoginToken/3-WebLogin.robot +++ b/000-LoginToken/3-WebLogin.robot @@ -32,7 +32,7 @@ Papermill_Login FOR ${items} IN @{paperMillOrgInfoList} ${papermill_orgId} Get From Dictionary ${items} orgId #纸厂组织id ${papermill_name} Get From Dictionary ${items} name #纸厂组织名称 - Exit For Loop If '${papermill_name}'=='516测试613' + Exit For Loop If '${papermill_orgId}'=='723518259651022848' END ${ztbsc_papermill_header} Set Variable {'Content-Type':'application/json','Authorization':'QNT ${PM_token}','X-APP-ID':'503258978847966406','X-ORGANIZATION-ID':'${papermill_orgId}'} #纸厂端切换组织后的请求头 Set Global Variable ${papermill_name} diff --git a/001-DirectSale/1-Client/create_order.robot b/001-DirectSale/1-Client/create_order.robot index a5c9a60..803ffc8 100644 --- a/001-DirectSale/1-Client/create_order.robot +++ b/001-DirectSale/1-Client/create_order.robot @@ -31,7 +31,7 @@ get_papermill_list ${papermillname} Get From Dictionary ${item} name #获取纸厂name ${cumulativeWeight} Get From Dictionary ${item} cumulativeWeight #累计已代卖吨数 ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类列表 - Exit For Loop If '${papermillname}'=='516测试613' + Exit For Loop If '${paperMillId}'=='723518259730714624' END ${value} Evaluate random.choice(${paperCategoryList}) random ${categoryid} Get From Dictionary ${value} id #纸厂品类id diff --git a/002-AgentSale/1-Client/create_order.robot b/002-AgentSale/1-Client/create_order.robot index a5c9a60..803ffc8 100644 --- a/002-AgentSale/1-Client/create_order.robot +++ b/002-AgentSale/1-Client/create_order.robot @@ -31,7 +31,7 @@ get_papermill_list ${papermillname} Get From Dictionary ${item} name #获取纸厂name ${cumulativeWeight} Get From Dictionary ${item} cumulativeWeight #累计已代卖吨数 ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类列表 - Exit For Loop If '${papermillname}'=='516测试613' + Exit For Loop If '${paperMillId}'=='723518259730714624' END ${value} Evaluate random.choice(${paperCategoryList}) random ${categoryid} Get From Dictionary ${value} id #纸厂品类id diff --git a/003-DirectSaleForwardFactoring/1-Client/create_order.robot b/003-DirectSaleForwardFactoring/1-Client/create_order.robot index a5c9a60..803ffc8 100644 --- a/003-DirectSaleForwardFactoring/1-Client/create_order.robot +++ b/003-DirectSaleForwardFactoring/1-Client/create_order.robot @@ -31,7 +31,7 @@ get_papermill_list ${papermillname} Get From Dictionary ${item} name #获取纸厂name ${cumulativeWeight} Get From Dictionary ${item} cumulativeWeight #累计已代卖吨数 ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类列表 - Exit For Loop If '${papermillname}'=='516测试613' + Exit For Loop If '${paperMillId}'=='723518259730714624' END ${value} Evaluate random.choice(${paperCategoryList}) random ${categoryid} Get From Dictionary ${value} id #纸厂品类id diff --git a/004-DirectSaleReverseFactoring/1-Client/create_order.robot b/004-DirectSaleReverseFactoring/1-Client/create_order.robot index e2da8cd..08722ce 100644 --- a/004-DirectSaleReverseFactoring/1-Client/create_order.robot +++ b/004-DirectSaleReverseFactoring/1-Client/create_order.robot @@ -31,7 +31,7 @@ get_papermill_list ${papermillname} Get From Dictionary ${item} name #获取纸厂name ${cumulativeWeight} Get From Dictionary ${item} cumulativeWeight #累计已代卖吨数 ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类列表 - Exit For Loop If '${papermillname}'=='516测试613' + Exit For Loop If '${paperMillId}'=='723518259730714624' END ${value} Evaluate random.choice(${paperCategoryList}) random ${categoryid} Get From Dictionary ${value} id #纸厂品类id diff --git a/005-AgencyForwardFactoring/1-Client/create_order.robot b/005-AgencyForwardFactoring/1-Client/create_order.robot index e2da8cd..08722ce 100644 --- a/005-AgencyForwardFactoring/1-Client/create_order.robot +++ b/005-AgencyForwardFactoring/1-Client/create_order.robot @@ -31,7 +31,7 @@ get_papermill_list ${papermillname} Get From Dictionary ${item} name #获取纸厂name ${cumulativeWeight} Get From Dictionary ${item} cumulativeWeight #累计已代卖吨数 ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类列表 - Exit For Loop If '${papermillname}'=='516测试613' + Exit For Loop If '${paperMillId}'=='723518259730714624' END ${value} Evaluate random.choice(${paperCategoryList}) random ${categoryid} Get From Dictionary ${value} id #纸厂品类id diff --git a/006-CounterFactoring/1-Client/create_order.robot b/006-CounterFactoring/1-Client/create_order.robot index a5c9a60..803ffc8 100644 --- a/006-CounterFactoring/1-Client/create_order.robot +++ b/006-CounterFactoring/1-Client/create_order.robot @@ -31,7 +31,7 @@ get_papermill_list ${papermillname} Get From Dictionary ${item} name #获取纸厂name ${cumulativeWeight} Get From Dictionary ${item} cumulativeWeight #累计已代卖吨数 ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类列表 - Exit For Loop If '${papermillname}'=='516测试613' + Exit For Loop If '${paperMillId}'=='723518259730714624' END ${value} Evaluate random.choice(${paperCategoryList}) random ${categoryid} Get From Dictionary ${value} id #纸厂品类id diff --git a/数据驱动.xls b/数据驱动.xls index b62828d..b7a6002 100644 Binary files a/数据驱动.xls and b/数据驱动.xls differ