lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2023-11-26 18:46:42 +08:00
parent 560f6d8b7b
commit a543e35f45
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+9 -10
View File
@@ -77,8 +77,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//} //}
//else //else
//{ //{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList(); unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList(); unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//} //}
if (unitWork1.Count() > 0) if (unitWork1.Count() > 0)
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>(); List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
pipeline = (from x in Funs.DB.HJGL_Pipeline pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode orderby x.PipelineCode
select x).ToList(); select x).ToList();
@@ -285,19 +285,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
strSql += " AND WeldJointCode LIKE @WeldJointCode"; strSql += " AND WeldJointCode LIKE @WeldJointCode";
listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%")); listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%"));
} }
if (DropTwoJointType.SelectedValue!=BLL.Const._Null) if (DropTwoJointType.SelectedValue != BLL.Const._Null)
{ {
strSql += " AND TwoJointType = @TwoJointType"; strSql += " AND TwoJointType = @TwoJointType";
listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue)); listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue));
} }
if (ckIsAudit.Checked==true) if (ckIsAudit.Checked == true)
{ {
strSql += " and AuditDate is null"; strSql += " and AuditDate is null";
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var SizeSum = tb.AsEnumerable().Select(x => x.Field<decimal>("Size")).Sum(); var SizeSum = tb.AsEnumerable().Select(x => x.Field<decimal>("Size")).Sum();
lbSize.Text=SizeSum.ToString(); lbSize.Text = SizeSum.ToString();
// 2.获取当前分页数据 // 2.获取当前分页数据
Grid1.RecordCount = tb.Rows.Count; Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb); var table = this.GetPagedDataTable(Grid1, tb);
@@ -475,7 +475,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
{ {
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null select x; var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null && x.IsTwoJoint == true select x;
if (jotList.Count() > 0) if (jotList.Count() > 0)
{ {
foreach (var jot in jotList) foreach (var jot in jotList)
@@ -504,7 +504,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
newJot.PreTemperature = wps.PreTemperature; newJot.PreTemperature = wps.PreTemperature;
newJot.IsHotProess = wps.IsHotProess; newJot.IsHotProess = wps.IsHotProess;
newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode)); newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
newJot.IsTwoJoint = true;
BLL.WeldJointService.UpdateConWeldJoint(newJot); BLL.WeldJointService.UpdateConWeldJoint(newJot);
} }
} }
@@ -911,7 +910,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
NPOI.SS.UserModel.ICell cell; NPOI.SS.UserModel.ICell cell;
cell = row1.CreateCell(0); cell = row1.CreateCell(0);
cell.CellStyle = cellStyle0; cell.CellStyle = cellStyle0;
cell.SetCellValue((i+1).ToString()); cell.SetCellValue((i + 1).ToString());
cell = row1.CreateCell(1); cell = row1.CreateCell(1);
cell.CellStyle = cellStyle0; cell.CellStyle = cellStyle0;
cell.SetCellValue(this.Grid1.Rows[i].Values[2].ToString()); cell.SetCellValue(this.Grid1.Rows[i].Values[2].ToString());
@@ -926,7 +925,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string date1 = this.Grid1.Rows[i].Values[5].ToString(); string date1 = this.Grid1.Rows[i].Values[5].ToString();
if (!string.IsNullOrEmpty(date1)) if (!string.IsNullOrEmpty(date1))
{ {
date1 = string.Format("{0:yyyy-MM-dd}",Funs.GetNewDateTime(date1)); date1 = string.Format("{0:yyyy-MM-dd}", Funs.GetNewDateTime(date1));
} }
cell.SetCellValue(date1); cell.SetCellValue(date1);
cell = row1.CreateCell(5); cell = row1.CreateCell(5);