From 45b6352267fd2a2ef82efb77f1a9f75a11925e43 Mon Sep 17 00:00:00 2001
From: LG_lai <laiyonglan0921@163.com>
Date: Thu, 15 Sep 2022 16:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E8=BE=86=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 001-DirectSale/1-Client/create_order.robot    |   3 +-
 002-AgentSale/1-Client/create_order.robot     |   3 +-
 .../1-Client/create_order.robot               |   3 +-
 .../1-Client/create_order.robot               |   3 +-
 .../1-Client/create_order.robot               |   3 +-
 .../1-Client/create_order.robot               |   3 +-
 Datadriven.xls                                | Bin 9728 -> 9728 bytes
 DatadrivenB-1.xls                             | Bin 9728 -> 9728 bytes
 DatadrivenB-2.xls                             | Bin 9728 -> 9728 bytes
 DatadrivenB.xls                               | Bin 9728 -> 9728 bytes
 DatadrivenC-1.xls                             | Bin 9728 -> 9728 bytes
 DatadrivenC-2.xls                             | Bin 9728 -> 9728 bytes
 DatadrivenC.xls                               | Bin 9728 -> 9728 bytes
 DatadrivenF.xls                               | Bin 9728 -> 9728 bytes
 DatadrivenP.xls                               | Bin 9728 -> 9728 bytes
 RF-TEST/0-Data driven/dataDriven.robot        |   6 +---
 RF-TEST/1-Client/APPlogin.robot               |  10 +++---
 RF-TEST/1-Client/create_order.robot           |  31 +++++++++++++-----
 .../Order/1-Platform dispatch.robot           |   4 ++-
 19 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/001-DirectSale/1-Client/create_order.robot b/001-DirectSale/1-Client/create_order.robot
index 0c2cad1..ca87096 100644
--- a/001-DirectSale/1-Client/create_order.robot
+++ b/001-DirectSale/1-Client/create_order.robot
@@ -81,6 +81,7 @@ order_list
     FOR    ${item}    IN    @{orderlist}
         ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
         ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${paperMillCategoryName}    Get From Dictionary    ${item['packerOrderList'][0]}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/002-AgentSale/1-Client/create_order.robot b/002-AgentSale/1-Client/create_order.robot
index 803ffc8..6552602 100644
--- a/002-AgentSale/1-Client/create_order.robot
+++ b/002-AgentSale/1-Client/create_order.robot
@@ -81,6 +81,7 @@ order_list
     FOR    ${item}    IN    @{orderlist}
         ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
         ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${paperMillCategoryName}    Get From Dictionary    ${item['packerOrderList'][0]}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/003-DirectSaleForwardFactoring/1-Client/create_order.robot b/003-DirectSaleForwardFactoring/1-Client/create_order.robot
index 803ffc8..6552602 100644
--- a/003-DirectSaleForwardFactoring/1-Client/create_order.robot
+++ b/003-DirectSaleForwardFactoring/1-Client/create_order.robot
@@ -81,6 +81,7 @@ order_list
     FOR    ${item}    IN    @{orderlist}
         ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
         ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${paperMillCategoryName}    Get From Dictionary    ${item['packerOrderList'][0]}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/004-DirectSaleReverseFactoring/1-Client/create_order.robot b/004-DirectSaleReverseFactoring/1-Client/create_order.robot
index 08722ce..23950e1 100644
--- a/004-DirectSaleReverseFactoring/1-Client/create_order.robot
+++ b/004-DirectSaleReverseFactoring/1-Client/create_order.robot
@@ -81,6 +81,7 @@ order_list
     FOR    ${item}    IN    @{orderlist}
         ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
         ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${paperMillCategoryName}    Get From Dictionary    ${item['packerOrderList'][0]}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/005-AgencyForwardFactoring/1-Client/create_order.robot b/005-AgencyForwardFactoring/1-Client/create_order.robot
index 08722ce..23950e1 100644
--- a/005-AgencyForwardFactoring/1-Client/create_order.robot
+++ b/005-AgencyForwardFactoring/1-Client/create_order.robot
@@ -81,6 +81,7 @@ order_list
     FOR    ${item}    IN    @{orderlist}
         ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
         ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${paperMillCategoryName}    Get From Dictionary    ${item['packerOrderList'][0]}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/006-CounterFactoring/1-Client/create_order.robot b/006-CounterFactoring/1-Client/create_order.robot
