From 14a1eac0eaa2c115e37d2e6171090f92262e151e Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 31 Oct 2024 09:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
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
 .../Services/ProductInventoryService.cs       |   6 +++---
 .../Services/Public/LingXingService.cs        |   2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 845061d2a1e468a406928c9cbc7faf730f236cff..a2bfa09e0e112381d00a4742a5832c583525db76 100644
GIT binary patch
delta 5277
zcma);33yXg7RQtK+IMf+WYJQftfMF{rEO^1Vqsbk1Q%df)lqAjq!1`cZByBbuk003
zXsJ8|skmVUWD^XCgNTSbn=3euE1(XeImQJY(D~owlu+i=nS9@$`#a0s&b_bPU6Izi
zBCWNgq*>ZF%|3JZ;A}^>!;@8%>2??AW;=>=GF*Lfirj8TR#s+ic1})qc4n?KJ3Ax8
zk>l~YoVgB{J2S(RS>!BoxQjC~Go3cgnQqIq!j+n1!KvZ)(5d0tem%L}wcg-pSJ`-P
zaB!JxvUf_LY*M*xptX9s)@j*6t(VzuoX_tGOew!|thcP(7x4GXPD{5L1^#IRM~tz}
z*YgTI9$yfCSILO7z(lV*h^EwA7W8?``?qY?ty|uCgLfN-S^D+xdxP#knb%cX>PXAz
z5zR#IC~ryez<@vK^7*}<{&~GedChYjYCL2W4lN%v)$6VZx{6A?$ZBeH($MmeK2O1T
zf1o_*bN3IHRe1AyH}!Gis0o3J63+ndSXYV9;|h8`1?P-D()1R4%e;QKn&*!*&n7mm
zvdLz~xynbCdfmQaUvy)IzaLcH^LjT{?Q%X7R4A|aAJy8Hvb1J#N^_e?bC;LmBy5*O
z&(Ioiv%RHeyTqDRsHH@WA+~%+uG5)Ol+h>K;dEr=IMOp6MMb$;>27D1w<tZw<0#5?
zx-!#UIq4ophC3_Q=}6DW$o6F6y7loEr#rK7lN`2=R>o+pU8vh=ZAMSc?g-US*V>FR
zQ-)xpKL7X<Z{rSl1GeOtV?>E7SR5#ud}F}xn}jQ6lZ_r**CzYpOEkDFFqv<bt^Ijp
zo*kogW1z>`E8MclVcU`#XDPQf9MGIruY=kovyCnG)6wjfHrtEP9;h|!m(cEoUS{7u
zw68#~La#xuLvKKDLT^F)p##uC=n&KaV;n~NHuMhkF7zIx#(N+7K-x6h5v$)Jt&{l)
z>`$T3AT`$K&==4#=s0u&`V!JG=2vLHhSZw>iMG+U!#)XHwg2My$7t1fY7CYC4cp(M
zy#TgaUs&4A=%NV55lD6V4pM_fpzon`7x4q^AE9O#0G(~W*YBru`WeVQ1zT<YXGqQQ
z3#7*FY`Y@1l7GWc)jAEGTd^~+RY$eBqgKsft=;by?EH0~U%(5oj$bj%Z;&ks#ey_Q
zhZ3MfXdhz#<DkbiIq6myOWhQ8bN-LcP5P?SQu|6kYb1rfIjrq)G%Hl)!Y^&Owb{@w
zvbPVtV(1?ZyOnM?YV9>tXbcOtpgRn58B}DD+o07t9Iy(Fa57aVlE)ygLB&Qyc{+tt
z!=1xjs;UGwr+!Co#KGC-gzcmygmoHkgcE6k_2L*k+4LFLMew7EhH4^VEkctpN{K;}
zIpU8;0*I6vbSFp3;*oMhf(BJ^<gR#R3L;Ytn#Pgo@yHBBe3b^x<j~#mkcm*0L9;lr
zRX@A9*@(<BXf8+QCZ3JVLu9@|3pjE--lrOod#o46>Z#^Jj@}!eYZ0RN8FW8K7RMt?
z5UDY!mLp4}5o(*Did2W#0|qVQ*!K8r79z_Hdhox;TVeE!&`N_I;?S!2RQ2feFcz<?
z<6do5jng}rlZ@-*2LlR3Z9Wdz<x!gt0rr%r&83GuBWiQOVVhB#s|<T~)aKg4o)@*b
zqLGM3)mF!w^seI;Mg3ec<SmKXTqoFdQ9D*0oCaA@n=1l)#d-PlQG1oO<R-no{UZiF
zY7~T<<2pZP(Bq6xga+NLrzUq_V+@SYVLJwS(x5e{(K}!@2RPb<W(V}~&AT_8&3nqA
zhI8`3Dz72bY=-_rim}ERioT)5I=xOa8kErxdU%;$oiJvtF#t<26KSnMSkqedU9B_1
zDYV|8r!gQL{8`aL9MUqR4pJj;Frv-IShFeCY>qWstjd*oru~`F#+7=uX5VU^Sf!t^
zZwno$*X!-}XD$C~y?xt|kxw~LF4WqdPi^d>ovZadnmIw_lMk8*O@d0G$&eokK&8-I
z=x`_61NQu?D#>5_qOncB_A-I5y<D712`AOsPp_k(K)F#=st|NnBTo@DwUMU@nl1{=
zSkeqZl`4SZ%oKDtqbbOl5c5_E%3+)(s4wGeL3xaG1odZ}D=43Fo}dAY^98+Yj}5j!
z&^7Ees|5{azDLjz&R8huL&kdreZ;s((8rAT2^z`W?iaM2aj~E+j7tPP%UC05J7cY&
z-Hb~G?MhJl$DZp1?PK=?g1%>5Cg?jxOVE#u%LP5i^;se4G<#PH`i1c!LBBGt5@bt^
z?YUmi*Sz+J1)XGEjS_#u{D>fplOM&*?0rm7nDKEz$(-<npvxK8U^-5C66;}Xz|2}~
z=BIE5oVylNuy>uH_1K1~w*R!CA)K*6&~=O(1>L~7NzgFH&4NZSZV@z=@fkr|xhUIE
zc*c;RRy^HyL2Vg#;DYI~r9CH1n$5gZ(1o1wJT}VsH$fd4cL}<Mr+Wd%$aB0XXb<B{
zg7z}LEGU(`?Gx04@fATAGrlUQr$Q6ke@##qcE2vD8{->-E@OOC(5*c4TY_$5+%M=#
zPB<Xw5EuTSph8YKBq*H|4hu?Sd|OZ^<2!=PKFsgpTVs4r(EB{v`+{6N+6RK%j7J1{
z7>^1nX8cgl1jfJP$a%1j1pR}H^0A;#7(Yd~Xo8~!eJ1F0c7Gx07~^q4eje?FpfB0`
zm7vEpt8ate)eQ3l-{OLDlyGesBlwIMf55lH_>-Vhj6dUpVf;6)E#nznX2#!egJtZR
z*d=L<x}=Kevdk8gAZZFOF;UVqMnjU|WGQI|dy^zJV{dawEf`x$YQ=bgq}GgWB(-I1
zC+R}QizFp8wwIJ*GIx;Fk+GAcRL0Jdx-fQ?)Qz#bq#lfal5{cSC6anFUMlG_#$J*x
zXS_nvm5f(ON{gXMy(OiyJ3~??qeD_3#w<xr#%xJBjJcBfGF~kykFlSm{)~T?l+Rco
zX#nFuN!KtAk~CPFv7@<G(hznJm2@5B^^$I2yiw9H#^I7iF#bi-NXAi;Ml+6)G?sCk
zq?;ITmUIi_UnSkjXx=92cIHA!cQCpn6*0Occ^JKtiW$dCn!xCjG?8(Vq!Px-lKhMT
zNu`W;qVNf|_9gTyo&~j3qg$!#^ltVttKT}^aYMO`J+FgOy+fkU>k1j6yKq4{GBqBV
zhRAf>Opa8>BQp`X+j@ST9xzQgoJ>ho693|jGE35INpmF4MGE}$B+Zw!K!&?ewNy`<
zN&!&+cUP<QdnBGT3nkr)Y&iHy6Bg>(xk!$n`_MP~2EAWigGaL-ZmYI-&|Ygl<G17g
z{DGmh>-9)SbGK-Gm@St0iyMEKf$>wW=nsE_8xxmE81Y1~N{lsty=N0^B#d|>SS7|9
zK&mz{5=wnlpV!%_mDu1?>&at!+NBjzy_UJoplMN?s|$N()ULEnAJcbgb<*0jQtuu*
zdR$+qB|RYXX&GdNCV!=m(S|JtC*Wn32pN!oB=jKsE1>4!7Env56|@q*hoDtZJ=FM|
z>x(B{8@tu#r0(ps9{#7H4bVnt6SNuH0zCt5h16?qTPSc+zsl&aTi|i33cE*vD%@TL
zdxdrAv{qp4uhZS3{zLUvMs{YxP<j@hc>-SaI#Ooqc&*|LEegpY5&VN1ZCA8i(GEpB
tK$e-LUt+C1qc^|kIjIgg_N=WG(f905X>C2DcefIL(Yu7^oYAk&`w!OLFUkM_

delta 4708
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

diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
index e6596b3b..03e2d19c 100644
--- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
@@ -72,7 +72,7 @@ namespace WMS.Web.Domain.Services
             //var str = string.Join(",", codes.Select(s => s.Code).ToList());
 
             var res = await _erpInventoryService.GetInventory(codes.Select(s => s.Code).ToList());
-            _logger.LogInformation($"拉取金蝶数据结果:{res.IsSuccess} {res.Message} {res.Data.Count()}");
+            _logger.LogInformation($"拉取金蝶数据结果:{res.IsSuccess} {res.Message}");
             if (!res.IsSuccess) return res;
             //过滤掉不符合要求的组织和仓库组合
             List<ErpInventoryDto> listOld = new List<ErpInventoryDto>();
@@ -144,7 +144,7 @@ namespace WMS.Web.Domain.Services
             var ids = resStock.Data.Where(w => listNames.Contains(w.Name)).Select(s => s.Id).ToList();
             //获取领星库存
             var resInventory = await _juShuiTanService.GetInventory(ids);
-            _logger.LogInformation($"拉取聚水潭数据结果:{resInventory.IsSuccess} {resInventory.Message} {resInventory.Data.Count()}");
+            _logger.LogInformation($"拉取聚水潭数据结果:{resInventory.IsSuccess} {resInventory.Message}");
             if (!resInventory.IsSuccess) return resStock;
 
 
@@ -235,7 +235,7 @@ namespace WMS.Web.Domain.Services
             string strIds = string.Join(",", ids);
             //获取领星库存
             var resInventory = await _lingXingService.GetInventory(new Core.Dto.LingXing.LingXingInventoryRequest() { wid = strIds });
-            _logger.LogInformation($"拉取领星数据结果:{resInventory.IsSuccess} {resInventory.Message} {resInventory.Data.Count()}");
+            _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 df6f5415..2c097ac7 100644
--- a/src/WMS.Web.Domain/Services/Public/LingXingService.cs
+++ b/src/WMS.Web.Domain/Services/Public/LingXingService.cs
@@ -25,6 +25,7 @@ using WMS.Web.Core.Help;
 using static System.Net.WebRequestMethods;
 using WMS.Web.Domain.Values;
 using WMS.Web.Core.Dto.JuShuiTan;
+using System.Threading;
 
 namespace WMS.Web.Domain.Services.Public
 {
@@ -142,6 +143,7 @@ namespace WMS.Web.Domain.Services.Public
             int num = res.Total / 800;
             for (int i = 1; i <= num; i++)
             {
+                Thread.Sleep(1000);//怕拉取过于频繁接口限制
                 dto.offset = i;
                 if (i == num) dto.length = res.Total - (num * 800);
                 resUrl = await GetStr<LingXingInventoryRequest>("/erp/sc/routing/data/local_inventory/inventoryDetails", dto);