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

WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs

@@ -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 单据属性

WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs

@@ -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>
         /// 物料供应商

WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs

@@ -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>
         /// 物料供应商

WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs

@@ -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; }
     }
 

WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs

@@ -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; }

WCS.Model/ApiModel/MatDetailCurrentInfo/UpdateMatDetailCurrentInfoByIdRequest.cs

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

WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs

@@ -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; }
 

WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs

@@ -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;
 

WCS.Model/ApiModel/PDAProductionLineCallOut/UpdateMatDetailCurrentInForCallOutRequest.cs

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

WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs

@@ -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>
         /// 物料供应商

WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs

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

WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs

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

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

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

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

@@ -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的值！");

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

@@ -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();