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 11:23:11 +08:00
parent a368d7628b
commit 711dccc857
7 changed files with 14 additions and 9 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.

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

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

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

@ -40,12 +40,12 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
if (type.WeldTypeName == "焊条" || type.WeldTypeName == "焊丝") if (type.WeldTypeName == "焊条" || type.WeldTypeName == "焊丝")
{ {
unit = "根"; unit = "根";
txtAmount.Text = mat.Amount.Value.ToString("0.##") + "根"; txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "根";
} }
else else
{ {
unit = "公斤"; 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('/'); string[] weldNames = weld.WeldName.Split('/');
@ -280,11 +280,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
} }
if (weldTypeName == "焊丝" || weldTypeName == "焊条") 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 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)) if (!string.IsNullOrEmpty(material.StoreMan))
{ {

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

@ -263,13 +263,14 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
} }
if (weldTypeName == "焊丝" || weldTypeName == "焊条") 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 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)) if (!string.IsNullOrEmpty(material.StoreMan))
{ {
var store = BLL.StoremanInfoService.GetStoremanById(material.StoreMan); var store = BLL.StoremanInfoService.GetStoremanById(material.StoreMan);