diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index e8c249c3..2f607d68 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1566,14 +1566,29 @@ 创建时间(老ops过来) - + - 出库单号 + 出库单对应销售订单号 - + + + 出库时间 + + + - 入库单号/采购单号 + 采购单号 + + + + + 入库时间 + + + + + 收货客户 @@ -1587,7 +1602,7 @@ 解绑 - + 出库 diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index 06fcc8e2..3476677a 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs @@ -60,15 +60,25 @@ namespace WMS.Web.Domain.Entitys [Column("CreateTime")] public DateTime CreateTime { get; set; } = DateTime.Now; /// - /// 出库单号 + /// 出库单对应销售订单号 /// - [Column("OutStockBillNo")] - public string OutStockBillNo { get; set; } + [Column("SalBillNo")] + public string SalBillNo { get; set; } /// - /// 入库单号/采购单号 + /// 出库时间 + /// + [Column("OutStockTime")] + public DateTime? OutStockTime { get; set; } + /// + /// 采购单号 /// - [Column("InStockBillNo")] - public string InStockBillNo { get; set; } + [Column("PurchaseBillNo")] + public string PurchaseBillNo { get; set; } + /// + /// 入库时间 + /// + [Column("InStockTime")] + public DateTime? InStockTime { get; set; } /// /// 收货客户 /// @@ -99,8 +109,9 @@ namespace WMS.Web.Domain.Entitys this.BoxId = 0; if (type == OutStockType.Sal) { - this.OutStockBillNo = outStockBillNo; + this.SalBillNo = outStockBillNo; this.CustomerId = customerId; + this.OutStockTime = DateTime.Now; } } /// @@ -110,7 +121,10 @@ namespace WMS.Web.Domain.Entitys public void InStock(string inStockBillNo, InstockType type) { if (type == InstockType.Purchase) - this.InStockBillNo = inStockBillNo; + { + this.PurchaseBillNo = inStockBillNo; + this.InStockTime = DateTime.Now; + } } } }