From 3bacdda1f3b97f94b7c93a13535d2ab169005ec2 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 24 Nov 2023 11:00:38 +0800 Subject: [PATCH 1/3] =?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 | 69 ++++++++++++++----- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index de4e6f0f..0dbd5055 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -90,7 +90,7 @@ namespace WMS.Web.Domain.Services.Public /// 查单据类型的值 /// /// - public async Task> BillQueryForBillType() + public async Task> BillQueryForBillType() { try { @@ -107,7 +107,7 @@ namespace WMS.Web.Domain.Services.Public var param = new ErpBillQueryParamDto("BOS_BillType"); param.FieldKeys = "FBILLTYPEID,FNumber,FName"; param.Limit = 10000; - param.FilterString = ""; + param.FilterString = ""; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -122,8 +122,8 @@ namespace WMS.Web.Domain.Services.Public var lis = new ErpBaseDto(); lis.Id = item[0]; lis.Number = item[1]; - lis.Name =item[2]; - + lis.Name = item[2]; + erp_list.Add(lis); } return ResultList.ReSuccess(erp_list); @@ -352,7 +352,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForTransferDirect(List sourceBillNos = null) + public async Task> BillQueryForTransferDirect(List sourceBillNos = null) { try { @@ -456,7 +456,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForTransferin(List sourceBillNos = null) + public async Task> BillQueryForTransferin(List sourceBillNos = null) { try { @@ -560,7 +560,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForAssembledApp_Assembly(List sourceBillNos = null) + public async Task> BillQueryForAssembledApp_Assembly(List sourceBillNos = null) { try { @@ -1187,7 +1187,7 @@ namespace WMS.Web.Domain.Services.Public { var token_result = await this.Init(); if (!token_result.IsSuccess) - return Result.ReFailure(token_result.Message,token_result.Status); + return Result.ReFailure(token_result.Message, token_result.Status); var query = new ErpBillQueryDto(token_result.Data); var param = new ErpSave(formId, dto); query.Data = JsonConvert.SerializeObject(param); @@ -1396,15 +1396,26 @@ namespace WMS.Web.Domain.Services.Public param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0"; 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 += ")"; + + } + //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'")); - param.FilterString += " and FBillNo in (" + srt_b + ")"; + param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -1430,7 +1441,7 @@ namespace WMS.Web.Domain.Services.Public lis.CreateTime = Convert.ToDateTime(item[9]); lis.Type = (int)OutStockType.Sal; lis.Erp_DetailId = Convert.ToInt32(item[10]); - lis.OrgCode= item[11]; + lis.OrgCode = item[11]; erp_list.Add(lis); } return ResultList.ReSuccess(erp_list); @@ -1636,8 +1647,20 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID 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 + ")"; + //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[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FStockID.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; + + } //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { @@ -1796,8 +1819,22 @@ namespace WMS.Web.Domain.Services.Public //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID 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 + ")"; + //param.FilterString += " and FStockIDSETY.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 += $"(FStockIDSETY.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + } + else + param.FilterString += $" or (FStockIDSETY.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + if (i == stocks.Count() - 1) param.FilterString += ")"; + + } + //根据原订单号查询 if (sourceBillNos != null && sourceBillNos.Count() > 0) { From 70dce8c9978a1388ad38e77d8a37ed4213fbba03 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 24 Nov 2023 11:07:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/Public/ErpService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 0dbd5055..e964329c 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1654,10 +1654,10 @@ namespace WMS.Web.Domain.Services.Public if (i == 0) { param.FilterString += " and ("; - param.FilterString += $"(FStockID.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + param.FilterString += $"(FStockID.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; } else - param.FilterString += $" or (FStockID.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + param.FilterString += $" or (FStockID.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; if (i == stocks.Count() - 1) param.FilterString += ")"; } @@ -1827,10 +1827,10 @@ namespace WMS.Web.Domain.Services.Public if (i == 0) { param.FilterString += " and ("; - param.FilterString += $"(FStockIDSETY.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + param.FilterString += $"(FStockIDSETY.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; } else - param.FilterString += $" or (FStockIDSETY.FNumber='{stocks[0].Code}' and FStockOrgId.FNumber='{stocks[0].ErpOrgCode}')"; + param.FilterString += $" or (FStockIDSETY.FNumber='{stocks[i].Code}' and FStockOrgId.FNumber='{stocks[i].ErpOrgCode}')"; if (i == stocks.Count() - 1) param.FilterString += ")"; } From c77a04391c0e6b1ee8aea6275c7763d917d18fd0 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 24 Nov 2023 11:12:17 +0800 Subject: [PATCH 3/3] =?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) {