From e0f0c786b9e9f93ad1b6409c72167887dba0380a Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 5 Nov 2024 09:48:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 276926 -> 276926 bytes .../IService/Public/ILingXingService.cs | 2 +- .../Services/ProductInventoryService.cs | 2 +- .../Services/Public/LingXingService.cs | 58 ++++++++++-------- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 08d6c8c4a6f97d58032cc58236edb11622a80498..3146152c809b5fd073a192ac2c7a5f5a414d9018 100644 GIT binary patch delta 3142 zcmZXW37k!37{>28XJ+1a7))XsGQ*^0QkJMBEtZ5Nv?wKs7VVo#<-5mPy>rhU<( zjf~D(fHN<{hs;$@B2O9a^CNJ_s-%}?&4Igmp#^-;CXXB ze`1N(BEn+7X>xXnpV_}?i6#>7nwFY!6N$t!Ys*c`nR_qFUG29nXk=YqSgOLb%Cy?F z#^h{YM)?(f>+n;`7NfeH4!GA!pZZ_ygq{CjL@ zBHM~%@=bv$!<1>tGNq5FPF-`kQ*)=tlq;uOIKx^=_Fe7gtq9ddxX+aSiA0TOOF^y9dD1QBt%;8o%b!CYdgAW6Je@HX*2!6M@Qf^y~7t2S}Ipe~nNAgE7VC>R~2xAvxB9Puqd0~!_y@`#HC zjfrmy2DsHid;E6pQ1l`8RrDjCsW^*xw&EOOf5o}P^FqY{ z^7)DjhyxWD5(gBgXm-!+vi zE)I?;h?;K*&d<76?fLGD#%~B(6_3zf=3uprMpnnHvBjgS;}VT#Wd}W?qRQY#|9*}7 zlm$h}d6mIrzt&9cgvj)OMuXS*dC9?>f|Gpj!KiF=aKP~oS;xbs+FmE*nCh77njW#- zqo!G=GE@7kPB_lg!L*;f%|ZXnPmJd!d&NP^to$X?v$|MT00UQ;atGzf>05(j zR=cEK+KiO_99nK%kiu*`jtKL$N6P-#^Dc0-z|lfS3yq>5a)LvmvZ|nV!#CBP*JK+r b(@wsdE8klh&94fIqIFe4VRC0xu&m=h>=I|p delta 3126 zcmZ|R37Ae*7zgn0-uunG?=U8WY%^MrmLW??Du#qKp`v}?v~RXBZipfkQ`|~u-}mAx zN)e-#WQpEWpti6#>7SuC}vn@A*Fl87VEoqE62aLcBRF7 z_G9*8?LJoLuKc@&yQ#FrItw@F4-2=}HjC{RHa|>kFu0re(_)83EnC1%{=bPkZOmQR z&C9mhzpQl^+GXJ`vfILq=krD?&2Ag^Sp0h{_F8|rO6KmqiVDm9W*w^b#qvK}{9^In z8~)XD)z^0S+#nInU*i|}k`t|1?YFJtwm#3U>)uG_ZParqw|8z2lGbXfxWaF=D$L2T zj(w&MP9);QgxG_hi~|gnI19sMN8>oB)Z6_WhD%Xg8=rX?AsAWhTLh!3Jz6lP+9iUq z&T%e6!L8&t!I8;KcD$f-h9M>hx-fm4pes31a2z>F(2cxZP(=Z#S z@=n1QESM@-N8Tm)n!H=^trupNxJNLM^QH+Ra=PFZvQ#jSyjPGS?-RU3&Jes!&J-*o zBSD(HUjXs}!8S5{P%w)d^pIc|)3XIT$vJ{ba;{)6`LJLkpW_k1X7W+N7V?WTTB>c>3&)GX*?ehYk*%t&a@-bc# z^k%`!g1+P{f_~(yf@1PDJ0Jb&*9C*fd4l;|EhTt^d{dCe%PkPpCl}gb3o^I%mS8;j zwx9tE76}@W?+BWb?+VVctA*~6E*31|HQo~}C6@`x$mN3OocF%qK=K1YOY%cOYw{yO z0r|0DfASMS8*+u<96skt32`p{so-!{tP-r^#(yR_p9QN0N3ft=(3V^y=s;EoI+1Gy zN0FZk)^f2g1Q&9#F9jDnhW7aD1eY-VmEbb+Yrz%dH-a8q?OVZj+?4MHKaf8PE@#0{ zf}ffFMer-RUT`fJ+h8Y`*-e7*an9Q;_>Ji;f~{n1=amJpQ_O5y@CUg~u$}x0_ShnTFiqfPF$^Q`XBgt_n(ewA|(D3WBBVkqx8TQQsz#Yj>WIjpUv7{zRDMJ}^- z6nW%6in?SyMSXH#MT3xTsAxp)r)W$zQ8Xo+DVme{iUP8QVt?`g#ew8Oik4(6MQie4 zMH})E#i1F7I81Rk(}jw*WIM$XWP3#ivZJCCd8Fbfva{l7vWwyvva8})@;JruWH&{3 zvPjWG`Tg5daRSr56ep6s6@AFQij&BGij&D=#VKTe#Q<`k;#Bf9#p&cA#bELb#hGMy zmf~#s9L2fhd5ZJN3ltZU7bz|#FHu}dUZ%L5yh1UAyi#!$d9~si@><1p1toYX_TAo<6P5Nf9XGkrD~m;LbEH(G={Q&3h!0x z)D)UsVWu%O_j{&Ot=a^K2a&)S=b@TT@j+Yfv61x^c`7CJ37Mc?EG nt)f|#LG8S^)V;bXHfN?Cf@oo7aDcZss;CTFruI|@?{@tg?5=8b diff --git a/src/WMS.Web.Domain/IService/Public/ILingXingService.cs b/src/WMS.Web.Domain/IService/Public/ILingXingService.cs index 121676db..e099b3e5 100644 --- a/src/WMS.Web.Domain/IService/Public/ILingXingService.cs +++ b/src/WMS.Web.Domain/IService/Public/ILingXingService.cs @@ -26,6 +26,6 @@ namespace WMS.Web.Domain.IService.Public /// 获取即时库存 /// /// - public Task>> GetInventory(LingXingInventoryRequest dto); + public Task>> GetInventory(List ids); } } diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs index f6c81147..0817feec 100644 --- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs +++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs @@ -235,7 +235,7 @@ namespace WMS.Web.Domain.Services var ids = resStock.Data.Where(w => listNames.Contains(w.Name)).Select(s => s.Id).ToList(); string strIds = string.Join(",", ids); //获取领星库存 - var resInventory = await _lingXingService.GetInventory(new Core.Dto.LingXing.LingXingInventoryRequest() { wid = strIds }); + var resInventory = await _lingXingService.GetInventory(ids); _logger.LogInformation($"拉取领星数据结果:{resInventory.IsSuccess} {resInventory.Message}"); if (!resInventory.IsSuccess) return resStock; diff --git a/src/WMS.Web.Domain/Services/Public/LingXingService.cs b/src/WMS.Web.Domain/Services/Public/LingXingService.cs index 805e8021..5ec6b350 100644 --- a/src/WMS.Web.Domain/Services/Public/LingXingService.cs +++ b/src/WMS.Web.Domain/Services/Public/LingXingService.cs @@ -142,41 +142,47 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task>> GetInventory(LingXingInventoryRequest dto) + public async Task>> GetInventory(List ids) { - //dto.length = 50; - //dto.sku = "NTONPOWER-OSP-3A2U-US-BK-4.6M"; - var resUrl = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); - if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); List list = new List(); - var res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(dto), null); - if (res.Code != 0) + foreach (var id in ids) { - _logger.LogInformation($"领星获取数据失败{res.Message}"); - return Result>.ReFailure(ResultCodes.LingXingDataError); - } - list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); - //var b = list.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).ToList(); - int num = res.Total / 800; - for (int i = 1; i <= num; i++) - { - Thread.Sleep(1000);//怕拉取过于频繁接口限制 - dto.offset = i * 800; - if (i == num) dto.length = res.Total - (num * 800); - var resUrl_f = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); - if (!resUrl_f.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); - var res_f = await _httpClientService.PostAsync(resUrl_f.Data, JsonConvert.SerializeObject(dto), null); - if (res_f.Code != 0) + LingXingInventoryRequest dto = new LingXingInventoryRequest(); + dto.wid = id.ToString(); + //dto.length = 50; + //dto.sku = "NTONPOWER-OSP-3A2U-US-BK-4.6M"; + var resUrl = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); + if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + + var res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(dto), null); + if (res.Code != 0) { _logger.LogInformation($"领星获取数据失败{res.Message}"); return Result>.ReFailure(ResultCodes.LingXingDataError); } - var d = JsonConvert.DeserializeObject>(res_f.Data.ToString()); - //var bc = d.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).Any(); - //_logger.LogInformation($"次数:{i} 是否存在{bc}"); + list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); + //var b = list.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).ToList(); + int num = res.Total / 800; + for (int i = 1; i <= num; i++) + { + Thread.Sleep(1000);//怕拉取过于频繁接口限制 + dto.offset = i * 800; + if (i == num) dto.length = res.Total - (num * 800); + var resUrl_f = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); + if (!resUrl_f.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + var res_f = await _httpClientService.PostAsync(resUrl_f.Data, JsonConvert.SerializeObject(dto), null); + if (res_f.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } + var d = JsonConvert.DeserializeObject>(res_f.Data.ToString()); + //var bc = d.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).Any(); + //_logger.LogInformation($"次数:{i} 是否存在{bc}"); - list.AddRange(d); + list.AddRange(d); + } } //var bcd = list.Where(w => w.SKU.Equals("NTONPOWER-OSP-3A2U-US-BK-4.6M")).ToList(); return Result>.ReSuccess(list.Where(w => w.Product_Total > 0 && w.Product_Valid_Num > 0).ToList());