调整出库单结构
This commit is contained in:
@@ -670,6 +670,11 @@
|
|||||||
单据编号
|
单据编号
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.OutStock.SourceBillNo">
|
||||||
|
<summary>
|
||||||
|
来源单号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStock.Status">
|
<member name="P:WMS.Web.Domain.Entitys.OutStock.Status">
|
||||||
<summary>
|
<summary>
|
||||||
单据状态
|
单据状态
|
||||||
@@ -736,11 +741,6 @@
|
|||||||
单据头Id
|
单据头Id
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SourceBillNo">
|
|
||||||
<summary>
|
|
||||||
来源单号
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SaleBillNo">
|
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SaleBillNo">
|
||||||
<summary>
|
<summary>
|
||||||
销售订单号
|
销售订单号
|
||||||
|
|||||||
@@ -31,6 +31,11 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
[Column("BillNo")]
|
[Column("BillNo")]
|
||||||
public string BillNo { get; set; }
|
public string BillNo { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 来源单号
|
||||||
|
///</summary>
|
||||||
|
[Column("SourceBillNo")]
|
||||||
|
public string SourceBillNo { get; set; }
|
||||||
|
/// <summary>
|
||||||
/// 单据状态
|
/// 单据状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("Status")]
|
[Column("Status")]
|
||||||
|
|||||||
@@ -25,11 +25,7 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("Fid")]
|
[Column("Fid")]
|
||||||
public int Fid { get; set; }
|
public int Fid { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// 来源单号
|
|
||||||
///</summary>
|
|
||||||
[Column("SourceBillNo")]
|
|
||||||
public string SourceBillNo { get; set; }
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 销售订单号
|
/// 销售订单号
|
||||||
///</summary>
|
///</summary>
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace WMS.Web.Repositories
|
|||||||
if (ids.Count() > 0)
|
if (ids.Count() > 0)
|
||||||
query = query.Where(w => ids.Contains(w.order.CreatorId));
|
query = query.Where(w => ids.Contains(w.order.CreatorId));
|
||||||
if (!string.IsNullOrEmpty(dto.SourceBillNo))
|
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)
|
if (dto.Type != null)
|
||||||
query = query.Where(w => w.order.Type == (OrderType)dto.Type);
|
query = query.Where(w => w.order.Type == (OrderType)dto.Type);
|
||||||
if (dto.SuccessSync != null)
|
if (dto.SuccessSync != null)
|
||||||
@@ -123,7 +123,7 @@ namespace WMS.Web.Repositories
|
|||||||
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
||||||
SuccessSync = s.order.SuccessSync,
|
SuccessSync = s.order.SuccessSync,
|
||||||
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
|
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
|
||||||
SourceBillNo = s.detail.SourceBillNo,
|
SourceBillNo = s.order.SourceBillNo,
|
||||||
SaleBillNo = s.detail.SaleBillNo,
|
SaleBillNo = s.detail.SaleBillNo,
|
||||||
DeliveryOrg = "",
|
DeliveryOrg = "",
|
||||||
ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId),
|
ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId),
|
||||||
|
|||||||
Reference in New Issue
Block a user