This commit is contained in:
tongfei
2024-03-18 11:03:51 +08:00
parent c0520b5cd3
commit 896450fd23
49 changed files with 394 additions and 536 deletions

View File

@@ -38,6 +38,12 @@ namespace WMS.Web.Core.Dto.Erp
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 仓库ID
/// </summary>

View File

@@ -22,12 +22,6 @@ namespace WMS.Web.Core.Dto
[Ignore]
public int TaskId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Ignore]
public int MaterialId { get; set; }
/// <summary>
/// 明细ID
/// </summary>

View File

@@ -33,11 +33,12 @@ namespace WMS.Web.Core.Dto.InStock
///</summary>
[Required(ErrorMessage = "仓库不能为空")]
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
///</summary>
/// 仓位编码
/// </summary>
[Required(ErrorMessage = " 仓位不能为空")]
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 箱信息
@@ -72,10 +73,10 @@ namespace WMS.Web.Core.Dto.InStock
public class NoPurchaseShelfDetailsRequest
{
/// <summary>
/// 物料Id
///</summary>
/// 物料编码
/// </summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 供应商

View File

@@ -18,10 +18,11 @@ namespace WMS.Web.Core.Dto.InStock
/// 仓库编码
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 明细

View File

@@ -41,10 +41,10 @@ namespace WMS.Web.Core.Dto.InStock
public int ErpDetailId { get; set; }
/// <summary>
/// 物料Id
///</summary>
/// 物料编码
/// </summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 入库数量

View File

@@ -50,11 +50,6 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary>
public int ErpDetailId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>

View File

@@ -46,10 +46,11 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary>
public class ContrastBoxDetailsResponse
{
/// <summary>
/// 物料
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 数量

View File

@@ -101,11 +101,6 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary>
public string StockName { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>

View File

@@ -47,11 +47,6 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary>
public string StockName { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>

View File

@@ -16,9 +16,9 @@ namespace WMS.Web.Core.Dto.InStockTask
public int ErpDetailId { get; set; }
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 收货数量
/// </summary>

View File

@@ -14,11 +14,6 @@ namespace WMS.Web.Core.Dto.Inventory
/// </summary>
public int InventoryInOutType { get; set; }
///// <summary>
///// 出入库存-方式(详情见枚举值)必填1-box按箱2-product按产品-------弃用
///// </summary>
//public int InventoryInOutMethod { get; set; }
/// <summary>
/// 箱ID
/// </summary>
@@ -35,9 +30,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 明细
@@ -51,9 +46,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class BoxInventoryBackDetailsGenerateDto
{
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 数量
/// </summary>

View File

@@ -30,9 +30,10 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 目标箱的仓位(可为空:当目标箱不需要上架时候)
/// 仓位编码 目标箱的仓位(可为空:当目标箱不需要上架时候)
/// </summary>
public int? SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 目标箱组织编码
@@ -52,9 +53,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class BoxInventoryDetailsChangeGenerateDto
{
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 数量

View File

@@ -35,9 +35,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string Stock { get; set; }
/// <summary>
/// 仓位ID
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public int SubStockCode { get; set; }
/// <summary>
/// 仓位名称
@@ -62,11 +62,6 @@ namespace WMS.Web.Core.Dto.Inventory
public class BoxInventoryDetailsResponse:EntityBase
{
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>

View File

@@ -35,9 +35,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位为空的时候,就是出库等操作,有值的时候就是移箱改箱和上架操作
/// 仓位编码:为空的时候,就是出库等操作,有值的时候就是移箱改箱和上架操作
/// </summary>
public int? SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 明细
@@ -51,10 +51,10 @@ namespace WMS.Web.Core.Dto.Inventory
public class BoxInventoryGenerateDetailsDto
{
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 物料库存数量
/// </summary>

View File

@@ -25,9 +25,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 类型1为入库2为出库
@@ -48,9 +48,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class BoxInventoryMoveDetailsGenerateDto
{
/// <summary>
/// 物料Id
///</summary>
public int MaterialId { get; set; }
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 数量
/// </summary>

View File

@@ -15,9 +15,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// 仓位编码
/// </summary>
public int? SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 箱号

View File

@@ -30,9 +30,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 明细
@@ -46,9 +46,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class BoxInventoryTakeDetailsGenerateDto
{
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 数量
/// </summary>

View File

@@ -10,9 +10,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class InventoryDetailsGenerateDto
{
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 组织编码
@@ -25,9 +25,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 数量:出入库

View File

@@ -15,9 +15,9 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位
/// 仓位编码
/// </summary>
public int? SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 物料编码

View File

@@ -10,9 +10,9 @@ namespace WMS.Web.Core.Dto.Inventory
public class InventoryDetailsSummaryResponse
{
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 组织编码
/// </summary>

View File

@@ -20,19 +20,18 @@ namespace WMS.Web.Core.Dto.Inventory
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// 仓位编码
/// </summary>
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 箱ID
/// </summary>
public int BoxId { get; set; }
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// 单据类型