任务单的数量变更问题优化

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -4829,6 +4829,11 @@
             已作废
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.InstockStatus.WaitInStock">
+            <summary>
+            待入库
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockType">
             <summary>
             入库类型

src/WMS.Web.Domain/Entitys/InstockTask.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 using System.Text;
 using WMS.Web.Core;
 using WMS.Web.Domain.Values;
@@ -74,7 +75,10 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="createTime"></param>
         public void Create(InstockType type,string sourceBillNo, DateTime createTime) 
         {
-            this.Status = InstockStatus.Wait;
+            if (type == InstockType.Purchase)
+                this.Status = InstockStatus.Wait;
+            else
+                this.Status = InstockStatus.WaitInStock;
             this.Type = type;
             this.SourceBillNo = sourceBillNo;
             this.CreateTime = createTime;
@@ -119,6 +123,7 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="creatorId"></param>
         public void Receive(int creatorId)
         {
+            this.Status = InstockStatus.WaitInStock;
             this.ReceiverId = creatorId;
             this.ReceiveTime = DateTime.Now;
         }
@@ -129,6 +134,15 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="creatorId"></param>
         public void Shelf(int creatorId)
         {
+            //明细中：所有的应入数量之和
+            var totalAccruedQty= this.Details.Sum(x => x.AccruedQty);
+            //明细中：所有的收货数量之和
+            var totalReceiveQty = this.Details.Sum(x => x.ReceiveQty);
+
+            if (totalAccruedQty == totalReceiveQty)
+                this.Status = InstockStatus.Already;
+            else
+                this.Status = InstockStatus.Part;
             this.ShelferId = creatorId;
             this.ShelfTime = DateTime.Now;
         }
@@ -139,7 +153,15 @@ namespace WMS.Web.Domain.Entitys
         /// <param name="creatorId"></param>
         public void NoPurchaseShelf(int creatorId) 
         {
-            this.ReceiverId = creatorId;
+            //明细中：所有的应入数量之和
+            var totalAccruedQty = this.Details.Sum(x => x.AccruedQty);
+            //明细中：所有的收货数量之和
+            var totalReceiveQty = this.Details.Sum(x => x.ReceiveQty);
+
+            if (totalAccruedQty == totalReceiveQty)
+                this.Status = InstockStatus.Already;
+            else
+                this.ReceiverId = creatorId;
             this.ReceiveTime = DateTime.Now;
             this.ShelferId = creatorId;
             this.ShelfTime = DateTime.Now;

src/WMS.Web.Domain/Values/InstockStatus.cs

@@ -29,6 +29,11 @@ namespace WMS.Web.Domain.Values
         /// 已作废
         /// </summary>
         [EnumRemark("已作废")]
-        Repeal = 4
+        Repeal = 4,
+        /// <summary>
+        /// 待入库
+        /// </summary>
+        [EnumRemark("待入库")]
+        WaitInStock = 5
     }
 }

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -330,7 +330,7 @@ namespace WMS.Web.Repositories
 
             //这里只查状态为：部分入库和等待收货
             var task_query = _context.InStockTask
-                 .Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait));
+                 .Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait || w.Status==InstockStatus.WaitInStock));
 
             //找到头列表
             var taskList = await task_query