From db6b9943bf5570b38bb9db7f6890d7757c026c00 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Fri, 26 Aug 2022 16:27:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/modules/system/wql/sys.xls | Bin 204288 -> 206848 bytes .../wms/ext/acs/rest/AcsToWmsController.java | 5 ++--- .../wms/ext/acs/service/AcsToWmsService.java | 4 ++-- .../acs/service/impl/AcsToWmsServiceImpl.java | 7 ++++++- .../src/test/java/org/nl/Test3.java | 13 +++++++++++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls index dc13e6f972f75e4d78e85e92d8c306cd33876ad4..5741d4b7e6d3ec757f9a65d5a511730c262e717b 100644 GIT binary patch delta 39821 zcmeIb30zcF`#65?nT16*6%_X?hyw~ZEV7u(ungjkf=g)$$RH$JfCZ+_Xk@0nrA=|I zEX{h&dd(#is9Z3uOijs5%}UYo%@&QcMKk61Jm=m!3(TmM?_2Nx|Go1$bMAf4bDrlp z+w(l<+;i_WZS^oUdMr(IzlRWV3Bp`XD0zeHx~b$*?g^^oKCe+x1*aJFFAAi4NI#uLxSxWj+VJkMr7 z^OnF=b75d=&DFpH+M@{yGZdudNB|*m?c3{k9ZzTjk8riQXO|v*dsyM5fuHN@OXj*_ z@#LeKe5(C4vu1wZOP$PPhIHW0nG@o=)Km_+$Im$GF+`#qH!WLui1?6X0k4(Z!-g4o zKQ8ggMcAxWBCNzvG~@ocOC}>MZLpUS3l6=T(kDH%K z&kOmtGS{X=lz0=;+^9t2>gJ6Qb7_=31y@hj49Iv^X&##4Vct8Xt4p#AA`Y(kcFIL+ z>_xa{HQ)vim*#5BY2U}uS0X;^b@Z(fDKkC1TF7yLvwnl5Nd?gj>DqhbL$SuJe4u zN55SC<@u*qc35z}%l0cP%dTDA-m>k!?(N@j5B7ZUmGRuHq(}DLIXUOk7arRc@YrV$ zZ|(JKz`ljweUdmWF~Ft!viFSN>F@GQowL{Ir(9}Y^s#&Q{9(t{ANkHZ^vdP_<@u%) z%d&Te?3y&?bl4uT%QIao_#;%P&c5uJ*hX_}K1UTb@Yh zz9_OFzkBL;Pu$rU_3Q@=E)E`}+CK9iKWv^6AE_Lr`6@m>{^^V5uX%jD@rAGWFE2U}Wq$w5!ROf0v^r+9@di?v&U+!DJ``7b9!=?vc?l&ReqpQLf zOE%nL{y=--?%?QUi@!FU&z&(Md1TPy&o?Hgr9ZuY{ov>3{nYgSp_hv{e06k}@$Rs^ z(Dgr!joJ6s*yAL5zUxM>MO+{`==oJoMaH|E21a&DGM+!0xG(OfhTMinxqscaCiz~| z%S8Qw0>Q3*Ce`R#HBMmje%ZGPvxxDqrzoT7dKRV>g4gI1zUsS&T!nQX(+%G)8 zVD5&)pU(CVoc8KdJNI^-GJWZwXqOqwj`e@P`h6F(=`OYL`A-33R*(G$=T7_NUwaRa z_nPqVzZ<8x4O=-)0V7y?1(Hd}@zp9{g%iM8|8dURX82 z1^8U}Tz}!jKSY%C%7(k%@3`*84z3d(-rnoGxr5WI-kn@Y-dt?DeC?;9Glq>fT@3!E zGW7Kizp5NImUGi)8Q1OmwfRBK)3MuH*6;Y}7z&TV{W*kgTWCVcww`6+?-c>e0`J=MIm__xS)_r}sq@2)A^{H!kbT2S+k0goC_ zUH-KH%zcCQeXzdn;2UF~T~T@E#7mbqf4RMP*0JVpyPipXdA>5uJ=xSVvtz@Q&rh!0 zl6vuCr_Wy;a4>3R)`iVqRh}jX6jL|6H)m4#&;J!TZtMxOcN(+j}u4!LufLpZM9(W8IP==4^8LB){UE z`O@?x)kYYv<7;%8J$PE7s+n$@NBepaPY#q1A*iIz7>-WQTjZlHBbB6#OeY1Tn9L;Y zwVvjCOdZYJD_qnC#WSbp=a{+5&ixP0Xnvd{9z;!IA-j0ABTA%|V7mBtj(t97|OHq3tFSKkUKb6^72stFmKO-Qv1n6VjzWP*u%1!4uX;nW;Lwm^Iu;=y2SW*fl3 zKxX1}0@t zN`FE=gE*!OlorgOe^)5XY_PZxZ@Cv3cLzrI0Ut1r8!I4BPeM}X5VE=#bkd-?P+Dl2 zQS%6y53Mu#0Yd%(trHG{9bNBg*%-(@?gR>9tXFk7N@50XDe9+U@^M%&)nnO=#aaN>f zZIEov4?Vl2%K?HV*bYu36KyUOogij&hlmJx;`lBZyG(k88;WUIVAbbho z-w;ZmvA=@&EQGHifTkwjLVVf$+84dX{s?D3LHHTMFA%$4MGb9 zXeZK+!XS~3K#0{K&LUu0@ny}@rV{S;FORyppK{^I?4BH%*Q@5#xn8%a)kz#VJ<@#Y z-0HfuAzVm5VV%JB6RxCl`Rb<89I2QHNh{2z=lht`PDR#Do5;Q9ruMGn$kUHO{sjSb z%jR=yJNaAr4gkLI!F*`nKRHtOnoZ^yA?ax@nj0W28O3SpRzA&r>1%YQKBPBf@FqP# zd^k97g0KJwFf34Oygm+KK@MPj9l$i8q}mV+c7Pb-0M^d|tiJLzRFv^DT)3#O+Wcy#?(OF35;g^9TW@#s+HuH2WjuEz1>!tF4wR1zh29Mq&Y= zeI6m(ELSSH+HSd0!_^MUl?z-oSgu^*YNvcN*dPX=2ORFFx`t_Bnw@W`}}(0@GFWh!W(@QapcBSfP zDOEo^ru|r{vQXP#sRCH3`U8W#WR%39KQP!!Kzp?HKe2274vAZO`ft zrP@#S3K8SEjz&~qSdc!9O(?6pF%lcJy<5pxiA|`b@{2F6O1mU_rNui&lYiO+FDS zH*xp7VVC|8i3`0qa~%br*SVKE;4FvZ(1G!2-j z`bJ@A4cASDm;S<;8m?Cl6JXXuK#)#~@!SOG^;ne7LgpKsS~z`%>ma1P!FenzQ3^Sm zxyGGi#OVo?IvBoXr5+4fzg3 zjQNq}K8Sk>Cu+IloQH7F8(f!VC3(W2dTw!NOy#&ZM761eVBu6f*9|8$tel9HDtNxZ z-EJ$ayI?xYDeJ1=;QAqZuN$&|)1Lj-Tf=_a&9dKa%U+GjpOWeZu3R+;PCpbX8@T)1 zjl@&29}CT13P0gVPerEsJAl@yggHC8IqmMS!5Frcd+1iw;I5l3!fx9l2!n1>4Ze4? z?DyER4;O0?%qMg@>>+q)VGb>xwY21c11O(o`r#duPOQhY>Ge`adh;xo!qx8OQfMzr zM=tRfJMw6$Bi{$tz4p}gIsjchfRgkyWPn;I-N$m~E1p5BudwPM*U6YbVn_t6RK*fK zi6e=i)}u+XKF?FTRAhUMq1#mHu7gyjkdsT@jcp)r8>KEF_Ype8Y^F+t7=7Pu|j%&H70@JUYKQyjuQlwcC$gdYxZ-K++$ z`Y@+%CyRbBt+-zD99n<9|${Yi0p(zvr+mcOmm*8}@1y04oZfpV$^U&z|6b(mTYg~aZL$089O z2Pkw~o92|d_z@$+yyAP43p}pL2uiC++^a z>fh_Iqv@*tat)Tyy83^w2CEWQekM&rd2E2?&`9!tc(_%I2)}*C`7^_Yj?;hBg6#jh z)_>BUt^Y^qG2xyQl1gGNkOnIiatlllTY$NvXw|KCo>_IkQYW^`GPA1D3H*=+Ztrng zt-n3|uoL_vR`Xz=;h2*Q$DP2fn!>&SvURq%0^mzabd0SNK6A)GSGCmwx3}^qoWPqL z!adqQMpwaVJ+=upM~g6~iSuTDENd@+A8UJ!|G)NPH2{BqVS7D6<(WPT(;|eOwr#H_ zsV%WR)0wnS{@?ieOWW&7%eWKU>)aXJ_F8MRYIFDhwHK=a`1{Mo7cR?Y!uk-dO;3TC z8eocv%WQbypuz*s<;7Y$-?~b&2r~da62L>mmhr_!Y=q^3W7r8&agj(oYQN!Danti* zsNM}>76jN6L<%7w^GqskIO0uYz=Q<_!rc7 zB28f01nb$I$lj~lKi_n&cI}}vTXw(Oym#xNn)ifjJ*f-VB&d7Q2%|q>65w$`Sr2Cz zH%jqYh}S`yhK#1QL_u=0BMDEEsS54}x4>B{y~fhlks0I(z{6!VgkqjPB#u(ZIZ~=) z9?p1@!tz2gsRaRf#5MvtC!x2846w+?4um4(N@%H70GS0buH?y#_b@CZq$b6sSu+X@ zqG$#QF5{svvVfRm6>ty}(0D@$B>@rLnSe+b1-!&L5>Q17%gXL40M=M{tpqgMRiV9v zgKw@1B>@rJnShxf7z#M0jexLDQwulL3M-vTcpU+U{w@I#yN!TGsf`P32iHvyJV?z?d$+!|;o#d1ukFBX z4{*RuCJN;jd%X!d9`^p_QoK=$_egOQ#Ot85X^4(C!41InL>yI{KiYCU=1|R!SNCpZ zHKif2LI$GZ=->gDCwI`^WEzCKD2@_5FcslJWLhW6!JR`j$CFH&sLO^cJeq`e1L!zo z6O_Y;@I0Silw+vihw%A)7$1QJ!UrCBUSE{MkH~FXVXQ?BWjWcvDaVE^j^fG5qgp|+ zA}N`WWW`1Lok)`KWFYMVdSZPb?G=FoZQO)}q|thw($nhGa03UQAmebl>H}#~ayZ z!*xUn>62J`JA$np-Pp)l8wkRI>@;Kw2tJ7oL>_2KZ3~SVL`tC7_a>!AP@%9@jQj|) zAtHs?AtGd+!g_gsrb4kSH;a!d${D`VB8d$HR2j}PIKsyfEaR(gPyi10L7)wg@QqN7 z*Do<wFaQRY>`?Qa;h# zA~x)fs8&`u%&35jbES-zR3bxJmt)RqWxd0EO2}uD@-;~Llq9D#rwntk0@~y=T1$u- ztE7yJAS0BBxi37y+xUxEtsntb0}^2$^8T+i?>D}E_~)ZXY7cz${q`?0Uxkz}7iutv zvnm%+x7*cFG%$TsQj9pT#S999T1U30b{PQwG2yWg+L^VS#Q#M7Zd?BKH_so)J@Gr) zKPlo1efrUk#!HM9RtZ*C6I73q)NelWE>;w)LZ~QNZ7l~i_KeiImP1LOr#wN}3Kl2o zR@qhYS!ksu$m_mRp3;gJ3TXtLFIti`>BN?*mij~0>me3Ih zVPhO!z4rr=aS6hOyZX~E#tX_t49N?S_P$s519B9RRx!Azlo{2u2(M>w9|`}!t2;gx z;f(;lpu~X;4zUaV`@_F@i2h|NXl0HBgBn;PRV-8&daxW+&;+P+W}~6XtlALOIO;wT zOC0vs!&O5&^swMxAF~HhklTBJjle@@;Vg@Wyvk%2g?$xDLdgr;A7Tc{9Xuq_J6gx= zj)uHMYlQ=$wDTyrpkf8ov$ASPEtK_Dsob`tu(Q}P*nteNb^uGzhS4r6eD1PI7#l`4 ziYC%d;Ahf_;4>TuqthV@52uqESer+~*hyv{9l}ml$tO*DbPJ%KA3$SSLSsHHWGA}2 zsb0l1(NAmX5a86F)CzqfXrNK<##k_{DkvW8GUk&e=o2#Zd`3bdxG6mA<}4FP91L>X z4gkz4S25awR7Phjt1elq4EvCv*~I2;Be=#s<5C0uUW{8gzS6P$XEv z2x5M)Sa^iuXuP@n=;_8m{w}gaD0wXq7F+X8aI)@-1ii-`Kxxu}l(EA)maGri4&A#C zc+ogrO94`1-%F7yLiV&dpdd==oEEeWtLXMd2^CGUW40n{2vnWO6bqIHcVUo#M#@bc z<`#2mSkCnzq!r&<{lmerwhUU^3=NhHa<>o(y$xLfiJ`p~OUx4(Il`M!bViT2vD?7} zf)C|2N#jOO95YtKnyi6!$3fAwzaMr-EXq1d{bBAo(R6&Qn7bXZ$;>(o=C=08wwdWb zI#9Kqu^2oMdi?LBgY|h9?x*0KThv&8s3E16fOa(gj)p8@jB$9Sfc)|h#eV4Guu0K} z!iF3R{Ztea1;-KMM)r#?7%4!#o*m)pk6m`F~!>?hD5X$O# z4VzS_g6V{BlI;plM7pS%>Omari7={w4hnCzClfM(tYh;kio}#J zxH2dJmLY_IH$?Xke^ov$Vf+{XC|0793f1oXaaoi864mrcY?$m|a$;({`mUAAlE zX6YE*9pLDrS>3ED436#>x@A^33x_*6ZSXI-X>f++sh8qLDMo$NM7m@CtJ{sA*Z;70 z8}?P4KEKPl238riG#_l+ox}=t*5^g#)~0h^r*DbwnAA?!BdZ3#O#$K7xMTJOt;Ho( zEIDd9jMqptP!E#-F-OdZj+m&NTuE5iIJPKi-%(|4BI8lOla&`5c*knR5e;$BsUiQi zwL4cc8sbW>Ga_h0)nv6P*O&ptn zC$|B9H|y|hlR?-!l=dECbsDY83U!N$B~6>2G&TQ!E;IHAb1BCfFf!u}e8`8T4yK z0kJPTY8m@#vB&RBgb#+&p0U>2u}^o_Hs}ZdKVeP+og8|-R&8M22jA*uoRLg*>9KZ?9jXNIwqfi*z8D%`tbbk=LLrAWC^7QeqEaPG?snC{CAb zCnq8u=W_>f9)ey{5n;ZHa6E~&Z}%qiLlyy1%gjbzQM);ce~Xz-Jv>d1wfuV=V%d3< z-D0u0M&~{z+7a}e96P?A(7dw48mz%tk4W%(^suKR)jnhoRX`57eUM8u8gbSp_Mawy zx&MGBu`u9+{}_3WNVJ7!J-8_LGXQx4fW2&rg{`yEh+_RoZyBG8!|8}Pw|*B|4~<1T zC?`AS&eh-?!q!!}u}8hCGYWPy9(66=IBu(HL|fU`#ZF~}W#>~|qH%1_<$fa0JbYL_ ztm%$&!KBjhL7EUvTdRi3OVk)aEQ2sFl?L0b$B3!eAK=iBP3A|W+~!?Y^B0Uf(cR_O?sAF;P#WAjTU&T zNzWcBq4lJviNP(Co=fbq?WD&Cc7-%Sy|$k81T%QsNskWT7nD=je+m0v1pne8Dhvm6 znZJ5%*?6laGuV=j<}PB%oh~MKzu{_ffprq2g2@Hm;<4?5sBR_C59Wz~Zt@aMgrzfS zbobWut+SCZA~esWVM%R7KvjY&(}QFiX66_1S>?rr`7>G*vTDk1L@3Fl-GqiQ)TNVE z^;i*l5n*E2Ah&w@Px8Su8L zA({+FlM=c1x{zuu?IN5QOI`e1GZfhc5TPlb1`I`ZRvsKYPi+wZ+Cbw_waX$06Cv$x z8a%~O)rbYN*Bn?d>|3@A@b$21S@tOHUEe;8dSG=LRmCBloAFZ7=}l!6u>pfb3PNTY zbzw^E#w3`N>uD9q*2zULT{OKY&hKz`(bEu4BvDVv;WYsRi^D7Lyt)~hR(JOnt^DFr zzGFW^oEh0K;nz#|Hhzzzd;OJPAEhk5i}0= zNUIMFeIBx+9%3t$aMMB@FW`UJF~CuRO?F-KZKxCGQi?M~>}o>$blRy1`|9<^8uIz` z>%yWFB#kN~|9gGgrCl~v3G69T9=RG7-1}<&GIp@xzXw|j4CEjExf-9 zHF>b`S_XBuQNUJJAHs}5pTQxpnk3#Cu&O*4GCesVBf)_$Z0kFM3Lj8K`%bkgQ!!N* zfz2Ck!nbth53hlHd$?LXQ1t4q=f2slw@Ch$5ITu=bKs`&uqKOc8a{i|1l?TPNx*gk zRx4LAm&TFX#zVJv72MtKwMN_ z&fpezZX>&F>(1?A@V4$;6N9&P=Pm&pwmE?Mf^~8BuY-T_u)1@9v#kQ-Z@D}7pV=ZX zjBODBduZF3@-nw*FYWgnc!0Y770kJY?4?ccMu4<18U#0Mdd_5<36w%(7`+p&z3!ls zAqvl9w{q^vqr>3pc`-VXN9$k{fl_E5KnDW&Kt8((H1uwE6KMN1Izj+y zKekPvg5__!5QjcW6SRc~+5hji-ojmw!mLQ@E^Zl+b^)W9H}YPro(5JC7CuFC-ByrG z!w48n4q#%{Ij1E$5y9jSZW&k#jL`c2d4I!bz14hc{EgpvgLoRNFmX46X#K@G`^KSS z32VWaS$&rq`xauwO7sM;OxhU+0o-5?6h>rH52Mrr&Tah&@9}M_Ke}3OMeK1<7fIvB zjM2k=1xYNhUd)++n{!Uw!FCo*xfhGQ!r}dF`WM~MzBCwX^JZKWd0hta+pe~4WOQ12 zB%^P_C8>}ExZw?LpiC}+uDWSDX5Xay?up_?i$d1!>M>d_a-=vtv(k-q* z9=mMo8nC$)jHcErJTi0MCz%MBGu>U6Ze+mA@<8SL4+~Qq?`|6`_pBg^mD)Qj$wY|wi+p2|x%--N~_+D%%4NCldf6$p7x z`Higk-)J*o1w1D6{|V2a)=1jkheL?1nMH?jkyh?SV7}#BeHO3tkF7%B3WTQ?2qS}F zh$SDQvWR+sKe4cgX0b^n++B3y7N8q=J2;bgBMpyQc$;)iHoWM*JRe`1&u3Tid0Az7 z!D82H;~U$!#z;wAZQ2jFpinY@cnfk9K3L*I-f65oh`W*+&mMXeEdy2sc6wNpaVi+D z7KvD}Y2mt9`2Jg-pb~^tq;h-djj}K1oR!7NmDpXsl-{tD&4x#rb>`qu%t#{dz{6_6 z1FHsBX@QwT-|H`Oz2d@9qCf9?HHXS=YqJ=1Gp<)X%ZRsdZ?Kn8_~ss}@4TPw%Hhau z7RL+g_QuYa@ei%fz#|^wa~Rloi~5O;Xo6Vmpw_u3ZYazHI4;^`LR_u%fz@mrSBML| zjnYFMcyp};lA4GgxH|acZ)4+|?}&>ii!AVMr}kd5!dC&D?c9^%Mkzik#o(>6bbl$< zN^z>OCfH8JIk$IxwQ=53A`}ep?LI2-IdMjF<%3~YYFT%GR!E*DmB>M zc&Qb7E~K5^ehvCD%x@-Q0~qNjEMTy$)o(-82fBXPkP>(3Uh zAqUvDlVia${7WbJUm970hBUIp;I%BnzX5g@!Z#4^qL_vZSi?d(J{wxgo()A|8f~5l ztp!|sE>tw+&NPySoUjy#Cu2^q{@nJtk0U_n1Y0r182h}4V;wXS)bc4iHf)2t}k)xn?FbaYa>sC)r)yyYHQWMM%c4#`?w7U@1wNZ4>1Ey zM;*H|a+|gl(0Lwv0gW1R93*6m`+ZSDEGfJnIZS?p%^qFE7E838;U8~RGtTGCXc%DG z9u71jSQ84uYn_zLFqM@5j5l&BOn&l`J#}9e8%v^F^kJp9ztd$^@BAk z>*lY|sJ*v|izcG8E2m)pEP{`gtpl0mojmxEi@2vOt`8RS7_=1!G1fnB{T4+Om2MlC z$+}Qy?PaYWGC+d2Xs?xJtJN{4Towhwv+AP6w{owQ*d#a}g9F80%tI{lX?4rVhnYgT z4WXpMg8S|E(#T2TOWK1U&KK(DBZFE?TIQ{+DBx7+uHfL zt!_56N3e{L)O!06HtO}Z4aqD-tBZwq4G;^DAH`@P?~zNrMH|};akcUo*d^%r5Nvaz z#ftNRR&iuw(|lyOy^YNSIA%0S@p38ND8+lExJimHNwE*STL|;P);bpJqYaTDxr&IgNI)Q9n;}|}e zSECdA>JJFF*1p=BPEm_sCx}H=_$TeFqwOuSb;WA=^Y-;pPo(pAwy#r|gg0+rgBkvR z-M*e*M#ujS`>LByyGhRoWX`9(`djZL!`wz*1ThyjypZv(K-Y$3MiXzH1H7u+9$TMTGk(_lwDPGM6a zhJ6NLk{p{?cx8)2>*{ZT+gn#Hz|l&kN^zzXS4i>F4#db1)=Gc|DLy8}%~I?NuZBZH zJj9NyYaD~OwXSIZcRGUw&oIA82wX@z{5Pku4Qz`yHh@zzYd?)$$}%{g#+E?(tu?d% z%hTAjPO>t+!88`%Rw6Hhigwxgl(Y}|4yM64s6;Qitv}#AuQ>E9D{>sR)M9R> zH=@{&RNLun1;hV?<~B~A&pMfrI%W%l=RY`|9klpH(^;7F6&B~@=T`Elv~F%fE8_hQ zOG>a^y3$sQnJkBD~-X4P(?QJ8()k=Ja zEsQh>t*5hlIy#xoHZgmLOUd>I_Y%O-PWr%e9&CCl#X2d*=Rgo%BE^fOc$E~_OL3zV zpUr?1M+O&`u>s!J;Q9mn?=hXlRdBIBo!VKu=`60I^W-|y*-NnOerxUQ|MGP980@+b zRqfy1&T5&YH*aUbErgQ&*X`_oaaxOp*SF0&GOV=;S>vdm(9=x4olbATB#-&MCK=V+ z?=;IwSZ4N??eeXg;Nshc|3h~9KQqCtceB{#TROpIEBa`Xroa<;7^gvelXm&d$_Sy_XVF@Y7DmNq>O7rQx)g6*%m%+1b%KSM?l9Tfb`3!Pb}rhd_!zP*Y;!5)5ni~*5`I^xlekkUY`N4*GSe+nT~H})9KSQ z5+-EKH|j@_qH@DbLn#j%y`|Sw6Zt*W1YT7A%A4(Ubz9y#2Afy24{%Rmr>bJVhGO3E;n&5I{#2U z$E4n;4DocYp$)B(GAHr*s6iM8OTs|`Z-gzC+ zP_;WKBQDQSv`d}9lkI#yM_jagMll~B-`PdYxhQ%Mak(!)l)t8}3g79n6Fw67klVue zCH^jY_dThkdjKE6_x*fir-;#=c6wGtN9+qqP-p5Z^2?39ZonwDo@X!deNQ>ou(6_? z&wo!5$mvPJd@fLYt+g?*<$*xu)RTd$2b~OD^~8ID54ST8>(e{XK;T~$(&tP-VKctz z?PS1-fCnpg1hni3;ASmJ$!)hXKoxL`tPHsFg7S%g%9R18;*|lXg_QvA2l`f0o_UCDOW@JDWY0?X2Tccoqwg1+1Y$jabb2bNi432 zoSu}IwX|raA$V1lr+b!*VwGa2O2gi(Ym(lsJiJDcqV?kBoavrFtf$_w1by)>CU zfAYxZe+%PJP1SM<-FDvoP@fVP#gQJ>?g54PGUZ(_1nl4f;Qh%fxgR`(112QR=QP6< z0pn{{a#8IAQlH?axJFHO?Ugk7ef1u$qvh?jyyocFZyq%5xNv04-uL(fF66Pxt=AhVW6PUDf=>)!ZufLgYn_p6(w4H2O>KotZ@Q!(ez7^2NbF=ytw7 z*wcM-Uj9b@@hBC4Tkst&A>m1eg5ZL(U>|j8gM0WSl2tI;th!jN%2!2(%uwkDs8nA*baI&LxPF8C8uwwU>ANZisD=zsm9KjJ(17FK160$; z99&&EK!v~J`+C3swD(t+yc70it0F?Y{gh*kU9ZmWI?&tC&2O0M%pKl-YQG1fhpAls z5dEH6?tW1x2S``ps+fK%g`d8q#8>M(o;1Y-au*}VlK?KFSqnE4v*Mx%ui24(E-mk1 z=Z_7qxRjV97P|DBV``dG`mg>b-I&6xB9fChyS%)(D1y{YUqN4p6#}!kzUHPy0fKHT zS9L4Clln2e$uG?wp*A17l|S`*jFzkJ1}6wU^?HonubRV7FXQPvj*z)RIL@0Rre<2HOSkZV0f|iCvrhzle)NWDG|EcnrcP5ROCm6vAf^Fzp1yCm}RR z*QX&C7M-M86{a=|J5SQ2Th_X#q-rv9rp+b}Hi6)GUA3={q)RF60ivmHq@jba8r~Sk z<*ZdGm9T%IYEoiCTB)x1Zo`an6}*2w1714quBProsJlylTFUvlsyn#R4p&F4T5=~x zJm|>5)Lq$$aPej3ImHD^!%*6#3_fz5gX;hV@D&12Uy?_HjCT=5ziGqC{aURyQX3uh zoi>cPDwRpZoqBN{h*ldNGcPbQoM;2Jfk}g=O~!Yw7vEPlEuB=BO&&KnCVCpDFhquz z7i0&HBk<1EgxTOOG-aU;hEK(E59;}Gxw-i>s`TT?>Rc1Np?}5#{Y$3y>Ss*ce0^kc ziZL#kXrq(D1}3H?kgy1CL}FNC@=N-GCVfJJDJj~dQb#V*o0iWk%_;=zo?l=n;XTpWa?p;_BiGYp^XX z?n3Wx;P#t8`;<&qcu#6eOLur5PD@Kqs)T$5JuyOGE5s8qm6^cN!BJN zMn9dgF=b4ocC;q32d~TeaDU$cuwybHqJiu#^jAPN5Q+9;9|sZY{}B_!*TT-hXjq&8U>l^g?(@FOu3NtvOv zY+A+aEK(%6or8^kx*2cBhF2IWa#C|X9&8FQky9jG@A-IBSD%MW;WYEnG3_=de8efD zCKz({Ir-)KU3nA8)44=XcH~Ex8luPolULQq$Y}q85wWQwmTrp(k92u(+p=dqcx+l} zadEkN+OB1~(G&D3`sC0N88lwkfzRr|Cp8oom6sM5oQ!EO4tz1O;B$1#*g4W9^S zrpFDL#>ny}L)VFG6_M)|-A}uxt|k#%=yR`=wLJs4`7|`!W9=8_fBL3R@;g;}KQdDX(mUsc5&f)w!in-0^~pPbcU z{-$g`zL1Zf$@{#lfS9y+W@-0N{K@DUdCoKPYxbYs;+Y-(?SUV=#hmku8Thp)MlGJF zJuj5@_}0^nACxtPtBM#-QabG9Ot%?G>ARaErV{VH%E-e?ZRnl>gI?R)Gtehk2df~4 zF@0lS9eA$iz)J6d^SlQdz27FrKJZ=k=kNFaS-nH&ed>X_=u=)txvOeEqD5WPqF(B0 ze6K}a+CTcL=Qq)pJ)^Ixqg&K1>SndCp!=RCz^B?(!u;>yF;QOldJJPctGghwDOf$$iFM!`n5lrXDv16{sW0g2LqBao6%Vf+uYqY%?fi`u~&Apso*pW6-*UTmhXaeXmyzAe1& z!yn*@SGUPz9GMJw(L&1wn#4s5Nf%q;?Yamb5Eo8gpuV=qKT^YZAFdynMnJQZc+kW! z%HYG^dXfYoj3kg`_{FhLc1OXL2!mnAKI4rzk&q`DawQ{o_R;WYVarc6(4~URCO8Ir zU7{g^$ItXJs^o+fKU0&f_yUNZP&e%tn$1OdfMWClo#g{@2ME4!{%3VqXDw6=3YH5Z z#=yIIwNMz)!NRP|v?uqvu=q0V?XQKxx5bH|!sC}|SK;%^)H@9OIeuj^9ZVt2AizAv zgKE~2R0kQOgf73*p2oIWB3YIZ4zdiSwxlD0)wc)4UV$$gCv8c^Fj6BOkcyQ^3AMk% zlbk`qfnRAisD)7uP(!M(&^}>7ds-K5AR|87L5}Z*@mHYUf`pPQ)DNhRae(uKumW%# z)L1klJJvy#i^5kTS@m!5YMX(-!H23<*Qk%6{f2g3Rx(lvt_~4ixk{s#l}r;pziLeh z)3c-%l8=QUnM;D;3>A z$9?A}j8!RkAw~s^4=ELWgd&yVQ^nNuaYCk2(X}pDtx$3xyinkxc#C$OFNC-%!jZ`B zQv8S%zk%^QKjCXB?&7BC&*=oco8l0>s8i_Tt_bHUgj9FMRJ{BrTmp98$L@et?WNFF zdnn4eZNh91g^_z(_z5D_yCC($LZzqTevgmgl+_r-bviFaAH}GMh=?fdz{n_Vyln{Z zbWcu891@_9(piO#TX!%G|tN_x}J+zBNGr delta 38011 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 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 1aa92c8..a8a393c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -78,14 +78,13 @@ public class AcsToWmsController { @Log("排产单确认") @ApiOperation("排产单确认") public ResponseEntity sureProduceTask(@RequestBody Map whereJson) { - acsToWmsService.sureProduceTask(whereJson); - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(acsToWmsService.sureProduceTask(whereJson), HttpStatus.OK); } @PostMapping("/status") @Log("ACS给WMS反馈任务状态") @ApiOperation("ACS给WMS反馈任务状态") - public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { + public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index ef0b57a..f83a2cc 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -5,7 +5,7 @@ import java.util.Map; public interface AcsToWmsService { /** - * ACS客户端--->WMS服务端 + * ACS客户端--->WMS服务 * ACS向WMS申请任务 * * @param jsonObject 条件 @@ -61,7 +61,7 @@ public interface AcsToWmsService { * @return Map */ - void sureProduceTask(Map jsonObject); + Map sureProduceTask(Map jsonObject); /** * ACS客户端--->WMS服务端 * ACS向WMS反馈任务状态 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index a1fe020..3a639d2 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -310,7 +310,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - public void sureProduceTask(Map jsonObject) { + public Map sureProduceTask(Map jsonObject) { String producetask_code = (String) jsonObject.get("producetask_code"); String device_code = (String) jsonObject.get("device_code"); String material_code = (String) jsonObject.get("material_code"); @@ -356,6 +356,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { taskObj.put("real_qty",qty); } taskTable.update(taskObj); + JSONObject result = new JSONObject(); + result.put("status", HttpStatus.OK.value()); + result.put("message", "任务状态反馈成功!"); + result.put("data", new JSONObject()); + return result; } @Override diff --git a/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java b/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java index d61e0c0..3cc2c4a 100644 --- a/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java +++ b/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java @@ -13,6 +13,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; +import java.util.Queue; +import java.util.concurrent.ArrayBlockingQueue; public class Test3 extends BaseTest { @org.junit.Test @@ -263,4 +265,15 @@ public class Test3 extends BaseTest { } } } + public static void main(String[] args) { + Queue ma = new ArrayBlockingQueue<>(10); + for (int i = 0; i <5 ; i++) { + ma.offer("pla00"+i); + } + ma.poll(); + for (String str:ma){ + System.out.println(str); + } + System.out.println(ma.size()); + } }