diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo
index 5ce06a5..5f598a7 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 31c4235..0e6e309 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 1ae5eaf..50e3bf5 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 8a1ac60..e3d675c 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 46a3358..067c7a0 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
@@ -1086,11 +1086,11 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                     }
                     if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : "";
+                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
                     }
                     else
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : "";
+                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? 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 ef9590a..1f244a5 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
@@ -280,11 +280,11 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                     }
                     if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : "";
+                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
                     }
                     else
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : "";
+                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? 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 25a2492..950a2cd 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
@@ -263,11 +263,11 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                         }
                         if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                         {
-                            number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : "";
+                            number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";                            
                         }
                         else
                         {
-                            number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : "";
+                            number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
                         }
 
                         if (!string.IsNullOrEmpty(material.StoreMan))