diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index 5f598a7..bac756c 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 0e6e309..e96ed3a 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-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index 61b77a0..680cc0b 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 067c7a0..937aeae 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.#") + "根" : 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.#") + "根" : ""; } else { - number = material.Amount.HasValue ? 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" : ""; } 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 1f244a5..efb5ff8 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.#") + "根" : 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.#") + "根" : ""; } else { - number = material.Amount.HasValue ? 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" : ""; } 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 950a2cd..24cd899 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.#") + "根" : 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.#") + "根" : ""; } else { - number = material.Amount.HasValue ? 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" : ""; } if (!string.IsNullOrEmpty(material.StoreMan))