入库接口调整

This commit is contained in:
tongfei
2023-10-30 15:52:58 +08:00
parent e4c46444d1
commit f2e6ef430d
21 changed files with 767 additions and 147 deletions

View File

@@ -26,8 +26,12 @@ namespace WMS.Web.Core.Dto
/// 入库单类型
/// </summary>
public Dictionary<string, string> InstockType { get; set; } = new Dictionary<string, string>();
/// <summary>
/// 入库状态
/// </summary>
public Dictionary<string, string> InstockStatus { get; set; } = new Dictionary<string, string>();
}
}

View File

@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace WMS.Web.Core.Dto.InStock
{
/// <summary>
/// 保存入库单明细-请求对象
/// </summary>
public class SaveInStockDetailsRequest
{
/// <summary>
/// 来源单号
///</summary>
[Required(ErrorMessage = "来源单号不能为空")]
public string SourceBillNo { get; set; }
/// <summary>
/// 供应商
/// </summary>
[Required(ErrorMessage = "供应商不能为空")]
public int SupplierId { get; set; }
/// <summary>
/// 组织
/// </summary>
[Required(ErrorMessage = "组织不能为空")]
public int OrgId { get; set; }
/// <summary>
/// 物料Id
///</summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
///</summary>
[Required(ErrorMessage = "仓库不能为空")]
public int StockId { get; set; }
/// <summary>
/// 仓位ID
///</summary>
[Required(ErrorMessage = " 仓位不能为空")]
public int SubStockId { get; set; }
/// <summary>
/// 入库数量
///</summary>
[Required(ErrorMessage = "入库数量不能为空")]
public decimal Qty { get; set; }
}
}

View File

@@ -18,43 +18,14 @@ namespace WMS.Web.Core.Dto.InStock
public int Type { get; set; }
/// <summary>
/// 来源单号
///</summary>
[Required(ErrorMessage = "来源单号不能为空")]
public string SourceBillNo { get; set; }
/// <summary>
/// 供应商
/// 任务单ID
/// </summary>
[Required(ErrorMessage = "供应商不能为空")]
public int SupplierId { get; set; }
[Required(ErrorMessage = "任务单ID不能为空")]
public int TaskId { get; set; }
/// <summary>
/// 组织
/// 明细
/// </summary>
[Required(ErrorMessage = "组织不能为空")]
public int OrgId { get; set; }
/// <summary>
/// 物料Id
///</summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库ID
///</summary>
[Required(ErrorMessage = "仓库不能为空")]
public int StockId { get; set; }
/// <summary>
/// 仓位ID
///</summary>
[Required(ErrorMessage = " 仓位不能为空")]
public int SubStockId { get; set; }
/// <summary>
/// 入库数量
///</summary>
[Required(ErrorMessage = "入库数量不能为空")]
public decimal Qty { get; set; }
public List<SaveInStockDetailsRequest> Details { get; set; } = new List<SaveInStockDetailsRequest>();
}
}

View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.InStockTask
{
/// <summary>
/// 入库任务单-详情信息
/// </summary>
public class InStockTaskInfoDto
{
}
}

View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.InStockTask
{
/// <summary>
/// 修改-入库任务单-明细对象
/// </summary>
public class UpdateInStockTaskDetailsRequest
{
/// <summary>
/// 明细ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 单据头ID
/// </summary>
public int Fid { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 收货数量
/// </summary>
public decimal ReceiveQty { get; set; }
}
}

View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace WMS.Web.Core.Dto.InStockTask
{
/// <summary>
/// 入库任务-修改请求对象
/// </summary>
public class UpdateInStockTaskRequest
{
/// <summary>
/// 单据ID
/// </summary>
[Required(ErrorMessage = "唯一编号不能未空")]
public int Id { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<UpdateInStockTaskDetailsRequest> Details { get; set; } = new List<UpdateInStockTaskDetailsRequest>();
}
}

View File

@@ -13,5 +13,50 @@ namespace WMS.Web.Core.Dto
/// 来源单号
/// </summary>
public string SourceBillNo { get; set; }
/// <summary>
/// 入库类型
/// </summary>
public int? Type { get; set; }
/// <summary>
/// 入库状态
/// </summary>
public int? Status { get; set; }
/// <summary>
/// 收货人
/// </summary>
public string Receiver { get; set; }
/// <summary>
/// 上架人
/// </summary>
public string Operator { get; set; }
/// <summary>
/// 创建时间(入库时间)
/// </summary>
public DateTime? CreateBeginDate { get; set; } = null;
/// <summary>
/// 创建时间(入库时间)
/// </summary>
public DateTime? CreateEndDate { get; set; } = null;
/// <summary>
/// 供应商ID
/// </summary>
public int? SupplierId { get; set; }
/// <summary>
/// 组织ID
/// </summary>
public int? OrgId { get; set; }
/// <summary>
/// 物料编码
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 仓库ID
/// </summary>
public int? StockId { get; set; }
}
}

View File

@@ -94,11 +94,11 @@ namespace WMS.Web.Core.Dto
/// <summary>
/// 上架人
/// </summary>
public string Operator { get; set; }
public string Shelfer { get; set; }
/// <summary>
/// 入库时间
/// </summary>
public DateTime OperateTime { get; set; }
public DateTime ShelfTime { get; set; }
/// <summary>
/// 明细备注
/// </summary>