From 9fb0658a393bc31e5e03eaa39c789bc00bb95606 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Tue, 25 Mar 2025 17:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E9=87=8F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A1=AB=E5=86=99=E6=94=AF=E6=8C=81=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs                 | 2 +-
 WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs                 | 4 ++--
 WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs             | 4 ++--
 .../BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs     | 2 +-
 .../ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs     | 4 ++--
 .../UpdateMatDetailCurrentInfoByIdRequest.cs                  | 2 +-
 .../MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs         | 4 ++--
 WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs         | 2 +-
 .../UpdateMatDetailCurrentInForCallOutRequest.cs              | 2 +-
 .../ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs     | 4 ++--
 WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs      | 2 +-
 .../ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs      | 2 +-
 .../ViewModels/MatDetailCurrentInfoUpdateViewModel.cs         | 4 ++--
 货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs   | 2 +-
 .../Views/MatDetailStocktakingInfoUpdateView.xaml.cs          | 4 ++--
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs
index 519f60b..f0491fd 100644
--- a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs
+++ b/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 单据属性
diff --git a/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs
index 540aade..1fd2cae 100644
--- a/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs
+++ b/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>
         /// 物料供应商
diff --git a/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs
index 97f8298..2eb2fa3 100644
--- a/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs
+++ b/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>
         /// 物料供应商
diff --git a/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs b/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs
index edebb23..618c7fc 100644
--- a/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs
+++ b/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; }
     }
 
diff --git a/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs b/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs
index 6cd9a6a..f2ddb19 100644
--- a/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs
+++ b/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; }
diff --git a/WCS.Model/ApiModel/MatDetailCurrentInfo/UpdateMatDetailCurrentInfoByIdRequest.cs b/WCS.Model/ApiModel/MatDetailCurrentInfo/UpdateMatDetailCurrentInfoByIdRequest.cs
index 736f786..83aa2ce 100644
--- a/WCS.Model/ApiModel/MatDetailCurrentInfo/UpdateMatDetailCurrentInfoByIdRequest.cs
+++ b/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; }
     }
 }
diff --git a/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs b/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs
index 04d3dd1..4911932 100644
--- a/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs
+++ b/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; }
 
diff --git a/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs b/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs
index 59539af..cfd8426 100644
--- a/WCS.Model/ApiModel/PDAMatBind/BindMatDetailRequest.cs
+++ b/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;
 
diff --git a/WCS.Model/ApiModel/PDAProductionLineCallOut/UpdateMatDetailCurrentInForCallOutRequest.cs b/WCS.Model/ApiModel/PDAProductionLineCallOut/UpdateMatDetailCurrentInForCallOutRequest.cs
index 43ae2a2..201a27e 100644
--- a/WCS.Model/ApiModel/PDAProductionLineCallOut/UpdateMatDetailCurrentInForCallOutRequest.cs
+++ b/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; }
     }
 }
diff --git a/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs b/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs
index acf5c6a..f345eb7 100644
--- a/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs
+++ b/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>
         /// 物料供应商
diff --git a/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs b/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs
index d05c6cb..0def62d 100644
--- a/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs
+++ b/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; }
     }
 }
diff --git a/WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs b/WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs
index 20d9695..c7ab0c6 100644
--- a/WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs
+++ b/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; }
     }
 }
diff --git a/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs b/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
index 2d59a03..24f35d0 100644
--- a/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
+++ b/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
@@ -135,8 +135,8 @@ namespace 智慧物流软件系统.ViewModel
             }
         }
 
-        private int matQty;
-        public int MatQty
+        private decimal matQty;
+        public decimal MatQty
         {
             get { return matQty; }
             set
diff --git a/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs b/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs
index 03f12fa..9709ab5 100644
--- a/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs
+++ b/货架标准上位机/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的值！");
diff --git a/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs b/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs
index a114be7..5864b8a 100644
--- a/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs
+++ b/货架标准上位机/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();