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

Compare commits

base: gaofei:ca6008fff6ca5ca8dac2c65ac1cb7bfe8941846a
Branches Tags
gaofei:master
..
compare: gaofei:c8d7d0652a0bdc313c2deeddc6c4d080c55d935a
Branches Tags
gaofei:master

No commits in common. "ca6008fff6ca5ca8dac2c65ac1cb7bfe8941846a" and "c8d7d0652a0bdc313c2deeddc6c4d080c55d935a" have entirely different histories.
ca6008fff6 ... c8d7d0652a

11 changed files with 15 additions and 31 deletions
Show Stats 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/.vs/config/applicationhost.config
View File

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

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

@ -232,8 +232,10 @@ 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_bw1jot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_hotjot").ToString());
sb.AppendFormat("<td></td>");
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("maybe_bw1jot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString());
sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Inputhotjot").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("</table>");

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2019;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

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

@ -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.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.Value.ToString("0.#") + "Kg" : "";
}
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 == "焊条")
{
number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
number = material.Amount.HasValue ? material.Amount.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.Value.ToString("0.#") + "Kg" : "";
}
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 == "焊条")
{
number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
number = material.Amount.HasValue ? material.Amount.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.Value.ToString("0.#") + "Kg" : "";
}
if (!string.IsNullOrEmpty(material.StoreMan))

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

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