gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250408 材料标签打印

This commit is contained in:
毕文静 2025-04-08 09:40:22 +08:00
parent acba3c7731
commit 3f229e710a
7 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL_DS/.vs/SGGL/v15/.suo
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

4
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
View File

@ -1086,11 +1086,11 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
} }
if (weldTypeName == "焊丝" || weldTypeName == "焊条") 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 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)) if (!string.IsNullOrEmpty(material.StoreMan))
{ {

4
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
View File

@ -280,11 +280,11 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
} }
if (weldTypeName == "焊丝" || weldTypeName == "焊条") 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 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)) if (!string.IsNullOrEmpty(material.StoreMan))
{ {

4
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
View File

@ -263,11 +263,11 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
} }
if (weldTypeName == "焊丝" || weldTypeName == "焊条") 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 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)) if (!string.IsNullOrEmpty(material.StoreMan))