Compare commits
2 Commits
a9b512ca0e
...
5c7e037a6f
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c7e037a6f | |||
| 9448d5ae09 |
@@ -7106,11 +7106,6 @@
|
||||
仓位
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.BoxBillNo">
|
||||
<summary>
|
||||
箱号
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.Erp_SubStock">
|
||||
<summary>
|
||||
子仓库
|
||||
|
||||
@@ -49,10 +49,10 @@ namespace WMS.Web.Core.Dto.TakeStock
|
||||
/// </summary>
|
||||
[Column("仓位")]
|
||||
public string SubStock { get; set; }
|
||||
/// <summary>
|
||||
/// 箱号
|
||||
/// </summary>
|
||||
public string BoxBillNo { get; set; }
|
||||
///// <summary>
|
||||
///// 箱号
|
||||
///// </summary>
|
||||
//public string BoxBillNo { get; set; }
|
||||
/// <summary>
|
||||
/// 子仓库
|
||||
/// </summary>
|
||||
|
||||
@@ -756,9 +756,9 @@ namespace WMS.Web.Domain.Services
|
||||
|
||||
var detailsB = response.Details.Where(f => f.MaterialCount > 1)
|
||||
//.ThenByDescending(s => s.Method)
|
||||
|
||||
// .ThenByDescending(s => s.Specifications)
|
||||
//.ThenByDescending(s => s.BoxBillNo).ThenBy(s => s.BoxLength)
|
||||
.OrderByDescending(s => s.BoxBillNo).ThenByDescending(s => s.Method).ThenByDescending(s => s.Specifications).ThenByDescending(s => s.Qty).ToList();
|
||||
.OrderByDescending(s => s.BoxBillNo).ThenByDescending(s => s.Method).ThenByDescending(s => s.Qty).ToList();
|
||||
|
||||
detailsA.AddRange(detailsB);
|
||||
response.Details=detailsA;
|
||||
|
||||
@@ -270,7 +270,7 @@ namespace WMS.Web.Repositories
|
||||
BeforeQty = s.detail.BeforeQty,
|
||||
AfterQty = s.detail.AfterQty,
|
||||
FinalQty = s.detail.FinalQty,
|
||||
BoxBillNo=s.box.BoxBillNo,
|
||||
// BoxBillNo=s.box.BoxBillNo,
|
||||
ResultType = s.order.ResultType.GetRemark(),
|
||||
Remark = s.detail.Remark,
|
||||
FailRemark = s.order.FailRemark,
|
||||
|
||||
Reference in New Issue
Block a user