From 0ec23858e7160d4900c881103acdf94248ca70db Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 30 Oct 2024 17:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
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
 src/WMS.Web.Api/Controllers/TestController.cs |   2 +-
 .../Services/ProductInventoryService.cs       |   4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 5aeefe763a1a4c35280eda8a5ecba1a9c496151c..845061d2a1e468a406928c9cbc7faf730f236cff 100644
GIT binary patch
delta 3142
zcmZwJ3wRa96$kLUyGhOgVk8u43<<sv6%~+|fRu)Z7EuUAz_-?F6%i2y<fW_x6+u7<
z=+f4rwmvEe5^ZIHAeGiqQE3VFg@}k6R1CO(E+SEEdnWfE<Hy(geJAsqGiPRYXYV5$
z(k(ZnTYB}2y=MZy$GNjsytu+Ut~Btw_nNb@)QdNk`sZiaz&Wvw^cQu=_Iq?sb&Mv=
z@K1=>O!s$>DvmXkT4S-+qGc+TT4!yw#d?>E)@}7W7r$ye-i9_?`<lh;7H?Q=u~;AF
z)cBpl?Z#Iu-m}<Y@xH}Qiw`VzS@<^nLu+?i1m=&dZR~s2|JeGj{e<IhTkF<yYq<Ja
z_V-wOto7Zcd}`sY@-t0^sjUV#>2nLW*j|e-EPi+qb=Kc!(cBhrlWpSvowwiejq`G>
z_Dk!#jS>sD2Q1upF)!qRo{~A3v?YIdI0vooCc2BOi3)4{w!M!&sH3m<=!46%J>28S
zJc@kxDBL-@6|=1UD&DirU)Rk$6hDy@92w?)9WNgh)D8^~+qiqpA8nVNnw@y?vyuQe
zOOlPTa=0LAR_-0Cz%9~0X@PAX#tCk1^mxH-jh-O5z0r3FCORj%m?W4?-YMvrmB~&K
z^vW>AR6!r6rwRI!(*^y=8G;h>F2MluZoyk#X0@4uLCl7N3&?u}+gUJ6u!AfU>?CIk
zc6niDiF*YjIPX5eGV*@G3*;QZYVrZW8gj1SWpbWi1Nop}6FFaSkX#@*KrR#<BEyFS
zi+Dhb1xJ`J7koo55&VZ-DoAB#F8E==Uf#zef;uu1>?fBAeAfQjc4qcBf`t67piOrF
zu;D2^D(J}K-`RGoSZ>!tK4v@nnVlcEXTaJgY!7CCFZcs*<4M6_7Ca>wLOw0Hn0!Vs
zjQpcLu;KKxg3;s(K?PT<6s#nl6XbEbRf1Mzm0)I&xwPj6W#kKj)-3pw-6;8IK_U5~
z;0oI<bZ^qtf|z@(5v(QG398BUf+Eg)NpLc`LC~K3i=YGfvY;KgQE(#pSHbDz-vn3j
zK3|a#SJQtNoW+Vwf*KzDKLppZ;8j5v7Hk%DB3~19C0`eGC*QEo8o5RA4j22U;5sh$
zFTwSWq22yg!3|8;2yP^|3C58Bwnxs@-n5S$59MuJn0(i!v0%I4J!W?Z-Y0ho#&fX`
z>|@95hl21)&f6{ci0O|7pOCfoer3TP!KciACitA(EBJz}6YL}R3%(>10muV_G<i_)
zRRhCZ91?uZ^kG3g`Hg*X@ru6{Od*d5rjg&-2Zgo&70h5ZrSLTKZuAuanWe}ka}+|V
zqFG2cSF|8=6~~Zyiet%^ihQz_;zwj_#c^aC#gEAX#qngJqAgjZC??w}PRKCCiHeh$
zK3Q=J*<Nuf*+Fp{dAi~ZvZLZm@+`&KWG6*uvWwyzva6yS*<I0t?5Q|c`Tg5V(VOW$
ziu1_6il31E6h9?P6#dBoih<-H#rfm~il32#6&I326c>>fD~6KcFhwanT=8>qgyIr%
zq+%2~T5&0Pnc{Nt3dNP=Rf?<0YZTX#zffF9{!(#0d4u9t+CRVH`}ao0O-zr8vMPcu
z-px^uilE!ju{tDeFWjQ8Nhf|9<1~$172`Q_Thqt{8@XL^2S+A0jZCtU$r^3S3dV#<
z>vFFgcj_<;Oi}xrw82!xG{tnq46C&KU5dLEGc{?4PzTs|#6<h3s{1t$UHLtl6kwL3
z%&INXHYrMqlXi)edy6q!OL4DaPT)HC>7X>`21%=OZxOb7<=%Jkqm@B@VHnH6wEa6_
zw|2kUmv0(xn(gJ>)L4J*_l0xRI!%RUSD0xG)!!FBpw?+BG`qq~V<_?mreodZxAo%A
zn}e}MIdj!+a9;FSZP4koae9%J@VHGA8u~nB>rZOvPmB)M2G!n!an+un(r-RrOR&IV
zp+@=3gT8Uqh@imtAJS;}<3XFAi)>`EMGLP4xfaJ*<XMzkZi&TGi-#?G<&>beMIVcN
zFUqY8MmMXl{1&UNjBlz7&dw=_<-&#|vfDPe<EVD1jw=rYaZb0Dimq8{`w_HUS&+sG
zdk7Jp)4^%`V>h|VX_ZrzQ<W*2+AKIVs;&=O<UOzMDb2GvkJ$5$cGL$ad8?yC^+Eg9
O%Ys5L?)z;}*6)7;k7~OB

delta 3122
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
Y?F~9d$$ddd`iCg!;-&k47gP`Y5&zU^lK=n!

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index ea17182b..5dcf507d 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -125,7 +125,7 @@ namespace WMS.Web.Api.Controllers
             //string codes = "AD";
             //var b = await _erpInventoryService.GetInventory(codes);
             int count = 10 / 5;
-            var bcd=await _productInventoryService.Erp();
+            var bcd=await _productInventoryService.LingXing();
 
             //LingXingResponse<LingXingStockResponse> r = new LingXingResponse<LingXingStockResponse>();
 
diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
index e8bd3d92..c63da746 100644
--- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
@@ -70,7 +70,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} {res.Data.Count()}");
             if (!res.IsSuccess) return res;
             //过滤掉不符合要求的组织和仓库组合
             List<ErpInventoryDto> listOld = new List<ErpInventoryDto>();
@@ -142,6 +142,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()}");
             if (!resInventory.IsSuccess) return resStock;
 
 
@@ -231,6 +232,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()}");
             if (!resInventory.IsSuccess) return resStock;
 
             //物料