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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-23 17:52:19 +08:00
parent 2840590e16 fecb0cdb10
commit af04a30429
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Domain/Entitys/OutStock.cs
View File

@@ -111,6 +111,8 @@ namespace WMS.Web.Domain.Entitys
this.Method = (InventoryInOutMethod)method; this.Method = (InventoryInOutMethod)method;
this.DeliveryOrgId = task.DeliveryOrgId; this.DeliveryOrgId = task.DeliveryOrgId;
this.ReceiptCustomerId = task.ReceiptCustomerId; this.ReceiptCustomerId = task.ReceiptCustomerId;
this.OrgCode = task.OrgCode;
this.StockCode = task.StockCode;
this.CreatorId = creatorId; this.CreatorId = creatorId;
this.CreateTime = DateTime.Now; this.CreateTime = DateTime.Now;
if (task.Type == OutStockType.Sal) if (task.Type == OutStockType.Sal)

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

@@ -1370,7 +1370,7 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData); 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}'")); 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 //1.先登录金蝶-拿到token
var token_result = await this.Init(); var token_result = await this.Init();
@@ -1395,6 +1395,7 @@ namespace WMS.Web.Domain.Services.Public
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0"; param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0";
param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1453,7 +1454,7 @@ namespace WMS.Web.Domain.Services.Public
if (stocks.Count == 0) if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData); return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'"));
//1.先登录金蝶-拿到token //1.先登录金蝶-拿到token
var token_result = await this.Init(); var token_result = await this.Init();
if (!token_result.IsSuccess) if (!token_result.IsSuccess)
@@ -1476,7 +1477,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'"; param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")"; param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")";
param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")";
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {
@@ -1533,7 +1534,7 @@ namespace WMS.Web.Domain.Services.Public
if (stocks.Count == 0) if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData); return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'"));
//1.先登录金蝶-拿到token //1.先登录金蝶-拿到token
var token_result = await this.Init(); var token_result = await this.Init();
if (!token_result.IsSuccess) if (!token_result.IsSuccess)
@@ -1556,7 +1557,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'"; param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")"; param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")";
param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")";
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {
@@ -1613,7 +1614,7 @@ namespace WMS.Web.Domain.Services.Public
if (stocks.Count == 0) if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData); return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'"));
//1.先登录金蝶-拿到token //1.先登录金蝶-拿到token
var token_result = await this.Init(); var token_result = await this.Init();
if (!token_result.IsSuccess) if (!token_result.IsSuccess)
@@ -1636,7 +1637,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {
@@ -1693,7 +1694,7 @@ namespace WMS.Web.Domain.Services.Public
if (stocks.Count == 0) if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData); return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'"));
//1.先登录金蝶-拿到token //1.先登录金蝶-拿到token
var token_result = await this.Init(); var token_result = await this.Init();
if (!token_result.IsSuccess) if (!token_result.IsSuccess)
@@ -1716,7 +1717,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'"; param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")"; param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")";
param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {
@@ -1773,7 +1774,7 @@ namespace WMS.Web.Domain.Services.Public
if (stocks.Count == 0) if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData); return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'")); var stocks_codes = string.Join(",", stocks.Select(x => $"'{x.Code}'"));
var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'"));
//1.先登录金蝶-拿到token //1.先登录金蝶-拿到token
var token_result = await this.Init(); var token_result = await this.Init();
if (!token_result.IsSuccess) if (!token_result.IsSuccess)
@@ -1796,7 +1797,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'"; param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")"; param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {