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