index 803ffc8..6552602 100644
--- a/006-CounterFactoring/1-Client/create_order.robot
+++ b/006-CounterFactoring/1-Client/create_order.robot
@@ -81,6 +81,7 @@ order_list
     FOR    ${item}    IN    @{orderlist}
         ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
         ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${paperMillCategoryName}    Get From Dictionary    ${item['packerOrderList'][0]}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/Datadriven.xls b/Datadriven.xls
index 5f8ee34ad8fc6424a993f30d4069498fae45010a..0c066e32f58fd0cd46facacf41767079f2cbd8ee 100644
GIT binary patch
delta 62
zcmZqhY4F*wT1dCjH!3+lH^?Hyq_Qa4*QL-kET_;Q)YH?j*f7s8H8MFMx7;i|#ih`@
R)X~;<vW<Y!=3hc=!T`Sn6=MJZ

delta 62
zcmZqhY4F*wT1YoC!!%txSKG`Y(J!gQKg%)2z&txOt-!)Htfa6oH_tIRvmz+KBh%8|
R+|kx{vW<Y!=3hc=!T_Z56vzMo

diff --git a/DatadrivenB-1.xls b/DatadrivenB-1.xls
index f421ec05fdb3f4ee6b45182fb5aaa137973d0a32..57e56ad563630bd9a9aea79d17f1bec67c9b6099 100644
GIT binary patch
delta 63
zcmZqhY4F)lC8TGb<K`7rXj$Q!6XoGqS!fv<Y>^lqWnPe2mYG*zlw^_NpB$+jV43Kb
S>*Z)`JNX}%;^vb==E4BMKo!&g

delta 63
zcmZqhY4F)lC8TFol3HozWSnM_;c1ZMQ<xHv9$*@nVV;{}=vZYErtckQrte>rS`p$F
SUf^hJJNX}%;^vb==E4A`uoWr*

diff --git a/DatadrivenB-2.xls b/DatadrivenB-2.xls
index 37d1751af15e1c6409af4b253a2484077d4f74cf..0865d341b9e2f64d852ba2543d5b16d66298b6f3 100644
GIT binary patch
delta 63
zcmZqhY4F)lC8TGb<K`7rXj$Q!6XoGqS!fv<Y>^lq6;N4VobKqKn{Jxx=^3W&YZe?8
S?B{4}JNX}%;^vb==E4BD<`r`Q

delta 63
zcmZqhY4F)lC8TFol3HozWSnM_;c1ZMQ<xHv9$*@n;b|I`lT+mpX`CMskQ?Az>J#Ya
S85n45JNX}%;^vb==E4B9eHEbq

diff --git a/DatadrivenB.xls b/DatadrivenB.xls
index 5b01616c5c7aa73dce493e7c314050a29f7ea98b..0ec768be7b49ef0dca364c0c4ed5d837884424c2 100644
GIT binary patch
delta 99
zcmZqhY4F)lC8TFk<mhAQ@8?q#QRWwH;B083U0mT=<{n%X7#dPqXp-!fk!e<umsx1)
z8=7uwJNX}%;^dP;(!7S|MkdC_mX;Pq#>QroKMKhMMa<32jf~7pOe`&pHp>b>76JfJ
C;vRSa

delta 99
zcmZqhY4F)lC8TGT=HirEn4MK%nGujyS?Fe9V38kHo)YAgA5m58?q21bq3_`yq^+N#
zZJBOsJNX}%;^dP;(!2)drX~g^Mn>l578VwhKMKi%MJx<0jEqbSjVw0H3O^PC0AbS}
APXGV_

diff --git a/DatadrivenC-1.xls b/DatadrivenC-1.xls
index d6b95e2312c46efbaaa9aba13b4539020a9c79cb..0d6cfaaf7c8dc70d3a059784d5718ab3a63bcdb2 100644
GIT binary patch
delta 56
zcmZqhY4F)_UP#+K$IUCM(6YicC(6UKvd}Uz*dj4J%Df=4EHkgbD9IwjKRHr6z%tP<
L*K6}HAvR$EK_?Th

delta 56
zcmZqhY4F)_UP#-lB(>7a$vDj<!_y$ir!XZTJ-{?D!#p>|(6P!SOy4`qOy9pKwIakV
LykPS$AvR$ED?Jkh

