From a17ed1650c80400aac3607fd0b21f720095d1e8e Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Tue, 27 May 2025 13:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 279122 -> 279122 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 +++++ .../Inventory/SerialNumbersBoxInventoryDto.cs | 4 ++++ .../Services/BoxInventoryService.cs | 10 +++++++++- .../Services/TakeStockService.cs | 8 ++++++-- .../SerialNumbersRepositories.cs | 4 +++- 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index b067329d93f7f38b3908229f4307a7122a5a0707..a792b8e05cf7fdf2056107d5404cf32af7ef4bc0 100644 GIT binary patch delta 18331 zcmZXb37AyXnTCUa-L-VpZD=JZC=xWF5Je@527!Q}xFTXif>9DB?xGI3rcfltLb7qj2xJnC`_!doI-|Tw5F3JB_wB)hJxs5ZVWgwxO}L^7W@WjeDEI z`>fG6rPEQk_El)#$k|t^M&VlLT311 zuBk@hTDQ=;=d4?*QE+hk)+4+fatzvibqFe|hxHC^mmGscqj0T%XnW+Wf2vWqwzq4# z{h>MAJM}2s8x_+Xk+V^$M&a7{&?e+;e5z5nHZinGIh%-9`PwTTjeC>B`%TU!r_)im zc2j7#ZC%b@OEn7D-bSnVubmA!dmFFz z{lXlo-25OW{3vH1q!UuO_DN`;`Cch}x)Gs`%G-!kqi}6ZXoux(OsY}1c2s^izkjQL0UVRJqf(E; zy@@g15A!xL)hJw>9NI~Fo1AJCuALIvnR%<6l6n;GO%3n7yiH9t3fImL?c%(hpK27Y z%?R!Cyv+!$cK_43cV&3L%G;IU#b?`KZfNuJHaFEMe6~fQ-ITXQXtkd(n8OxTYUZtB zF3H=i?MzsvpMX0;yerS3J|!&CPr$t){xQ!Wc}h{};PHPTyod4(>J!2os;Y-A4{=4F zL0yC;`UzMW;uCoWbrF{6C*bLPrS>EKe4bI=gk|~(SQ}HmnrBcKVTpbM)`j?1olpo|7BzGi5^{|gZvpj=Dqj2rh&_2)Gr#${&{|o5T znzuQ;Zxn2Es!{lKoeH&ku(4pB3dw8~t`$Qo6|7j-+J67gxYs4TmV$Mud$rHDY28BG zu3+6#jl%t&q4g?Q&s3xE-+$I8yuJkn^@jrHP~{W$4{`T`^=~J_68!}18RB;f4C*t& z68*&O+u$&V6c{9TAVu}C?}s+Bz#!2mTpJzQn1YQ?H44`buW1zUr+V4LEHSSFg?c3&RMp~}V8A--6!)s=L@)irNTc&`?0O{!7&bn8NUyI|{5jl#7Jp?z4e z4Rx*U^@qm2*6=nJtQD{JWPv$Ux%hdAUlr{0`h>O5wrN{J>sYic?dF3ytm0>=bFub9 znkzD>-!d%IPe3`uE=2~(^M#^%*fybcD>A6h2Wvh*@%`I&VfH98sGG1%KLNc$+^NW* zF2WN11bi#Ror?^TFOi~pSl?p&{nxL^DDf!V>mSp7r)d3Cjl#8oq3u<)fvHB}+Mv+( zDOzPv>QT5iIK2IeHW;n;RDd~Dxi}=mp+y_gPJ|`;3HW}9Ba005?Y4jYqwxtxhj(bv zMz@;~)`Wfn#)f!QkwN`SgeCe37#HF(MFw@T!a$~A5yFh@mQ^{{DSo?m28H(?G{E?yYo#YMZYod`?x6Hp29QXc7cA}o

