修改了仓位
This commit is contained in:
@@ -2143,6 +2143,11 @@
|
|||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<!-- Badly formed XML comment ignored for member "P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.RealityQty" -->
|
<!-- Badly formed XML comment ignored for member "P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.RealityQty" -->
|
||||||
|
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.shelfSpace">
|
||||||
|
<summary>
|
||||||
|
入库仓位
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.SerialNumbers">
|
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.SerialNumbers">
|
||||||
<summary>
|
<summary>
|
||||||
序列号
|
序列号
|
||||||
|
|||||||
@@ -76,6 +76,10 @@ namespace WMS.Web.Core.Dto.InStockTask
|
|||||||
/// 入库数量
|
/// 入库数量
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal RealityQty { get; set; }
|
public decimal RealityQty { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 入库仓位
|
||||||
|
/// </summary>
|
||||||
|
public string shelfSpace { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 序列号
|
/// 序列号
|
||||||
|
|||||||
@@ -88,5 +88,7 @@ namespace WMS.Web.Core.Dto.OutStockTask
|
|||||||
|
|
||||||
public int MaterialCount { get; set; } = 0;
|
public int MaterialCount { get; set; } = 0;
|
||||||
|
|
||||||
|
public string position { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -655,6 +655,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
BoxHigh = b.BoxHigh,
|
BoxHigh = b.BoxHigh,
|
||||||
BoxWeight = b.BoxWeight,
|
BoxWeight = b.BoxWeight,
|
||||||
Qty = b.Qty,
|
Qty = b.Qty,
|
||||||
|
position=b.SubStockCode,
|
||||||
SerialNumbers = string.Join(",", b.SerialNumbers),
|
SerialNumbers = string.Join(",", b.SerialNumbers),
|
||||||
SerialNumberList = b.SerialNumbers,
|
SerialNumberList = b.SerialNumbers,
|
||||||
Method = outStock.Method.GetRemark(),
|
Method = outStock.Method.GetRemark(),
|
||||||
|
|||||||
@@ -197,6 +197,7 @@ namespace WMS.Web.Repositories
|
|||||||
RealityQty = x.detail.Qty,
|
RealityQty = x.detail.Qty,
|
||||||
ReceiveQty = x.detail.Qty,
|
ReceiveQty = x.detail.Qty,
|
||||||
ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
shelfSpace=x.order.SubStockCode,
|
||||||
Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId),
|
Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId),
|
||||||
Receiver = "",
|
Receiver = "",
|
||||||
ReceiveTime = "",
|
ReceiveTime = "",
|
||||||
@@ -249,6 +250,7 @@ namespace WMS.Web.Repositories
|
|||||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, boxdetail.MaterialNumber),
|
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, boxdetail.MaterialNumber),
|
||||||
ShelfTime = "",
|
ShelfTime = "",
|
||||||
Shelfer = "",
|
Shelfer = "",
|
||||||
|
shelfSpace ="",
|
||||||
ReceiveTime = boxd.CreateTime.HasValue ? boxd.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
ReceiveTime = boxd.CreateTime.HasValue ? boxd.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||||
Receiver = boxd.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, boxd.ReceiverId.Value) : "",
|
Receiver = boxd.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, boxd.ReceiverId.Value) : "",
|
||||||
SerialNumbers = boxdetail.SerialNumbers != null && boxdetail.SerialNumbers.Count() > 0 ? (string.Join(",", boxdetail.SerialNumbers).TrimEnd(',')) : "",
|
SerialNumbers = boxdetail.SerialNumbers != null && boxdetail.SerialNumbers.Count() > 0 ? (string.Join(",", boxdetail.SerialNumbers).TrimEnd(',')) : "",
|
||||||
@@ -281,6 +283,7 @@ namespace WMS.Web.Repositories
|
|||||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),
|
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),
|
||||||
ShelfTime = "",
|
ShelfTime = "",
|
||||||
Shelfer = "",
|
Shelfer = "",
|
||||||
|
shelfSpace = "",
|
||||||
ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||||
Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "",
|
Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "",
|
||||||
SerialNumbers = x.detail.SerialNumbers != null && x.detail.SerialNumbers.Count() > 0 ? (string.Join(",", x.detail.SerialNumbers).TrimEnd(',')) : "",
|
SerialNumbers = x.detail.SerialNumbers != null && x.detail.SerialNumbers.Count() > 0 ? (string.Join(",", x.detail.SerialNumbers).TrimEnd(',')) : "",
|
||||||
|
|||||||
Reference in New Issue
Block a user