Merge pull request '获取纸厂数据' (#1) from test into master

Reviewed-on: http://git.qniao.cn/automated-test-scripts/ztb-ops-rf-api/pulls/1

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}

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

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

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

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

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

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