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 16:26:01 +08:00
parent c501aa2f8c
commit c8df7c91f2
12 changed files with 156 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,13 +76,13 @@ namespace WMS.Web.Domain.Services
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
Result res_Rollback = Result.ReSuccess();
bool isSuccess = true;
if (res_Rollback.IsSuccess)
{
isSuccess = await _takeStockRepositories.AddRange(list, false);
if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
}
if(res_Rollback.IsSuccess)
if (res_Rollback.IsSuccess)
{
var res_Inventory = await _boxInventoryService.GenerateTakeBox(list, false);
if (!res_Inventory.IsSuccess) res_Rollback = res_Inventory;
@@ -127,22 +127,22 @@ namespace WMS.Web.Domain.Services
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 unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(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搜索
if (stock == null || subStock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
//组装dto
#region 组装dto
List<ErpTakeStockDetailsSaveDto> detils = new List<ErpTakeStockDetailsSaveDto>();
detils.Add(new ErpTakeStockDetailsSaveDto()
{
FOwnerid = stock.OrgId.ToString(),
FKeeperId = stock.OrgId.ToString(),
MaterialId = entity.MaterialId.ToString(),
UnitId = unitId.ToString(), //物料带出来
StockId = stock.Id.ToString(),
SubStockId = subStock.Id.ToString(),
FOwnerid = new ErpNumberDto(stock.OrgCode.ToString()),
FKeeperId = new ErpNumberDto(stock.OrgCode.ToString()),
MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId)),
UnitId = new ErpNumberDto(unitNumber), //物料带出来
StockId = new ErpNumberDto(stock.Code),
SubStockId = subStock?.Id.ToString(),
BeforeQty = entity.BeforeQty,
AfterQty = entity.AfterQty,
FinalQty = entity.FinalQty,
@@ -151,8 +151,8 @@ namespace WMS.Web.Domain.Services
ErpTakeStockSaveDto dto = new ErpTakeStockSaveDto()
{
BillNo = entity.BillNo,
StockOrgId = stock.OrgId.ToString(),
Type = entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS",
StockOrgId = new ErpNumberDto(stock.OrgCode),
Type = new ErpNumberDto(entity.ResultType == TakeStockType.Loss ? "PK01_SYS" : "PY01_SYS"),
Date = entity.Date,
Details = detils
};
@@ -161,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.result.IsSuccess, resSync.result.Message,resSync.syncStatus);
entity.Sync(resSync.result.IsSuccess, resSync.result.Message, resSync.syncStatus);
await _takeStockRepositories.Edit(entity, true);
return res;
}
@@ -171,15 +171,15 @@ namespace WMS.Web.Domain.Services
/// <param name="dto"></param>
/// <param name="type"></param>
/// <returns></returns>
private async Task<(Result result,SyncStatus syncStatus)> 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), SyncStatus.Fail);
//var res_s = await _erpService.Save<ErpTakeStockSaveDto>(dto, formId);
//if (!res_s.IsSuccess)
// return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.Fail);
//提交
ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);
ErpOperateDto o_dto = new ErpOperateDto(formId,"257552");//res_s.Data
var res = await _erpService.Submit(o_dto, formId);
if (!res.IsSuccess)
{
@@ -210,7 +210,7 @@ namespace WMS.Web.Domain.Services
return (res, SyncStatus.PortionSuccess);
}
_logger.LogInformation($"同步金蝶成功");
return (Result.ReSuccess(),SyncStatus.Success);
return (Result.ReSuccess(), SyncStatus.Success);
}
}
}