From d7f6d6b718cc998a7d7036baaefe8897d3ef8adf Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Fri, 27 Jun 2025 14:06:52 +0800
Subject: [PATCH] =?UTF-8?q?v1.0.4=20=E6=95=B0=E9=87=8F=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AA=E6=94=AF=E6=8C=81=E6=95=B4=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 ++--
 货架标准上位机/货架标准上位机.csproj                          | 4 ++--
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailCurrentInfo.cs
index f0491fd..519f60b 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 decimal MatQty { get; set; }
+        public int MatQty { get; set; }
         #endregion
 
         #region 单据属性
diff --git a/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailHistoryInfo.cs
index 1fd2cae..540aade 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 decimal BeforeQty { get; set; }
+        public int BeforeQty { get; set; }
 
         /// <summary>
         /// 物料数量（更新后物料数量）
         /// </summary>
         [SugarColumn(ColumnName = "after_qty", IsNullable = false, ColumnDescription = "物料数量（更新后物料数量）")]
-        public decimal AfterQty { get; set; }
+        public int AfterQty { get; set; }
 
         /// <summary>
         /// 物料供应商
diff --git a/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs b/WCS.BLL/DbModels/STZL/MatDetailStocktakingInfo.cs
index 2eb2fa3..97f8298 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 decimal MatQty { get; set; }
+        public int MatQty { get; set; }
 
         /// <summary>
         /// 物料数量（盘点数量）
         /// </summary>
         [SugarColumn(ColumnName = "stocktaking_qty", IsNullable = false, ColumnDescription = "物料数量（盘点数量）")]
-        public decimal StocktakingQty { get; set; }
+        public int StocktakingQty { get; set; }
 
         /// <summary>
         /// 物料供应商
diff --git a/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs b/WCS.Model/ApiModel/BatchBindMatDetail/MatDetailCurrentInfoImportModel.cs
index 618c7fc..edebb23 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 decimal? 数量 { get; set; }
+        public int? 数量 { get; set; }
         public string 货架编码 { get; set; }
     }
 
diff --git a/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs b/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs
index 97e099c..ed7e5d4 100644
--- a/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs
+++ b/WCS.Model/ApiModel/MatDetailCurrentInfo/MatDetailCurrentInfo.cs
@@ -40,7 +40,7 @@ namespace WCS.Model.ApiModel.MatDetailCurrentInfo
 
         public string? MatCustomer { get; set; } = string.Empty;
 
-        public decimal MatQty { get; set; }
+        public int MatQty { get; set; }
         #endregion
 
         #region 批量绑定相关
@@ -60,7 +60,7 @@ namespace WCS.Model.ApiModel.MatDetailCurrentInfo
 
         public DateTime? BindTime { get; set; } = DateTime.Now;
         #region 盘点数量
-        public decimal StocktakingQty { get; set; } = -1;
+        public int 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 83aa2ce..736f786 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 decimal MatQty { get; set; }
+        public int MatQty { get; set; }
     }
 }
diff --git a/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs b/WCS.Model/ApiModel/MatDetailHistoryInfo/MatDetailHistoryInfoModel.cs
index 4911932..04d3dd1 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 decimal BeforeQty { get; set; }
+        public int BeforeQty { get; set; }
 
-        public decimal AfterQty { get; set; }
+        public int 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 cfd8426..59539af 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 decimal Qty { get; set; }
+        public int 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 201a27e..43ae2a2 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 decimal MatQty { get; set; }
+        public int MatQty { get; set; }
     }
 }
diff --git a/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs b/WCS.Model/ApiModel/Stocktaking/MatDetailStocktakingInfoModel.cs
index f345eb7..acf5c6a 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 decimal MatQty { get; set; }
+        public int MatQty { get; set; }
 
         /// <summary>
         /// 物料数量（盘点数量）
         /// </summary>
-        public decimal StocktakingQty { get; set; }
+        public int StocktakingQty { get; set; }
 
         /// <summary>
         /// 物料供应商
diff --git a/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs b/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs
index 0def62d..d05c6cb 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 decimal StocktakingQty { get; set; }
+        public int StocktakingQty { get; set; }
     }
 }
diff --git a/WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs b/WCS.Model/ApiModel/Stocktaking/UpdateStocktakingInfoRequest.cs
index c7ab0c6..20d9695 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 decimal StocktakingQty { get; set; }
+        public int StocktakingQty { get; set; }
     }
 }
diff --git a/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs b/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
index 24f35d0..2d59a03 100644
--- a/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
+++ b/货架标准上位机/ViewModels/MatDetailCurrentInfoUpdateViewModel.cs
@@ -135,8 +135,8 @@ namespace 智慧物流软件系统.ViewModel
             }
         }
 
-        private decimal matQty;
-        public decimal MatQty
+        private int matQty;
+        public int MatQty
         {
             get { return matQty; }
             set
diff --git a/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs b/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs
index 9709ab5..03f12fa 100644
--- a/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs
+++ b/货架标准上位机/Views/MatDetailCurrentInfoUpdateView.xaml.cs
@@ -38,7 +38,7 @@ namespace 智慧物流软件系统
                 try
                 {
                     txtMatQty.Text = txtMatQty.Text.Trim();
-                    var qty = decimal.Parse(txtMatQty.Text);
+                    var qty = int.Parse(txtMatQty.Text);
                     if (qty < 0)
                     {
                         HandyControl.Controls.MessageBox.Show("数量请输入大于0的值！");
diff --git a/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs b/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs
index 5864b8a..a114be7 100644
--- a/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs
+++ b/货架标准上位机/Views/MatDetailStocktakingInfoUpdateView.xaml.cs
@@ -46,7 +46,7 @@ namespace 智慧物流软件系统
         {
             try
             {
-                decimal.Parse(StocktakingQty.Text);
+                int.Parse(StocktakingQty.Text);
             }
             catch
             {
@@ -56,7 +56,7 @@ namespace 智慧物流软件系统
                 return;
             }
 
-            matDetailStocktakingInfo.StocktakingQty = decimal.Parse(StocktakingQty.Text); ;
+            matDetailStocktakingInfo.StocktakingQty = int.Parse(StocktakingQty.Text); ;
 
             this.DialogResult = true;
             this.Close();
diff --git a/货架标准上位机/货架标准上位机.csproj b/货架标准上位机/货架标准上位机.csproj
index 8f413e9..bf18c3c 100644
--- a/货架标准上位机/货架标准上位机.csproj
+++ b/货架标准上位机/货架标准上位机.csproj
@@ -8,8 +8,8 @@
 		<LangVersion>latest</LangVersion>
 		<Company>重庆盟讯电子科技有限公司</Company>
 		<Copyright>Copyright ©  2025</Copyright>
-		<AssemblyVersion>1.0.3</AssemblyVersion>
-		<FileVersion>1.0.2</FileVersion>
+		<AssemblyVersion>1.0.4</AssemblyVersion>
+		<FileVersion>1.0.4</FileVersion>
 		<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
 		<Authors>重庆盟讯电子科技有限公司</Authors>
 		<Product>智慧物流软件系统</Product>