修改仓位
This commit is contained in:
@@ -6212,14 +6212,6 @@
|
|||||||
<param name="materialId"></param>
|
<param name="materialId"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.Getuc_warehouse_position(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.uc_warehouse_position},System.String)">
|
|
||||||
<summary>
|
|
||||||
获取物料规格型号
|
|
||||||
</summary>
|
|
||||||
<param name="erpMaterials"></param>
|
|
||||||
<param name="materialId"></param>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
|
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
|
||||||
<summary>
|
<summary>
|
||||||
获取物料名称
|
获取物料名称
|
||||||
|
|||||||
@@ -86,7 +86,6 @@ namespace WMS.Web.Domain.IService.Public
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
string GetMaterialSpecifications(List<ErpMaterialDto> erpMaterials, string materialNumber);
|
string GetMaterialSpecifications(List<ErpMaterialDto> erpMaterials, string materialNumber);
|
||||||
|
|
||||||
string Getuc_warehouse_position(List<uc_warehouse_position> warehouse_position, string positionCode);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取物料基本单位名称
|
/// 获取物料基本单位名称
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ namespace WMS.Web.Domain.Infrastructure
|
|||||||
|
|
||||||
/// 查询实体集合
|
/// 查询实体集合
|
||||||
Task<List<uc_warehouse_position>> Getuc_warehouse_position();
|
Task<List<uc_warehouse_position>> Getuc_warehouse_position();
|
||||||
|
string Getuc_warehouse_position(List<uc_warehouse_position> warehouse_position, string positionCode);
|
||||||
|
|
||||||
|
|
||||||
Task<List<Box>> GetEntityListByNos(List<string> billNos);
|
Task<List<Box>> GetEntityListByNos(List<string> billNos);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,23 +99,7 @@ namespace WMS.Web.Domain.Services.Public
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取物料规格型号
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="erpMaterials"></param>
|
|
||||||
/// <param name="materialId"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public string Getuc_warehouse_position(List<uc_warehouse_position> warehouse_position, string positionCode)
|
|
||||||
{
|
|
||||||
if (warehouse_position == null || warehouse_position.Count == 0)
|
|
||||||
return "";
|
|
||||||
var mat = warehouse_position.Where(x => x.position_code == positionCode).FirstOrDefault();
|
|
||||||
if (mat == null)
|
|
||||||
{
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
return mat.position;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取物料名称
|
/// 获取物料名称
|
||||||
|
|||||||
@@ -225,6 +225,23 @@ namespace WMS.Web.Repositories
|
|||||||
return res.Clone();
|
return res.Clone();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取仓位
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="erpMaterials"></param>
|
||||||
|
/// <param name="materialId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string Getuc_warehouse_position(List<uc_warehouse_position> warehouse_position, string positionCode)
|
||||||
|
{
|
||||||
|
if (warehouse_position == null || warehouse_position.Count == 0)
|
||||||
|
return "";
|
||||||
|
var mat = warehouse_position.Where(x => x.position_code == positionCode).FirstOrDefault();
|
||||||
|
if (mat == null)
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return mat.position;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
|
|
||||||
//取仓位
|
//取仓位
|
||||||
var positions = new List<uc_warehouse_position>();
|
//var positions = new List<uc_warehouse_position>();
|
||||||
var postionList = await _boxRepositories.Getuc_warehouse_position();
|
var postionList = await _boxRepositories.Getuc_warehouse_position();
|
||||||
//positions = postionList
|
//positions = postionList
|
||||||
|
|
||||||
@@ -207,9 +207,9 @@ 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"),
|
||||||
shelfSpaceCode= _erpBasicDataExtendService.Getuc_warehouse_position(positions, x.order.SubStockCode),
|
shelfSpaceCode= x.order.SubStockCode,
|
||||||
|
|
||||||
shelfSpace = x.order.SubStockCode,
|
shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, 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 = "",
|
||||||
|
|||||||
Reference in New Issue
Block a user