Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

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

@@ -43,6 +43,10 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
         /// <summary>
+        /// 完成装箱用户
+        /// </summary>
+        public string CompleteCartonUser { get; set; }
+        /// <summary>
         /// 箱子创建用户
         /// </summary>
         public string CreateUser { get; set; }

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 using WMS.Web.Core;
+using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Domain.Entitys
 {
@@ -14,7 +15,7 @@ namespace WMS.Web.Domain.Entitys
     public class SerialNumbers : EntityBase
     {
         public SerialNumbers() { }
-        public SerialNumbers(string serialNumber,int materialId,int boxId,int opsBoxId,string creator,DateTime? createTime) 
+        public SerialNumbers(string serialNumber, int materialId, int boxId, int opsBoxId, string creator, DateTime? createTime)
         {
             this.SerialNumber = serialNumber;
             this.MaterialId = materialId;
@@ -88,18 +89,20 @@ namespace WMS.Web.Domain.Entitys
         /// 出库
         /// </summary>
         /// <param name="outStockBillNo">出库单号</param>
-        public void OutStock(string outStockBillNo)
+        public void OutStock(string outStockBillNo, OutStockType type)
         {
             this.BoxId = 0;
-            this.OutStockBillNo = outStockBillNo;
+            if (type == OutStockType.Sal)
+                this.OutStockBillNo = outStockBillNo;
         }
         /// <summary>
-        /// 出库
+        /// 入库
         /// </summary>
         /// <param name="inStockBillNo">出库单号</param>
-        public void InStock(string inStockBillNo)
+        public void InStock(string inStockBillNo, InstockType type)
         {
-            this.InStockBillNo = inStockBillNo;
+            if (type == InstockType.Purchase)
+                this.InStockBillNo = inStockBillNo;
         }
     }
 }

src/WMS.Web.Domain/Services/SerialNumberService.cs

@@ -188,7 +188,7 @@ namespace WMS.Web.Domain.Services
             {
                 var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
                 //修改序列号和箱绑定关系
-                entity.OutStock(outStock.BillNo);
+                entity.OutStock(outStock.BillNo, outStock.Type);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()
@@ -316,7 +316,7 @@ namespace WMS.Web.Domain.Services
                 var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
                 var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, instockDetail.SubStockId);
                 //修改序列号和箱绑定关系
-                entity.InStock(inStock.BillNo);
+                entity.InStock(inStock.BillNo, inStock.Type);
 
                 //记录序列号操作日志
                 SerialNumberOperate op = new SerialNumberOperate()

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

@@ -15,5 +15,35 @@ namespace WMS.Web.Domain.Values
         /// </summary>
         [EnumRemark("出库任务单")]
         OutStockTask = 1,
+        /// <summary>
+        /// 出库单
+        /// </summary>
+        [EnumRemark("出库单")]
+        OutStock = 2,
+        /// <summary>
+        /// 入库任务单
+        /// </summary>
+        [EnumRemark("入库任务单")]
+        InStockTask = 3,
+        /// <summary>
+        /// 出库单
+        /// </summary>
+        [EnumRemark("入库单")]
+        InStock = 4,
+        /// <summary>
+        /// 改箱
+        /// </summary>
+        [EnumRemark("改箱单")]
+        ChangeBox = 5,
+        /// <summary>
+        /// 移箱
+        /// </summary>
+        [EnumRemark("移箱单")]
+        MoveBox = 6,
+        /// <summary>
+        /// 盘点
+        /// </summary>
+        [EnumRemark("盘点单")]
+        TakeStock = 7,
     }
 }