From 247ce1158d21db50dff854f6a785f10cda14337b Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 23 Nov 2023 17:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=91=E8=9D=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Public/ErpService.cs | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 4189f87d..de4e6f0f 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1370,7 +1370,7 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure(ResultCodes.ErpStockNoData); //var stocks_codes = string.Join(",",stocks.Select(x => x.Id)); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); - //string.Join(",",stocks.Select(x => $"'{x.Code}'")); + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); @@ -1395,7 +1395,8 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0"; param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; - + param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; + //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1453,7 +1454,7 @@ namespace WMS.Web.Domain.Services.Public if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); - + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); if (!token_result.IsSuccess) @@ -1476,7 +1477,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; //string srt = JsonConvert.SerializeObject(stocks_codes); param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")"; - + param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1533,7 +1534,7 @@ namespace WMS.Web.Domain.Services.Public if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); - + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); if (!token_result.IsSuccess) @@ -1556,7 +1557,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; //string srt = JsonConvert.SerializeObject(stocks_codes); param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")"; - + param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1613,7 +1614,7 @@ namespace WMS.Web.Domain.Services.Public if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); - + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); if (!token_result.IsSuccess) @@ -1636,7 +1637,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; - + param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1693,7 +1694,7 @@ namespace WMS.Web.Domain.Services.Public if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); - + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); if (!token_result.IsSuccess) @@ -1716,7 +1717,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; //string srt = JsonConvert.SerializeObject(stocks_codes); param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")"; - + param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1773,7 +1774,7 @@ namespace WMS.Web.Domain.Services.Public if (stocks.Count == 0) return ResultList.ReFailure(ResultCodes.ErpStockNoData); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); - + var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'")); //1.先登录金蝶-拿到token var token_result = await this.Init(); if (!token_result.IsSuccess) @@ -1796,7 +1797,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; //string srt = JsonConvert.SerializeObject(stocks_codes); param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")"; - + param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) {