From bc27fb250e6720ced4ae275191a49b5c212e0d72 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 13 Aug 2024 10:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= 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/OutStockTaskController.cs | 7 ++++- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 20 ++++++++++++ .../GetOutStockTaskByNoResponse.cs | 4 +++ .../GetOutStockTaskByNoSubStockResponse.cs | 29 ++++++++++++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index d2418d377b9e47d316464dfd8ce4b8a7f5f5c99e..16b1953b6dd63941550a8f60ace68fe49467fa00 100644 GIT binary patch delta 4621 zcmb7G32;L?Yiv3?7D(nyCB~lT<Z+?DZR(4MA;KG6| zFXBf}l^eO2XIwba4p(`C4R&}$&@na^WO@lP@qYG@#lJ zhWvr1YYPWvxy+KL1;ffGx|XTp5}(f>hThXy9t_O1yLqpC_>({UNoap_^ zkmlOVCOhm61Z_`qbMC_QZn?&GzAqZ9`sYScJ&-s zHoR&WYFg6V+}W(TsIH3!dPB`_XSHsnJ{d?}7&d?fzq8GOqzn&QBISR}3H#Icc z9eE|KDg#+YgN+v5y8N0IS;NL=fv!ck=|j*>^ynr zpVcDQc^z3o&TkGGi=6gDMoy%=D{(0dTP&ArD{vo>4tX2K?Z6JvwPCy;cmUW5>;fJH z9s(W)9swQ&b_0(AmmtO-jE@6P08au>0Xp8(z+TH`y7qxQM}>#y0`I=7ShJWH;ouAnWmMvG2#Izv%qt}^MDTY0`UK;ckU+6t>#5Yd=zs(298B=`vf=+oB&P& zp8{>b&uM!%1l7kzAETc$x4S+wx_5e)DHuPCE!;!;x&?J=XB%glBjZ*sXM;KC!f^&c)fV z)SKKOmSAe9Wro>)Df>;HDW><6lV)L3qv;&~9#7D0F*hZ%1z>JAc}_>nq$LDP*yI+m z%#B;vm7>cu54QOxFA&?VWV(g0EHe3~AI7`cjI{G&lOtkUl1#M}lWsvOv}G;dYF>{7 ziu}SU z$TQ-y)EV+DXL^O|J2?v97$#xK%8Wkwsj=4`oqt5V(lvTj%s7zZ{Oh=?j()gY zHKv*?%+UxR9kW_(Fldz)Fr)i$Rj#7t-x)pJ&iHn9firER>ej#2ybjBroyx5yV;`+% zEQ42@v7UUF$!n0g)oIXWK^A-#NHZ4KOyDPVX_Qe>7v0y4Y|#&VakspN+ds zC+l7O8%;Z{zIXCAtHthnoU6yH9vPd>p?n2!C6MkO%H4r`&FHbsYL^k&4`DbB&U~8;>I{B`%|Ot?3=>6T38a*^(uv@uJb!^6InR zDB~%X%H{NJ&)9i*jXcT|2#rEJxPrKnA|g}~PwX&M6Hn^klZk6I#{z1JZxA|#`0|v5 zb}I1|LZ=a5C3HIRuY}%6JV2<2c%aZa;w()g2<#<(&7FwmBhC>In>bHsJ@G+tXdr%D z=nUe+LjA-?gw7-$D$`~WFB95Gyj|#Q;s=B_5l40j4-oGW+DyD#=p5p`LW9Jg2@MgS z6dEQzEwqJruGD89@!v!{pZG6A7Z86bbRqFS<22Hh7ZHCbi@%BZsL-25~rjl3U~`~PocLWojBZv^$5KknT0Mx4 zSm>R^*9dJTE*83)c!ZZa6892^-NY|RSs%kgD-L^zFB6Bz#^SL;$5~t| zw9HC;ot^(KS68H<+vA-PJ5{dp*iO|er^-tFRZXPaksYzODVY$J1 zW2Xwtm|~6RDHcz)aK~GDn#I#CzR_Y2T%fPB*lV%Rie1LGr9Ut=*qWu^p|*CfxA1{! zuy_W%p^$gD{(V@>eyf~kTJn1_E4pQuO6wijN*&+OMhizg`3(ifrB(3@XTHO6wgn;S z2(BFy1IUg}$0iFx(h*!cCI*l+V_181K%+WtME}uWmG*MVPpDcmU}00u&J!opz$+^( z{iib_Q75qKxGWWgTpO2boYa$Qzk5#fm6K|>kruRuatH`p&gyrJjA-jAHN+@ufhGl? z!c@Qn2(W;;(9Z+9fOiGX2f6|Cp<4hf1Qr1u-`T71t?ll1ioQ?{H z*#^xvYPQkY-mY@HZL;)#;C%cCZbIXo{BKl$_q|T}H|i3n&)2F;bip_3-`D&Ps)@_3 delta 4156 zcmai%d303O9mnUrJ9B@pfzsG&3KBL;DMu?O$s{51^w>}p31k5bVJFOFGJphu01`l% z0I~=Hk^p&0ki`WARNTO)QtQeh7Hg~RX=zIp>1nlU=jYf1ZT+L)JM#a0`9ak_GD{#(spB|Ho0S#*jet; zGj`sLOke7w&}?^nz8z3IWc)7L4yaRnU1)bg_d&a$-OwIrFLXcj0Q4aA5VQ~K<8ueS zX=fFf{*OS9LXSa*p~s;opeLcHpr@fD&{60a=zh2UO}lT*#xh=j`7_8Y@kO-Vwgvko z*rt71;$|4Ll;_2MMeJA6ehYc~(Y^+mB^`&%a!j8SkQwVFbP6*4k2$`W@27y*q0>+X z1~8rfTgNvLla4-(+@HfX6PGUzhyTBt+ze$t4kHJ zci=al-Q_-C+_xrfaa_d}kJ0e}m+4Dc@$a-*E&MlSzVE~L=b2otMK1+)i+% zPViXG<0LXZ9k~sWD$NrlQk{-WL}XG-^JEE4Nr$E)G)?n#iOfhxY7m*JIV6#AI#P>B zM01@)9#EGT7e!>2=GhWy2waZL(fty9yXLtPdMDkf9-Zd7eX3M;><)>}PfxZ0(S@2D zB(f+SS&YaM&38&tS0G@ zO@N~|X-ny0N0YV`9QK@~EoFvXpR}d6upd`uL5EXU4_c6nOLbu{PTEq_M4||FGaXW; z#NP3Wq%Gxxz4FT)cy-cV<$gFp?f&js&Fl1tc#n8bUaxtB;Jx0SYL%UJ%|?Awf?u*Q z$R^DjQP5YwW)5(waaWzSC%dNxs0uIZRn=m7mjEmJ+@?18gIn}Z zu;O_E-l7?outmqSc&m>0<`&JZm7u=@QPcO1KBq6Z$693)%_)5a4S za0+pb;8fyQt<+%Ci1Wldoj6}`2JuNrs3Cqmg)yE<{D!zg#AgJ<#3jCiFe2x z?ZmEN2XUuh7jcGk+ew@$cpve%1$Pl&DY%=sr{EsqUV?jxvw$&kPux#DT4sI#caz|Q z#8*r5L&Pu2h3>;GCJFnA`%A*Z#My!ehzANDB)&%Q5bia>M~IKhV2@IaD`m9DaE}Te zCLS;NIB}KW6U5bmPh!huw5N!lmZBUXJ}USOx=DgZ{H%DNBYs}+81XbSn0w_ub%oXD z4%w#$4m&4ZUc(9{?*wjI!Be&yUp*Kep;tx8r~c21hxmccxOuoD0c! zrqND<$2eRjk@9q;0+C9`J$*p+b+5P8EVt>P(zC0a3a)Z^f`e}y2GtHvba;}(laUSo z6o;oeJk7y@Fx@d{$2bC*$LDmDKEuJ;QRDDTWWyn6hj~$G<&aa!VMkshYQ0Yms*Jv| z9n^g?MjZUO(8z7ci?Dud6P2=?3! n@9!vS3$Mg?8^_d0Zc;oyFfx(+pVQQ2wKO%cx9p<&_YMC6mk?(z diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index edb4bc76..3c0a234d 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -244,8 +244,13 @@ namespace WMS.Web.Api.Controllers var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); res.details.ForEach(x => { - x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList(); + List rList = new List(); + var slist = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList(); + slist.ForEach(f => rList.Add(new GetOutStockTaskByNoSubStockResponse(f))); + x.MaterialSubStocks = rList.OrderBy(s => s.SubStock_Do).Select(s => s.SubStock).ToList(); + x.FistSubStock = rList.OrderBy(s => s.SubStock_Do).First().SubStock_Do; }); + res.details = res.details.OrderBy(s => s.FistSubStock).ToList(); return Result.ReSuccess(res); } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 8b2d4c73..f000040e 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4939,6 +4939,26 @@ 物料对应的仓位有哪些 + + + 所有仓位中排序第一的 + + + + + 处理仓位排序 + + + + + 仓位编码 + + + + + 仓位编码变种 排序用 + + 模糊搜索出库任务单 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs index 9fdd7bf0..a1c76f5e 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs @@ -61,5 +61,9 @@ namespace WMS.Web.Core.Dto.OutStockTask /// 物料对应的仓位有哪些 /// public List MaterialSubStocks { get; set; } = new List(); + /// + /// 所有仓位中排序第一的 + /// + public string FistSubStock { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs new file mode 100644 index 00000000..d597b47f --- /dev/null +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs @@ -0,0 +1,29 @@ +using NPOI.OpenXmlFormats.Spreadsheet; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.OutStockTask +{ + /// + /// 处理仓位排序 + /// + public class GetOutStockTaskByNoSubStockResponse + { + public GetOutStockTaskByNoSubStockResponse() { + } + public GetOutStockTaskByNoSubStockResponse(string subStock) + { + this.SubStock = subStock; + this.SubStock_Do = subStock.Replace("-0", "-"); + } + /// + /// 仓位编码 + /// + public string SubStock { get; set; } + /// + /// 仓位编码变种 排序用 + /// + public string SubStock_Do { get; set; } + } +}