diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 0a6212e6..1d8abd74 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -670,6 +670,11 @@ 单据编号 + + + 来源单号 + + 单据状态 @@ -736,11 +741,6 @@ 单据头Id - - - 来源单号 - - 销售订单号 diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index dc622e66..a7b84333 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -31,6 +31,11 @@ namespace WMS.Web.Domain.Entitys [Column("BillNo")] public string BillNo { get; set; } /// + /// 来源单号 + /// + [Column("SourceBillNo")] + public string SourceBillNo { get; set; } + /// /// 单据状态 /// [Column("Status")] diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs index 145167c9..5c973682 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -25,11 +25,7 @@ namespace WMS.Web.Domain.Entitys /// [Column("Fid")] public int Fid { get; set; } - /// - /// 来源单号 - /// - [Column("SourceBillNo")] - public string SourceBillNo { get; set; } + /// /// 销售订单号 /// diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 727eba7e..2ca30412 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -97,7 +97,7 @@ namespace WMS.Web.Repositories if (ids.Count() > 0) query = query.Where(w => ids.Contains(w.order.CreatorId)); if (!string.IsNullOrEmpty(dto.SourceBillNo)) - query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%")); + query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%")); if (dto.Type != null) query = query.Where(w => w.order.Type == (OrderType)dto.Type); if (dto.SuccessSync != null) @@ -123,7 +123,7 @@ namespace WMS.Web.Repositories CreateTime = s.order.CreateTime.DateToStringSeconds(), SuccessSync = s.order.SuccessSync, Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId), - SourceBillNo = s.detail.SourceBillNo, + SourceBillNo = s.order.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId),