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

1

This commit is contained in:
高飞 2025-07-09 15:01:46 +08:00
parent 8ce39f37ad
commit a21b5be88e
6 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HJGL_DS/FineUIPro.Web/ErrLog.txt
View File

@ -49,3 +49,15 @@ IP地址:::1
出错时间:07/07/2025 10:10:27
错误信息开始=====>
错误类型:FormatException
错误信息:输入字符串的格式不正确。
错误堆栈:
在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
在 System.Number.ParseDecimal(String value, NumberStyles options, NumberFormatInfo numfmt)
在 System.Decimal.Parse(String s)
在 BLL.Funs.GetNewDecimalOrZero(String value) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\BLL\Funs.cs:行号 386
出错时间:07/08/2025 16:56:56
出错时间:07/08/2025 16:56:56

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

8
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
View File

@ -59,10 +59,12 @@
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow Hidden="true" runat="server" ID="trRemainingAmount" ColumnWidths="25% 25% 50%">
<f:FormRow Hidden="true" runat="server" ID="trRemainingAmount">
<Items>
<f:Label runat="server" ID="lbRemainingAmount" Text="库存重量(公斤)：" CssClass="customlabel"></f:Label>
<f:Label runat="server" ID="lbReAmount" Label="库存数量(根)" CssClass="customlabel" LabelAlign="Right"></f:Label>
<f:NumberBox ID="lbRemainingAmount" runat="server" Label="库存重量(公斤)" LabelWidth="120px" DecimalPrecision="4" LabelAlign="Right" NoNegative="true" AutoPostBack="true" OnTextChanged="txtRemainingAmount_TextChanged">
</f:NumberBox>
<f:NumberBox ID="lbReAmount" runat="server" Label="库存数量(根)" LabelWidth="120px" DecimalPrecision="4" LabelAlign="Right" NoNegative="true" AutoPostBack="true" OnTextChanged="txtRemainingAmount2_TextChanged">
</f:NumberBox>
<f:NumberBox ID="txtRecycleAmount" runat="server" Label="回收数量(根)" LabelAlign="Right" NoNegative="true">
</f:NumberBox>
</Items>

47
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.cs
View File

@ -123,7 +123,7 @@ namespace FineUIPro.Web.WeldMat.Stock
this.lbReAmount.Text = remainingAmount.ToString("0.####");
if (weld.ConvertValue > 0)
{
this.lbRemainingAmount.Text = "库存重量(公斤)：" + (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
this.lbRemainingAmount.Text = (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
}
else
{
@ -346,7 +346,7 @@ namespace FineUIPro.Web.WeldMat.Stock
protected void txtAmount_TextChanged(object sender, EventArgs e)
{
if (this.trRemainingAmount.Hidden == false)
if (this.trRemainingAmount.Hidden == true)
{
if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
{
@ -357,7 +357,7 @@ namespace FineUIPro.Web.WeldMat.Stock
decimal remainingAmount = Funs.GetNewDecimalOrZero(this.txtAmount.Text.Trim()) - (stockIn.UsingAmount ?? 0);
if (weld.ConvertValue > 0)
{
this.lbRemainingAmount.Text = "库存重量(公斤)：" + (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
this.lbRemainingAmount.Text = (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
}
this.lbReAmount.Text = remainingAmount.ToString("0.####");
//if (weld.ConvertValue.HasValue)
@ -374,6 +374,47 @@ namespace FineUIPro.Web.WeldMat.Stock
}
}
}
protected void txtRemainingAmount_TextChanged(object sender, EventArgs e)
{
if (this.trRemainingAmount.Hidden == false)
{
if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
{
var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text.Trim());
if (weld != null)
{
Model.Weld_StockIn stockIn = BLL.StockInService.GetStockInById(this.StockInId);
decimal remainingAmount = Funs.GetNewDecimalOrZero(this.lbRemainingAmount.Text.Trim());
decimal remainingWeight = Funs.GetNewDecimalOrZero(this.txtWeight.Text.Trim()) - remainingAmount;
if (weld.ConvertValue > 0)
{
//this.lbRemainingAmount.Text = "库存重量(公斤)：" + (remainingAmount * weld.ConvertValue.Value).ToString("0.####");
int c = (int)Math.Ceiling(remainingAmount / weld.ConvertValue.Value);
this.lbReAmount.Text = c.ToString();
this.txtAmount.Text = ((stockIn.UsingAmount ?? 0) + c).ToString();
}
}
}
}
}
protected void txtRemainingAmount2_TextChanged(object sender, EventArgs e)
{
if (this.trRemainingAmount.Hidden == false)
{
if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
{
var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text.Trim());
if (weld != null)
{
Model.Weld_StockIn stockIn = BLL.StockInService.GetStockInById(this.StockInId);
int c = Funs.GetNewIntOrZero(this.lbReAmount.Text.Trim());
this.txtAmount.Text = ((stockIn.UsingAmount ?? 0) + c).ToString();
}
}
}
}
#endregion
//protected void rblIsReview_SelectedIndexChanged(object sender, EventArgs e)

4
HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx.designer.cs generated
View File

@ -145,7 +145,7 @@ namespace FineUIPro.Web.WeldMat.Stock {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbRemainingAmount;
protected global::FineUIPro.NumberBox lbRemainingAmount;
/// <summary>
/// lbReAmount 控件。
@ -154,7 +154,7 @@ namespace FineUIPro.Web.WeldMat.Stock {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbReAmount;
protected global::FineUIPro.NumberBox lbReAmount;
/// <summary>
/// txtRecycleAmount 控件。

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />