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

调整同步状态

Browse Source
This commit is contained in:
18942506660
2023-12-01 11:11:16 +08:00
parent 5f6d1d0de0
commit 8c37838402
11 changed files with 155 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -38,11 +38,12 @@ namespace WMS.Web.Domain.Services
private readonly IErpService _erpService;
private readonly ILogger<TakeStockService> _logger;
private readonly IBoxInventoryService _boxInventoryService;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
public TakeStockService(IMapper mapper, ILoginService loginService,
IBasicsRepositories transactionRepositories,
ITakeStockRepositories takeStockRepositories, ILoginRepositories loginRepositories,
ISingleDataService singleDataService, IErpService erpService, ILogger<TakeStockService> logger,
IBoxInventoryService boxInventoryService)
IBoxInventoryService boxInventoryService, IErpBasicDataExtendService erpBasicDataExtendService)
{
_mapper = mapper;
_loginService = loginService;
@@ -53,6 +54,7 @@ namespace WMS.Web.Domain.Services
_erpService = erpService;
_logger = logger;
_boxInventoryService = boxInventoryService;
_erpBasicDataExtendService = erpBasicDataExtendService;
}
/// <summary>
/// 保存
@@ -107,7 +109,7 @@ namespace WMS.Web.Domain.Services
public async Task<Result> Sync(OperateRequest dto)
{
var list = await _takeStockRepositories.GetEntityList(dto.Ids);
list = list.Where(w => w.SuccessSync == false).ToList();
list = list.Where(w => w.SuccessSync == SyncStatus.Fail).ToList();
foreach (var entity in list)
await Loss_Profit(entity);
@@ -123,7 +125,9 @@ namespace WMS.Web.Domain.Services
//获取金蝶仓库仓位编码
//var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
var materials_result = await _erpService.BillQueryForMaterial();
var materials = materials_result.Data.ToList();
var unitId = _erpBasicDataExtendService.GetMaterialUnitId(materials,entity.MaterialId);
var res = await _erpService.BillQueryForStock();
var stock = res.Data.FirstOrDefault(f => f.Code == entity.StockCode);//需要根据单点code搜索
var subStock = res.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
@@ -136,7 +140,7 @@ namespace WMS.Web.Domain.Services
FOwnerid = stock.OrgId.ToString(),
FKeeperId = stock.OrgId.ToString(),
MaterialId = entity.MaterialId.ToString(),
UnitId = "", //物料带出来
UnitId = unitId.ToString(), //物料带出来
StockId = stock.Id.ToString(),
SubStockId = subStock.Id.ToString(),
BeforeQty = entity.BeforeQty,
@@ -157,7 +161,7 @@ namespace WMS.Web.Domain.Services
FormIdParam type = entity.ResultType == TakeStockType.Loss ? FormIdParam.STK_StockCountLoss : FormIdParam.STK_StockCountGain;
//操作金蝶
var resSync = await ErpOperate(dto, type);
entity.Sync(resSync.IsSuccess, resSync.Message);
entity.Sync(resSync.result.IsSuccess, resSync.result.Message,resSync.syncStatus);
await _takeStockRepositories.Edit(entity, true);
return res;
}
@@ -167,13 +171,13 @@ namespace WMS.Web.Domain.Services
/// <param name="dto"></param>
/// <param name="type"></param>
/// <returns></returns>
private async Task<Result> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
private async Task<(Result result,SyncStatus syncStatus)> ErpOperate(ErpTakeStockSaveDto dto, FormIdParam type)
{
string formId = type.ToString();
_logger.LogInformation($"开始同步金蝶 单号:{dto.BillNo} 数据: {JsonConvert.SerializeObject(dto)}");
var res_s = await _erpService.Save<ErpTakeStockSaveDto>(dto, formId);
if (!res_s.IsSuccess)
return Result.ReFailure(res_s.Message, res_s.Status);
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail);
//提交
ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);
var res = await _erpService.Submit(o_dto, formId);
@@ -181,10 +185,10 @@ namespace WMS.Web.Domain.Services
{
//如果提交失败
//1.则调删单接口
var del_res = await _erpService.Delete(o_dto, formId);
if (!del_res.IsSuccess)
_logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 提交失败原因: {res.Message} 删单失败原因:{del_res.Message}");
return res;
//var del_res = await _erpService.Delete(o_dto, formId);
//if (!del_res.IsSuccess)
// _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 提交失败原因: {res.Message} 删单失败原因:{del_res.Message}");
return (res, SyncStatus.PortionSuccess);
}
//审核
res = await _erpService.Audit(o_dto, formId);
@@ -193,20 +197,20 @@ namespace WMS.Web.Domain.Services
//如果审核失败
//1.调反审核接口
//2.调删除接口
var noAudit_res = await _erpService.NoAudit(o_dto, formId);
if (!noAudit_res.IsSuccess)
{
_logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 反审核失败原因:{noAudit_res.Message}");
return res;
}
//var noAudit_res = await _erpService.NoAudit(o_dto, formId);
//if (!noAudit_res.IsSuccess)
//{
// _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 反审核失败原因:{noAudit_res.Message}");
// return res;
//}
var del_res = await _erpService.Delete(o_dto, formId);
if (!del_res.IsSuccess)
_logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 删单失败原因:{del_res.Message}");
return res;
//var del_res = await _erpService.Delete(o_dto, formId);
//if (!del_res.IsSuccess)
// _logger.LogError($"盘盈盘亏同步金蝶 单号:{dto.BillNo} 审核失败原因: {res.Message} 删单失败原因:{del_res.Message}");
return (res, SyncStatus.PortionSuccess);
}
_logger.LogInformation($"同步金蝶成功");
return Result.ReSuccess();
return (Result.ReSuccess(),SyncStatus.Success);
}
}
}