diff --git a/001-DirectSale/1-Client/create_order.robot b/001-DirectSale/1-Client/create_order.robot
index 803ffc8..0c2cad1 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    '${paperMillId}'=='723518259730714624'
+        Exit For Loop If    '${paperMillId}'=='723518259730714624'    #516测试纸厂id
     END
     ${value}    Evaluate    random.choice(${paperCategoryList})    random
     ${categoryid}    Get From Dictionary    ${value}    id    #纸厂品类id
diff --git a/Datadriven.xls b/Datadriven.xls
index 51ba8c39330ea2c7a01d179d5a3afe9892f0990e..51d1207ecf2c04a809e4370fa656a14937404114 100644
GIT binary patch
delta 578
zcmYk2y)OfC7{{Nxa_Y4`ZBKi}wHlE+*V5Ke78FhBz#t~^Qb|R;G;O6ckytt#o*2X;
z79+{cBnA?jO)M7Te=vA?u6HSSx#9WzzR%}*es`2QN?qS`EYG9Fwc#uGg)-O3GGlmN
zCukpaXH4kZ4)oMQsj!w$m%$AwuMX@mo=)%X?G$|3)qK9Vn_DkK3p{97_3u`BK0Gy-
zDMnJNIvr0YCQ60L@Jw|6Ah#cnZqIHe7Lrqm<YIPvV`nRaE4)v8ZN280ARc>^j$Uw)
z{R<kP6<Cmgr|K50R9PU1FO=w`WsHP_5(045$^r@oM8y_@c9S_N5yoY4G!O!&Vs#Pe
zC%a*F=~nuztQ`crb2{)ztdR%6Z}tn+6{*e>s5e@jCs3b)Kcc^Rz_hjLX;i!(M!}?4
z3hG?HiJSP}PHwUUDjOJQ7Kq`o_s`<d(|ALc7(V~Ah{SuK+jNR#8H6TtvPiqcG^xGF
z@G2pILpoyUJ#ngd+3{u@qE=%WAUcGnoqpReUEN@MGLDZGCKJ<tI9p+#osw+?`ple#
Sn2J5p5;Lror8IldRr3q17i!1=

delta 519
zcmYk2yGz4R6o=1EHMUksTWr%LjiEY}+QwE*U#JMWIOw3_13`oqwD>@+LZKkII5{4i
z#Kon9B1(3h#L0g_5XDto1;vvG;yv8q{LXj2JdUQ0rfwd1ZiZpTE8;W%jVHX{{AoL5
zq4xmLX@$l?dB1WDQ84h*r?6}D(f8)nON$%pMs;bT*w|QJC`?aQjcRRodux7rt+q2c
zzBxOQpDXVTZf2I&>Z7AL66i6%LRUOfu_@_l62heZhIR-62YnEv?hd@vc|gTaNoOh4
zWQC=1Sk?s{VlLf9bU)VRVMPaK?}sVLkjL2%+xt(lmdZlh-H8x6K%e0}FGBnv@PC~L
z(kLqNMAkKkHto1YVtc6^w@B_Zt}0rm#aizkC0551MPWnO{O6FYoUX-4w!`l_BytSl
zhoZ483NcAApu?TW*2FBt>MWR}2;h)LjOw&2hxh8MkcR}NmJ%q<<860bC_vK9EV76%
mc9x>d`k9=a1vO15LE7a!l;v<tTVVzBT&r*xh(|AaT7CgWdtoL3

diff --git a/DatadrivenB-1.xls b/DatadrivenB-1.xls
index e238dce58075458830cc259787208fffb569f3e9..af89b3673967da6b35270466628d82d0857e8a67 100644
GIT binary patch
delta 580
zcmYk2OD_Xa6vxk<GDSsI^f5E7QI#|`ooYR*B*dd0ktVE2Bo@>wDymv(NF+ACfD<bl
zVP``!)^>J2frX94M&c77&YhWH?&|!{Z+_>Vdy+fJ-93te$AhZq#~1MnHPI!oQM`2e
zj5p^6OGG?CUo9L}R?GQQ2tY~UK{Jfy^TmVRO8eeQxm+#oubn~@yc@UmMqMJkksV(z
z6}I;Vx8^qvOH;{YrnposYuUxZ#Oy+HYHo98>#$I%O!iN24iDp)D{^hLI9UwuB|X#y
zUh;oI1GInu8u0lKP)C&mV)!lTERJzmVLHypdME)wn{Fk#8(hB?r_W?vNdPl#Ug{^w
zYT3M|?O9f}6ol=6d_?xps@8NL@x37aRu0gyQwc{?w!v@GmfKHkgpTF*lUv6fMU8Qm
zZxSH(@1_Bh<~Ol=4(P-Ce`d*~Ewf~@d@KG25}Et(Q&Cw8gF(sN4~=$5<{cv&tTIoU
zB7kFRF*@h1X?zO3x(6UiDIW-w4&Xyu*qwoxopEvyKg>*{j1LpctW8zjLlCz)2W4r@
Psmm;5+^8eMRY%Pae+6k=

delta 670
zcmZvY&r9227{{MC)mW|2wQJKhF@|i6(Y4X|BdvuwsGw}1i0tAHgRyQagXxq`Q9<<L
z$;;qnCvP70BIGVI5E*zAJnl084aM)1q{YMX@+Lgr_xpUlPu|_x-Px0KRap>nIG&S#
z)myo*Cj7ge1CdUo2v0X{{rK2w>`|WH$>Ux_T=^HhetgJVnVbLedUbW}d)?jgYBO%7
zHC<oXSX_S7T%W4VHI^n8*Xo;JH`c4Ig~>^I*Jt~G(n^mo<z>M!i<AZXmij173cVnX
zI;A+O7@1Pj9kYbw(D4`!jnqyRqq6(}heHFAmVsl45}k?}N4oRbArWL`aXyT!FeA$u
z*m30%xI|s_Q{Y2qA{Dq<bIHb==hMI#>CB>mG}@U(1Enlq8unWkZk|6ExWm*Oyic*(
zC-6q8d1wz)xsx@faAqD9N1hml7?YQVz0;-_SjT2hA)xa=b9Vvcv52n!ht67?u7mKL
zo<&(YIOEhGar6fq1DfEw@xKi;Man}-v<<7k`jzqIjrlKG0V*7t%@uh)XeX;wj5Kym
oNY!Gk1dT^k0<B_M$r>&s?2SS5<R|OBsQSOHSBiA){Na<XdsC@t)c^nh

diff --git a/DatadrivenB-2.xls b/DatadrivenB-2.xls
index a30d668cd411733f963530d6f094dfa4ec20f52e..90dd0e90d2b99bbde89d43e53b8f68090a3cf4c5 100644
GIT binary patch
delta 580
zcmYk2&r0J^6o=1EHB~Ft7W*ejYwT1gwM}ic#wsXQiX&KLKwK!yVkVs;PMKO;Eee7g
zU%-PaH=?`Qj1brE-1!79+z4(2pFqWPli--UI=}PfJNMkf@?rV%MihKLRK*b9i?5gx
zJp!A<Gk4H@bf2<J+z0e^!hY*#(>Q`KG!!26L(wqmJAYb3TR)o3c73~Y1by&i{_8fo
zGJ3T%|EuwPb8BkjTXnCokj)nA>+OY=uchL|^4g|RTbi#`3#&$DS1-=YV9^u5F#T?p
z#4AaQjzEC?uh0X25FiD7{xx(_<$@%>Ng7LIT2`2bi?SBYK*XU3h#m#cN5$!5SyM8=
zEL(v3S+d%;fMvUr)l?2*&ObpS$7of1dXV^W5I-sxXgI9I5;?~ZvS`~KA~sIPc8AEV
zVNFq!oaLK@iT!`mutoEm*gY5I@#>RVvS`~ZSuEd*zkx*NJiaI@%V8uUc_*OP>Bzie
zmLhHD(<uTtpcbQZGN9va^uap`2}=1upmY+i2V>p>B%O?tQ}}FUDa!aT!O8|z)jJJo
VhjUS;V_E&q3g%yRRyhCC@eUDiX&(Rp

delta 670
zcmZvY!Asj<7{=c(b+Ot(ZD-RqF$+;-IE~G$i5BL-gEB?Yq8AUsu)28=*3ylEAbQ!!
zi}2yeo5$@U<SrtJ47?3?+(rKl#pg}Z;=z1;3Geeg@9%l@9V{FyoL#9(Rmf5@FaN9e
z@=#3$51l6>o5~QL7qt6rqgne&1zMB8yA1I+xb6y)qh5V+>GQ`%<NMcXch{@Tx_)zJ
zy1qSME!7&c{^F0h<=SSYT3#LV-RjhoeCW1=KUt+ynDVCRm_w8U`<}WfOA5Uujyk6#
zssx!*(;agd$&up~92%+ZDnTRi6C4ip#ab^Mqm*h_%=o1{TMmgZBZu=6vZ9O}XJ99l
z9&m{|=t$s07a|k7S#!z8o9ENOc-Njq18J;1iw4Swd~et*F5EnSK6FQ^d3Xn~S|{+v
zsRd|HQ@N8hrf_Bf6i1#JhA7J$!`^Svi>za_rx?=tpSimTayh2!&(K+G(RC2s&|sXU
zgELMqV~+lWV?YypH^ENd7m@K$679h%u#S5@d1v0HeW0SD+3d@IukG{%4aFKeC#7n!
lHVlnNRYJ|TtaJqz67?pad2-WQ7Zbsy^+A!YT{!LUcmy4)XlMWc

diff --git a/DatadrivenB.xls b/DatadrivenB.xls
index e8b93c14a9e46274f79a5282dd9a3badf637b302..5b01616c5c7aa73dce493e7c314050a29f7ea98b 100644
GIT binary patch
delta 627
zcmYk2zi-n}5XbL1;Fbn33C$1NNgp9dQR+CcjT<{it!Sx8g)*Q{RVxNaC{;nEAw?09
zDs|~Uz=??g#K;1YJ9lG4Vx|KN5(^T40Y%)it%Bcl-~0G;_uhVIzw_~vETvM&<s5#K
zPtcH)61$0SC$hnhiPx-NP62&qVZ8fb*gb$e40I7(g2isP|NQChm7V*;;i&(tcK{dR
zXYk=%Fj;SIE-yVCJl@`EZQb2`F}Q76et&(`TV3j}jfd^__|{fqrM+r2dPeKf{5&ou
z%NV593zj$MTCU@Gp6~nkHO&=~__psjuI>1hJ^aG&;G5!9uyJ`!W>q{?&EhO%Xq^+7
zf;32AfLQkkCaFq575}Ivt6@#knTac!S*$}Lrl*N+K=QN_^h?du>%c-=hWZv+BU>i4
z9c$dMp%nj<CDNgniKb_XzYg+gl>ig3>7|Mt8*(8XxpTyp=|t`vxlMec^QvIQP4dM4
z+cY22Vw0$s02dGcGpivTnbnXLw-RrllG(-II%hT(3aT;(=i`nhI>B;b#8OR)0QRWG
z=)9V4;^*Rb#e)i^VjxiJ;n7S<@u3=Lf^6ZhFf%9<!=x~q;as@^wU|p#*2E6K$Nb<u
KUy$BiJ@Xgd|8-FS

delta 706
zcmZvY&ui2`9L2wrt#R8`*4=iqyGdh+MM`bcruo@`6^bAhmX@XT(1IYkWua=pAH5XB
zUOagb22b8RDo7!B5kW-gP4MVN{{jDi7T-6?E<KoG66VdD&wH7}&SB^1tEzN`Tqrl?
zFZD#eQY-1{`M088sS%!Ybnxun)B7)}MO*U2s3Cr&-$v8&e7L{a^~3&ZXKUYGi#Jwo
z_8&d&_8#o5#ZPwJ;Pz_N3wIB;_cp^@>nqF4@^s9W-|NQ3#n=mcKS`E6-;d<qx&<YU
zV$X|$AW6K`9RH{aQy#Y+bA}qoKcO+IlS0>s>wKazRwXi}raR^=+U1UMI5bj+s}jx0
zyKp!(S!fe*%u{8!V#a&j*>Ol@84c_&AS=&ka0X^sxdblJ2)!2g&}UK0+^o4|<IVjv
zFcybhG?2Vu7Y&p-dEKx#T)4S^Gjr#uO?am;20QQ;sV!({Q~4xoOySHHD2_Zb4B^XT
z!+tTKw^_$zPdlUYKlAA}$bLcB|3hbOK-WQ-rmIDk4o*N93XXn;V?YypH|fL4zNm#*
z5<Q1iV7!?K<sb8RH3BLx&E`n{ylhuvnkh7PE=kp5Z5A3=RWdEItZIS_$<LOcg|cVe
R5pnv(x}iwdZoRuQ@(*4=acBSl

diff --git a/DatadrivenC-1.xls b/DatadrivenC-1.xls
index 1aa6c58517ccf5094560ccfefd5f888f726c9a00..fd67012811b36ec4bd55816279ecb399b2363e08 100644
GIT binary patch
delta 581
zcmYk2OD_Xa6vxk<GDSrdeauX26p7Sys`aRn5RZC9ny?~~SWvI1sA{Dlk=XbGPONOi
zQY0i}ZD;2bSlCExginAtcV>dQtNTB{`JHp_appL4`ydJ)52~UcpT#fKM3=xu@WSac
zUY+MG*5(2FD&erSQp}z}0165Z>R~jS&F}A&T6UL<#d3ac^#tnR&A6$qs*WYs(_?Fe
z+}7^E=G^*0VKN?1<rm9EExnK%pP7$O&TdR^9^^`;iN2|gp&@*CwHnUGYmr6pPSQi2
z;H3s%Py-DhfChYkd#IwD10wh>=`4y-Sz$U(%X%mVL7Q$Ox(i&tH%_0*x)K9s+PqYc
zlhv|$P1}>KY6%G2|M-aPrd_S>KH_^o{Jl9q$95&$k+2PZleXM`V%z9gZa=wo+*Z^G
zXZa=pV*e%$m^7cnsyUz+@BW!3leWx~$?~oE8%SjC#ZN_L2@D1$cOTT+6`5Czbg;}k
zNs0iDsKn@;H6`&e^y2P^4oZ1LptK+Fo5SuDMC^={1NdQP8fCnhU}nv#>K=rs%{eGb
RVn$tJDdS2V7A{*WegLH7X>9-i

delta 664
zcmZvY!Asj<7{=c()!43s+G^7_F@{V;)MmzYX)O$)f-=D(vWq(iqHZFnQ#!>7vR-!D
zW$>|+H;;M|avx(bcJUw#JbKyw3sLsGNm_bXKE8za`JVUpy!o07&4tUKs<I^HL_8;N
z)qD9_P5KW#ry`R~6P|85e!tdO|3rCuEiV#=`0f8n#1lntufF*9<^KM`yPA9KRp;Dt
zW45+;w7fgNc{o$8ukTDPAJjf<9UWF0Oa5KvS{0_eDmdmSWkJ2CN0cFj#)w0{Q5;o_
zOsVOPIgZTG(Fcb{YP*V2QLe(_&_Ja1!|{}o?TQ)ay7R^%5oBa>K7p(-Bg+}saiter
zqAvO(@S*P_9k^L@$;O-K)4-T)&!U0!tUZecN>RQr>{l+_Jbx~5hp9Puhp<{F@J6Y5
zXq~Ct$r@8QGY^U*FAYPK<dtE6Y|#s>W3#6a(D|Ray8v=2qU-;mv(}>PAdJv(l%<37
zoE}FUy@O*w6MQ%R_Q0k{dnk!cU=>(j`#t&B{F5pJ6%Nhjvb-6zQxzJGG<Hr&)naWN
j8jq?3TG_HvRa{8e8-wP_4QoYI{2$h|B3(Ow_N40{Jb!2M

diff --git a/DatadrivenC-2.xls b/DatadrivenC-2.xls
index 491d310754c4300481b7439cba68757268714ab9..7da9d67c03643d95bb46f91a5f55ef0dc8b5d26b 100644
GIT binary patch
delta 581
zcmYk2O)oQ16vxk<GDYR7qAxSk8bu=2PPJY}Nr*~=L?aThAhBR*gho}-kVtHN0Vh^A
zVkr`mv9`1G2`p?RHuCrcJaO*K#AEL2{?BiI=bU?zKgr)cih|FFsu;u<@eAXkM_}W4
z=?<80?hBUe^Z|XfaJ08tF-{=_WrYV#kTs0b{`Ow`&Pt_HE$yzI!XJ1yZ|m#olX@XH
zv0mQV+!@}OD;$<5Q>jd8sX947mCFv!E^ZpdnTcW{vtX<p=-JUx{Ojp3-7PmFi{ZVb
zMS8$b4ZffOnn8d#@Btp6j&3f9;Xg@Z2~5Ze({NhWB1s54bSu%l;Q6_6`b^f8Brwb7
zr+SL4w#{$Zo@F(jhN$yTfXF`D)$Sf3z8}P&n+r7TQli~y#}Kq=+Z`mflaB2Ul3T-~
zqQ*GOHwh8@f6|ae^GWQQ3kLB1mszrC+bmfu--^G1MCJkfR8*G6a9HvVLZefWdBx0y
ztIVfU1aM3xM(4a$$EV1vcL=&E<qd(-A$(|ydNUAnGENTThn2-C<IMysYg1M42qYZN
TMVXFyb(v+%YjsSx>Zth!HxX$t

delta 664
zcmZvY&r9227{{MCb+NUB+G^7_F@|i2sEy66i5AA7hlviw6}{{rh;=^>gIRP83S+(O
z<VASdX*Z905pow1#ES=Eu;VV<e=$1zK1o_UEH7`u^L@Y1=lkUCtaet<u2iKVWF=XU
zztpZgRMWw~!S5oM&Jvyn)IQkRZ+@jBy^^OXL;MJ?Q^{1>+gn?Iv)pQZ{7`q>UTw+s
z_n+7I-o0p4nyn>&?bFK3=5DP~-JJ8?M({Uxs|r)zlpJ%4@}PEUh;pRRG;zo|B~c~F
zl$!3CGsuh_BXDS>_NxSy<u)7+jm6q19J7?}SIjuko!1VDFe8ui3bLY%JZE4hm0@s+
z2IxrOLl+_&x><9{#+&EUz<AQ1MFVNBKZ^!RSw1!F4Hs^nzYw~k)B?PZv3e))#;HYU
z_fxr(HKuT85fn$B8HT9J8^iw6qnB96W=|=k^FMQU3FK-_*Z)Ijtw+~En52m~O9yA3
z9>yH~9>;(t_-=ytV{b*)LrL@*R)O_x)RTYA-x(jMXlOS3^5?jnS)i#{W9On&E!JkB
j@u*6u`IeQb;X<O`1T;_XT3ccvxU`-r(zT1nj|T1l4-RI9

diff --git a/DatadrivenC.xls b/DatadrivenC.xls
index a4aef94d1510849f3ea326b4a1a663343eb59fee..84b89ef0864ecfd45cf7f92ce03c43643ae7e192 100644
GIT binary patch
delta 581
zcmYk2OD_Xa6vxk<GDSrdeauX26p7Sy`tYb$LcF3DT}W3Vv7q$`qN=3PL}KF$II*%3
zOOcR_wVj<$U|}P%5k3Lp+?fgHuI~T*=6BAy$GPL&?Sm+IJgAC(d=|e@6I}wEzze6(
zcy*q$SdRzjtB2bDN~LfD0VpdxXobl_p>(jb-?h73sZ>jQ#S>_OH{+(Up)r<Po0(cI
zZ*A^oHs;q3%d?3@y0lm==BG*vwMsTyo8E}eW%F9RsAbm2#_-+MZ8+PnMHaz3Ne}gd
zml}LQ6SRQ<8t?(`p@D7=h~T%RvnWPoh3Pma>!BC~ZMuW#IJkaqoIaIxB?ip2d8wWt
zt7Y?=wkKKDk`T84@ew&dyIS3S#1De_dvkz}y-K(*X&d||ZMpr#_Rz81esb%$t*8;s
z@=XH7{!JP%X+DWnbHEVZ{WD7@ZJ8yL<y-MLkjOlQpNh(o7z|48VQ981GOrjj!7B5l
zC;~X55~Fk0k;2E&i+cq6DCG@-(h<Dx47<}1u`^C)@WaeB%6K!u%sN%oJql5qb5NGT
QoVvu)#+5oQTz1#}00F6K4gdfE

delta 664
zcmZvY!Asj<7{=c(b+NUBuANQW#2B(6;%qcp(<%%>rZBM+O7Y-97*pv*528gBL@%Da
z2p^ujdDM%LyNDoOJP3lvUEF^$9DCj*EgsCrm+(H{^ZuSU-$C`DdU>lVH6e%NIr&?C
zkw<FM|JQjcGRZXIc}Kfjzc!Z-DNl>?B4LO}|1J?v6uss`t>iUktBXx{zEYq1)>z-D
zt<-n6XXckzo6|qO&rFXll$&$gYwnc)H}jwhQ{ERGbAYm-zEBrsNTDypAy*Vf6(dt>
zx?>I^Gjx1}LnF0a#i%HM!r@R)q;<nFM9Fr=jC0*tbw~smS)30eE6m7p26kNe04`An
z9SeNuTBHLvYcAP%^L!c@Bkfr<kVf0HXrL73SHrHmaP$1Rz#XRM;Qfr%I)OJz%|m;g
z%AKq+g){S@IP%gkL`mKo_I`_AU>%!1g@Dfg%-sc$OA%dvgU(uuu7l7|eNmPU&KSLq
zIQlD&0Zs7T_-j24k@ip$?ZGOrPP#q$$9ztefeMFab6Gz1+NlZ+L>fECrE0M@2#rTo
g0<COWsR>+2*c*f9$rWo!RQwxjQjxBmKl{}2A3i*15C8xG

diff --git a/DatadrivenF.xls b/DatadrivenF.xls
index 177108e11cfab7e8e0e7ceb7498918186c283c80..42b518d7a5bd47ddc0769583b4718ef8a39f33d0 100644
GIT binary patch
delta 553
zcmX|+O)mpc6o${8GQL$CZOuoGB9WTTP_#-?AsP{>Sg~kgK_x_0QB;~pZ2SQy5{Zpi
z+K`O3ot+;bBrGI062Aa(?sU?7a~J1*pYxu3PSPjoyGK#*cu*4q_$L0ME;b2l60hp~
z)@R)%GkZKhrxwcltHtaobil5{g*KSVW(x<~`&~OL#bT+jw{{Ax@MYaLyw{t>SZ<?`
zP92t0YvrxP%;NOSW_~JuG(WbTi482|^~_RcXniEVo12T4l1ZFwQLSh1tH{E5FB!pp
z@X>%@Xap|^pacKF1JqOHf-wF`28&=sR+xdavJo^vb?A1Y2cW51ar#U)6cd=8<|BWQ
zQY&dbJMBf*^eBX!9zT&ov}<L$pZH-AtCb53>{UX2Q70i_)0ON1u|0Gv*#XKna7)oz
zILkNbAlAeSC0Xs3xI&M+lHJXJ&i9n4djx+JjYUyaC3g&(9Y^Mll~PO06DJAam@G#3
zygiOj!4LN+^pVOVfz(la=nT0N5Oy?9j^Veh>7?;tf~|FGntL1~4(B2*j%jU~C9E55
JLb&d(`3Eg%XNLd)

delta 664
zcmZvY%}X0m6vgkG=opO<6U`)<I2}eQMdN6UCQ&egAS#-TRVfw(@dJ^F3W<~oqMNR|
z5gxAGxokJW>_r6WraQr<F7#h;sr1~LNpR75yczDf=l#x|cTzejUEZq7ypRLIxO`Aw
z<xe%_yfvMRXedH>8tJgQR$2c+30juFn^WS>`P2Lu?5_@eUM_!0f2)j4?Hy!?OXZ3E
zOm=r_b9!-RY3}Pzwfw!ZG(TG^Y?mh|ibZ)Ev7DFay($d(H)$I^6a)K}S|~~i^%6&2
zQ4m#t45{h1kw&uTXoo{1wO$3NPp-mYQ>U+Wz|l{kdc}-iy1i+Wa5G})4<O6Sh;asX
zP-z2~sDVxeK6EW2uA8+CS$Ok&8W@B1Su~Kc^;tAf`s7&3TFAi7^T%Dcml}t+8>`lV
z*H2AAd!NcDSz`)kCP1;}WvX~w<0e_b=5EsE^562gB$z`!SN{)}wHj9k;S+uIQ*>~K
zsnzG`?>H%Ff^Wsy>D&^L97>`iSOwNuM@~K)PvJaJ-neYe%li*jxIjI=#?BF`nyjUv
j@u-Tc<xMj@imUL>2B78ShPfgN&W$;)$c&Y^=xX=}nZjsr

diff --git a/DatadrivenP.xls b/DatadrivenP.xls
index 37a43994b4a573683a9c4a0424cd497cb92b9863..62f63e0701114a34dcf0c616fce500a2dd2d60d9 100644
GIT binary patch
delta 646
zcmZ9JO;6iE5Qb+RY67$k29jVqsRKQPBsiarozM$yfFQ^L4v14FXetFEKB9amfP~<J
z)N@Ci=%MNlpp|^#)LZZU1-TUU+FyXgtZgcUSKirq=b3kRwdb|-+K*qNAW5i+VeE@{
zm=Z?>HjiHiL-yanE0&H+K;JVs>3nF{FJKb7Di=oKZM}ZjJ?O-m+wFGmu=Vi*Ucx{7
z`_QdFwVqjAYxMFp(_AW7EALJ^3z?O|`f=;1T-aaTt!z{mE7i^B{?5T(1Gl6Y_Qw>d
zn9t`*hLts~LfJ5imT3=-UyCe(H?kg0LXh^ngJBp00aC!v^b`D)`5=LUqO)1dDk{^l
zrs#n*L_B(e=nQ^R-l%C{PJfV;Ecv+oL8rg3XsH}bc|9Q_^K@Z%zYy^S5dUXB&~Zkc
zisw9sutU4vVPap?aJ|Fitz%QwUT~J5eUjKTeo<9s;LRfsnd|g(Ms_?#JP(;XjL#8`
z<uDeJ14Vf56%<~umm@tUnIr+6Qi;*HoG|fs^v{_EaZ<S>kZQpUMZYjgYoHyXJWwIv
z5IiYCf@aQhmog+N<GeueDbKYMy@GpB!Qq)h`yS|5w0N-R;vCG<%<X-Io4BUEXC?bu
Kn-jiG58MMQXK8By

delta 565
zcmYk2yGz4R6o=1kHP#og)wXHU7@~;OHrghp#uq4}2v((nqJtn-L=k+@f)5Z}1i|s(
z<RY$u2-)4#)lG14(ZRn!a8NvHL+icM{qFC6zr#JroMi4EI8T;gk1vdG+z*~}_4aSg
zB@6I=pj8b=h1GoS6a-ktn_7vz*iW?|K5a6ywK+30mo}zn7jkQhh52!PEOoHHG;S60
zdpp~QxxMVv#_nV`KQTHyj6+Q-eh0#S-7r&@ZuY0mR8rTiUdvXSZ#gF8b3~J45TwE%
zsDl7_pbMP-d+^c83o?qLCdX-<Qlgm>A>hg<FC=hH)OZb|E^DDgH(rT@k_N134HD@g
zd&wFsTE9dko&?o>6QX3Q+!3O@UhW7{K7k{W+L&|=VJD5-QiLV&Oj2SFccvGJSLP7N
z(q3#W-Fd;l=YN)nlg3}N7$`(57Lj--bhu8DEWOa+Hj6ZiVXs8@ncpM?a7<T>_C<?{
zpYl7Orl+N0fM^<DTUEXfVlH!%7S<^aixYD`*;8Z#io*9p!p(V!nYf`Wvp)M#8Sr3I
J6|UQ={s3xgXO;i}

diff --git a/RF-TEST/0-Data driven/dataDriven.robot b/RF-TEST/0-Data driven/dataDriven.robot
index dc9eba7..93b1919 100644
--- a/RF-TEST/0-Data driven/dataDriven.robot	
+++ b/RF-TEST/0-Data driven/dataDriven.robot	
@@ -112,3 +112,11 @@ ztbsc
     ${start_time}    Get Substring    ${start_time}    0    19
     ${end_time}    Add Time To Date    ${time}    1 day
     ${end_time}    Get Substring    ${end_time}    0    19
+    #转换'为空
+    #${List}    Set Variable    ['{"id":"742739866076450816"}', '{"id":"742363192650502144"}']
+    #${BList}    Convert To String    ${List}
+    #${BList}    Replace String Using Regexp    ${BList}    '    \
+    #随机获取多个数值
+    ${List}    Set Variable    [{0},{1},{2},3,4,5,6,7,8,9]
+    ${num}    Evaluate    random.randint(1,8)    random
+    ${data}    Evaluate    random.sample(${List},${num})    random
diff --git a/RF-TEST/1-Client/APPlogin.robot b/RF-TEST/1-Client/APPlogin.robot
index c428d6b..760359e 100644
--- a/RF-TEST/1-Client/APPlogin.robot
+++ b/RF-TEST/1-Client/APPlogin.robot
@@ -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    '${orgfullName}'=='仔仔工厂'
+        Exit For Loop If    '${orgId}'=='721760754042277888'    #仔仔工厂组织id:721761724339982336    #长沙中联组织id：721760754042277888
     END
     ${packerId}    Get From Dictionary    ${packerBaseInfo['scrapPaperPackingFactoryList'][0]}    id    #组织工厂id
     ${packerName}    Get From Dictionary    ${packerBaseInfo['scrapPaperPackingFactoryList'][0]}    name    #组织工厂名称
@@ -70,10 +70,11 @@ get_Personal_baseInfo
     ${reps}    GET On Session    baseinfo    ztb-supply-chain-service/get/user/base-info
     ${organizationList}    Get From Dictionary    ${reps.json()['data']}    organizationList    #用户组织列表
     FOR    ${items}    IN    @{organizationList}
+        ${orgId_P}    Get From Dictionary    ${items}    id    #个人资质组织id
         ${orgfullName}    Get From Dictionary    ${items}    fullName    #组织名称
         ${enterpriseInfo}    Get From Dictionary    ${items}    enterpriseInfo    #组织企业信息
         ${qualificationType}    Get From Dictionary    ${items}    qualificationType
-        Exit For Loop If    '${orgfullName}'=='仔仔工厂'
+        Exit For Loop If    '${orgId_P}'=='${orgId}'
     END
     ${salesTaxPoint}    Set Variable    2051
     Set Global Variable    ${salesTaxPoint}
@@ -84,10 +85,11 @@ get_Enterprise_baseInfo
     ${reps}    GET On Session    baseinfo    ztb-supply-chain-service/get/user/base-info
     ${organizationList}    Get From Dictionary    ${reps.json()['data']}    organizationList    #用户组织列表
     FOR    ${items}    IN    @{organizationList}
+        ${orgId_T}    Get From Dictionary    ${items}    id    #个人资质组织id
         ${orgfullName}    Get From Dictionary    ${items}    fullName    #组织名称
         ${enterpriseInfo}    Get From Dictionary    ${items}    enterpriseInfo    #组织企业信息
         ${qualificationType}    Get From Dictionary    ${items}    qualificationType
-        Exit For Loop If    '${orgfullName}'=='长沙中联泵业股份有限公司'
+        Exit For Loop If    '${orgId_T}'=='${orgId}'
     END
     ${salesTaxPoint}    Get From Dictionary    ${enterpriseInfo}    salesTaxPoint
     Set Global Variable    ${salesTaxPoint}
diff --git a/RF-TEST/1-Client/create_order.robot b/RF-TEST/1-Client/create_order.robot
index e4327ba..e55494c 100644
--- a/RF-TEST/1-Client/create_order.robot
+++ b/RF-TEST/1-Client/create_order.robot
@@ -1,5 +1,6 @@
 *** Settings ***
 Documentation     \#移动端下单
+Test Teardown     Run Keyword If Test Failed    Fatal Error
 Library           String
 Library           DateTime
 Library           urllib3
@@ -31,7 +32,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/RF-TEST/2-Platform/Auction.robot b/RF-TEST/2-Platform/Auction.robot
index 48c1d04..f079934 100644
--- a/RF-TEST/2-Platform/Auction.robot
+++ b/RF-TEST/2-Platform/Auction.robot
@@ -37,10 +37,12 @@ auction_detail
     #拍品详情
     Create Session    auction    ${uecops}    ${ztbsc_header}
     ${reps}    GET On Session    auction    auction-service/admin/get/auction/detail/${auctionEntrustId}
+    ${auctionId}    Get From Dictionary    ${reps.json()['data']}    auctionId    #拍品唯一标识
     ${displayName}    Get From Dictionary    ${reps.json()['data']}    displayName    #拍品名称
     ${auctionLotId}    Get From Dictionary    ${reps.json()['data']}    auctionLotId
     ${displayAddress}    Get From Dictionary    ${reps.json()['data']}    displayAddress    #拍品地
     ${displayDescribe}    Get From Dictionary    ${reps.json()['data']}    displayDescribe    #拍品描述
+    ${auctionId}    Set Variable If    '${auctionId}'=='${None}'    null    ${auctionId}
     #修改拍品设置
     #上传图片
     Disable Warnings
@@ -61,7 +63,8 @@ auction_detail
     #sleep    0.5
     #保存拍品设置
     Create Session    auction    ${uecops}    ${ztbsc_header}
-    ${auctionData}    Set Variable    { \ \ \ \ "auctionLotImageList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "url":"${pictures}", \ \ \ \ \ \ \ \ \ \ \ \ "type":1 \ \ \ \ \ \ \ \ }], \ \ \ \ "displayDescribe":"${displayDescribe}", \ \ \ \ "displayAddress":"${displayAddress}", \ \ \ \ "displayName":"${displayName}", \ \ \ \ "quantity":9, \ \ \ \ "id":"${auctionLotId}" }
+    ${quantity}    Evaluate    round(random.uniform(2,30),2)    random    #拍卖重量（吨）
+    ${auctionData}    Set Variable    { \ \ \ \ "auctionLotImageList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "url":"${pictures}", \ \ \ \ \ \ \ \ \ \ \ \ "type":1 \ \ \ \ \ \ \ \ }], \ \ \ \ "displayDescribe":"${displayDescribe}", \ \ \ \ "displayAddress":"${displayAddress}", \ \ \ \ "displayName":"${displayName}", \ \ \ \ "quantity":${quantity}, \ \ \ \ "id":"${auctionLotId}" }
     ${reps}    POST On Session    auction    auction-service/admin/modify/auction-lot    ${auctionData.encode('utf-8')}
     Should Be Equal As Strings    ${reps.json()['message']}    successful
     #设置拍品规则
@@ -71,9 +74,12 @@ auction_detail
     ${Bidders}    Get From Dictionary    ${reps.json()['data']}    records    #竞拍人员列表
     FOR    ${items}    IN    @{Bidders}
         ${id}    Get From Dictionary    ${items}    id    #竞拍人员id
-        Append To List    ${List}    ${id}
+        Append To List    ${List}    {"id":"${id}"}
     END
-    ${bidders_List}    Evaluate    random.choice(${List})    random
+    ${Num}    Evaluate    random.randint(1,6)    random    #获取随机数字
+    ${bidders_List}    Evaluate    random.sample(${List},${Num})    random    #获取多个竞拍人员id
+    ${BList}    Convert To String    ${bidders_List}
+    ${BiddersList}    Replace String Using Regexp    ${BList}    '    \
     #获取时间
     ${time}    Get Current Date    result_format=%Y-%m-%d %H:%M:00    #获取当前时间
     ${start_time}    Add Time To Date    ${time}    00:05:00    #获取未来两小时
@@ -82,7 +88,10 @@ auction_detail
     ${end_time}    Add Time To Date    ${time}    00:10:00
     ${end_time}    Get Substring    ${end_time}    0    19    #截取正常时间时间
     #保存拍品规则
-    ${Auction_rules}    Set Variable    { \ \ \ \ "auctionBidderDtoList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "id":"${bidders_List}" \ \ \ \ \ \ \ \ } \ \ \ \ ], \ \ \ \ "auctionLotDto":{ \ \ \ \ \ \ \ \ "startingPrice":2150, \ \ \ \ \ \ \ \ "id":"${auctionLotId}" \ \ \ \ }, \ \ \ \ "auctionDto":{ \ \ \ \ \ \ \ \ "id":null, \ \ \ \ \ \ \ \ "auctionEntrustId":"${auctionEntrustId}", \ \ \ \ \ \ \ \ "bidOptions":"10,30,15,20", \ \ \ \ \ \ \ \ "bidScale":10, \ \ \ \ \ \ \ \ "endTime":"${end_time}", \ \ \ \ \ \ \ \ "startTime":"${start_time}" \ \ \ \ } }
+    ${bidScale}    Evaluate    random.randint(1,10)    random    #加价幅度
+    ${startingPrice}    Evaluate    random.randint(1000,2000)    random    #起拍价（元/吨）
+    ${addDelayTime}    Evaluate    random.randint(1,5)    random    #延期时间（分钟）
+    ${Auction_rules}    Set Variable    { \ \ \ \ "auctionBidderDtoList":${BiddersList}, \ \ \ \ "auctionLotDto":{ \ \ \ \ \ \ \ \ "startingPrice":"${startingPrice}", \ \ \ \ \ \ \ \ "id":"${auctionLotId}" \ \ \ \ }, \ \ \ \ "auctionDto":{ \ \ \ \ \ \ \ \ "id":"${auctionId}", \ \ \ \ \ \ \ \ "auctionEntrustId":"${auctionEntrustId}", \ \ \ \ \ \ \ \ "bidOptions":"${bidScale},${bidScale},${bidScale},${bidScale}", \ \ \ \ \ \ \ \ "bidScale":"${bidScale}", \ \ \ \ \ \ \ \ "endTime":"${end_time}", \ \ \ \ \ \ \ \ "startTime":"${start_time}", \ \ \ \ \ \ \ \ "addDelayStatus":true, \ \ \ \ \ \ \ \ "addDelayTime":"${addDelayTime}" \ \ \ \ } }
     ${reps}    POST On Session    auction    auction-service/admin/modify/auction-rule    ${Auction_rules.encode('utf-8')}
     Should Be Equal As Strings    ${reps.json()['message']}    successful
     #委托拍品列表
@@ -97,3 +106,51 @@ auction_detail
     ${PutonAuction}    Set Variable    { \ \ \ \ "id":"${auctionId}", \ \ \ \ "isDown":false }
     ${reps}    POST On Session    auction    auction-service/admin/operate/auction    ${PutonAuction.encode('utf-8')}
     Should Be Equal As Strings    ${reps.json()['message']}    successful
+
+auction_detail1
+    #拍品详情
+    Create Session    auction    ${uecops}    ${ztbsc_header}
+    ${reps}    GET On Session    auction    auction-service/admin/get/auction/detail/${auctionEntrustId}
+    ${auctionId}    Get From Dictionary    ${reps.json()['data']}    auctionId    #拍品唯一标识
+    ${displayName}    Get From Dictionary    ${reps.json()['data']}    displayName    #拍品名称
+    ${auctionLotId}    Get From Dictionary    ${reps.json()['data']}    auctionLotId
+    ${displayAddress}    Get From Dictionary    ${reps.json()['data']}    displayAddress    #拍品地
+    ${displayDescribe}    Get From Dictionary    ${reps.json()['data']}    displayDescribe    #拍品描述
+    ${auctionId}    Set Variable If    '${auctionId}'=='${None}'    null    ${auctionId}
+    #修改拍品设置
+    #上传图片
+    Disable Warnings
+    ${image}    Evaluate    open('./标的1-6.jpg','rb')
+    ${filepath}    Evaluate    open('./标的1-6.jpg','rb')
+    ${file}    Create Dictionary    filepath=${filepath}    image=${image}
+    Create Session    auction    ${ztbops}
+    ${reps}    POST On Session    auction    recycle-user-center/upload/image    files=${file}
+    ${pictures}    Get From Dictionary    ${reps.json()}    data
+    #上传MP4文件
+    #${file}    Evaluate    open('./5e7f47fb6aea3.mp4','rb')
+    #${file_data}    Create Dictionary    file=${file}
+    #${type_data}    Create Dictionary    type='mp4'
+    #Create Session    auction    ${ztbops}
+    #${reps}    POST On Session    auction    recycle-user-center/upload/file    data=${type_data}    files=${fileData}
+    #${MP4Data}    Get From Dictionary    ${reps.json()}    data
+    #Set Global Variable    ${MP4Data}
+    #sleep    0.5
+    #保存拍品设置
+    Create Session    auction    ${uecops}    ${ztbsc_header}
+    ${quantity}    Evaluate    round(random.uniform(2,30),2)    random    #拍卖重量（吨）
+    ${auctionData}    Set Variable    { \ \ \ \ "auctionLotImageList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "url":"${pictures}", \ \ \ \ \ \ \ \ \ \ \ \ "type":1 \ \ \ \ \ \ \ \ }], \ \ \ \ "displayDescribe":"${displayDescribe}", \ \ \ \ "displayAddress":"${displayAddress}", \ \ \ \ "displayName":"${displayName}", \ \ \ \ "quantity":${quantity}, \ \ \ \ "id":"${auctionLotId}" }
+    ${reps}    POST On Session    auction    auction-service/admin/modify/auction-lot    ${auctionData.encode('utf-8')}
+    Should Be Equal As Strings    ${reps.json()['message']}    successful
+    #设置拍品规则
+    #随机获取竞拍人员
+    ${reps}    GET On Session    auction    auction-service/admin/page/auction-bidder    params=pageNum=1&pageSize=30&keyword=&depositPaymentStatus=1
+    ${List}    Create List
+    ${Bidders}    Get From Dictionary    ${reps.json()['data']}    records    #竞拍人员列表
+    FOR    ${items}    IN    @{Bidders}
+        ${id}    Get From Dictionary    ${items}    id    #竞拍人员id
+        Append To List    ${List}    {"id":"${id}"}
+    END
+    ${Num}    Evaluate    random.randint(1,6)    random    #获取随机数字
+    ${bidders_List}    Evaluate    random.sample(${List},${Num})    random
+    ${BList}    Convert To String    ${bidders_List}
+    ${BList}    Replace Variables    ${BList}    '    "