组装拆卸单-erp
This commit is contained in:
@@ -1839,6 +1839,14 @@
|
|||||||
<param name="isTransaction"></param>
|
<param name="isTransaction"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnAssembledApp(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">
|
<member name="T:WMS.Web.Domain.IService.IOutStockService">
|
||||||
<summary>
|
<summary>
|
||||||
出库服务
|
出库服务
|
||||||
@@ -2786,6 +2794,14 @@
|
|||||||
<param name="isTransaction"></param>
|
<param name="isTransaction"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SysnAssembledApp(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">
|
<member name="T:WMS.Web.Domain.Services.OutStockService">
|
||||||
<summary>
|
<summary>
|
||||||
出库服务
|
出库服务
|
||||||
|
|||||||
@@ -56,5 +56,13 @@ namespace WMS.Web.Domain.IService
|
|||||||
/// <param name="isTransaction"></param>
|
/// <param name="isTransaction"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<Result> SysnTransferin(List<string> billNos = null, bool isTransaction = true);
|
Task<Result> SysnTransferin(List<string> billNos = null, bool isTransaction = true);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 同步:组装拆卸单
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="billNos"></param>
|
||||||
|
/// <param name="isTransaction"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<Result> SysnAssembledApp(List<string> billNos = null, bool isTransaction = true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,6 +105,11 @@ namespace WMS.Web.Domain.QuartzJob
|
|||||||
if (!Transferin_result.IsSuccess)
|
if (!Transferin_result.IsSuccess)
|
||||||
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
|
return Result.ReFailure(Transferin_result.Message, Transferin_result.Status);
|
||||||
|
|
||||||
|
//5.同步数据:组装拆卸单
|
||||||
|
var AssembledApp_result = await _inStockTaskService.SysnAssembledApp(null, isTransaction);
|
||||||
|
if (!AssembledApp_result.IsSuccess)
|
||||||
|
return Result.ReFailure(AssembledApp_result.Message, AssembledApp_result.Status);
|
||||||
|
|
||||||
return Result.ReSuccess();
|
return Result.ReSuccess();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -430,5 +430,91 @@ namespace WMS.Web.Domain.Services
|
|||||||
|
|
||||||
return Result.ReSuccess();
|
return Result.ReSuccess();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 同步:组装拆卸单
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="billNos"></param>
|
||||||
|
/// <param name="isTransaction"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<Result> SysnAssembledApp(List<string> billNos = null, bool isTransaction = true)
|
||||||
|
{
|
||||||
|
var erp_list = new List<ErpAssembledAppDto>();
|
||||||
|
|
||||||
|
//1.获取金蝶数据:组装成品入库订单数据
|
||||||
|
var erp_result_ass = await _erpService.BillQueryForAssembledApp_Assembly(billNos);
|
||||||
|
if (!erp_result_ass.IsSuccess)
|
||||||
|
return Result.ReFailure(erp_result_ass.Message, erp_result_ass.Status);
|
||||||
|
var erp_list_ass = erp_result_ass.Data;
|
||||||
|
erp_list.AddRange(erp_list_ass);
|
||||||
|
|
||||||
|
//1.1.获取金蝶数据:拆卸子件入库订单数据
|
||||||
|
var erp_result_disass = await _erpService.BillQueryForAssembledApp_Disassembly(billNos);
|
||||||
|
if (!erp_result_disass.IsSuccess)
|
||||||
|
return Result.ReFailure(erp_result_disass.Message, erp_result_disass.Status);
|
||||||
|
var erp_list_disass = erp_result_disass.Data;
|
||||||
|
erp_list.AddRange(erp_list_disass);
|
||||||
|
|
||||||
|
|
||||||
|
//2.通过单据编号找到wms系统现有的任务单;并修改
|
||||||
|
var erp_removeList = new List<ErpAssembledAppDto>();
|
||||||
|
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.Assembled);
|
||||||
|
|
||||||
|
//找到当前对应来源单据编号的集合数据
|
||||||
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user