Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
Binary file not shown.
@@ -18,10 +18,6 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string DestBox { get; set; }
|
public string DestBox { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库
|
|
||||||
/// </summary>
|
|
||||||
public int? StockId { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// 原仓位ID
|
/// 原仓位ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? SrcSubStockId { get; set; }
|
public int? SrcSubStockId { get; set; }
|
||||||
|
|||||||
@@ -22,10 +22,6 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Specifications { get; set; }
|
public string Specifications { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库
|
|
||||||
/// </summary>
|
|
||||||
public string Stock { get; set; }
|
|
||||||
/// <summary>
|
|
||||||
/// 序列号
|
/// 序列号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SerialNumbers { get; set; }
|
public string SerialNumbers { get; set; }
|
||||||
|
|||||||
@@ -127,8 +127,6 @@ namespace WMS.Web.Repositories
|
|||||||
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
|
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
|
||||||
if (!string.IsNullOrEmpty(dto.DestBox))
|
if (!string.IsNullOrEmpty(dto.DestBox))
|
||||||
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
|
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
|
||||||
//if (dto.StockId != null)
|
|
||||||
// query = query.Where(w => w.changeBox.StockId == dto.StockId);
|
|
||||||
//if (dto.SrcSubStockId != null)
|
//if (dto.SrcSubStockId != null)
|
||||||
// query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId);
|
// query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId);
|
||||||
//if (dto.DestSubStockId != null)
|
//if (dto.DestSubStockId != null)
|
||||||
|
|||||||
Reference in New Issue
Block a user