From 6b3e6387a0350a74e4de248ff3f5872e5791fda3 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Mon, 15 Apr 2024 17:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 240054 -> 240054 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 10 ++++++++++ .../InStockTask/InStockTaskQueryRequest.cs | 10 ++++++++++ .../InStockTaskRepositories.cs | 17 +++++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index b4551d240e13276a93772cced82951316036d9c8..13023a8e386f251b8a2acacbcb7edac98bcd60c6 100644 GIT binary patch delta 13643 zcmd5>d2|$2y3f6pswRO@ojrslB#;CGWa%uO1xN!4OF{x+UjiiE>ByP{2wPaPAcE}V zDpx=dWKmI;*lMZcsBhjlD((;UjfxI)-prXf=jqrr{hl)8%$xV!>gw+5s*W>f&imu_ zIbYXzzvZsq{qFBpy>NT*3%3WO>nG5ha%*8;VNq_AquF6?EX;T0S_}i$;5}nJ=03-7jAZL+FUvwQ+h>Tbq0NX7#d1$y->#%vRDHAMcl}Bz>{I(pTn%XotrBEAwcYoQVgKz0rAS zg+@^tGn9NAorSKG?oyv~Y0OE2w)#r$m|3VT;K6zyOFBQRME3=ReAYLkxu3&OhcTtCv9JjcKt4KCPo)DRX|+0wkD^_K!*RY6dehYmAb4Yvk*EO5V|gu$^*%~7ZSXy zNM#dRi*^Qv%LHTTsR5`oXkzN#8$-#N0Ue?A>WkcXOW+R657oZ2X7QVX4(fl7&a^$$V26XJx@ zOk{QKUb6|I?b^A52+CSlso7n95wY}zv1lB5Z{0d==AhR*Q4u-1UPMg+e|kL&%|^`{ zfjAD;l5HDWwELXe#-ouWy`@;2LYQz4>5WrknW70Omi(=y5Y5%p2Et;rGFT8#uQ%c- z+BN}=4s@Hj7tk*!ph&_cYN{-tx!K5!Rs~m~NKN#3HX1}og3r7!8!aOF(VAi`&B;Lv zG|L3Ju#9Zkluvr6`&N!6cUqW>mY{i>MmCJY!|1EIXariLk;=KK4(bb}_3rjW+LDLT zQLiS{y4yQ~;<>wh6e-_Qu9GDZX-gGauBj|_>om=1?ykm}8L~G;R(KA2N8Xw7%g*k?s_(GP0#^iK;6lv{H zw=d1B#rdw+51-@%ha!^=aUJW;L)s96`qSuuS~S{~@z9ZIL;{0mExW$HY#N}+&!`@! z(ydN3%eCkFDXf_`P-N4^tI;&qQ+){-?GAL4Dn2*Yq6$*^+^%4kRC;n(Es5PC7yd$c1-( zSV{%K=va_!JDh<58x{JZiyE00^`gf^D;VH~IQ(D%pV$z3B=p-ZluRal^1av;4El(Q z@x*lo`AX5QlL6inTMV)Q<}=`B75AAh>d`uYKXH++CV+sVGg#(_fnt5IfLt|z){xlmxs)I^%fUOx4OFiS|2HH3m%SwFvT{b(2Ft+6RaZ5E8_ZK7nl|W zYnprYE&BkcxLxPry+V0Gr}=0IH-kZ57b^}eK^#7MqfpLU^G;{ zUPMaXuc;-sf7d|n&K*L}^r3;$LJ{SKo1ZXN9Sl^Bw`NEaDwI{ws`0MvHJB$Yi$~9g zi>AR_rkL1W@b@ zT0IJNnD^_dG@@B?XRyCwpZC?^G_|4g4v6qGJ*)K%oi>Y>aPydKhp zp>{(+`H;IlKos;&uD>{q)+~St|KKGPy}1Di^mHrQtWT6aY|cx7>9dgmB(iw$gL-|A zQeq6W+f1SSBmnkYxVTt111hkOqX~OZqag--7{6aQ?B0W_6PrR~Wpejc99`Lo%Jg88 zCF-;NRtX5(LT?Vo1IV#YqUq%>RF*h1bOQ{G=f_osc*U-0q{eRa<&mW}XNkSpX}9F& zTP#KS);veCwJ5LHVzn1L3LA6t8XKD}P0dYtc88^@si4SVaaxM=3Y!~C@`_6=7Khzx z4O`q#^DVJBhdvdJ7bceUZ!s!9tSD3u!Fd#Ih{2;_wBID)MEYn9p042|C>M+4`uj#e z-;agYQ7}t`hBmEVAJ*RlK_hjE<^6OHs>q6)7^-hfL$l*>C92ch0UL+n60{{)5Kp6q z;hCBj7hn`m_r&8VY3u&(eb0B9%A=zb@LS%o@AN(g{6&tfijzBWZ+`4Sf}{PoJG%O;0kfFL7`lx3-q66i1#9GqWdy&m3|6fsWNEf z7`)N&*{HADMn4>bC+nxw_p*8*T`(4J*27Mw1!!)f5m~VO1;JgU06#NmZx&vr2TAO% zzSs~g0JNqWKDniCO{Kpbhv$kFy2{~5>NM|V)z{~dbXP7e)4t+j*6R%~ z5qIU`DH?AWYl}47f_squ9gqa^HV)IBML0sLE5h+{{a$~)L(?DWLBs3s4(uJH0h$E{ zY5-tC!_^}IWyqn>9A(4S*CoN=r=i3Jq0^J^0M4YZ&cS06r~bHAQhZo>h{M2FNs_c| zF8&R-)W*JuI~xo0EQO9dYhej|2Ddm1N{SrT5^J+17e10Z3LS-oj;7*9Yjcww6!}Gk zCAm#S_B?RPFLs8_4c!k4Si(vx7UI!~w*D=$;=?9|=p}Q`iVo}3V^Masu3Zf8_$MsF zzctf-)SnvevdYeGSc30_yvNf!_u+c_@lxE<@9ipu9$JkH4F?chM-~}S7A)cr+PVf$ zq+~f>qQ7=9wA*UDlCd|~2iM}M(s%WkAmi6^?`OV2^p`8~8oG0g?+yoWrj zyh1vm0gurqO$OJ}=-~!z5es#B2EGDi(myxgEHO`~QLn~kTHhF=M$jr(;Yxi zq82+IA&v{K(RX(gXpbFF5Q~Df6t0_N=+|~U$#52Qx3k+~5^ZsWIBH=%#?jw9aE%^W zC`cSGY$It;6aFvsisnOuHl~{4RdV1{ysBx^e(v){(rUxEOcq2TzF2u9M+2!?%xK=b z`=cf3lMf3L?RPD9d4lk;CB`RJw71sJ-(p|rnBU&&SU1nPam!|>^hP&+iBGKVXQQ#V z+;o?ShxLnWlMlc??FU)1ltH?2LSk7z)z=)r>7`L&-XDTTn<*@8I6ODPa}&^Jpmv}w zKwE*f0c{7`0n}ll_aDF()J9Vd;-Q@!xOIYfFVI0CQLW|(@XY)uPzMmRc>sttwIApJ z5VJo7bQtIu&~YFP{wLts3&iRs@MLvA1QY>fR84jSeQGk$Bo?B&AG$x z#k%=kblffUq7!b@6t@(82IQvNY~6XPVF{`v$? z$QS~eWT1DDO@0^XJ)rl2hJtJu&~Ts;JdN(f2_sT~9|@ESlm;{kXf#kdPzFyg{t8=? zz60NUDBpu;0h=IsFAVvwEz;fd_+D~nAz$T@@8>)oxrmnwq4N&_4?o5S9#FRW4U2gw z1Pp;^hTaD-C4R$F9tr_N;F+QK0n80t<&p0E1ZNJXPbYDMQU>#tAT3k=Co2Dwl>f=f ze>wd$iK|bx@zXrAjfWMO!ni4no65MU((EBzjgVBxPggn*9Rh}Rw1hDwQeO)9ynv?B z`!cw!{0hE8=}e{4Cy#rmN1hI*GkAHXs+kqgRDq_Nr^hq6NmX?L@j?(U;^oDvgGRFi zG)sATnNhPGH1)hYq8AZ*ZVZ=B+cLRqVFeq-N_r`i8<#kpp8>O=_RAwzDaBbleJhh2 zW?kiN-6Jnl#Qx%v;NtS&VgoH1!&#G`QTI)4jb`7-jr_e>dTBe8q7&0S-2 z*V<(LE<8_R7mkoV&Eld_#0A(Gj{{w#?s44yh)cj;2D$=Q8SV%41l=`(8;YOgrC%Sz z9Y}ZzR9AW0cmnUCG>40;eHsL}U|;F?>N6n!5ab^LT?76$JU<4y4*U(En?QX)&jPuC zo&$QGmp;qkI;i%I!3L+tESzb`LZK2OVv+K{SovR~{4bSmShx*b(lP~smMo8_$xs7PZ3MN?rs+Ejc3Ct?StP-d>g^QEiRxTTx8knd-pchiP zVpAh4Gz!w)RBkS3wzHC5@W>9vI0VU-&LtswXEK*K+^IxclXoRN@*1V6hKGm#aWXf% zpi7advEh;TvZ5Lg9(li_RHMKnA5x02^qb1Lf*Gfkk{SRW`J7TzSKXsz?-O#902$dm z7@o3IVE>Sin+2AT?-S(J(CH?Do;?r9wZ_K1Iku`balN1{kFNz- zD(2{Y0JG9>xIs{s&u0ir$qc;@U{?7JTLdTsx&k~i^ge(&uVmjv+;>yfpzJa$4rg3w)=mFH52|P4s4woYON{S)GPua(q z=PSFquBl1s$$Vc@8tUfc&BDDHb#dF3#f_BPVL=7<4~x51S=?=cyd65xF3sA?HKP9y z%ldZb4*wK&2=Wfi6amks$ol|hr{8dw0ENI@0?!P+4`6ot4fhC82p9s-480FvI>B(b z_bBfYpcJqKo>_L%qdT}~s{ao|iGKSM-X;BfF;|LHyZ!x~7%q2fS_huB-c9RwbN`dp z<2RcgF8656fM;esf|UIlKF&#ldSFri(a@B-?&q$dw7vey?-%5~n#zG^mG2d#x;JrT zMA|;T;mhIjK8+#p%y6GTcYcW9r9*dcW2J;>ZXl)=JGkiJC_W(2Gq>@=e=yp&hSO`5 zEA2cec#+2;r6uJ&JPaK;BFINo&91MLxuiM z*EMjwKB79E3OJnxr!#{5sH!;|(3}I!V}g8M)m#W@9tX`uLB6DFE(bJMK=TCs;1MpV z^GQ|vR6u(bv`-82Ge*rd&|DYf8%E7d(DVuNv#Q1wsO>q>JTJ&Ecr_Z7A%Wt>M8Q2n znQ!+@wy$w3pdH=zmzs#beVxR)YBcdLox2JirPM&?)D+?WO~ahnPM;iHi$)-kT8p&kI~u z=V5^%R5gA*@-d~T2CYZ#Rf=k)dgPNzQ4LSSS$|s5s&NRXyHZqx&m%vs6xE3H$XAr& zWp6fvrJTY*giTpik9<{8s!`^VuLT!x1{a@GifRyfWQi4haKt@}6}-{nk>@FR!;iBW z?Cyj^)Q5F`9C!Z!H_Vgn$V!;4mlVYIvhx2E<^L7s|EJ3TE_NYRkn3sGKXQFlu(=o5 z+_d*1mpajpT;Y=W3!D2*oBJ)B`?k&fu}ywWu*t6j{R_~~z~?tM_wQ})Z*6Y358Zxy zk()aFUqLMb){F*<0g45R1BwUwIjz0K?NtFV{pJ!k9={>b=;Qbg_!k02a8Jc=3iP9F zt|;a$sOCJlTmT9Hs=tH27fc_2WHqggF cp9s>>C%9%D#V~TKNx9T^bxG0Zxyup%3%jIzp#T5? delta 15278 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 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index f0d6c185..f9322b8b 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2443,6 +2443,16 @@ 仓库编码 + + + 箱号 + + + + + 序列号 + + 入库任务表-查询对象 diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs index fab90264..b7ce9272 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs @@ -58,5 +58,15 @@ namespace WMS.Web.Core.Dto /// 仓库编码 /// public string StockCode { get; set; } + + /// + /// 箱号 + /// + public List BoxBillNos { get; set; } + + /// + /// 序列号 + /// + public List SerialNumbers { get; set; } } } diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 6899da1d..1de7bac0 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -752,6 +752,10 @@ namespace WMS.Web.Repositories var query = _context.InStockTaskDetails .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) + .GroupJoin(_context.InstockTaskBox,p=>p.order.Id,ts=>ts.TaskId, (p,ts)=>new { p.detail,p.order,ts}) + .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box }) + .GroupJoin(_context.SerialNumbers, p => p.box.BoxId, ts => ts.BoxId, (p, ts) => new { p.detail, p.order, p.box,ts }) + .SelectMany(x => x.ts.DefaultIfEmpty(), (p, serNumb) => new { p.detail, p.order,p.box, serNumb }) .Where(adv => 1 == 1); if (!string.IsNullOrEmpty(dto.SourceBillNo)) @@ -763,6 +767,19 @@ namespace WMS.Web.Repositories query = query.Where(w => materialNumbs.Contains(w.detail.MaterialNumber)); } + //箱号 + if (dto.BoxBillNos != null && dto.BoxBillNos.Count != 0) + { + query = query.Where(w => dto.BoxBillNos.Contains(w.box.BoxBillNo)); + } + + //序列号 + if (dto.SerialNumbers != null && dto.SerialNumbers.Count != 0) + { + query = query.Where(w => dto.SerialNumbers.Contains(w.serNumb.SerialNumber)); + } + + if (!string.IsNullOrEmpty(dto.Receiver)) query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId ?? 0));