diff --git a/DatadrivenC-2.xls b/DatadrivenC-2.xls
index fb0cc61c374c5cc0bac516b614fea4bf3c9cbd9f..5812f92ac643795a9f0d15bd9e9fd87048d3bba0 100644
GIT binary patch
delta 57
zcmZqhY4F)_UP#A0$IUCM(6YicC(6UKvd}Uz*dj4JDxk8!INi}dH{CSX(=$xl*DN?H
M*w1nEZy{D;08XS6kN^Mx

delta 57
zcmZqhY4F)_UP#BRB(>7a$vDj<!_y$ir!XZTJ-{?D!_zb>C#T9I(l|dNAUD9b)F;r-
MGca)TZy{D;07)kkz5oCK

diff --git a/DatadrivenC.xls b/DatadrivenC.xls
index 84b89ef0864ecfd45cf7f92ce03c43643ae7e192..d6f2ccb2c557cb533a87cdde78be9c6b5629ff72 100644
GIT binary patch
delta 56
zcmZqhY4F)_UP#-d$kE5p-_NHgqRcPYz}e75yST!$%ssd&Ff^pJ&?MO{Bh#!RFSF3p
LH+1taAvR$EE(a5L

delta 56
zcmZqhY4F)_UP#+4&BZCTFgvTjG9w_Zve3=Iz#>1YJSE5}KccGG-Mz{=L*K(aNLxQe
L+j8?SAvR$EL~RpV

