From c77a04391c0e6b1ee8aea6275c7763d917d18fd0 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 24 Nov 2023 11:12:17 +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 --- .../Services/Public/ErpService.cs | 61 +++++++++++++++---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index e964329c..ca984e6f 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1394,17 +1394,18 @@ namespace WMS.Web.Domain.Services.Public //4.日期>=系统上线之日 //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 + ")"; + //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; + //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; for (int i = 0; i < stocks.Count(); i++) { if (i == 0) { param.FilterString += " and ("; - param.FilterString += $"(FStockID.FNumber='{stocks[0].Code}' and FDeliveryOrgID.FNumber='{stocks[0].ErpOrgCode}')"; - }else - param.FilterString += $" or (FStockID.FNumber='{stocks[0].Code}' and FDeliveryOrgID.FNumber='{stocks[0].ErpOrgCode}')"; - if (i==stocks.Count()-1) param.FilterString += ")"; + param.FilterString += $"(FStockID.FNumber='{stocks[i].Code}' and FDeliveryOrgID.FNumber='{stocks[i].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FStockID.FNumber='{stocks[i].Code}' and FDeliveryOrgID.FNumber='{stocks[i].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; } @@ -1487,8 +1488,20 @@ namespace WMS.Web.Domain.Services.Public //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 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 + ")"; + //param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")"; + //param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")"; + for (int i = 0; i < stocks.Count(); i++) + { + if (i == 0) + { + param.FilterString += " and ("; + param.FilterString += $"(FSrcStockId.FNumber='{stocks[i].Code}' and FStockOutOrgId.FNumber='{stocks[i].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FSrcStockId.FNumber='{stocks[i].Code}' and FStockOutOrgId.FNumber='{stocks[i].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; + + } //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1567,8 +1580,20 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 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 + ")"; + //param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")"; + //param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")"; + for (int i = 0; i < stocks.Count(); i++) + { + if (i == 0) + { + param.FilterString += " and ("; + param.FilterString += $"(FSrcStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FSrcStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; + + } //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1739,8 +1764,20 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 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 + ")"; + //param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")"; + //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; + for (int i = 0; i < stocks.Count(); i++) + { + if (i == 0) + { + param.FilterString += " and ("; + param.FilterString += $"(FStockId.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FStockId.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; + + } //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) {