Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
tongfei
@@ -1609,7 +1609,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
//3.未出库数量>0
|
||||
//4.日期>=系统上线之日
|
||||
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
|
||||
param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0";
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0 and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
|
||||
//param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
|
||||
for (int i = 0; i < stocks.Count(); i++)
|
||||
@@ -1702,7 +1703,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
//2.审核状态：已审核
|
||||
//3.单据类型:标准
|
||||
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
|
||||
param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a' and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//string srt = JsonConvert.SerializeObject(stocks_codes);
|
||||
//param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")";
|
||||
//param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")";
|
||||
@@ -1794,7 +1796,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
//2.审核状态：已审核
|
||||
//3.单据类型:标准
|
||||
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
|
||||
param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183'";
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183' and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//string srt = JsonConvert.SerializeObject(stocks_codes);
|
||||
//param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")";
|
||||
//param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")";
|
||||
@@ -1886,7 +1889,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
//2.审核状态：已审核
|
||||
//3.单据类型:标准
|
||||
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
|
||||
param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//string srt = JsonConvert.SerializeObject(stocks_codes);
|
||||
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
|
||||
//param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
|
||||
@@ -1978,7 +1982,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
//2.审核状态：已审核
|
||||
//3.单据类型:标准
|
||||
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
|
||||
param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'";
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9' and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//string srt = JsonConvert.SerializeObject(stocks_codes);
|
||||
//param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")";
|
||||
//param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
|
||||
@@ -2070,7 +2075,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
//2.审核状态：已审核
|
||||
//3.单据类型:标准
|
||||
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
|
||||
param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7'";
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//string srt = JsonConvert.SerializeObject(stocks_codes);
|
||||
//param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
|
||||
//param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
|
||||
@@ -2130,6 +2136,105 @@ namespace WMS.Web.Domain.Services.Public
|
||||
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 销售出库单
|
||||
/// </summary>
|
||||
/// <param name="sourceBillNos"></param>
|
||||
/// <param name="beginTime"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForSalOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
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}'"));
|
||||
var stocks_orgs = string.Join(",", stocks.Select(x => $"'{x.ErpOrgCode}'"));
|
||||
|
||||
//1.先登录金蝶-拿到token
|
||||
var token_result = await this.Init();
|
||||
if (!token_result.IsSuccess)
|
||||
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
|
||||
|
||||
//2.时间条件：可能还有其它条件
|
||||
|
||||
var beginStr = DateTime.Now.AddYears(-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);
|
||||
var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString());
|
||||
param.FieldKeys = "FBillNo,FSoorDerno,FStockOrgId,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FSALUNITQTY,F_ENTRYREMARKS,FCreateDate,FEntity_FENTRYID,FStockOrgId.FNumber";//FEntryID
|
||||
param.Limit = 10000;
|
||||
//查询条件：备注其中的条件值以金蝶的值为准！！！
|
||||
//1.创建时间在两天前和当天时间之间
|
||||
//2.审核状态：已审核
|
||||
//4.日期>=系统上线之日
|
||||
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
|
||||
//6.物料 物料属性=费用或资产的排除 不拉取
|
||||
param.FilterString = "FDocumentStatus='C' and FMaterialID.FERPCLSID not in (10,11)";
|
||||
//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[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)
|
||||
{
|
||||
var srt_b = string.Join(",", sourceBillNos.Select(x => $"'{x}'"));
|
||||
param.FilterString += " and FBillNo in (" + srt_b + ")";
|
||||
}
|
||||
else//没有指定单号搜索 则带时间范围
|
||||
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'";
|
||||
|
||||
query.Data = JsonConvert.SerializeObject(param);
|
||||
var json = JsonConvert.SerializeObject(query);
|
||||
|
||||
//4.请求查询接口
|
||||
var result_json = await _client.ExecuteBillQueryAsync(json);
|
||||
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
|
||||
|
||||
//5.返回数据的组装
|
||||
var erp_list = new List<ErpDeliveryNoticeOutStockResultDto>();
|
||||
foreach (var item in result)
|
||||
{
|
||||
var lis = new ErpDeliveryNoticeOutStockResultDto();
|
||||
lis.SourceBillNo = item[0];
|
||||
lis.SaleBillNo = item[1];
|
||||
lis.DeliveryOrgId = Convert.ToInt32(item[2]);
|
||||
lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
|
||||
lis.MaterialId = Convert.ToInt32(item[4]);
|
||||
lis.StockCode = item[5];
|
||||
lis.SubStockId = Convert.ToInt32(item[6]);
|
||||
lis.AccruedQty = Convert.ToDecimal(item[7]);
|
||||
lis.Remark = item[8];
|
||||
lis.CreateTime = Convert.ToDateTime(item[9]);
|
||||
lis.Type = (int)OutStockType.Sal;
|
||||
lis.Erp_DetailId = Convert.ToInt32(item[10]);
|
||||
lis.OrgCode = item[11];
|
||||
erp_list.Add(lis);
|
||||
}
|
||||
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public async Task<Result<ErpSalOutStockSaveDto>> BillQueryForSalOutStock(string id)
|
||||
{
|
||||
@@ -2280,6 +2385,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
return ResultList<ErpInventoryDto>.ReFailure(ResultCodes.Erp_Inventory_Error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user