diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index f42f8307..4c6cc2f1 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 62157118..182c1a04 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -77,7 +77,7 @@ namespace WMS.Web.Domain.Entitys /// 明细 /// public List Details = new List(); - public void Create(OutStockType type,string stockCode,string orgCode, int deliveryOrgId, int receiptCustomerId, DateTime createTime) + public void Create(OutStockType type, string stockCode, string orgCode, int deliveryOrgId, int receiptCustomerId, DateTime createTime) { this.Type = type; this.StockCode = stockCode; @@ -140,7 +140,12 @@ namespace WMS.Web.Domain.Entitys /// public void GenerateStatus() { - if (this.Details.Where(w => w.RealityQty >= w.AccruedQty).Count() == this.Details.Count()) + if (this.Status == OutStockStatus.Repeal) + return; + + if (this.Details.Where(w => w.RealityQty <= 0).Count() == this.Details.Count()) + this.Status = OutStockStatus.Wait; + else if (this.Details.Where(w => w.RealityQty >= w.AccruedQty).Count() == this.Details.Count()) this.Status = OutStockStatus.Already; else this.Status = OutStockStatus.Part;