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

提交代码

This commit is contained in:
高飞 2025-04-08 14:14:06 +08:00
parent 1d7450c522
commit f972b10f8d
7 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

4
HJGL_DS/.vs/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site> </site>
<site name="FineUIPro.Web" id="2"> <site name="FineUIPro.Web" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web" /> <virtualDirectory path="/" physicalPath="E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:64304:localhost" /> <binding protocol="http" bindingInformation="*:64304:localhost" />
@ -170,7 +170,7 @@
</site> </site>
<site name="WebAPI" id="3"> <site name="WebAPI" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\工作\鼎盛\HJGL_DS\HJGL_DS\WebAPI" /> <virtualDirectory path="/" physicalPath="E:\鼎盛\HJGL_DS\HJGL_DS\WebAPI" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:32379:localhost" /> <binding protocol="http" bindingInformation="*:32379:localhost" />

6
HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs
View File

@ -232,10 +232,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_jot").ToString()); sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_jot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString()); sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_hotjot").ToString()); sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_hotjot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString()); sb.AppendFormat("<td></td>");
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Inputhotjot").ToString()); sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("maybe_bw1jot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_OKhotjot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_NotOKhotjot").ToString());
sb.Append("</tr>"); sb.Append("</tr>");
sb.Append("</table>"); sb.Append("</table>");

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.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.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.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.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.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.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);

22
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
View File

@ -10,6 +10,23 @@ namespace FineUIPro.Web.common.ProjectSet
{ {
public partial class SelectWelder : PageBase public partial class SelectWelder : PageBase
{ {
#region 定义项
/// <summary>
/// 项目id
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
#endregion
#region 加载 #region 加载
/// <summary> /// <summary>
/// 加载页面 /// 加载页面
@ -20,6 +37,7 @@ namespace FineUIPro.Web.common.ProjectSet
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
this.ProjectId = Request.Params["projectId"];
BindGrid(); BindGrid();
//InitTreeMenu();//加载树 //InitTreeMenu();//加载树
} }
@ -58,7 +76,7 @@ namespace FineUIPro.Web.common.ProjectSet
WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId) WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId)
AND IsOAM=1"; AND IsOAM=1";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
if (!string.IsNullOrEmpty(txtWeldCode.Text)) if (!string.IsNullOrEmpty(txtWeldCode.Text))
{ {
@ -122,7 +140,7 @@ namespace FineUIPro.Web.common.ProjectSet
{ {
Model.Project_Welder newProjectWelder = new Model.Project_Welder(); Model.Project_Welder newProjectWelder = new Model.Project_Welder();
newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString(); newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString();
newProjectWelder.ProjectId = Request.Params["projectId"]; newProjectWelder.ProjectId = this.ProjectId;
newProjectWelder.IsSelected = true; newProjectWelder.IsSelected = true;
newProjectWelder.IsApprove = true; newProjectWelder.IsApprove = true;
newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder)); newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder));