From 5b4d83e76ad8d144aea6701c97304ae419dcad84 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 7 Aug 2024 11:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 275060 -> 275060 bytes .../Controllers/BarCodeController.cs | 7 ++- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 10 ++++ src/WMS.Web.Domain/Entitys/Box.cs | 12 +++++ .../Infrastructure/IBoxRepositories.cs | 2 - src/WMS.Web.Repositories/BoxRepositories.cs | 44 +++--------------- 6 files changed, 34 insertions(+), 41 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 0efbd29f192da86ac24b0e8762231b5d269c60c6..163dcc66e36b139f6326e6b85503b31874c8c2a6 100644 GIT binary patch delta 28518 zcmeI5349bq+J`gK)v4ybFGGmoFakzEL_|b7AV;_l0mC7efXFQ(pkjlF$g&=Q+A4Cm z>U!Y0>SkR;L}XoM5fEKG)&tR1SCM`lT|`8_|JzkllQgJ7v&Z*+>EEx?Prdz2^`yIJ zrl#vn<*N^?e)VD1*oO;ZPsL(S_lmWeh)hTSMd55*g(uXUt)c2D_zUx{a&79JPGpGDb-5`DtY zA(q@XKj)fh{u|rl4Px(yN4^pt`O4TWpAdC2s&R-99UlUL^`63MJK~qL_C7$Jm(Tm8 zr3GmVgBS%?U=dk?9i)F#JE*Zdb`yPO@y|Q)a}|AQ^+;f$gvF~w5KquoR)W5^=%0Ga zfz+07u;rjd-|8)gQd_>mmctf#-|J0Zgq!Gy#SNy31jPi!h1!)R%&r8s*n-mame*1Z zN^Efil{%1^^X`IXf(bs$0Cgmr!RQ2#Eh>w|`R znqXfYDI5_JVO<{`)MZ%L#{~7ZnyT(+rd#!7-LO)}?~rcIbLxxk z392s=eyhP&4et&MwL7dtP;Pl_Ic15wph8fQP85`_v7rd6^Y8g=Yn^BUam`C`M0xqf>mew=xR>C7(s~-Lm!O_e z4FRR~Hd-G+y`vfe;o?zW20!kZ{)I1t2 zXi(HcKzT!w9-S{}NK`{WX$3|bDySf;A)vHjMjI|@Sg7$EgkCrjE;Pb;7YI}$hXeto zjWpUQK_jCY0!kZgv@wE4M>LNk${TCE3k8jhcpOmLIHQdhG%l(kptK1_yGYQ4sD^;j zyotuUSkT0%hk)`X8EvwlNl^^}rA;x~R6$ds8Ujk2W;AcQplMML0p-mw-X(%&L^TAI zHq&UA3YrxW=EStKxuQ0cDbOrQ4Im5U178<1zi!< zJVcZ?&v;h}niusDP?~47`GUNthJex*80~673!)kVN?Vv}?ixW0qaFgvTV$HMR?s47 z$#+;V77i(Ku@SEmv^d%x0!mww)I9o?pe0cc0p%@Cdh}~SOQRYBO1s`@Hwd~usv)4X z8;y38pc_Lib^a3^QQk7+Ef=&b+8hE(TVb@D1+9o`2q^6qquna#mWbwYM0vjPZWH83 zJPs)BcB9=P==P|FfYMeP?M^`}qZ$HA^Hv#ewV+i|4*}(^G1^)|YoH}B05BE~De*2N z{zlMU(e@Bf+TB{i=ifbo?k>_G7z>A#d9P{kw}S31B7#{|E5Ln5ykDRadDlijwfBJ0 z9u)KdUNFUbJP#zjb;f&0(7Gb~1@nH@3h=NI9}%de4h@(^wE{e9#K#0G;f_<+A4kH4 z9yi|a1S*jyh=9_bFxr!Xo+z?kFcuDl3q57T-wRZVwTI)6i1G@J_Xk0R#k~Xvl=igI z{wV0_sD^;j)*I~^LF=O$0^#D(2ID;|P$~B85*$#?Z8X|*f;L7q1eCVPXwM7U6x9$= z+UBI@(F=k$M?D0TwiB!X>S|tZ-U;AY6vLp9iw^g3VJ8%A)vhX zjQ75v_n;-;^}tv-q{KZ&{6Ns2A|jYYwF2xl;)ep2L^abSDs1lc8;rABcpn+>?}9!m z(jb^MwE}!>#7_h&siz2LQLO-<8u1?jm6Ql(QLO-W8shz z>lyI`o9Y#B5O)ugT87c;+msR25Ws>vq?BpA1~w|iE)?FX_nKw26K%?hYFW1bhd1Lb zr)C?gp-tIQ3xRN9jn>Sj zrcn(6r8PI&DK<5aY6vJT*J$HUwJA61A)ve##%pO)3uwu+3dX`ACAKo+X*RWrw%5w` z%fA&b@LC(|bemd7Ed*3!ZH#t?O>K(o6^w;LN^EPyGi_>HLbVDG|(~S^+v3@f;hKln7=~tpFX3INr5Ui(D=UgbU>vuak{RL_IJJ+ z;dj|qR;*3Fk?X}NzlaQGS*-v)jM&rma~fHh{*vid(}ulFxVKHciaZ|7kMCvskG>Os z?SekW>uXb=A|9AMwF2}rVon^D)JXuds8)dfMjT-Kn;Ki0JqDV{c{U9!@=!28RILDm zj5ydvCAAMQi-QXLH?fvkSwoC>zD+~m6}#^|q%hXhniy+XV634w6%=U=%&isJelEsK z8V)nwaGQn|@xbg2vkToh)|0X95k|bgrV&L%FpDD!H|?-0l*<}vJlmp?(Wf`k@3_#~ zR&kV(M%(@=3$2X8*4J1S;@M+Ne5_4litGf;I~n7Tyw)1r^FpJIv+2Sj8kjY;0*p7} z1RIsqF$J?Y-Yy)Kh+ifeUS!0HHeFOi1haUN?QcI2Z|UcBw5qhb*v3fAq;LaoOa$e_ zRrrG@+r3qdrm!|OrO{-6T1Tr;=#S-IW}M z96(csrhw)Q%>lU#xquc7E&L(Bwi;Av#oP+P)(oxvY}d-c5Cymmf^8Yv0@^XO1GHyo z59q+q0nm}5BOs3<573#RGoTAY7eF_LZh(A-d_Yfzo`BvAy#ak0`U3iUO#MLv83qCd zF$@9>VHg4^U?>0#V;BY)!7u_al3^rZG{b1XScb8HaSY=C6Bs4{CNfL}Ok$V>m?AvT z6wovdO#{qem;so{FcUC~VHRLE!)(A@hPi+%7_I=!W0(gBe;*I9fFlb43mFyy7BMUW zEM`~?SR(S#Z&?Cb%Auuz>lv;G+{kbvU>U|| zF+2q*WGDnY&G0l}J;Qpy28IoQjSL$Bn;5)Jpv_F10b3Zh0A6Hx5%3bjOMtBmTLIe` zwgI*?YzORQ*a_IhunX`y!|Q89Py@2g8 z!1fq_B?Nqg$j1yH13qQ=6!00tXMlYS`-I=@U_29F%uv~nC@~Nq!H@ua&G0qg0K);m zL572XLkx!ihZzn7jxZbn#B4we?+5Slb9xug>3xRx0Tyqvu*qh?R|t|GlLVDxCCg!6wsW3dy2UX+!buWz@5ET4BVOf zf*<|`9v(0RfY!XJH8!=n$dz1K=)D9s_rB zIy0cp@;J_4dKa#A@vqu%wM*~D+|7Tvi`BDXJ~KKO=vM%G08WSlPC&XuFOHz!F#Owi zi)MYe!u^GQ4BQ{+&(I$*kO80R_yh+G@^9*Dy()(=53&8xhvEa%3%F9??;z}a81pbc z*4-MPK7x5fp?kAcJDxt0Do`9<5%^qT2(G&=1;%z4C4z& z_q3dtcM(_csTGvZr%P;nG~p8|pJv)vC1|>Zjnk1-P?M7;F10)16DmspII-YTJE%>w z?4T}PX47og2xJ8HgUp}-%|SB7%}~4GvyJB1;cBj0U9MJFg?SjB|4A>acI*oONG~fR zex>cxZC0(ubhYgUxo&W(8?b8?<(5kzLrow>2WxC^+4vcOblr z@*c|jD0?8E=?3lG;4GIuu>GBVtS04x_HJ;tOP|~Rkv>+t)ITEyV7MEMaDxk6s*bHSP->#oLaFT^>T7k6*GczjXS{wr zs*8s#aD%JeV4)ja;|7b|;98gJrTf{h#v8`z1b=lu>&coKu(rFw4ma582CuroE|=>2 zNC|3IH4|I*y1|DoH9+fG>3-g>_=xNi!PzJcQAEro8zmh@qBtmx{00N8I<*^Pa}$)4 zP;yYJVbjU!ezyVE)y>v}^AXz+bLY?RiUcWMcK0rpr_>`ou&Jm2&jHqJu^Il>f!1~L zBbGntJZnNM!{2b8wHVPZgRFg3k_jx7$(byfe%@f~gxF+%_+Ts7Yh>=nG%khg6ut^` zOp7P~baINmE!XT9W~YRyB)+pde$W4j^p8Aq2s`PljuIzzq;9`+4>4TOLrmUG>-uxE zI>O$iYAxTi*5epS9bSHNuRV>|>z8MBlsKuwGkYCSnpqtsPU`UfHCY|%O!Cj4Na`@> zpS$Yeg06b<^pE=4Ssf)#>hO|#9cT7Bz7(=LCYshR{_&&^FZsJpF4e4#=_O6-@cuPf z9qLr_>7SK6z_ZOEnNuXGBYFP$JCi#7bB%ZT&(G?(BH7wJ)7n+XOzP14$9J;iiI`s+ zSskXeYkn-LW3lLr?{;CX<#i=W)+qg44UfM^7Q6F;i=Pq&wnZf!+Q`p7|}}r0d+Et zl`x?;;b*DjON7T?XG)YTVWM>NCGh&gEeQ47t~Y1*#}X!RgCcpYJp0S@B|O~XNH$lp zgo)D4m+& zhuijz(A#gq&;*dfkOOGS&=k;|p*ar*cRIdt-#mU`9$M(kfSY+gces}y-X9Mi=rIih z4PqDs7{V|FP{2?C7{)LRFoFU1kbe1aFWQ-ccBX~nzSBT6xak>ynG7=lvlwt^ySPDDm&#+ruL5dChCcm^cgCAHrVoY8o7*R z`t?^?7u(@brN4BQ)!Gh+A`3UKvJS?*y?SPZ>joDaaqJ^8;@DSyQo@j0q+ zq{PRm!ch{bRtiT;WLzm6BWZI?;aG{ZD}@(IWM3&9C+S5kjFBDF{1WQm*}g;ONn_!Ul-$lXymO(LI1;dF`HaSCThB)llRMB@EZ z;Y^9_7lq!Xl4j`xbeTlLiwe({NP?fl1O7w=t-ouD4Z{m(~{?fXK8`N_bC;=S|WQy;X;XQ6NT4EB!wtkgma+XYb7#7 zRCKYV>-4X&L?TN>MSmrcETV9!M52hoUrVHlD7+p|sDtJkB(g(P_(n-L>DHD>TCQ=0 zr0?|ZZkCi5SMDv6CR++`mB_46=u3)g;WkM^m+T|zvx2}DK9Geu%rfBctlctjgLw?QR8Eh8ftu8Qe%z3le9%Q_Jl;rjB4yj ziKH2zhhP6GiM$yV{=G!zjKV^R1R8~ZkknGQ_Ozrw>VvXg(lZ)2;Eg~F&*Hi3=yQ@b zX?$KHja4UP>BC(w7<&lD^XTwWNP)JRs>C zjRz%ttML$C9U2cy`d;G^yigqV)M5_BHChe{g&x@srR%VC$kABNq4F9lI8;$%C5I|& ztm05rjny2guCazgH8s|9sJ6yB4%O9I&!H1EW;j&e(eJ;R4mHr>EQe0inC(zQjg1^? ztg(qhCuz)a=wyve9crerxkIOD%ysBgjV&B%sj-zqr)l(BJ9N6{HV&Pkv8_XAYHa7w zSsL3rbhgG04xOX1qeHI7Jcl}I?Cj9F8oM~uRbw}Yx@*jLsE3nRGkpK;=}<2n?(I;9 z@7{0KuU;%knG>1&_*3t<>W%;5sfqeJY9^t6PI$kN=NRhmBxry`1ND~kQd1h`_++jN( zFBOMB^e<$6oP$iZ@eWOZjeyQ%2#6@rBoBI%BIr^-!;S0 z1>6=37u*(0jzV2fHl2<-B$Lb`Dc!`Yvgve^7u`H_gs(bg=9RuSOF8i>)!dI}UM(_D z?%J~HbdqPRY&sqEl-7htL$6Rjj$AHI2z>n z3zL_9*>pPUtvLLvI`!#THl0rLkQ{GzSlM(s$tf3->0xEl>0o55Y&sqF#&X1b2$fBz zquyfhSGLJ7XJymr;BSZ3by7B+4j%{p%V%{w%BIu7(ZHW=^FdK7K-qLUNS{o8-2N-4 z)A8<<$@i#94n`SMdj<0;Q7gb|BTjZuNr_+<)e5lIh*KO?QX-f|wE~oncTN=c-eP6^ z+cFW$rt>MA&gb~1^YJ(nb44^0Q@?lPYA*4_KBbQ+6rGBS^BGM zSi%3NI4gD={;@~#e^Ali;kq6~0}Tr6dgu)Gg0OzRpS#yuUwyjc22I_dnHw~BgHv4k zUohc9%c5CF$DD8hiAnujn&G%~3Cc`=_1~?!|Bdr63@tkU!lihs$C`s-7UGwoRKP?F z6;UdoR7RPN*c_C(D3_xYpP<3-@~Ji8yc-ec2^wy~8WS|oN?fgnXB(vb0bzaM`*59+= z>QvHH=l|vzrA8c`EnQ?rsVtFC%N%riQj<$z%BSTqpO!n_6ZnBH&x2w9kC%8E1?6W@K*Lj|r{OZjwmF}dE zB=vU9zFk%J?Wz*_{F=zqk;rrXMWl1aY5rh}bhvSE|48xP{?UJ0#XAN?A8lG(bVans zuyU%DQMxFADo_sJ@0`fnUcwQIDX$7ImJ#p_f00Ij_D(*Wc9jw=k~^kGK3b3UBQl zlqXSmop({Vt@lvYq44^zI2m5XtAO<=8&Jxj0bcpvt+)}(^okjoa5tgO8+spwH?kRp zm)F-1^t%mluI{t_2 zqgfHP*DF>+hz|xI93A4_#!p{hzN2{hhUoMTS)ZZK(>DV$GJ=fjf(QjxU=dk?P2XC6 zL|E0ln3Wg9MEfkB#e!&z{$<7JJBz;8OZF$19Ke!;7X6@?97-IT7)1qHLTyP1vn5-2G0GGq^`gzm1|6()f}nCoFDZ{D6$Dk(ODZLstBfU81f6*F zlB!s8lAvlwEy<+nSX9HWZCmwf*VKz^C7Y~`rFDcKM69~r*U!X6#M`+8eEdp!O*mm^C#6bTncofl9JHFpC}iH4j-2d!3DT zs-Vu$HmcptPK*Nzx)|*=L0!Tc0!r&@w9^H34QmJ}t((!j-wEm#_7G5BcjNUC)IF>r zpfuNLJq5YY5-%ArCJrgFml4kp)Qj8mQlBj%%Ij^sGX?byZx;cjG+Q;Ya7N8%HWG~NXQmC!ChKxw0lHd@fAu!exrE;QO0K^KNJk0Z*v z$arG~T@>;-ptNyD8!u>FSVKT*6O4ATpb23O0i}5pjdzKliD3@`a{8Ujk2 zVzf&IO$loVC~d0IylH}_hCKw7H{E!b37Q_(5K!6-qg^g&Mp#2YX)}#>g`k;AOCEoY zC~ubWt`syY+#CW*n{BkK1kDa>2qbkP;Ud@g_kF!tEiTw1o-H zqniaS40{MDZ&AXd-wRq4)(}wIEk^r;pj*Nk0!mwKv?YQT$F=0~k8wnKMaH{TP*J!! z1eA80(f%mtwy=hP(r!1JFX;A==5a)MOO1Djprs*?14>(FwB>@9g*60}cBj!+2)Z+@ zA)qwxF5|5fbXV9zKzXZ-cDJBa&=M~IFeVNu@g5`oNzgsv_7G6oy;{Tf-+hAaO=%E} zi9^b~-!%AVLHDPKU>4O3@PHBjB2Wo^Y9pZ9d(dbP33|{Adk-eOhmH4FK@X>F7tGsL zGr%K8d{m&4+%;ep)eP{M5g!+*#2;Yt^~aI;L{Av+Nr6h}i6Ee~r;PTrpr=x{3&zAD zB|c-sVnNT8Y!CY%5#>E=yypZxThfbhKxxk#?FB*4hcyJ0_M*{V67*tNLm)nRwAy$t z3sgeS76H}V8l$};XiZo{KxwZU?Qeo!4QmJ}?X`sF(d&X<3wsDCZ*9V(Hw3K>YX~Uq zO{2Xf=*_T(fYRPJ+B<^Yj%&%|ALEGf-ZkEPg5C``hk(-78Ew6wbzuzwrEM_UMnM}w zn#U34Z8F~bf;NRb4k&H2(LNBgIjkX|v@J&aP|%jJhJez%t;YLE(AKbrfbzB(?eBuN zg*60}_Oa1E5%h6bLqKWUjpltSXnWX0KzTci_nDv_&=Q||U`!lR;!Y!eE@)?p2xd{u z0K1I%KLVB5iKayZ=3~LA| z?U2!a6m*ES64#iBDDSZGjtDv&ZVmyZW!Q<^ArYH0?9g*XKxt8_>IbjU})mk~N;XstPsa)7YKzS8R za}{l>5Y`Y-S|y`Zwy9EBLqKU&jCP_;Rah%=AP`YrRpXsxQ`K;D2q>+Z(W={2EvzA+ zv>HaMX;Y1o8lFEQ%By9(+BVgKmpBw)OdL{T9V6DYsZPlTaW65U)iYXso9cx%1Tf)# zDP(CsfYRC+ zZCqQM+Jrp>l$T??b~fceOB`k}CJrgFy%9Uu)IQu^d)u$LEqbok(O8{q>KL{VP>ppq z+Nm~mPT49L6Ni-8#fYcb)Fnj(v#4f(u5ppyKyL)mt`W!ev{4JaW)X-_)XR8h*rXlL5gJ7v3IObGdpZ;Q^! z&NbdyHsz*xVD@tT{gbVO*?o-G*QP!x8kn^{{@t%x?TQa)TMZ%=@{C+N>fgQAs^6%e ziS)OrU&`uWUcH~~-}Ff|Cp+JG18mAq@xbim`_G+heb8y3(FWNxFhv8ire=V_Mr;=K z_cXTZdqYg*Y@3FptP18;)eJDyi09a-Bo7>zMKuEqGvaU?m81w}QOy9&qi4j5pWGh3 z-fCE2);ZUv0<2TwesqCd+-_%dLZnfl(ay7}Fr{fQH(hA^Ip|c$9$~!mZ5ol{f!P~T zysD-3bfnQp<6U6W$P^FE-blOnsxPADPN*=-h_>a|op06kALwko-e9x|Uue_l@WUQm z+-AOYQZ##vu`aS{Ov+Zkyp=Kjn$xUdd1H+>&Ze;`8kjXT1B^G~1RIs)4hFM0zIaqu z>k5&5vGFF_ba9FYX76Hue|O8xyu?P=%p|{i536Rq$#y<3!on#Wy)-VWz+`_~59{QL zQ|+~6`&168$b?2j{o&n zR#xTq%MW1iLVF0d!^P3h2hr4bYvTJHTad0lgS{0eUm^2IMm2 z0{SrY0pu~{0s1ra2Mk~s02stD2r$HB8Uh;1FcdJ1VHlu*p#V_GPzV^oFaj`=VI*J_ z!zjRo3>N|}Vz>w}j$s^N0>cErM23lgNeq(!Q-lYa0-DO9setJW(*ZLWW&ma~%mmD0 zm<5>4FdHz3VGdv}!(6~ThIxQ%8LkD)XP6JTf#C+g0)_>Eg`zJ`TNZ*AacB|X7KU2@ ziy0OJiWrIjw=vuXxSip4z*2^#fMpEJ0CzIn3Al^lF2E{=Re*aK?g8A(a4+C~fET~* z^8kk)K$?zuNZHBi2?=rj#SjVsquz_I%U=zb8z-ETcfGrGL z09zTh0=6-11ANTzFpBi~rnajgLs2xc;50vrYhP>z8w11d1^iGC#pK9#S+fKzjvhy$tusxedp)L^Iq zsKrnVP=}!opdLd#Ko&z5py9<#eB!#Bch7F@o<+8wT8+2LzBI$e44-rs z)TziEsK#j$m)pJYHPlc5ID6o7JE%c3?VuK2Vbd(w2-FSg1@(h0nuYX<+n}Dw-(FYR z@!4!OyGqUG#xpNGe|LYYMr4j3$;a1t!+fh|L%Pm(gVt`)#tquKG~agVdIWOZpq(4E zcY_Ya!}G24BPY`*h<0>oJA_YBcA$KQvJ>GhZg83#boDr%Q+6{)loI)m|n6hVoiSSTXX4bE_b-u|?KR(4aWi0WBx(8mq>x>O03 zJU8g)2L0V2-wg)1!9bTPXZqg8Xzg}X1*@M3#%OMoYWcZ?tgJ|FfABx7>XADBRfDX?k-Gk>LDo~%>!F?XZm_`(HoCzk zH+bKr`k8*E_oL0LP!^Vb?gqPDYJlb%`gaeuMwZJ4HbOZ$(_i_1v__<{-*AXkvuYEB znxZsAX^wJY#LpjMUE8`Z_=Si|d6>Txap%p;l`7R}OMZz|qkfrz9ry=^Seql${dH$s z3!)jqFBoc#kJR(m47F}Vw9h%#H!Y4%NV$XaQ0~C3kko{fTWPX?!7!_}*Vx>QX;Rvx zlV)X@bCRoWx3xT;q!WDZCaxu0#cvi-t72q`G>iP7Na^Th4#*igQ=`<08p&JgeA1^* zS#wQuXZ_Mljra+pYAw&S*6$}0HN3pUR{I+-|JP?~lsZu(*`<4SS!QaKI#I*>&tz(- zBgub%CQ-v2e?I$;PdNKd+%g*di!(J!ov48>MYYv&W~<}NAX8(aY3-6@Cu(?!=Q_De zGc~4_Hc`X-&tz(-or=Fdm#C3A{(Kpv4#aG;>#q9cnHqBvt<5#9;gvoYAHyZ?P|QUN zs@m#2<6To0nHr|G>yMSFf&2?xuEotNe?^ z{>No#e8OdD;vMl52^eLcf1$RIE8N6ZkC}jRm(f-pEC1p+(keW4`0x8~rB!$jA+I9* z5b-FuicgQD{>&>`=77*xj{7p94iT;Y;z#+{=;1b^)yPC1W~p*5FYMY zBwl)@OM)od90-q&Hwi-REdE;-IS~5&A8!u#VB!<*!6bIcPb5K|0nHhj16nY&0JLIg74OycXDzZCA73wSFJ8MBn(57e`*^>! z^OjfV4z!{1UfiLeVH_F;C}1c66fzV7Mlg&3jAX#=qhH^7i*}}6hKay^EXtItQXT=`L69|0|m=*AAx3^`=ZTdQ&F4uz62^ zi+nHL5`2;JRg06XSzYIOXX3kfLcoDr9XLNv}Kc0 zbyJ$I$@iCA1wY>z8Ko@0!3t}lZw;~P`S-1`>e=z$#^SXrtOHSRryjrH#$hEo6$eOk zDrWAl#XnI$^bie{_>DU5q0t~ogA+VN(%A_fD(RdA50f;U8GX|QlFrpwDDmy6qUT9` zKPvP_NPI;qK40QXQsGF6?@EOiNF+ol93_z#rEs*QzeN;YD3KhcaEwHbl){T7y`hD% zlHSrdPSQIX$4h!I($kAS%n1_NQEI)5C31ZfPLxQ%QFw_&=8eKh5+CRaCrf15D4ZgZ zb))c7i92ixr%I%yD4Ztoxu|fuM2?EW%REUl^bWdQA}vLQXG)~1D7-=0^y^B$8N^do{MKqjM!~*N6=ZyJz6>QJN=liKOIfusLm9i^rq! zI&4|vd>jMqUXN|)=nax?)K6o9M5c#o>?Vm^4}}XQvON^uERpY_aFO(o@}cVM_s;2Q?Nfk8SC#jOg`z6)T_-BbM z74;||kmU8#{1=H-6%~F^(#!gZJ|vO1qM{E=%F@DLCDqgTh@^%ZAC=Td<70TQX?$GL z>$4(gBSJCHzh9V)!4K<=yZ+U9QvKc?hf_P=sMI>V=sr!(Ae9dGd1Qqbe6_G4)q1rzc zhx+Moe@6{^9#5nX1vGy~;M)Rxk}A7f~Mqs9ap=)~{& z@MuAU9Av&ZG(;~sJGo>imYn0zu=tXyF&ds+RDeb2`t*QxsaNO>q(Xu5~Q4WoE=t2j1XJZ^rQ5%kTlfx$iV_3h)L5kW~hsME1K&PnjFh5IZyfcU< zIHZOFy4dN>!vLj>g)=2S7EYo!_rH>tgtH*@rqHj=OG@0jZewm;w=MNpI5pCP;pqF9 z-Ob+Xksb^u@scXj6sz=LIO?T_zdw^>mGH_o#VS1*PHA(j{xd07$)59{%dyhOzl>9? z(u3jLoE{7({?fuPh7!Hp>A`Sf>A`ULcgN|$a8@VIdeVd8B))*qsiQtH(u3h7b_sq# zsCLP5=YgdM!{HxGV$w4}dN7<4$u#&OsCsRs2g6Z2B0U&RdN7>yU^r%YiS%GN{IQT8 z3@1j%8Vtu~5Ez)B-da!^T%U>4O3P>zS1 z>Hl%GZh9~t^^00P3Qu}49`h@N-@;%#o%}gFOXg#G#~P7G=Qzh->J3F=ARZX*xBJ|Bq0*&}8=T?>E!?1` z8?^GX@~zsx)iD%0m2M0LHyGs7RL7-hDAOH(&~mG0&Tn8ug-Xd06czKl3YV$RHka;SX4jAs1*lx>kRjc09Sg zNPld@38rlTISlDBoYG@BrN?kekKx2QzUeWXj>(LMsdjEG SI0@#wdGqkM_-rgW{eJ !inBoxBillNo.Contains(w.BoxBillNo)).Select(s => s.Id).ToList(); if (deleteBoxIds.Count() == 0) return Result>.ReSuccess(inBoxBillNo); - var deleteBoxBillNos = boxs.Where(w => deleteBoxIds.Contains(w.Id)).Select(s => s.BoxBillNo).ToList(); + var deleteBoxs = boxs.Where(w => deleteBoxIds.Contains(w.Id)).ToList(); + //软删除 + deleteBoxs.ForEach(f => f.Delete()); + var deleteBoxBillNos = deleteBoxs.Select(s => s.BoxBillNo).ToList(); _logger.LogInformation($"重置的箱号:{JsonConvert.SerializeObject(deleteBoxBillNos)}"); //执行数据库 IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); @@ -88,7 +91,7 @@ namespace WMS.Web.Api.Controllers if (!res_Rollback) { //删除箱信息 - isSuccess = await _boxRepositories.DeleteEntityList(deleteBoxIds, false); + isSuccess = await _boxRepositories.EditEntityList(deleteBoxs, false); if (!isSuccess) res_Rollback = true; } isSuccess = _transactionRepositories.CommitTransaction(res_Rollback, _transaction); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 1b2a8316..96930288 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -168,6 +168,11 @@ 创建时间(对应老OPS的创建时间) + + + 是否删除 ops供应链重新装箱后软删除 + + 明细 @@ -204,6 +209,11 @@ + + + 软删除 + + 老ops箱信息明细 diff --git a/src/WMS.Web.Domain/Entitys/Box.cs b/src/WMS.Web.Domain/Entitys/Box.cs index cee95ee5..569219c6 100644 --- a/src/WMS.Web.Domain/Entitys/Box.cs +++ b/src/WMS.Web.Domain/Entitys/Box.cs @@ -55,6 +55,10 @@ namespace WMS.Web.Domain.Entitys /// 创建时间(对应老OPS的创建时间) /// public DateTime CreateTime { get; set; } = DateTime.Now; + /// + /// 是否删除 ops供应链重新装箱后软删除 + /// + public bool? IsDelete { get; set; } = false; /// /// 明细 @@ -191,5 +195,13 @@ namespace WMS.Web.Domain.Entitys return Result.ReSuccess(); } + /// + /// 软删除 + /// + public void Delete() + { + this.IsDelete = true; + this.Details.Clear(); + } } } diff --git a/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs index bc88b741..2b1575e5 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs @@ -33,7 +33,5 @@ namespace WMS.Web.Domain.Infrastructure Task> GetEntityList(List ids); Task> GetEntityListByNos(List billNos); - //批量删除 - Task DeleteEntityList(List boxIds, bool isTransaction = true); } } diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs index 02c5aab0..ec3206a2 100644 --- a/src/WMS.Web.Repositories/BoxRepositories.cs +++ b/src/WMS.Web.Repositories/BoxRepositories.cs @@ -77,7 +77,7 @@ namespace WMS.Web.Repositories public async Task Get(int id) { var entity = await _context.Box.Include(x => x.Details) - .FirstOrDefaultAsync(f => f.Id.Equals(id)); + .FirstOrDefaultAsync(f => f.Id.Equals(id) && f.IsDelete != true); return entity.Clone(); } @@ -88,7 +88,7 @@ namespace WMS.Web.Repositories /// public async Task> GetBox(List BoxBillNos) { - var list = await _context.Box.Include(x => x.Details).Where(f => BoxBillNos.Contains(f.BoxBillNo.ToLower())).ToListAsync(); + var list = await _context.Box.Include(x => x.Details).Where(f => BoxBillNos.Contains(f.BoxBillNo.ToLower()) && f.IsDelete != true).ToListAsync(); var resList = _mapper.Map>(list); var materials_result = await _erpService.BillQueryForMaterial(); @@ -153,14 +153,14 @@ namespace WMS.Web.Repositories public async Task GetByNo(string billNo) { var entity = await _context.Box.Include(x => x.Details) - .FirstOrDefaultAsync(f => f.BoxBillNo.Equals(billNo)); + .FirstOrDefaultAsync(f => f.BoxBillNo.Equals(billNo) && f.IsDelete != true); return entity.Clone(); } public async Task> GetEntityListByNos(List billNos) { var entity = await _context.Box.Include(x => x.Details) - .Where(f => billNos.Contains(f.BoxBillNo)).ToListAsync(); + .Where(f => billNos.Contains(f.BoxBillNo) && f.IsDelete != true).ToListAsync(); return entity.Clone(); } @@ -168,7 +168,7 @@ namespace WMS.Web.Repositories public async Task> GetByNos(List billNos) { return await _context.Box - .Where(w => billNos.Contains(w.BoxBillNo)).Select(s => s.BoxBillNo).ToListAsync(); + .Where(w => billNos.Contains(w.BoxBillNo) && w.IsDelete != true).Select(s => s.BoxBillNo).ToListAsync(); } public async Task AddRange(List entitys, bool isTransaction = true) @@ -203,41 +203,11 @@ namespace WMS.Web.Repositories { var res = await _context.Box .Include(s => s.Details) - .Where(f => ids.Contains(f.Id)) + .Where(f => ids.Contains(f.Id) && f.IsDelete != true) .ToListAsync(); return res.Clone(); } - /// - /// 批量删除 - /// - /// - /// - /// - /// - public async Task DeleteEntityList(List boxIds, bool isTransaction = true) - { - IDbContextTransaction _transaction = null; - if (isTransaction) - _transaction = _context.Database.BeginTransaction(); - try - { - var res = await _context.Box - .Include(s => s.Details) - .Where(f => boxIds.Contains(f.Id)).ToListAsync(); - - _context.Box.RemoveRange(res); - await _context.SaveChangesAsync(); - if (_transaction != null) - _transaction.Commit(); - } - catch (Exception ex) - { - if (_transaction != null) - _transaction.Rollback(); - return false; - } - return true; - } + } }