18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系统的仓库标识，统一使用编码

Browse Source
This commit is contained in:
tongfei
2023-11-08 15:16:07 +08:00
parent c66741b561
commit a5775e6d95
16 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1275,9 +1275,9 @@
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTaskQueryResponse">
@@ -1445,9 +1445,9 @@
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.InStockQueryRequest.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockQueryResponse">
@@ -1570,7 +1570,7 @@
物料Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.StockId">
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.StockCode">
<summary>
仓库ID
</summary>
@@ -1675,9 +1675,9 @@
即时库存明细-查询请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.MaterialNumber">
@@ -1740,9 +1740,9 @@
物料收发明细-查询请求
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.StockId">
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.MaterialNumber">

19
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -355,9 +355,9 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockDetails.StockId">
<member name="P:WMS.Web.Domain.Entitys.InStockDetails.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockDetails.Qty">
@@ -505,11 +505,6 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.StockId">
<summary>
收货仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.StockCode">
<summary>
收货仓库编码（对应金蝶和单点）
@@ -565,9 +560,9 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryDetails.StockId">
<member name="P:WMS.Web.Domain.Entitys.InventoryDetails.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryDetails.SubStockId">
@@ -600,9 +595,9 @@
类型：1为入库，2为出库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.StockId">
<member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.StockCode">
<summary>
仓库ID
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.OrderType">
@@ -2503,7 +2498,7 @@
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForStock">
<summary>
获取仓库
erp:仓库
</summary>
<returns></returns>
</member>

4
src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs
View File

@@ -48,8 +48,8 @@ namespace WMS.Web.Core.Dto
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
}
}

2
src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs
View File

@@ -43,7 +43,7 @@ namespace WMS.Web.Core.Dto.InStock
/// 仓库ID
///</summary>
[Required(ErrorMessage = "仓库不能为空")]
public int StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
///</summary>

4
src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs
View File

@@ -55,8 +55,8 @@ namespace WMS.Web.Core.Dto
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
}
}

4
src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryRequest.cs
View File

@@ -10,9 +10,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class InventoryDetailsQueryRequest : PaginationBaseRequestDto
{
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 物料编码

4
src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryRequest.cs
View File

@@ -10,9 +10,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class InventoryInOutDetailsQueryRequest : PaginationBaseRequestDto
{
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int? StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 物料编码

4
src/WMS.Web.Domain/Entitys/InStockDetails.cs
View File

@@ -42,9 +42,9 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 数量
/// </summary>

4
src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
View File

@@ -34,10 +34,6 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 收货仓库
/// </summary>
public int StockId { get; set; }
/// <summary>
/// 收货仓库编码（对应金蝶和单点）
/// </summary>
public string StockCode { get; set; }

4
src/WMS.Web.Domain/Entitys/InventoryDetails.cs
View File

@@ -21,9 +21,9 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// </summary>

4
src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
View File

@@ -27,9 +27,9 @@ namespace WMS.Web.Domain.Entitys
public InventoryInOutType Type { get; set; }
/// <summary>
/// 仓库ID
/// 仓库编码
/// </summary>
public int StockId { get; set; }
public string StockCode { get; set; }
/// <summary>
/// 单据类型

1
src/WMS.Web.Domain/Mappers/InStockMapper.cs
View File

@@ -53,7 +53,6 @@ namespace WMS.Web.Domain.Mappers
.ForMember(x => x.SupplierId, ops => ops.MapFrom(x => x.FSupplierId))
.ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.FPurchaseOrgId))
.ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.FMaterialId))
.ForMember(x => x.StockId, ops => ops.MapFrom(x => x.FSOSTOCKID))
.ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.StockFNumber))
.ForMember(x => x.DeliveredQty, ops => ops.MapFrom(x => x.FStockInQty))
.ForMember(x => x.FactoryPrice, ops => ops.MapFrom(x => x.FCHUCHANGPRICE))

6
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -98,8 +98,8 @@ namespace WMS.Web.Repositories
if (dto.OrgId.HasValue)
query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
if (dto.StockId.HasValue)
query = query.Where(w => w.detail.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.Type.HasValue)
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
@@ -125,7 +125,7 @@ namespace WMS.Web.Repositories
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
Qty =s.detail.Qty,
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
CreateTime =s.order.CreateTime,

6
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -103,8 +103,8 @@ namespace WMS.Web.Repositories
if (dto.OrgId.HasValue)
query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
if (dto.StockId.HasValue)
query = query.Where(w => w.detail.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
if (dto.Type.HasValue)
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
@@ -251,7 +251,7 @@ namespace WMS.Web.Repositories
SourceBillNo=s.order.SourceBillNo,
MaterialId=s.detail.MaterialId,
StockCode=s.detail.StockCode,
StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),

4
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -73,8 +73,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => mids.Contains(w.MaterialId));
}
if (dto.StockId.HasValue)
query = query.Where(w => w.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode);
if (dto.Qty.HasValue)
query = query.Where(w => w.Qty == dto.Qty);

4
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -73,8 +73,8 @@ namespace WMS.Web.Repositories
query = query.Where(w => mids.Contains(w.MaterialId));
}
if (dto.StockId.HasValue)
query = query.Where(w => w.StockId == dto.StockId.Value);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.StockCode == dto.StockCode);
if (dto.OrderType.HasValue)
query = query.Where(w => (int)w.OrderType == dto.OrderType.Value);