调整物料编码

This commit is contained in:
18942506660
2024-03-16 15:39:45 +08:00
parent 405b414912
commit d8e2c7509d
28 changed files with 343 additions and 160 deletions

View File

@@ -29,10 +29,14 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
/// </summary>
[Required(ErrorMessage = "目标箱号不能为空")]
public string DestBoxBillNo { get; set; }
///// <summary>
///// 目标箱仓位或重新上架选择仓位
/////</summary>
//public int SubStockId { get; set; } = 0;
/// <summary>
/// 目标箱仓位或重新上架选择仓位
///</summary>
public int SubStockId { get; set; } = 0;
public string SubStockCode { get; set; }
/// <summary>
/// 明细
/// </summary>
@@ -44,23 +48,23 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
public class SaveChangeBoxRecordDetailsRequest
{
public SaveChangeBoxRecordDetailsRequest() { }
public SaveChangeBoxRecordDetailsRequest(int materialId, decimal qty, List<string> serialNumbers)
public SaveChangeBoxRecordDetailsRequest(string materialNumber, decimal qty, List<string> serialNumbers)
{
this.MaterialId = materialId;
this.MaterialNumber = materialNumber;
this.Qty = qty;
this.SerialNumbers = serialNumbers;
}
public SaveChangeBoxRecordDetailsRequest(int materialId, decimal qty, string serialNumber)
public SaveChangeBoxRecordDetailsRequest(string materialNumber, decimal qty, string serialNumber)
{
this.MaterialId = materialId;
this.MaterialNumber = materialNumber;
this.Qty = qty;
this.SerialNumbers.Add(serialNumber);
}
/// <summary>
/// 物料ID
/// </summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//[Required(ErrorMessage = "物料不能为空")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>

View File

@@ -13,10 +13,14 @@ namespace WMS.Web.Core.Dto.Inventory
/// 序列号
/// </summary>
public string SerialNumber { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//public int MaterialId { get; set; }
/// <summary>
/// 物料ID
/// 物料编码
/// </summary>
public int MaterialId { get; set; }
public string MaterialNumber { get; set; }
/// <summary>
/// wms箱ID
/// </summary>

View File

@@ -15,11 +15,16 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
/// </summary>
[Required(ErrorMessage = "箱号不能为空")]
public int BoxId { get; set; }
///// <summary>
///// 仓位ID
///// </summary>
//[Required(ErrorMessage = "仓位不能为空")]
//public int SubStockId { get; set; }
/// <summary>
/// 仓位ID
/// 仓位
/// </summary>
[Required(ErrorMessage = "仓位不能为空")]
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 数量
/// </summary>
@@ -36,11 +41,11 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
/// </summary>
public class SaveMoveBoxRecordDetailsRequest
{
/// <summary>
/// 物料Id
///</summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
///// <summary>
///// 物料Id
/////</summary>
//[Required(ErrorMessage = "物料不能为空")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>

View File

@@ -25,10 +25,10 @@ namespace WMS.Web.Core.Dto.OutStock
}
public class SaveOutStockDetailsRequest
{
/// <summary>
/// 物料Id
///</summary>
public int MaterialId { get; set; }
///// <summary>
///// 物料Id
/////</summary>
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
@@ -43,10 +43,10 @@ namespace WMS.Web.Core.Dto.OutStock
///</summary>
[Required(ErrorMessage = "箱不能为空")]
public int BoxId { get; set; }
/// <summary>
/// 箱对应仓位不能为空
/// </summary>
public int SubStockId { get; set; }
///// <summary>
///// 箱对应仓位不能为空
///// </summary>
//public int SubStockId { get; set; }
/// <summary>
/// 仓位
/// </summary>

View File

@@ -15,21 +15,26 @@ namespace WMS.Web.Core.Dto.TakeStock
/// </summary>
[Required(ErrorMessage = "箱不能为空")]
public int BoxId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
///// <summary>
///// 物料ID
///// </summary>
//[Required(ErrorMessage = "物料不能为空")]
//public int MaterialId { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[Required(ErrorMessage = "物料不能为空")]
public string MaterialNumber { get; set; }
///// <summary>
///// 仓位ID
///// </summary>
//[Required(ErrorMessage = "仓位不能为空")]
//public int SubStockId { get; set; }
/// <summary>
/// 仓位ID
/// 仓位
/// </summary>
[Required(ErrorMessage = "仓位不能为空")]
public int SubStockId { get; set; }
public string SubStockCode { get; set; }
/// <summary>
/// 子仓库(跟金蝶交互字段)
/// </summary>