diff --git a/DatadrivenF.xls b/DatadrivenF.xls
index aa50754ca44f9467bdc25b0e40c2f6ecf6903cbc..19f145f4a24fb01e5bec1f8fc2b7bc36e16a6260 100644
GIT binary patch
delta 56
zcmZqhY4F*wOh~&}yEHl5+d0(R#3aekBO<*xBETmxJ2E81$s;ky!@w!Z%fLv#G{@XG
LqkQv4A$?&0Bs>zi

delta 56
zcmZqhY4F*wOh~&VBq}#8*T*c$z}U>#)HlL8J*cQ4u{1I(B)G)HuO!LSD6AqPy&}^h
L-D~qjA$?&0HEa{C

diff --git a/DatadrivenP.xls b/DatadrivenP.xls
index 19d9fd9cff7dc89996457217821750e86cdd0348..d68451798a0948c824d3b30f48cd2ceab1de3ac5 100644
GIT binary patch
delta 62
zcmZqhY4F*wT1dCjH!3+lH^?Hyq_Qa4*QL-kET_;Q)YH?j*f7s8H8MFMx7;i|#ih`@
R)X~;<vW<Y^=AT0B!T`Sf6=DDY

delta 62
zcmZqhY4F*wT1YoC!!%txSKG`Y(J!gQKg%)2z&txOt-!)Htfa6oH_tIRvmz+KBh%8|
R+|kx{vW<Y^=AT0B!T_Y|6vqGn

diff --git a/RF-TEST/0-Data driven/dataDriven.robot b/RF-TEST/0-Data driven/dataDriven.robot
index 7c6739a..d6e3d69 100644
--- a/RF-TEST/0-Data driven/dataDriven.robot	
+++ b/RF-TEST/0-Data driven/dataDriven.robot	
@@ -133,11 +133,7 @@ ztbsc
     #${ServiceFeeType}    Evaluate    random.choice(${ServiceFeeType})    random    #保理服务费类型
     #Run Keyword If    ${ServiceFeeType}==3041    Run Keyword    ServiceFee3041
     # ELSE IF    ${ServiceFeeType}==3042    Run Keyword    ServiceFee3042    # ELSE IF    ${ServiceFeeType}==3043    Run Keyword    ServiceFee3043    # ELSE    ${ServiceFeeType}==3044    Run Keyword    ServiceFee3044
-    #Mock
-    #Make Headers
-    Create Mock Session    login
-    Create Mock Request Matcher    post    recycle-service/admin/login    form-data    username=laiyonglan@qniao.cn    password=qn123456
-    Create Mock Response    200
+    #判断多个条件满足时跳出For循环
 
 *** Keywords ***
 ServiceFee3041
diff --git a/RF-TEST/1-Client/APPlogin.robot b/RF-TEST/1-Client/APPlogin.robot
index 760359e..06b8614 100644
--- a/RF-TEST/1-Client/APPlogin.robot
+++ b/RF-TEST/1-Client/APPlogin.robot
@@ -26,11 +26,11 @@ login_token
     Set Global Variable    ${userId}
     Set Global Variable    ${gettoken}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.xls
     Put String To Cell    ztbsc    3    7    {'Content-Type':'application/json','Authorization':'QNT ${gettoken}','X-APP-ID':'470236309865238528'}    #写入移动端请求头数据
     Save Excel    DatadrivenC.xls
     #数据驱动
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenC.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenC.xls
     ${client_firstlogin_header}    Read Cell Data By Name    ztbsc    D8    #客户端首次登录header
     Set Global Variable    ${client_firstlogin_header}
     sleep    0.5
@@ -45,7 +45,7 @@ get_baseInfo
         ${orgId}    Get From Dictionary    ${items}    id    #组织id
         ${orgfullName}    Get From Dictionary    ${items}    fullName    #组织名称
         ${packerBaseInfo}    Get From Dictionary    ${items}    packerBaseInfo    #组织工厂信息
-        Exit For Loop If    '${orgId}'=='721760754042277888'    #仔仔工厂组织id:721761724339982336    #长沙中联组织id：721760754042277888
+        Exit For Loop If    '${orgId}'=='721761724339982336'    #仔仔工厂组织id:721761724339982336    #长沙中联组织id：721760754042277888
     END
     ${packerId}    Get From Dictionary    ${packerBaseInfo['scrapPaperPackingFactoryList'][0]}    id    #组织工厂id
     ${packerName}    Get From Dictionary    ${packerBaseInfo['scrapPaperPackingFactoryList'][0]}    name    #组织工厂名称
@@ -55,11 +55,11 @@ get_baseInfo
     Set Global Variable    ${packerName}
     Set Global Variable    ${orgfullName}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.xls
     Put String To Cell    ztbsc    3    1    {'Content-Type':'application/json','Authorization':'QNT ${gettoken}','X-APP-ID':'470236309865238528','X-ORGANIZATION-ID':'${orgId}','X-PACKING-FACTORY-ID':'${packerId}'}    #写入移动端请求头数据
     Save Excel    DatadrivenB.xls
     #数据驱动
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenB.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenB.xls
     ${client_header}    Read Cell Data By Name    ztbsc    D2    #客户端首次登录header
     Set Global Variable    ${client_header}
     sleep    0.5
diff --git a/RF-TEST/1-Client/create_order.robot b/RF-TEST/1-Client/create_order.robot
index e55494c..3e0a8fd 100644
--- a/RF-TEST/1-Client/create_order.robot
+++ b/RF-TEST/1-Client/create_order.robot
@@ -48,11 +48,19 @@ get-carinfo
     #获取使用过的车辆信息
     Create Session    get-carinfo    ${ztbclient}    ${client_header}
     ${reps}    Get On Session    get-carinfo    ztb-supply-chain-service/user/get/supply-reservation-order-org-vehicle-info-record-list
-    ${carNumber}    Set Variable    ${reps.json()['data']}    #获取车辆列表
-    ${plateNumber1}    Evaluate    random.choice(${carNumber})    random
-    #log to console    \nvalue:${plateNumber1}
-    ${plateNumber}    Get From Dictionary    ${plateNumber1}    plateNumber    #车辆信息
+    ${carNumber}    Get From Dictionary    ${reps.json()}    data    #获取车辆列表
+    ${carNumberList}    Create List
+    FOR    ${CarNumberInfo}    IN    @{carNumber}
+        ${plateNumber}    Get From Dictionary    ${CarNumberInfo}    plateNumber    #获取车牌号
+        Append To List    ${carNumberList}    ${plateNumber}
+    END
+    ${num}    Evaluate    random.randint(1,5)    random
+    ${plateNumber}    Evaluate    random.sample(${carNumberList} ,${num})    random
+    ${plateNumberList}    Convert To String    ${plateNumber}
+    ${plateNumbers}    Replace String Using Regexp    ${plateNumberList}    '    "
+    ${plateNumber}    Evaluate    random.choice(${plateNumber})    random
     Set Global Variable    ${plateNumber}
+    Set Global Variable    ${plateNumbers}
 
 financial_service_provider
     #支付渠道--直卖
@@ -66,7 +74,7 @@ createorder
     ${datatime}    get current date    result_format=%Y-%m-%d
     #${DT}    Add Time To Date    ${datatime}    -1 day
     #${str}    Get Substring    ${DT}    0    10
-    ${data}    Set Variable    { \ \ \ \ "paperMillId":"${paperMillId}", \ \ \ \ "paperMillScrapPaperCategoryId":"${categoryid}", \ \ \ \ "estimatedCategoryPrice":"${quotedPrice}", \ \ \ \ "estimatedTotalVolume":30000, \ \ \ \ "paperMillFinancialServiceProviderId":"${serviceId}", \ \ \ \ "customerName":"${realName}", \ \ \ \ "arrivalTime":"${datatime}", \ \ \ \ "plateNumbers":[ \ \ \ \ \ \ \ \ "${plateNumber}" \ \ \ \ ], \ \ \ \ "salesTaxPoint":${salesTaxPoint}}
+    ${data}    Set Variable    { \ \ \ \ "paperMillId":"${paperMillId}", \ \ \ \ "paperMillScrapPaperCategoryId":"${categoryid}", \ \ \ \ "estimatedCategoryPrice":"${quotedPrice}", \ \ \ \ "estimatedTotalVolume":30000, \ \ \ \ "paperMillFinancialServiceProviderId":"${serviceId}", \ \ \ \ "customerName":"${realName}", \ \ \ \ "arrivalTime":"${datatime}", \ \ \ \ "plateNumbers":${plateNumbers}, \ \ \ \ "salesTaxPoint":${salesTaxPoint}}
     log    ${data}
     Create Session    createorder    ${ztbclient}    ${client_header}
     ${reps}    Post On Session    createorder    ztb-supply-chain-service/user/create/supply-reservation-order    ${data.encode('utf-8')}
@@ -79,9 +87,16 @@ order_list
     Create Session    orderlist    ${ztbclient}    ${client_header}
     ${reps}    GET On Session    orderlist    ztb-supply-chain-service/get/packer/order-list    params=status=&pageNum=1&pageSize=15
     ${orderlist}    Get From Dictionary    ${reps.json()['data']}    records    #组织交易订单列表
+    ${Time}    Get Current Date    result_format=%Y-%m-%d
     FOR    ${item}    IN    @{orderlist}
-        ${plateNumber1}    Get From Dictionary    ${item['packerOrderList'][0]}    plateNumber    #获取订单车牌号
-        ${supplyChainInstanceId}    Get From Dictionary    ${item['packerOrderList'][0]}    supplyChainInstanceId    #获取物流编号
-        Exit For Loop If    '${plateNumber1}'=='${plateNumber}'
+        ${packerOrderList}    Get From Dictionary    ${item}    packerOrderList    #订单车辆信息
+        ${orderTime}    Get From Dictionary    ${item}    orderTime    #下单时间
+        Exit For Loop If    '${orderTime}'=='${Time}'
+    END
+    FOR    ${OrderInfo}    IN    @{packerOrderList}
+        ${CarNumber}    Get From Dictionary    ${OrderInfo}    plateNumber    #获取订单车牌号
+        ${supplyChainInstanceId}    Get From Dictionary    ${OrderInfo}    supplyChainInstanceId    #获取物流编号
+        ${paperMillCategoryName}    Get From Dictionary    ${OrderInfo}    paperMillCategoryName    #获取下单的品类名称
+        Exit For Loop If    '${CarNumber}'=='${plateNumber}'and'${paperMillCategoryName}'=='${categoryName}'
     END
     Set Global Variable    ${supplyChainInstanceId}
diff --git a/RF-TEST/2-Platform/Order/1-Platform dispatch.robot b/RF-TEST/2-Platform/Order/1-Platform dispatch.robot
index 3074468..99f4212 100644
--- a/RF-TEST/2-Platform/Order/1-Platform dispatch.robot	
+++ b/RF-TEST/2-Platform/Order/1-Platform dispatch.robot	
@@ -54,7 +54,9 @@ orderdetail
     #订单详情
     Create Session    order    ${ztbscops}    ${ztbsc_header}
     ${reps}    GET On Session    order    ztb-supply-chain-service/admin/get/supply-reservation-order-detail    params=supplyChainInstanceId=${supplyChainInstanceId}
+    ${plateNumberList}    Get From Dictionary    ${reps.json()['data']}    plateNumber    #订单车牌号
     Should Be Equal As Strings    ${reps.json()['code']}    0
+    Set Global Variable    ${plateNumberList}
 
 Direct_saletype
     #选择交易类型-直卖
@@ -77,7 +79,7 @@ Agent_saletype
 Direct_dispatch
     #提交直卖派单
     Create Session    order center    ${ztbscops}    ${ztbsc_header}
-    ${data}    Set Variable    { \ \ \ \ "id":"${id}", \ \ \ \ "supplyChainInstanceId":"${supplyChainInstanceId}", \ \ \ \ "supplyReservationOrderId":"${supplyReservationOrderId}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "sellerOrgId":"${sellerOrgId}", \ \ \ \ "sellerName":"${sellerName}", \ \ \ \ "orderPlacerPhone":"${orderPlacerPhone}", \ \ \ \ "paperMillScrapPaperCategoryName":"${paperMillScrapPaperCategoryName}", \ \ \ \ "paperMillScrapPaperCategoryId":"${paperMillScrapPaperCategoryId}", \ \ \ \ "arrivalTime":"${arrivalTime}", \ \ \ \ "paperMillOrgId":"${paperMillOrgId}", \ \ \ \ "receivingPaperMillName":"${receivingPaperMillName}", \ \ \ \ "isHosted":"${isHosted}", \ \ \ \ "transactionType":"${transactionType}", \ \ \ \ "paperMillFinancialServiceProviderId":"${dispatchSaleServiceProviderId}", \ \ \ \ "orderTime":"${orderTime}", \ \ \ \ "orderPlacerName":"${realName}", \ \ \ \ "dispatchStatus":"${dispatchStatus}", \ \ \ \ "dispatchSaleServiceProviderId":"${dispatchSaleServiceProviderId}" }
+    ${data}    Set Variable    { \ \ \ \ "id":"${id}", \ \ \ \ "supplyChainInstanceId":"${supplyChainInstanceId}", \ \ \ \ "supplyReservationOrderId":"${supplyReservationOrderId}", \ \ \ \ "plateNumber":"${plateNumberList}", \ \ \ \ "sellerOrgId":"${sellerOrgId}", \ \ \ \ "sellerName":"${sellerName}", \ \ \ \ "orderPlacerPhone":"${orderPlacerPhone}", \ \ \ \ "paperMillScrapPaperCategoryName":"${paperMillScrapPaperCategoryName}", \ \ \ \ "paperMillScrapPaperCategoryId":"${paperMillScrapPaperCategoryId}", \ \ \ \ "arrivalTime":"${arrivalTime}", \ \ \ \ "paperMillOrgId":"${paperMillOrgId}", \ \ \ \ "receivingPaperMillName":"${receivingPaperMillName}", \ \ \ \ "isHosted":"${isHosted}", \ \ \ \ "transactionType":"${transactionType}", \ \ \ \ "paperMillFinancialServiceProviderId":"${dispatchSaleServiceProviderId}", \ \ \ \ "orderTime":"${orderTime}", \ \ \ \ "orderPlacerName":"${realName}", \ \ \ \ "dispatchStatus":"${dispatchStatus}", \ \ \ \ "dispatchSaleServiceProviderId":"${dispatchSaleServiceProviderId}" }
     ${reps}    POST On Session    order center    ztb-supply-chain-service/admin/dispatch/supply-reservation-order    ${data.encode('utf-8')}
     Should Be Equal As Strings    ${reps.json()['message']}    successful
     sleep    1