From 9ac131f2862a97e887b75644c8bc287c9f40a319 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 18 Oct 2024 17:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= 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 src/WMS.Web.Api/Controllers/TestController.cs | 2 +- src/WMS.Web.Api/appsettings.json | 2 +- .../IService/Public/IErpInventoryService.cs | 2 +- .../Services/ProductInventoryService.cs | 15 ++++++++++++--- .../Services/Public/ErpInventoryService.cs | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index ccaca5217029d34f3c21fc87e508f06ed4c99f71..3aac70a11f73110235631866a06505975d8b9411 100644 GIT binary patch delta 2580 zcmZ{l2XItX6o&V`OL8tPMugB29Rvmhw`F&O=tKkt5D9~TGl)7#c9&vkp%chL=pBOa z5DOq6kkBza5)>)Yg#bg5-itKfVG$xk#&ffWGK{{Nf6sTyZRhUWy>~hG-sM>B!6+?H z(=wAFIsKj@41(>iW%(B(;qx9L8It(xKJsJ~*??x@eMTB%;^ zj{@m~dZY%rwjY?1)+4oR>lW#Kjo4m#MKiCL9t{=ia=!nQf~WaS1N5X%YUW9sZ3D?9 z#oBDPjb!sl1uAB|bx?2k+77~NIFe%mh3r_AU;p_iLa4=fqZ2za{dTeHJ_S8)n8)>E2NSKGNlqTPmUR|yV~ z)Szo5HQ9C2AEf6uafAGuq%t&t8vK9bZap_Hnrd&8uiA2lq}KS8q~@(zvXOc=n?;Ul z4w9a4&|UJ?K()C-WBNh8@;m?4tQYtEV)J5X9d$L4YpL|)T2#N(%%#YN&5sZ31upHL zSs_{!w=4Y@#np4ztlUXlZK2uC$MeJqc-s$&7$EJ}5-~`&P)i&+@;(<&=}bqljkYw@ zOIZTDffa?_p{R;gI$JBwHR2YD1|dAGVPC+0@SauHDu?NS{TT-UdP+s20|9-Eg8-W_ z4hC$>I0W!r#-V_TjKct%F=hZB)gqG(2W-yK5fH+b%$a~ExFQ62ig6_18OBk7=NPj9 zJMgg4fO8qg0Ip*k3%G%C9NyeeeqdVZ*`LqN_7XU6SIYy`)eh=7+D;5E^VO$K@mT?JS zJH{UX+cPc&?98|fa5*<62QZg$1z-#>w-T@d<0`;R5!u>mz^q2hYXB>9#acQj<2t}< zjOzirL>bqXh*v}Tyg&h94bE-?e4X(pz&eaS1J-5S3|Nct7r@$#TL9}bZUyYh$Jqw> zDdTp)H@V(i=IFM)h8*nh=L%^YokLU}?wf_KSM4643i6(mK zfQ(#s&gs2Q01A@ zs)8YjBdMAK)vX# zI$y+jrcrDhbmPQ(OK6Vl6?k$zKjD8G#2%Sr05C&%1# zQ#6XMk_WBBm`8^*6{vRPE66uv?g}&7o-5H=DvVizVp$@LIn+@DSIAaj`k+IuRJ2mj zDn+Y|2F1c890e*=g_6KP|aE+OU&AcSr;+uBj!hAYO$zeF1Rn=(9MUB#4yjl Dii7`g9TImFj&!~}w6Pqvj5Zq;w+>zRjwFAI+mqx;cEtsfoX%87fTE}jm&YIQ#oAo~pPRC}Y*B{2r~ZQ3qNl#N zv0mn%jF4=0MdnC2T?oAhk0&o(WR z@~b0JN3@j`K8|{-Pby;#8qr)+s&8{@56t8UQJGLHM1J)s-Fy79p+(bycc zOzeWlV_H0>Ks+AT;yE1>C|o4RAN(bikdAIe^7g z7_5sk0L$1t6Yv4!EWn41vjOLDf93*KvUeWfBgXlFe={xswABn>^FqKoTzf9yJ;p_V z_ZdF{)Po$nn099O5ig6=gAKq>gU?CXpRU$grlxMdBzQVW-@Kwg`fGrt+ z0Bp{<1F!|-PQccTy8u7r{JR1BG426u%K<+E{><&&3pk)EfbN)mfUz90A25co7|_9Z z0MNyFke(>ULx86_+hIUIZ+8SRneixK3ga=rRK}kG(-@D_!3H^73Dw43F9rOC@dT~o zfRliy*n1lA4C7hAbk25;9y#`209?t-E&^U+?`6O%j92NV3mLJ-XKy9o6EG*N5$$wiPo9X;0)~|*oZVApw-Ehspj1Q1(nFXg zLpVs{M?CZK)0x3EGelxK&tyEE8A>z5jEsDd5gaZPaJa+~lK!oRI8tJ!#8DDQQwaIT zNE|D1oV1$bc-fKOei>AxRIkJFDtv;p8sS8VSrko`R*sGZXT8a0fj7K*_pNMIaE@HaT=cb5hl_uY% zSneg!;3}ItNcPYwJHyy;Q*76Bq&YWHhK$FVq*-Q*+oG4=dp2{wT5i^Ug0|G z#(Clmv;RGTH5(VgJE5v}6)7m9K9~wjFy>V19n7^4L}rAx)`+eUFGc0at|81* zSD&vaUr~Xg0wbY9IGe7M>S$)s9!uzuJF70PmsP_CY0R$>QHEI|nw!fXiY(oH^jM7Z F`~y+1Kgj?9 diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 91f1ddc1..5d177a25 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -119,7 +119,7 @@ namespace WMS.Web.Api.Controllers //await _juShuiTanService.GetTest(); string codes = "AD"; - var b = await _erpInventoryService.Get(codes); + var b = await _erpInventoryService.GetInventory(codes); //LingXingResponse r = new LingXingResponse(); diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index a37022d5..2cf62c82 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -37,7 +37,7 @@ }, "ErpOptions": { "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //原:119.23.206.129 - "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/666a6c4a522823 正式账号密码 orico/A123321./Orico + "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/666a6c4a522823 正式账号密码 orico/A123321./Orico/663a26829afbdd "Password": "A1B2C3Dh.", "ErpId": "ce20210909", "ZhangTaoId": "666a6c4a522823" diff --git a/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs b/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs index e5fbb1f8..65f01a97 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpInventoryService.cs @@ -9,6 +9,6 @@ namespace WMS.Web.Domain.IService.Public { public interface IErpInventoryService { - Task>> Get(string stockCodes); + Task>> GetInventory(string stockCodes); } } diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs index 76bdd28e..a0b82261 100644 --- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs +++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs @@ -36,7 +36,7 @@ namespace WMS.Web.Domain.Services ILingXingService lingXingService, IBasicsRepositories basicsRepositories, IBasicsRepositories transactionRepositories, - IJuShuiTanService juShuiTanService, + IJuShuiTanService juShuiTanService, IErpInventoryService erpInventoryService) { _erpService = erpService; @@ -62,11 +62,20 @@ namespace WMS.Web.Domain.Services w.ManagementSystem == 1 || w.ManagementSystem == 4).Select(s => (s.Code, s.ErpOrgCode)).ToList(); if (codes.Count() <= 0) return Result.ReSuccess(); - var res = await _erpService.BillQueryForInventory(codes); + var str = string.Join(",", codes.Select(s => s.Code).ToList()); + + var res = await _erpInventoryService.GetInventory(str); if (!res.IsSuccess) return res; + //过滤掉不符合要求的组织和仓库组合 + List listOld = new List(); + foreach (var item in codes) + { + var zList = res.Data.Where(w => w.OrgCode == item.ErpOrgCode && w.StockCode == item.Code).ToList(); + listOld.AddRange(zList); + } List inventoryList = new List(); - foreach (var item in res.Data) + foreach (var item in listOld) { var entity = new ProductInventory() { diff --git a/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs b/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs index 5e2efb6f..838dc253 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpInventoryService.cs @@ -42,7 +42,7 @@ namespace WMS.Web.Domain.Services.Public var iResult = JObject.Parse(response)["LoginResultType"].Value(); return iResult == 1 ? true : false; } - public async Task>> Get(string stockCodes) + public async Task>> GetInventory(string stockCodes) { List list = new List(); HttpClientEx httpClient = new HttpClientEx();