diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 64256bad..8454cbfe 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -995,7 +995,7 @@ 明细 - + 创建 diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index ccc1f4ca..09daa7a7 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -95,7 +95,7 @@ namespace WMS.Web.Domain.Entitys /// /// /// - public void Create(InstockType type,string sourceBillNo, DateTime createTime) + public void Create(InstockType type,string sourceBillNo, DateTime createTime,int supplierId) { if (type == InstockType.Purchase) this.Status = InstockStatus.Wait; @@ -103,6 +103,7 @@ namespace WMS.Web.Domain.Entitys this.Status = InstockStatus.WaitInStock; this.Type = type; this.SourceBillNo = sourceBillNo; + this.SupplierId = supplierId; this.CreateTime = createTime; } diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 0f200ce2..2b846da3 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -457,7 +457,7 @@ namespace WMS.Web.Domain.Services { var current_order = erp_list.Where(x => x.BillNo == item).FirstOrDefault(); var dto = new InStockTask(); - dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime); + dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime, current_order.SupplierId); //找到当前对应来源单据编号的集合数据 var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList(); @@ -574,7 +574,7 @@ namespace WMS.Web.Domain.Services bool IsAny = details_Groups.Any(d => d.RealityQtyTotal != 0 && d.AccruedQtyTotal > d.RealityQtyTotal); if (IsAny) order.Status = InstockStatus.Part; - else if (details_Groups.Sum(x => x.ReceiveQtyTotal) <= 0) + else if (details_Groups.Sum(x => x.ReceiveQtyTotal) <= 0 && order.Type== InstockType.Purchase) order.Status = InstockStatus.Wait; else if (details_Groups.Sum(x => x.RealityQtyTotal) <= 0) order.Status = InstockStatus.WaitInStock; @@ -609,7 +609,7 @@ namespace WMS.Web.Domain.Services { var current_order = erp_list.Where(x => x.BillNo == item).FirstOrDefault(); var dto = new InStockTask(); - dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime); + dto.Create((InstockType)current_order.Type, current_order.BillNo, current_order.CreateTime, current_order.SupplierId); //找到当前对应来源单据编号的集合数据 var current_erp_details = erp_list.Where(x => x.BillNo == item).ToList();