修复bug

This commit is contained in:
18942506660
2023-12-09 11:49:48 +08:00
parent ad598e25f5
commit 279945539b
9 changed files with 160 additions and 42 deletions

View File

@@ -2050,24 +2050,24 @@ namespace WMS.Web.Domain.Services.Public
}
}
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForSalOutStock(string id)
public async Task<Result<ErpSalOutStockSaveDto>> BillQueryForSalOutStock(string id)
{
try
{
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
return Result<ErpSalOutStockSaveDto>.ReFailure(ResultCodes.ErpStockNoData);
//1.先登录金蝶-拿到token
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
return Result<ErpSalOutStockSaveDto>.ReFailure(token_result);
//3.获取金蝶采购订单:拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString());
param.FieldKeys = "FID,FEntity_FENTRYID,FMaterialID,FMustQty,FRealQty,FStockID.FNumber";
param.FieldKeys = "FID,FEntity_FENTRYID,FRealQty,";
param.Limit = 10000;
param.FilterString = $"FID={id}";
@@ -2079,30 +2079,19 @@ namespace WMS.Web.Domain.Services.Public
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.Miscellaneous;
// lis.Erp_DetailId = Convert.ToInt32(item[10]);
// lis.OrgCode = item[11];
// erp_list.Add(lis);
//}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
var erp_list = new ErpSalOutStockSaveDto(id);
foreach (var item in result)
{
var lis = new ErpSalOutStockDetailsSaveDto();
lis.DetailId = item[1];
lis.Qty =Convert.ToDecimal(item[2]);
erp_list.Details.Add(lis);
}
return Result<ErpSalOutStockSaveDto>.ReSuccess(erp_list);
}
catch (Exception ex)
{
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
return Result<ErpSalOutStockSaveDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}