From fb3dd7069fc25eceed949d5ca869bce343e3217a Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 29 May 2024 16:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 274420 -> 274420 bytes .../Services/InStockTaskService.cs | 2 ++ .../Services/OutStockTaskService.cs | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 604cad0a66276d632b6966bd2cfaf66d5833fa84..fe5f3d248877ebaf7723c4023713bc9195d43e61 100644 GIT binary patch delta 10123 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 delta 10389 zcmeI233L@j*2nX@UUxNHNZ67<*cD|FUJ^psgk~p%eJ2tj0xYzZMGA_3A)iXnC|Qq z*sHMkLA(b4by#I|pc`|;^V)5XYiFVE8}Rjk-h}C6`~jx>tR&^kvSpghcKrOdMWx*=nhXJc}mb}&Yg)h`w5wZ zAO(W{Al{8-j9`>Rkb>uDOk}JeNzT~8ih)-OMsuigkgA-Ys)|O{f|PiEraCf7K~;L% zsF#+^=^C*i&36Ksn|)fl8jw6Mza;&+)7KzUps?G+EPgYN#28 zSQJhP_Ki{sPAyeKDj-cm8eoF}Y!FemQdyvk>IS>HRotpnFG%T(^@DB=ebO%m$^xgS z2dF`?N0eR;;P?%LaH6ygtj`A=E8sV(sHi^LEDoua!^A@M#zUgHn({FI(@=$Mqa(^pt2RDjI(r zRJ$jL32JnqxJ*6$EY4RvCmvKewJ-+{KL>Yykw~sMaAZx9=p9fe{%j0Y9~O(`l>n% zdgOJHp;o+(-uCY?cB(y~s(BTyni}ep?dYd}MPz_U{p0!p>wfyHv^PY4WMyM>s6RCQZlTW~g1AM4H_onCm^y>fZe#NA24$>Ls<(p;ma@TWe??RLMt;W-_FmP%zTw zE0HXc-VVTfI}oLPI=nBa1|Ja3RQQ0XClBh#!JyjPRSZ){4u~4^jE>;O9)FuCZTppO z`4w8Gn}BqTq=AM8fJPb`0lv|7zCoQPI?}{cXB^Qc?VyexMD&n`Lx9#g-P+vnt>~xL zt;Vq(9dJx_@~F{XcGpgKQ)L`8`ZejPou25smj-?F)iD5d@FUhoNBWp*)iI+@%Utc` zBAurp571wOzRLz`7zh}wVX&!QJ7&CZX&#Da<+w4-8m^t;ih76+)=14GRj8+!WR2E5 zIx^?5sAE|9+R0b9mx+)yR`XbOxVKnf6=*I{-AL4~K3?;99I8-5VPs7oVF$v++9@`p zZslCM+H@;NX|kD1Gffn@o&w1kc)QoqKV`Gb?zjc&1_AmFKg)FM&}`F9r8y>DgW3qx zbJN}WZUdT!pSbm?+DqR#b4{<9=NI$+;s)>6aiL1d6?FpFs@A!pUf1hPhZexDhur{M z2)hxs$aLH*9JjUOwsB}N0$~I~j+^1QnU0&~P$^CmL6CJ2`G=hrUMS8&kE;6WKX#H;0bFKMp&AX5Ah70r(^A zBiqzkHPsm6DST1G8PP1t2L zF{rj${DpX?b{%xJ+i~A@-1i*!eaHR4p%hE?+ihH)OsU9y;kaKql!hMbTB>xnQBbKK zI2~4BZQUqR0u9uFfg+`DLqrGkMR|#(t{o^Aha>QN!ha#)l$O53l5yjJ zc*)qya!u-e0nK6Gk)LXb4h6 zEgHtD;ju;|kQr&wD9((IWyTDk_HVx_N7R}(y)v?S>WM)}3n=^B~3`^l_keh4K zJkH%88{>RruC?g8^ZQ$1g`;%6MK^G2VeC*hqR}FYd||rS>UkkyitCkYX(h>53pBv< z`5M6=;`#c@c>idG=kw)2zS|ftz*hl*0?+5Uhd;sddB))vd;W~_-xmD#EEysij-KX) zc@j}=rswn2!N11y{RzWJXujw3B*9;BPW>A_f1#xo8Dho-MD3kg%if7^jCfJI4lhDq z)P^l8wR~J+(Ne}`R-C>abMg9C?c6LjM<8k&Lb&~mjD0|@wBltRv}5-H~^#yVB<^@9Vgfsa5f8ZY%kqk4FyxTIVoDrm%Jkq0}A%z*mr zN-;wX?;@^H>$-@j$~kIu{nZp=ub)+j`gXyP^=))mi^szdkFEw6&{4}Oedl!6&{?fn zEgHlt$$8!~8nY>vK<7P``^b{rkuq=$sK53)`3eT5;XKTNemezigOMgUer|w){9pC)T&8O@zaNe8|p5p zM>+SD)T^9(OX^e3eI?~;#x2uNQXXS}iRW8K!&Pa3!~&0BW1yrajDsXy!Z=t`GsYp3 zE@vDnsRiRONv{O_9)?SNTKYIb;^WfCk&?D^g;A2;WE?H&k74F9lK#Y)FR3H98!M@l z@hVAoGZskN#5hjUy^P}}J;FFa(nE}elD04wN&1wrSklKnhH0Xty&Nu)G>Io@vZOCL zIz`gwj8i3j#W+pUH;mII{h7x;L(+$gS4;Ycai+uvvp*BFFbIy$#vlS=KRid`1KP)H zB-LPlL*w@F&f$GBb69gJ%vtz|5eWN{bkBvoZxFDa4nPDx3O8zk9`N>XLU zyD-Cy8^aQ-2L6%n#uLQ&UlJ<^e)PX3y~Kn64IV45ut`!~u5gc}RK|NHr8C}#2aNH4 zJYS3tNP3Msdl1hhIt%Lub2A=H?)V{zwFv*n4@;~@`1pv#dW4UU;sN8{9+UJqPs(p4 zJ;AsIb-BXtBt6N|-%EOm@o7mTxwB_vn4abEbCPc7b`eR>bMysCFEYM_`;{xaENLr8 zx8d1md=+QM_&OeV#y9Z5GyVY&JmXt<-Zl2a>F<#AHizGlw3Bg{q}`0~O01yyr~jVB zx`~hPODv!G_yL|ksdnEd8ix09n~x=Z!uYAAzcB8V^cmwmNq=ShT+$beUrO4~_?4uu z8NZQqfbpQDZy66s`Wxe6N#A*h_o*w1IQ+e&DB}@HM;VVvI?i}P(hrP3N;=7SO44b@ zGm?H{Ot2|n`{!%eBp8D>nT(cAGR$n-REe>&O;s4H+Ek4((WdH*Nj4=j*08B2V=bF% zGuE*wg)!BpG{(9%)niPzslJb4YG6}C4mYx?F=G>(nlfHu)1{2fY`To`a+{hnwy>!s zV=J4kU~Fwu8^(}L8H|}WWiht3DckPoPf$CXayZ=HrVfl9ZR*6>*`_NQyV(AYkZQbA zq=wI0L)Gi7U2VN*G81cLWi(4TG#jRO;O_c6J8+KeFSB&Bz0Y#JT+!W*QV*MYa;8@- z(;JySHud!~HL)NQOZ7u4&sOcu7*oP};jfJP+XG=Vz{X$bzJWFkvT3kQLr@d(p*9V( zX}FDbzY(^UiMbM>fB8q~>LYE)#8EblMr{OGChD!QwKT>aMEN$aNQ||;6^Xd->6SD9 zu@CCw|Jfz_f4xhjuuIfDyjqrjRu&(GA0L$nRjV$=csP~_(swn-sTUFEcp1rmZ{(D>F>gSZ#a9KzPqh`e#e4(dp_Q*iC!x#YkPrQ)$}v*(x5{77e96X z&38DGE8)9$utP<*L&dO(whAke@~^Vvkyx?gf$!fETW#AY>U5ukaZZL+!FO?0ST$H8 zYzksiVbfsKVddY@<$EGC5W5;S(^fhAMZa{tFR}za_C-kH*ZK6EvzM{{Z|!}y public async Task SysnDataNew(List erp_list, bool isTransaction) { + if (erp_list.Count() <= 0) return Result.ReSuccess(); + _logger.LogInformation($"获取到金蝶入库任务单数据:{JsonConvert.SerializeObject(erp_list)}"); //1.通过单据编号找到wms系统现有的任务单;并修改 var erp_removeList = new List(); diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index dfd1f396..6f6c94d8 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -23,6 +23,8 @@ using WMS.Web.Domain.Services.Public; using WMS.Web.Domain.Values; using WMS.Web.Domain.Values.Single; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; namespace WMS.Web.Domain.Services { @@ -44,12 +46,14 @@ namespace WMS.Web.Domain.Services private IBoxRepositories _boxRepositories; private readonly IExportExcelService _exportExcelService; private readonly IServiceScopeFactory _serviceScopeFactory; + private readonly ILogger _logger; public OutStockTaskService(IMapper mapper, IErpService erpService, ILoginService loginService, IBasicsRepositories transactionRepositories, IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories, IErpOpsSyncDateRepositories erpOpsSyncDateRepositories, RedisClientService redisClientService, IErpBasicDataExtendService erpBasicDataExtendService, - ISingleDataService singleDataService, IBoxRepositories boxRepositories, IExportExcelService exportExcelService, IServiceScopeFactory serviceScopeFactory) + ISingleDataService singleDataService, IBoxRepositories boxRepositories, IExportExcelService exportExcelService, IServiceScopeFactory serviceScopeFactory, + ILogger logger) { _mapper = mapper; _erpService = erpService; @@ -64,6 +68,7 @@ namespace WMS.Web.Domain.Services _boxRepositories = boxRepositories; _exportExcelService = exportExcelService; _serviceScopeFactory = serviceScopeFactory; + _logger = logger; } /// @@ -122,6 +127,9 @@ namespace WMS.Web.Domain.Services /// public async Task SsynDate(List erp_list, bool isTransaction) { + if (erp_list.Count() <= 0) return Result.ReSuccess(); + _logger.LogInformation($"获取到金蝶出库任务单数据:{JsonConvert.SerializeObject(erp_list)}"); + //2.通过单据编号找到wms系统现有的任务单;并修改 var erp_removeList = new List(); var SourceBillNo_list = erp_list.GroupBy(x => x.SourceBillNo).Select(x => x.Key).ToList(); @@ -466,7 +474,7 @@ namespace WMS.Web.Domain.Services _outStockTaskRepositories = scope.ServiceProvider.GetRequiredService(); _outStockRepositories = scope.ServiceProvider.GetRequiredService(); _erpService = scope.ServiceProvider.GetRequiredService(); - _boxRepositories= scope.ServiceProvider.GetRequiredService(); + _boxRepositories = scope.ServiceProvider.GetRequiredService(); } var entity = await _outStockTaskRepositories.Get(id);