A5yutYxrOG3Q8 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 P4Krrk|Iz`SF7Eh$ofwj8 delta 18270 zcmZXa37m~pAIHbO%#8coJ0r4W7qX-%Te5^imJqUJO{6GULkzKi(>T;uzg zf6z64i1~+HWYiF2tYD)0)bN}6rGxdUhchFvvt6kjuGFNav-!GBUE}J_&(2~-UMz54!X|$BI z6pyvEq%=}SQU)n2DT`cXCM?H&X525I(#)>_6-{R)?*Cbl$FEFJ6{reVLp7)lHQ*Yk z3ALa$)PZZEE?fuKLp`VuH^7b102)FgXber@CWtrX?q+BP&7lRfgj=8$w1zftE3}2% zpdGY_+o1z=gig>I?tm`P6}rKl&>ea}Pq+(uL2u}j(k$-xMec@v&>sfCKo|sr;T{+Q z_rg#Z2KT{mxE~&X5ik-Sgoj`hjD|7rFpPz9FdiO(3GgUPOo=!1A4B4h29sbiOo4Qm z3e(_mm<}^wCOiR8!Yr5#PeBIEflPQB=E6L92Ij*8SO|;YKd=~<=yiG)o`dJ%1$Ysb z!b`9WUWQj-IlKxh=4aH&Un0I5T?22zTd)?^!P~GNHo!)B2i}GE;C=W2K7>v15qu1v zz^AYoK7%drIc$Y(@C9s#9k3I2r8Fz%??%3auVByoq-*n^i$_zN`7ua=R45KtKnW-b zS3)T$4P~G#Tm|KzJXC;+PzfqS6{reVLp7)lHQ*Yk3ALa$)PZYLn_cDCMXrPEp&rzS z8{kH0Fuz~j{3ZG~MQ?^?&>UJoOSlDEL2GCOw?bRE4cb9_xE(q`N9Y8d;ST5mU7;J? zIe!zUiT6hPKwr2U`aypf00UtV42FAP2;2)pVHn&8!{L5-07k$_cn}_fQ7{_Dz{4;W z#=&@a1SX{NhxI5j5gvm$q`@SZ3{xN-rouFM9HzqzmUp&ufTG66;{AXSOu@a>+lAwhBfde zyaj7v9lQ$;;`iWv_y9hHP4E$X44=TKuo*ssE$}&Pg>CQ!Y=<4NGnEhJ z2lHfAX_=i>CEM>%sHN_*{jQR(NKZ*mWT0dqGAu3|hK-SoK^~Djf=rc6MKUBA$b89s zWQk-6vQn}VStD74Y>{k1c1d<2-%7qk4oeOrrzNM6>_TxY8@r&c3rNAjNWsF{ezGJP zNtL7`Wh7;gDv~NlElDk;v7|BLOMIkM5u{X+Y`=n}0#ZX#1F0*ii!?0KGOqh_y_- zXZr`$br3lsIf9&#oI(DO{DEAOTtW&LMG6-c%(p=IU zxm9v2(m@jMfOV5~LwZYkBZDP_k>Qfz$Y{xEBu$crOqWbYG9{VFV##7;sbnd#QnC_R zD_M(tAo&23G6Op`$*?tj85hN;! zA|)gxkaCi8NDWC1q>iLcBCmgaS$(=1NE#rGB#n@!lBP&UNk^osq$|=>(i7<`>5B}J z3_*rTh9M&*BatzZF~~T{IApS9aw4z)blG&eo{~I;%#qAN7DyH#OC?K@<&x#dD#Q8tQbAGysUoR@RF_moYDsD#b>~;PF@Mc?YqeX`zD;r)(oxb8 z=_=`p^px~O`bzpD10(~GdnETD_et(UMo2~=qa>q{@sjb#1jz(sqGTd6DK49YO_fYV zW=Lirvm~>SOi3oPK(YXNR`M*eOtK7FAz6XECV35cQ}QOVQL+(vSMn~hNwNv~EJ+`N zpJ6-HwFCJ|@)h!p@1OAxkAok=00?d)~6@T93RZc@OzW@)5FGvKiST*@A49Y(;iUb|d>G`;i|cKOl!C zhml_;zaoD~{y_eb{Db5xhQ#v~%l4CGNl1z$1-VjkCDKUJ2x%c{fwYyhMLJ44BE2NN zkb#nc$bFLgkOw6XB9BNOK_*EiA=4$(<5-3)16d?lgdCI{M2ikljGnO_H0Cwvx6;S4mf-ucR+B zL^1>!B^iZ0DtQ!{Dw&GRmdr-xN#-GoB#V&eB+ntQNM4EX`md6$qHB$04YEP90of$k zgnTaf9N8(^iR_i^MZS@IgM26X4ml_}i2Nk^2{|G;f*g|^LrzFeAn`M@Gng;&k+YJs z$e)rwkqeRwNP>qXc)WKc`H+H=f=E$GQ6yQCj6@|-Bvq1%l$4Z2N=r&3<>In(SVc)i zq^hJUQe9FVsU@j})Rojl>PzY)4I~YaCXyydGf6X~rKBa&M$!gpCuxUtkaR%0c>4V5 zg59aEJCVC2cOiWxeUbi>{>Wg-U}UIdC^B3!92qGYiHw$vM#f6UBI70FkqMFs$VACR zB+b+3PZ~BwT~m<9C66OBB{PxPlG#Y6Bomn@nTITtEJT(_mLM-kUO<*fmLba}%aN6m zmB<^CH;}iGIQQB9+v<87c}MaN@`2<7Wr$Qj8Qu8>@Tl$4Z2%1Fu}xzO6nr@CH0YpNSu4FbJf)pX)bAww3f6++Dh6Y?IrDzj*^Z@ zXGv$ItE4N^UD6%tDd~yylJr9QNctdgNgSDEWD+)6HW^8mq$ATM(~&16Pav}-vyco) z29hbsMCMB7BF{*kK^93CA@WRzqSGEOoMnIM^fq)F0{bV)igT{0cnp#N$% z@L$cQxNH;lspL~+i)0J3Rk9V?CfSDUknBKqOLilBC3}(mlKsd*$wB0hmQId!xNs^FaN&5ULhI#7pkfPhM$ zH%M+k8b}%-jUM$z5@*x2!kPN74tmTXHwjU(z2LC>e+h zk_=0r|1q*Lbd8maMaD_SA&*HO zL((K^$YjZ6Bwdn@Op{DQrc0(HGbJ;TCnZlJvn8{U3`qtuM=~dg*Z*nR({#<1%thu& z<{|SX^O1#;g~%ewB4n{-F|tIm1bI&K9P+&6dE`aOi^x*RQsgDcOUTQTmy!5#*>dbv z$*agp$x7t)B)+Uu{nbgT?yX76`L_4pGVQglz0S1PyY>dte$TbvH|-By`yBkQ&kC*SIN&Du-n0+8 z_94^$$+dsZ)jpD|eKc45n0+FDNou9%FnB7n3h=F~_y4IR|8&k!&a|rD&*-!odk$sGmNcKzSjM$gc{LI&kluq``gVx(%afA#;5{LD!8WdEA~A34HE&1ApU z|BoDHq)xJbZ88Omck=l0y2+Ho;CiSB_2CA%5gI^4XatR+3ETut;bv$C&7lRfgj=8$ zw1zftE3}2%pdGY_+o1z=gigs6p*kaXKo{r=-QZ5>4n3eJ+y%X$H}rwNa5waW{xARr z!XOw7_rMUi7ly(xxDSTI{qO*cfRV`*p&mpYf>AIU#=yfc7RJGNcmyWEqc9O3gE*wY zB$y0SARVT{GEgXRF z;UFA>pWtUW0!QH(9EV@v1e}CZa2n1)7W@X;@Vj3Bv&cF46VAimZ~-pDCCF2(nV%mD zKp{wkWQafvQlSKtgi=r%u7Yw<0V+aes0!7fI$Q&_;kshH{tc1Fa5FTAmT(KSf;Mm~ z+y?F8cIW_|pflV7U7#y;gFB%I^n|;hH}rwKp&#^z0Wb&#!##2ChQLr52E*Y27y%>U zAs7W?;9(dG<6t~YfJb2>Xr45f3{zk#OoPW^2F!#fVHV7Wr(h1mGr5}!^WYhn4+~%+ z{0A1p5_lG#gXiG|coCMuORx-HhF4%Yyb3E|C9Hzi;B|NdR>K;26W%Ju>%SIR2XDiA z*Z>>h9e5YsgZJSB_z*V1NANLx0-wTW_zbqd=dcyF!56R{cEC>91-s!(_zL#u_1}x^ zgRfyfd<);f0r(z%fJ5*j{0xWT2>ch0!!K|GPQocT16kn1Z;%bY!yoV``~~OXZ@8e> z?II*Zc&9^N$OrkM02G2EP!tj&8KMw_6i9_DpafhArJxLyg>q0HDnKQu3{{{iRDcfrD5E?;aXaY^)W@rY@p#|Imt)Mlufm`7=Xb0_~19XH= z&^f~Ee+SY9y1|{$1A4+;&ye=_3FVj2dXiuf53e@?`II^xge=d|k7g4K}-7hv-vT76oG>iZwp zH@&%M@RveC>^~8+Hf3^VKsj}p8_QKe@cD>Yy9$D=V<~74$axohA!63Hf*|W$=K7PP zoid?tFy+e;v-lMxSqRgV_JHJf!4(m+I2Ht1C{xfLkVF@JBVrcMf*=cN3dZdbE9R1K zMa=5jIz2x*H+7gB%Wc80xG`eZ-hv5PhvTL$8!YdFA4bgDTo7cPPCbT&S5wrLg1X&1F&>oPwahKc^F{^_?l9fUw z?E$Ipf?r3>>R}LMB~d|pKpMK>w-K|r7z9~pRL~xfrV7T*8}j>zS$zzWtVAkl4@h%2 zOb6|@JWZ4iw6ha+ZrGf1-3siZw1?SrKM--ucM z41z3$DrgT#M;H7hVwOjPAWNkR+5^(r1y4r&xYkdDB(9`AAYEPZbi}N$20_+Z6|@JW zy9;JT%=&8(WGz-fdq8@+;BOJLK6_1&WU*FBdq8@*ah>9DzU zH{qp-SxOEbAj`_!)MbOyT`;d_mYRd$bQ`n>e&PuiEa3T1=%EBj)}=M2Js`7OvXE!i zszZ;N#cO-!3>PcnnU(BdK326gpFJR%E|}z*m2QIOA2v0VvW%i;>! z1M-XudY)M-4}vV4D`*eMA{R{Y%u;$zFs_D@_JAyN$>N?_YY(Pm-CaR@K$g2;3D2y> z2f^hwXb%KexL_&ItknlW*6qy~21j#a5kGjBmGNj?era%>+a8eBE_jtk<8lyJ&>oPr zE?B`cwSeHT|sW2o9=qgltMx=Y9n^K{VrC|Glh~+jLM0P9dNN5@Tegec=9$t`@FY`a;-)V9{-fL!JdE2tQ+oFvax(c6pQNu_72aKwL&@STsBwGDGt zo+);&)7v<>smI(Xe+GXE>7J>DhNh!9YGVUjY?@~(rJ)$5QyUxXVlzBbNBvif%P1;Sm$`Af*ZL*{<@>9Da4iNQmC)-z@2bva)n!EjD)lgmBtnWA*)tW>FO{!u@#=FhX?1SHqK35 zHn_tDS8*+odp~CX7T1#wiHh0G5KIH--_jGjF*l#ZO znP;{pxak;IhmHO2VxN0v<3cFLP6lpz|DAKWZCpj9CLW3Ku)> zne8W`>DZ5AV`%{ZsR_j@2C>R6_P1v? z-25xXf^y{`SJmbI;gXLRBKTa#xv9%O+G;L%iEBRdiak>#e`>sj>(3iCyLbL|BD0;x z{&-Cn%O5p+dqT0A!C7j%*p*SU^CuLm9mKA6v3TjI*%%bcT^r=CbGfonvu!98V;_dRJ6jVMs~$DGnL@F6lOWgB<*tdE%}${lyPxcI&0MTj)NF+c#hL}N<}Owz%5JG# zA4YW8*;>Y3u5Q$9qY6#eGRU=Zv3gOn$trl8wK55H*$LaY;0;l;2`e-oyRvMoZ4it5 z4Wed`Rw&1&Et_i>_PqAMc{{sctEkyN7CLX|V7@Lc);el7mjyBN{!@>Ayxm-`ZPe^N z3(nikp4T2YZ+92GEo%0r1rur>b=diOxLEtB*|`?X*Tc@&!+jdw<&qtv>~GT>W`0Id zJ|KF#fi6+A(=C{yx1GWsIB6dj>>f2c;X=PspWs)z+r@fC%|5wczPs&w_P~7oP0(EI z^^2N~bV0JeP1*y=fo{qnQM1u52oAJCdmuQ-1@DiVjd($DkPX@c!67afA00J2^@1e3 z_Vf(f12WVlAC8)xd_j<1eG1wGGRy@hM9ogW(9^@#KXYU2U-02GF{*ulxh^*8vAG9a zE-h-d35KS7Ac&20vGl0fL>P*V3}O$t*yB;N#n8p{233ze>u8so8D$4zu8$QuY;25+ z&5oMwiEcW^)nQ{}T`V(dHZO)^V@*sKJL6n#UexSu4CTfJ(>>;53!`S|V<^T}NPE^a z7h4=P`yxZJv>-Ow#&rJYqh{M=C^tFCrMu}~ikeN8p;&qlo91FKN6nVYP;6Qdo9<$( zqGm&8_ycNskelgpuSd;(&Cqmg;IxnRNf%oaHM==Ou_uGrY!_P_HG4fT$MpDT2e}NF z+YmKdK`-ZsWdyM~F7|Fz8%4uc!gSbQ?r9hMAZm7zhGu)(#@P8bH>t(?ubbw7G~fRK D*r3Ki diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 132599be..3e509dee 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4234,6 +4234,11 @@ wms箱ID + +

+ 是否为不计算 + + 页码 diff --git a/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs b/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs index 348fce1b..f02ceddc 100644 --- a/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs +++ b/src/WMS.Web.Core/Dto/Inventory/SerialNumbersBoxInventoryDto.cs @@ -22,5 +22,9 @@ namespace WMS.Web.Core.Dto.Inventory /// wms箱ID /// public int BoxId { get; set; } + /// + /// 是否为不计算 + /// + public string isNotCount { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index efb32cb3..e66019cc 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -1545,9 +1545,17 @@ namespace WMS.Web.Domain.Services item.Details.ForEach(x => { var current_sers_info = out_SerialNumbers.Where(o => o.BoxId == item.BoxId && o.MaterialNumber == x.MaterialNumber).ToList(); + var current_sers_infoCount = out_SerialNumbers.Where(o => o.BoxId == item.BoxId && o.MaterialNumber == x.MaterialNumber && o.isNotCount!="1").ToList(); if (current_sers_info != null && current_sers_info.Count != 0) { - x.Qty = x.Qty - current_sers_info.Count; + //if (isNoCount == "1") + //{ + + //} + //else + //{ + x.Qty = x.Qty - current_sers_infoCount.Count; + //} var crrent_sers = current_sers_info.Select(t => t.SerialNumber).ToList(); x.SerialNumbers.RemoveAll(r => crrent_sers.Contains(r)); diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 6233a0fc..4c6b30f8 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -413,7 +413,9 @@ namespace WMS.Web.Domain.Services { BoxId = entity.BoxId, MaterialNumber = d.MaterialNumber, - SerialNumber = s + SerialNumber = s, + isNotCount="0" + }); } } @@ -433,7 +435,9 @@ namespace WMS.Web.Domain.Services { BoxId = entity.BoxId, MaterialNumber = d.MaterialNumber, - SerialNumber = s + SerialNumber = s, + isNotCount="1" + }); } } diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 058a6f21..1b279245 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -163,11 +163,13 @@ namespace WMS.Web.Repositories public async Task> GetEntityList(List serialNumbers) { var res = await _context.SerialNumbers + // .Where(f => serialNumbers.Contains(f.SerialNumber)) .Where(f => serialNumbers.Contains(f.SerialNumber)) .ToListAsync(); var res_c = res.Clone(); - var s_e = res.Select(s => s.SerialNumber).ToList(); + //var s_e = res.Select(s => s.SerialNumber).ToList(); + var s_e = res.Select(s => s.TwoSerialNumber).ToList(); //在序列表里没找到的序列码 则到老ops序列码数据里去处理 list比较 取差集 var s_c = serialNumbers.Except(s_e); if (s_c.Count() > 0)