diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo
index bac756c..2f05814 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide
index e96ed3a..26c02b0 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm
index 8cad8f9..5218227 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
index 680cc0b..3abdf2f 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
index 937aeae..12ca7b7 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
@@ -1086,11 +1086,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                     }
                     if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                     {
-                        number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根";
                     }
                     else
                     {
-                        number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg";
                     }
                     if (!string.IsNullOrEmpty(material.StoreMan))
                     {
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
index efb5ff8..aa66c47 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
@@ -40,12 +40,12 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                         if (type.WeldTypeName == "焊条" || type.WeldTypeName == "焊丝")
                         {
                             unit = "根";
-                            txtAmount.Text = mat.Amount.Value.ToString("0.##") + "根";
+                            txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "根";
                         }
                         else
                         {
                             unit = "公斤";
-                            txtAmount.Text = mat.Amount.Value.ToString("0.##") + "Kg";
+                            txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "Kg";
                         }
 
                         string[] weldNames = weld.WeldName.Split('/');
@@ -280,11 +280,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                     }
                     if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                     {
-                        number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根";
                     }
                     else
                     {
-                        number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg";
                     }
                     if (!string.IsNullOrEmpty(material.StoreMan))
                     {
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
index 24cd899..73c5d13 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
@@ -263,13 +263,14 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                         }
                         if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                         {
-                            number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                            //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                            number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根";
                         }
                         else
                         {
-                            number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                            //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                            number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg";
                         }
-
                         if (!string.IsNullOrEmpty(material.StoreMan))
                         {
                             var store = BLL.StoremanInfoService.GetStoremanById(material.StoreMan);