From 58aa0408dbf76dd8ed48cbad3e6cfc0a3dddc511 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 15 Oct 2024 09:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 275696 -> 275696 bytes .../Controllers/OutStockTaskController.cs | 12 +++++++----- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 2 +- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 10 ++++++++++ .../OutStockTask/OutStockTaskInfoRequest.cs | 17 +++++++++++++++++ 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoRequest.cs diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index be4a42b59d13fe93334033f8694013508bba3db0..88f46296db27ebfb70705a5aa559c76f24450158 100644 GIT binary patch delta 3698 zcmaKu32;@_8OPtfC%NB6K*Ao75DB&&repJ7LbkD;hN85}K^qAe&|1&WB?&(}_2rgr*2?|twXI_;bJzw`T+v)u38 zd(ZW*rFqxV44!N3GmP&2`vigorFnUw9DiX!Zn&TzRF)G873TZ%a{{4ASx!MwSy3by z$_wNKB1L6ofk?94RQw3l`@2{h>f8FRw6E z&=aHP`8qp6&uHtm9cXra$jLcn78zMi@dz`^^kq7&`#_BCdJLWak=P%j zZ3P?4iu(QxLofd?&|8r1bOF+XU4%Y??q0;FurERPVF2CtfA#z9u6`DBKZmX7`75O7 z_yRg*M}5AG#7cZ$!l8?F8M?brS77UodU0<Gb zGx(PB6pygHRDR03+0kpe##qIFSNeY|{{NN6Pg_sK@Z;ZEx`}yajDuE;Ll&1xq%0W; zBNDNAq(nv~Bcl-+6Sa7(gvKR9;}M!*ak)e$CL@y&sjzsmM5ZJoQxTbF@pOsoQg;?N z1CdILXG&yN>Yd0eD*zCKVXlJ+p-I=$H#3cJ?u$wTM7<)YTTAG!=4ehrMR$X#ce5R zEN1c?XZc{2Ie1>&FBL=HqPQ(}g1szmC#r+(;1zLODgt}eJ^Ab6_FBg%QMDZ%i(jyM zdCk2R{G!Dh1gqWsC8|q@tQxC#jE@=^WTVA3sL^q-o&%g{oM9KuA#T5N)v|e3?VapR z7T4aD4c6JUmRo2I5#$^9Al^Z zV6`eRjYg+rqq=JBa*JzKtzqnTE^SgB+w8H5IUDjrX+|-(Hry6W%tKo##zzDjT?lr@szsvc) zL3NFyxLitHM%V()Vd98pT>ePnQG%n1A5KYl#}H==jwKEVjw8+$98a7lIDxo8u$;I^ za3b*uBQe;dDDflWt|0!I;AG;{k}-w&tl(7QbAr=|&kIf`eq6fEAYLh0NxV~VCh;D@ zS;Ttv(kacjXH#81j}JBb@*j$OpN1@{m) z3GO9sE8Siq?j-no;s@dwZNYya&Jgz>iQ5alOx#g$A91GOe&XNC%r5Z&!B>d8OTw$f z?@6^^BOW9P2Z(+MkF^WVE-4hYG%phh6X; z;t_)H5D8$G#&D;iQRO;^8dcBqu$}m*iP-wJAOENsX~%e!!;PvuI@SVaXU9}q}wN3rIUR`b?v+R zj$@{cJ2`pOf$`I>_z$=C?Vhu27|BGiPHZB#-z0U-bhD4C?VYXJwtmGq7r#_LaXMdC z57J0me^x}Cz-4v7oMSuPs#Q0))fKhOyf11Oa}_k#c9w2bKXtt)Rl3=K9y}>Hb5bD- zBFKj3!@mG(4sHRpgzkqH!nX)o3@w3fA7}v_YOM`t;C0of{Ra4}p&Do-q|dfmx9+-n z*y_|sIEou_VY@ZxQZ#93BIn<0)fRWzcdCu$-(+)-6nqORL@HH`>v0Y{Txb6Zr?bA| zdQJ738Z5j_AT|0d*PO9|Hyv;kS?ns delta 3759 zcmZXW3v?9K8OL|#Ci4w18$}}#kY`&t3T(23O{%4#6kBSca-=*0RFZ6#R|xM%crD=# zqCh}K2}^j$DU>UnDm`sa|9AI;MVNE`dw<{KKIXeS zbH}@u;a$rxKCd+P8b-T5J;TMpqDXP5I8s`Y(Y5kK2}X*$=4R(aB6-nBaWIq@$u5nAOG~=s=Z8y*i@N5QhN7i6=m7L4q`Mr14nc20Z#zSf9@`B(4xNDBflflFpwp0vq25J%22$X& zXm8mD?Dt^n_MF6zqSfQ+F?9a>VxLF*4cK~F7a+Zq4 ze+)Im0J^huyrnAR)N4Jz@3HqD{S2{S)^fS z%~nJ2EYjU;y}M`+V*F3g{cq4^=n8Zd`a5(D`V^{zzP@c)_o18KS-sQuhMVXz>jkBu zz3#3)XP%lHy8&BY@!o-e7ntW6d{cRfhgx2`XML6FHLWsM@IRFP-Gbl$Wbn_eAN#oY zc}q9GXZk$M^0~<3Vu_TbA`wJNEsjcLcq%dikM@eXODpZEh7>mm#GBy<%hsbz~ zCrD&sDl!R?$rewMNS(U9xT%Otv$#ScGtzHIrdxgso?-D!30+KenuSiYof-XAi&#ve zb5fI4B0AUNc@mkQiY!26p~Z_NvN#dp25GuVOAuRX@e2~$m6~lCA}?C}(!Jv?x4z}` z3X4}ts46wpDs)kMUSqLib@v*1jrkReUlm;I8iQ1e%r@0l51&sM7-XHr)u_}- zu$}{)XxwgN)$m4b#I9fk@m|5{#D@|XYs@o$6R}xprZLA{xUNRxZtBJcy^2@|M1lJJv6m*DxDEJC-Z^2iI*UD(s z#Onm(#OY>o!Rv_|2-Xl!R!Q#$;tIiy#Er~Y(!B{cD#@FP?-zWHxUWpNg?OvXv5k1U z;11$i!8+om(rqVkmS8<`bHUe%TMF(Xen>F(3*v``e@Wa*a5wRDGV`y9`w8wLZYK$Q ziH}QN_YwD(1ef^RlCYonn}Tl;cMv>4{J7woc+|}9vBYC{koa90?GW)m8SO3NLczC* z2Mhk1c&OlE;^zgAV9RCT-w+>_qWqTlnBecwO%je1pAhdmLx@ibpCT@m(N1GM;ypuL zE&a|CzbD>v#P189$KO>FF5qbu?}x-6k#lLAD*8d04EiZ?x!`r;ae_DSoJpV0i6@Bn z3t~^aO#CIe3%9GzrgO4ZbutDz|E^V`tU-42+ojOfZ}-Hv%V68*A-3~Goyv9krm5lO z-h)*}6_?sSg*a;C7ccSQHjl7*q|Kv{4*zJI%WNKF<3(O>>vw)J7HaFaV!2KqYvY|i z&gSvRhC|-@9_gccg8eK{wB_8M8Tvr`Rx3 ziC~?WYyh>l6Q|lRQi))lm}~$|%^tqntG#->rIU796yoCDo` zT2;a~7n%pnhi;u***LxQ$+ZB!h0r2svF)6`uAWZUhuB*8u^XzR)od%_%+*!eu0dC! zRzs~j=1b*T!D^d3r1^Mfz*nJs-iV{t;dSyunU18;nnx{y?WoULc LyC2_F4?X#Rj7;j9 diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index cb23ba98..d55a714d 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -300,19 +300,21 @@ namespace WMS.Web.Api.Controllers /// /// /// - [HttpGet] - [Route("GetInfoByNo/{billNo}")] - public async Task> GetInfoByNo([FromRoute] string billNo) + [HttpPost] + [Route("GetInfoByNo")] + public async Task> GetInfoByNo([FromBody] OutStockTaskInfoRequest dto) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return Result.ReFailure(ResultCodes.Token_Invalid_Error); - var entity = await _repositories.GetByBillNo(billNo); + var entity = await _repositories.GetByBillNo(dto.BillNo); if (entity == null) return Result.ReFailure(ResultCodes.OutStockTaskNoData); - return await _outStockTaskService.GetInfo(entity.Id, loginInfo); + var response = await _outStockTaskService.GetInfo(entity.Id, loginInfo); + response.Data.Details = response.Data.Details.Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList(); + return response; } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index a2895eec..440b8d82 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -595,7 +595,7 @@ - + 出库任务单详情(根据订单号搜索) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index b2159569..7e714386 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -5334,6 +5334,16 @@ 出库单对应箱明细Id + + + 出库任务单详情(根据订单号搜索) + + + + + 出库任务单编号 + + 出库任务单详情 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoRequest.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoRequest.cs new file mode 100644 index 00000000..fc1f0c69 --- /dev/null +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoRequest.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.OutStockTask +{ + /// + /// 出库任务单详情(根据订单号搜索) + /// + public class OutStockTaskInfoRequest:PaginationBaseRequestDto + { + /// + /// 出库任务单编号 + /// + public string BillNo { get; set; } + } +}