zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-07-03

Browse Source
This commit is contained in:
李超
2023-07-03 14:46:37 +08:00
parent cba6685973
commit e575463176
26 changed files with 517 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageList.aspx.cs
+3 -3
View File
@@ -45,9 +45,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
+ @" LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId =Proce.WeldTypeId"
+ @" LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=Proce.GrooveTypeId";
List<SqlParameter> listStr = new List<SqlParameter>();
//strSql += " AND ProjeceId = @ProjectId";
//listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql += " where Proce.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/HJGL/WeldingManage/ProcedureImageListEdit.aspx.cs
+1
View File
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string imageId = Request.Params["ImageId"];
Model.PW_ProcedureImageManage procedureImage = new Model.PW_ProcedureImageManage();
procedureImage.ImageContent = this.txtImageContent.Text.Trim();
procedureImage.ProjectId = this.CurrUser.LoginProjectId;
if (this.drpWeldingMethod.SelectedValue != BLL.Const._Null)
{
procedureImage.WeldingMethodId = this.drpWeldingMethod.SelectedValue;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingProcedureSearch.aspx.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
material.MaterialClass,
material.MaterialGroup"
+ @" FROM PW_WeldingProcedure AS weldingProcedure"
+ @" LEFT JOIN Base_Material material ON material.MaterialId = weldingProcedure.MaterialId WHERE 1=1 ";
+ @" LEFT JOIN Base_Material material ON material.MaterialId = weldingProcedure.MaterialId WHERE ProjectId = '"+this.CurrUser.LoginProjectId+"' ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtWeldingProcedureIdS.Text.Trim()))
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingProcedureSearchEdit.aspx.cs
+1
View File
@@ -78,6 +78,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string weldingProcedureId = Request.Params["weldingProcedureId"];
Model.PW_WeldingProcedure weldingProcedure = new Model.PW_WeldingProcedure();
weldingProcedure.WeldingProcedureCode = this.txtWeldingProcedureId.Text.Trim();
weldingProcedure.ProjectId = this.CurrUser.LoginProjectId;
weldingProcedure.WType = this.txtWtype.Text.Trim();
if (this.drpSte_Name.SelectedValue != BLL.Const._Null)
{