diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index 810dddd6..06fcc8e2 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs @@ -69,6 +69,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("InStockBillNo")] public string InStockBillNo { get; set; } + /// + /// 收货客户 + /// + [Column("CustomerId")] + public int CustomerId { get; set; } = 0; /// /// 操作(绑定箱信息) @@ -89,11 +94,14 @@ namespace WMS.Web.Domain.Entitys /// 出库 /// /// 出库单号 - public void OutStock(string outStockBillNo, OutStockType type) + public void OutStock(string outStockBillNo, OutStockType type,int customerId) { this.BoxId = 0; if (type == OutStockType.Sal) + { this.OutStockBillNo = outStockBillNo; + this.CustomerId = customerId; + } } /// /// 入库 diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index c4662eb2..6e3be00c 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -193,7 +193,7 @@ namespace WMS.Web.Domain.Services var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); if (outstockDetail == null) continue; //修改序列号和箱绑定关系 - entity.OutStock(outStock.BillNo, outStock.Type); + entity.OutStock(outStock.BillNo, outStock.Type, outStock.ReceiptCustomerId); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() @@ -321,7 +321,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, inStock.Type); + entity.InStock(instockDetail.SourceBillNo, inStock.Type); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate()