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-12-09 11:49:48 +08:00
parent ad598e25f5
commit 279945539b
9 changed files with 160 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,12 +133,16 @@ namespace WMS.Web.Domain.Entitys
/// 同步金蝶(成功)
/// </summary>
/// <param name="operateId"></param>
public void SyncSuccess(string sourcBillNo, int operateId)
public void SyncSuccess(string sourcBillNo, int operateId,string salOutStockId)
{
//foreach (var e in erpDetailIds)
// this.SuccessSyncFail.Remove(e);
var erpd = this.Details.SelectMany(s => s.ErpDetails).Where(w => w.SourceBillNo.Equals(sourcBillNo)).ToList();
erpd.ForEach(f => f.SuccessSync = SyncStatus.Success);
foreach (var e in erpd)
{
e.SuccessSync = SyncStatus.Success;
e.ErpSyncId = salOutStockId;
}
//所有erp明细同步成功才是整个单据成功
var erpDetails = this.Details.SelectMany(s => s.ErpDetails);
if (erpDetails.Where(w => w.SuccessSync == SyncStatus.Success).Count()== erpDetails.Count())

5
src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs
View File

@@ -50,5 +50,10 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("SuccessSync")]
public SyncStatus SuccessSync { get; set; } = SyncStatus.Fail;
/// <summary>
/// 同步到金蝶后金蝶的单据Id
/// </summary>
[Column("ErpSyncId")]
public string ErpSyncId { get; set; }
}
}

8
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -91,8 +91,12 @@ namespace WMS.Web.Domain.IService.Public
/// </summary>
/// <returns></returns>
Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForMisDeliveryOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null);
Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForSalOutStock(string id);
/// <summary>
/// erp:查询销售出库单信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<Result<ErpSalOutStockSaveDto>> BillQueryForSalOutStock(string id);
/// <summary>
/// erp:单据查询-物料集合
/// </summary>

50
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -9,6 +9,7 @@ using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.OutStock;
using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Dto.OutStock;
@@ -235,11 +236,11 @@ namespace WMS.Web.Domain.Services
DetailsId = string.Join(",", erp_details)
};
//下推金蝶
var res = await this.Push(erpDto);
if (res.IsSuccess)
entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0);
var res = await this.Push(erpDto, entity);
if (res.result.IsSuccess)
entity.SyncSuccess(s, loginInfo?.UserInfo?.StaffId ?? 0,res.erpId);
else
entity.SyncFail(res.Message, loginInfo?.UserInfo?.StaffId ?? 0, SyncStatus.Fail);
entity.SyncFail(res.result.Message, loginInfo?.UserInfo?.StaffId ?? 0, res.syncStatus);
}
//entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true;
//最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱
@@ -253,12 +254,47 @@ namespace WMS.Web.Domain.Services
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
private async Task<Result> Push(ErpPushDto dto)
private async Task<(Result result, SyncStatus syncStatus, string erpId)> Push(ErpPushDto dto, OutStock entity)
{
var res = await _erpService.Push(dto);
var id = res.Data;
if (!res.IsSuccess)
{
_logger.LogInformation($"出库单->下推失败 单号:{entity.BillNo} 错误:{res.Message}");
return (Result.ReFailure(res.Message, res.Status), SyncStatus.Fail, "");
}
string id = res.Data;
var resSalOutStock= await _erpService.BillQueryForSalOutStock(id);
var salOutStock = resSalOutStock.Data;
salOutStock.Details[0].Qty = entity.Details[0].Qty;
//{"Id":12709885,"Number":"XSCKD10629570","DIndex":0}
return Result.ReSuccess();
string formId = dto.TargetFormId.ToString();
_logger.LogInformation($"出库单->开始同步金蝶 单号:{entity.BillNo} 数据: {JsonConvert.SerializeObject(dto)}");
var res_s = await _erpService.Save<ErpSalOutStockSaveDto>(salOutStock, formId);
if (!res_s.IsSuccess)
{
_logger.LogInformation($"出库单->修改数量失败 单号:{entity.BillNo} 错误:{res_s.Message}");
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, id);
}
//提交
_logger.LogInformation($"出库单->保存成功 开始提交 单号:{entity.BillNo}");
ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data
var resSubmit = await _erpService.Submit(o_dto, formId);
if (!resSubmit.IsSuccess)
{
_logger.LogInformation($"出库单->提交失败 单号:{entity.BillNo} 错误:{resSubmit.Message}");
return (resSubmit, SyncStatus.SubmitFail, o_dto.Ids);
}
//审核
_logger.LogInformation($"出库单->提交成功 开始审核 单号:{entity.BillNo}");
resSubmit = await _erpService.Audit(o_dto, formId);
if (!resSubmit.IsSuccess)
{
_logger.LogInformation($"出库单->审核失败 单号:{entity.BillNo} 错误:{resSubmit.Message}");
return (resSubmit, SyncStatus.CheckFail, o_dto.Ids);
}
_logger.LogInformation($"同步金蝶成功");
return (Result.ReSuccess(), SyncStatus.Success, o_dto.Ids);
}
}
}

39
src/WMS.Web.Domain/Services/Public/ErpService.cs
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);
}
}