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

erp直接调拨入库

Browse Source
This commit is contained in:
tongfei
2023-11-11 15:55:29 +08:00
parent 3aa36adfec
commit 4467f4cb24
6 changed files with 117 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -77,7 +77,7 @@ namespace WMS.Web.Api.Controllers
bool isTransaction = false;
//3.同步数据
var result = await _inStockTaskService.SysnMiscellaneous(null,isTransaction);
var result = await _inStockTaskService.SysnTransferDirect(null,isTransaction);
if (!result.IsSuccess) isRollback = true;
//4.提交事务

16
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1764,6 +1764,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnTransferDirect(System.Collections.Generic.List{System.String},System.Boolean)">
<summary>
同步：直接调拨入库单据
</summary>
<param name="billNos"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.IOutStockService">
<summary>
出库服务
@@ -2665,6 +2673,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnTransferDirect(System.Collections.Generic.List{System.String},System.Boolean)">
<summary>
同步：直接调拨入库单
</summary>
<param name="billNos"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.OutStockService">
<summary>
出库服务

8
src/WMS.Web.Domain/IService/IInStockTaskService.cs
View File

@@ -40,5 +40,13 @@ namespace WMS.Web.Domain.IService
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnMiscellaneous(List<string> billNos = null, bool isTransaction = true);
/// <summary>
/// 同步：直接调拨入库单据
/// </summary>
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnTransferDirect(List<string> billNos = null, bool isTransaction = true);
}
}

12
src/WMS.Web.Domain/Mappers/InStockMapper.cs
View File

@@ -66,6 +66,18 @@ namespace WMS.Web.Domain.Mappers
CreateMap<ErpMiscellaneousDto, InStockTask>()
.ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo))
.ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime));
//ERP直接调拨入库单
CreateMap<ErpTransferDirectDto, InStockTaskDetails>()
.ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.StockOrgId))
.ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.MaterialId))
.ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.DestStockCode))
.ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.Qty))
.ForMember(x => x.Remark, ops => ops.MapFrom(x => x.Remark));
CreateMap<ErpTransferDirectDto, InStockTask>()
.ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo))
.ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime));
#endregion

5
src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs
View File

@@ -95,6 +95,11 @@ namespace WMS.Web.Domain.QuartzJob
if (!miscellaneou_result.IsSuccess)
return Result.ReFailure(miscellaneou_result.Message, miscellaneou_result.Status);
//2.同步数据：直接调拨入库单
var TransferDirect_result = await _inStockTaskService.SysnTransferDirect(null, isTransaction);
if (!TransferDirect_result.IsSuccess)
return Result.ReFailure(TransferDirect_result.Message, TransferDirect_result.Status);
return Result.ReSuccess();
}
}

75
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -280,5 +280,80 @@ namespace WMS.Web.Domain.Services
return Result.ReSuccess();
}
/// <summary>
/// 同步：直接调拨入库单
/// </summary>
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SysnTransferDirect(List<string> billNos = null, bool isTransaction = true)
{
//1.获取金蝶数据：直接调拨入库订单数据
var erp_result = await _erpService.BillQueryForTransferDirect(billNos);
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message, erp_result.Status);
var erp_list = erp_result.Data;
//2.通过单据编号找到wms系统现有的任务单；并修改
var erp_removeList = new List<ErpTransferDirectDto>();
var SourceBillNo_list = erp_list.GroupBy(x => x.BillNo).Select(x => x.Key).ToList();
var data_list = await _inStockTaskRepositories.GetListBy(SourceBillNo_list);
if (data_list.Count != 0)
{
//2.1提取出wms任务单明细信息
var data_list_details = data_list.SelectMany(x => x.Details).ToList();
foreach (var item in data_list_details)
{
var data = data_list.Where(x => x.Id == item.Fid).FirstOrDefault();
//2.1.1对比erp的物料信息
var erp_data = erp_list.Where(x => x.BillNo == data.SourceBillNo && x.MaterialId == item.MaterialId).FirstOrDefault();
if (erp_data != null)
{
//2.1.2修改数量
item.AccruedQty = erp_data.Qty;
erp_removeList.Add(erp_data);
}
}
//2.2.提交修改
var isSuccess = await _inStockTaskRepositories.UpdateRange(data_list, isTransaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
//2.3剔除:已修改的单据
foreach (var item in erp_removeList)
{
erp_list.Remove(item);
}
}
//3.wms任务单的来源单据编号不存在于erp中，那么就新增
if (erp_list.Count != 0)
{
var add_entitys = new List<InStockTask>();
var current_billNos = erp_list.GroupBy(x => new { x.BillNo, x.CreateTime }).Select(x => new { x.Key.BillNo, x.Key.CreateTime }).ToList();
foreach (var item in current_billNos)
{
var dto = new InStockTask();
dto.SourceBillNo = item.BillNo;
dto.CreateTime = item.CreateTime;
dto.Create(InstockType.Stkdirecttransfers);
//找到当前对应来源单据编号的集合数据
var current_erp_details = erp_list.Where(x => x.BillNo == item.BillNo).ToList();
//给到dto的实体明细中
dto.Details = _mapper.Map<List<InStockTaskDetails>>(current_erp_details);
add_entitys.Add(dto);
}
//3.1提交新增
var isSuccess = await _inStockTaskRepositories.AddRange(add_entitys, isTransaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
}
return Result.ReSuccess();
}
}
}