18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2023-11-20 16:22:39 +08:00
parent df4095c6dd
commit 0d8aa6e4ad
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -1362,7 +1362,8 @@ namespace WMS.Web.Domain.Services.Public
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",",stocks.Select(x => x.Id));
//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}'"));
//1.先登录金蝶-拿到token
@@ -1372,8 +1373,8 @@ namespace WMS.Web.Domain.Services.Public
//2.时间条件：可能还有其它条件
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -1387,7 +1388,7 @@ namespace WMS.Web.Domain.Services.Public
//4.日期>=系统上线之日
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0";
param.FilterString += " and FStockID in (" + stocks_codes + ")";
param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1444,7 +1445,7 @@ namespace WMS.Web.Domain.Services.Public
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => x.Id));
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -1452,8 +1453,8 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -1467,7 +1468,7 @@ 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 in (" + stocks_codes + ")";
param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1522,7 +1523,7 @@ namespace WMS.Web.Domain.Services.Public
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => x.Id));
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -1530,8 +1531,8 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -1545,7 +1546,7 @@ 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 in (" + stocks_codes + ")";
param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1600,7 +1601,7 @@ namespace WMS.Web.Domain.Services.Public
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => x.Id));
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -1608,8 +1609,8 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -1623,7 +1624,7 @@ 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 in (" + stocks_codes + ")";
param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1678,7 +1679,7 @@ namespace WMS.Web.Domain.Services.Public
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => x.Id));
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -1686,8 +1687,8 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -1701,7 +1702,7 @@ 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 in (" + stocks_codes + ")";
param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1756,7 +1757,7 @@ namespace WMS.Web.Domain.Services.Public
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => x.Id));
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -1764,8 +1765,8 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd 00:00:00");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd 00:00:00");
var beginStr = DateTime.Now.AddMinutes(-30).ToString("yyyy-MM-dd HH:mm:ss");
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
var endStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
@@ -1779,7 +1780,7 @@ 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 in (" + stocks_codes + ")";
param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)