ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

所有数量类型填写支持小数

Browse Source
This commit is contained in:
hehaibing-1996
2025-03-25 17:04:09 +08:00
parent 43b34b7980
commit 9fb0658a39
15 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs
View File

@ -92,7 +92,7 @@ namespace WCS.BLL.DbModels
/// 物料数量
/// </summary>
[SugarColumn(ColumnName = "mat_qty", IsNullable = false, ColumnDescription = "物料数量")]
public int MatQty { get; set; }
public decimal MatQty { get; set; }
#endregion
#region 单据属性

4
WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs
View File

@ -70,13 +70,13 @@ namespace WCS.BLL.DbModels
/// 物料数量（更新前物料数量）
/// </summary>
[SugarColumn(ColumnName = "before_qty", IsNullable = false, ColumnDescription = "物料数量（更新前物料数量）")]
public int BeforeQty { get; set; }
public decimal BeforeQty { get; set; }
/// <summary>
/// 物料数量（更新后物料数量）
/// </summary>
[SugarColumn(ColumnName = "after_qty", IsNullable = false, ColumnDescription = "物料数量（更新后物料数量）")]
public int AfterQty { get; set; }
public decimal AfterQty { get; set; }
/// <summary>
/// 物料供应商

4
WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs
View File

@ -76,13 +76,13 @@ namespace WCS.BLL.DbModels
/// 物料数量（原始数量）
/// </summary>
[SugarColumn(ColumnName = "mat_qty", IsNullable = false, ColumnDescription = "物料数量（原始数量）")]
public int MatQty { get; set; }
public decimal MatQty { get; set; }
/// <summary>
/// 物料数量（盘点数量）
/// </summary>
[SugarColumn(ColumnName = "stocktaking_qty", IsNullable = false, ColumnDescription = "物料数量（盘点数量）")]
public int StocktakingQty { get; set; }
public decimal StocktakingQty { get; set; }
/// <summary>
/// 物料供应商

2
WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs
View File

@ -13,7 +13,7 @@ namespace WCS.Model.ApiModel.BatchBindMatDetail
public string 物料批次 { get; set; }
public string 物料规格 { get; set; }
public int? 数量 { get; set; }
public decimal? 数量 { get; set; }
public string 货架编码 { get; set; }
}

4
WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs
View File

@ -36,7 +36,7 @@ namespace WCS.Model.ApiModel.MatDetailCurrentInfo
public string? MatCustomer { get; set; } = string.Empty;
public int MatQty { get; set; }
public decimal MatQty { get; set; }
#endregion
#region 批量绑定相关
@ -56,7 +56,7 @@ namespace WCS.Model.ApiModel.MatDetailCurrentInfo
public DateTime? BindTime { get; set; } = DateTime.Now;
#region 盘点数量
public int StocktakingQty { get; set; } = -1;
public decimal StocktakingQty { get; set; } = -1;
#endregion
public int RowNumber { get; set; }

2
WCS.Model/ApiModel/MatDetailCurrentInfo/UpdateMatDetailCurrentInfoByIdRequest.cs
View File

@ -8,6 +8,6 @@ namespace WCS.Model.ApiModel.MatDetailCurrentInfo
{
public int MatDetailCurrentInfoId { get; set; }
public int MatQty { get; set; }
public decimal MatQty { get; set; }
}
}

4
WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs
View File

@ -26,9 +26,9 @@ namespace WCS.Model.ApiModel.MatDetailHistoryInfo
public string MatSpec { get; set; }
public int BeforeQty { get; set; }
public decimal BeforeQty { get; set; }
public int AfterQty { get; set; }
public decimal AfterQty { get; set; }
public string? MatSupplier { get; set; }

2
WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs
View File

@ -44,7 +44,7 @@ namespace WCS.Model.ApiModel.PDAMatBind
/// <summary>
/// 物料数量
/// </summary>
public int Qty { get; set; }
public decimal Qty { get; set; }
public int NeedLocationAreaId { get; set; } = 0;

2
WCS.Model/ApiModel/PDAProductionLineCallOut/UpdateMatDetailCurrentInForCallOutRequest.cs
View File

@ -14,6 +14,6 @@ namespace WCS.Model.ApiModel.PDAProductionLineCallOut
/// <summary>
/// 修改后的数量
/// </summary>
public int MatQty { get; set; }
public decimal MatQty { get; set; }
}
}

4
WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs
View File

@ -60,12 +60,12 @@ namespace WCS.Model.ApiModel.Stocktaking
/// <summary>
/// 物料数量（原始数量）
/// </summary>
public int MatQty { get; set; }
public decimal MatQty { get; set; }
/// <summary>
/// 物料数量（盘点数量）
/// </summary>
public int StocktakingQty { get; set; }
public decimal StocktakingQty { get; set; }
/// <summary>
/// 物料供应商

2
WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs
View File

@ -8,6 +8,6 @@ namespace WCS.Model.ApiModel.Stocktaking
{
public int MatDetailCurrentInfoId { get; set; }
public int StocktakingQty { get; set; }
public decimal StocktakingQty { get; set; }
}
}

2
WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs
View File

@ -8,6 +8,6 @@ namespace WCS.Model.ApiModel.Stocktaking
{
public int MatDetailStocktakingInfoId { get; set; }
public int StocktakingQty { get; set; }
public decimal StocktakingQty { get; set; }
}
}

4
货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
View File

@ -135,8 +135,8 @@ namespace 智慧物流软件系统.ViewModel
}
}
private int matQty;
public int MatQty
private decimal matQty;
public decimal MatQty
{
get { return matQty; }
set

2
货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs
View File

@ -38,7 +38,7 @@ namespace 智慧物流软件系统
try
{
txtMatQty.Text = txtMatQty.Text.Trim();
var qty = int.Parse(txtMatQty.Text);
var qty = decimal.Parse(txtMatQty.Text);
if (qty < 0)
{
HandyControl.Controls.MessageBox.Show("数量请输入大于0的值！");

4
货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs
View File

@ -46,7 +46,7 @@ namespace 智慧物流软件系统
{
try
{
int.Parse(StocktakingQty.Text);
decimal.Parse(StocktakingQty.Text);
}
catch
{
@ -56,7 +56,7 @@ namespace 智慧物流软件系统
return;
}
matDetailStocktakingInfo.StocktakingQty = int.Parse(StocktakingQty.Text); ;
matDetailStocktakingInfo.StocktakingQty = decimal.Parse(StocktakingQty.Text); ;
this.DialogResult = true;
this.Close();