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-23 18:52:01 +08:00
parent 1530dd850b
commit 56fe58fe54
19 changed files with 326 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManageEdit.aspx.cs
+1 -1
View File
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
{ {
string PersonId = Request.Params["PersonId"]; string PersonId = Request.Params["PersonId"];
var q = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.WelderCode == this.txtWelderCode.Text.Trim() var q = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.WelderCode == this.txtWelderCode.Text.Trim()
&& (x.PersonId != PersonId || (PersonId == null && PersonId != null))); && (x.PersonId != PersonId || (PersonId == null && PersonId != null)) && x.ProjectId == this.CurrUser.LoginProjectId);
if (q != null) if (q != null)
{ {
Alert.ShowInTop("焊工号已经存在！", MessageBoxIcon.Warning); Alert.ShowInTop("焊工号已经存在！", MessageBoxIcon.Warning);
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx
+9 -2
View File
@@ -25,14 +25,21 @@
<Items> <Items>
<f:DatePicker ID="txtNDEDateMonth" runat="server" Label="月份" <f:DatePicker ID="txtNDEDateMonth" runat="server" Label="月份"
EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
Width="265px" LabelWidth="100px" DisplayType="Month" DateFormatString="yyyy-MM" LabelAlign="Right"> Width="265px" LabelWidth="90px" DisplayType="Month" DateFormatString="yyyy-MM" LabelAlign="Right">
</f:DatePicker> </f:DatePicker>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="单位名称"
LabelAlign="Right" Width="300px" LabelWidth="90px" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtSearchCode" runat="server" EmptyText="输入查询条件" <f:TextBox ID="txtSearchCode" runat="server" EmptyText="输入查询条件"
AutoPostBack="true" Label="委托单号" LabelWidth="100px" AutoPostBack="true" Label="委托单号" LabelWidth="90px"
OnTextChanged="Tree_TextChanged" LabelAlign="Right"> OnTextChanged="Tree_TextChanged" LabelAlign="Right">
</f:TextBox> </f:TextBox>
</Items> </Items>
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
+13 -4
View File
@@ -53,6 +53,7 @@ namespace FineUIPro.Web.HJGL.NDT
{ {
GetButtonPower(); GetButtonPower();
this.Type = Request.Params["Type"]; this.Type = Request.Params["Type"];
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
this.txtNDEDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.txtNDEDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.TrustBatchId = string.Empty; this.TrustBatchId = string.Empty;
@@ -148,8 +149,8 @@ namespace FineUIPro.Web.HJGL.NDT
//} //}
//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)
@@ -264,6 +265,10 @@ namespace FineUIPro.Web.HJGL.NDT
&& x.DetectionTypeId == ndtTypeId && x.DetectionRateId == item.DetectionRateId && x.DetectionTypeId == ndtTypeId && x.DetectionRateId == item.DetectionRateId
orderby x.TrustBatchCode descending orderby x.TrustBatchCode descending
select x; select x;
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
trusts = trusts.Where(x => x.UnitId == this.drpUnit.SelectedValue).OrderBy(x => x.TrustBatchCode);
}
if (item.DetectionRateValue > 0) //探伤比例为0的批不显示 if (item.DetectionRateValue > 0) //探伤比例为0的批不显示
{ {
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
@@ -300,6 +305,10 @@ namespace FineUIPro.Web.HJGL.NDT
&& x.DetectionTypeId == ndtTypeId && x.DetectionRateId == ndtRateId && x.DetectionTypeId == ndtTypeId && x.DetectionRateId == ndtRateId
orderby x.TrustBatchCode descending orderby x.TrustBatchCode descending
select x; select x;
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
trusts = trusts.Where(x => x.UnitId == this.drpUnit.SelectedValue).OrderBy(x => x.TrustBatchCode);
}
foreach (var trust in trusts) foreach (var trust in trusts)
{ {
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
@@ -318,11 +327,11 @@ namespace FineUIPro.Web.HJGL.NDT
Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(trust.PointBatchId); Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(trust.PointBatchId);
if (batch != null && batch.IsClosed == true) if (batch != null && batch.IsClosed == true)
{ {
newNode.Text = code; newNode.Text = code + "【" + BLL.UnitService.GetUnitNameByUnitId(trust.UnitId) + "】";
} }
else else
{ {
newNode.Text = "<font color='#EE0000'>" + code + "</font>"; newNode.Text = "<font color='#EE0000'>" + code + "【" + BLL.UnitService.GetUnitNameByUnitId(trust.UnitId) + "】" + "</font>";
} }
} }
else else
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.designer.cs
Generated
+18
View File
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HJGL.NDT {
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtNDEDateMonth; protected global::FineUIPro.DatePicker txtNDEDateMonth;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// Toolbar5 控件。 /// Toolbar5 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs
+1 -1
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
{ {
string PersonId = Request.Params["PersonId"]; string PersonId = Request.Params["PersonId"];
var q = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.WelderCode == this.txtWelderCode.Text.Trim() var q = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.WelderCode == this.txtWelderCode.Text.Trim()
&& (x.PersonId != PersonId || (PersonId == null && PersonId != null))); && (x.PersonId != PersonId || (PersonId == null && PersonId != null)) && x.ProjectId == this.CurrUser.LoginProjectId);
if (q != null) if (q != null)
{ {
Alert.ShowInTop("焊工号已经存在！", MessageBoxIcon.Warning); Alert.ShowInTop("焊工号已经存在！", MessageBoxIcon.Warning);
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx
+7
View File
@@ -29,6 +29,13 @@
EnableCollapse="true" Width="300px" Title="点口管理" ShowBorder="true" Layout="VBox" EnableCollapse="true" Width="300px" Title="点口管理" ShowBorder="true" Layout="VBox"
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="单位名称"
LabelAlign="Right" Width="300px" LabelWidth="90px" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtWelderCode" runat="server" EmptyText="输入查询条件" <f:TextBox ID="txtWelderCode" runat="server" EmptyText="输入查询条件"
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+15 -11
View File
@@ -36,10 +36,11 @@ namespace FineUIPro.Web.HJGL.PointTrust
/// <param name="e"></param> /// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
// ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); // ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
if (!IsPostBack) if (!IsPostBack)
{ {
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.txtStartTime.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.txtStartTime.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.InitTreeMenu();//加载树 this.InitTreeMenu();//加载树
@@ -92,8 +93,8 @@ namespace FineUIPro.Web.HJGL.PointTrust
//} //}
//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)
@@ -245,7 +246,10 @@ namespace FineUIPro.Web.HJGL.PointTrust
{ {
pointManages = pointManages.Where(x => x.WelderCode.Contains(this.txtWelderCode.Text.Trim())); pointManages = pointManages.Where(x => x.WelderCode.Contains(this.txtWelderCode.Text.Trim()));
} }
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
}
foreach (var item in pointManages) foreach (var item in pointManages)
@@ -257,7 +261,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
ToolTip = "批", ToolTip = "批",
EnableClickEvent = true, EnableClickEvent = true,
}; };
var pipeline= PointBatchService.GetPointBatchById(item.PointBatchId); var pipeline = PointBatchService.GetPointBatchById(item.PointBatchId);
string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate); string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate);
string PipeArea = ""; string PipeArea = "";
if (!string.IsNullOrEmpty(pipeline.PipelineId)) if (!string.IsNullOrEmpty(pipeline.PipelineId))
@@ -272,22 +276,22 @@ namespace FineUIPro.Web.HJGL.PointTrust
break; break;
} }
} }
string code = "DK-" + item.PointBatchCode.Substring(item.PointBatchCode.Length - 4)+ PipeArea; string code = "DK-" + item.PointBatchCode.Substring(item.PointBatchCode.Length - 4) + PipeArea;
if (!item.EndDate.HasValue) ////批 没有关闭 粉色 if (!item.EndDate.HasValue) ////批 没有关闭 粉色
{ {
newNode.Text = "<font color='#FA58D0'>" + code +"【"+startdate + "】"+"</font>"; newNode.Text = "<font color='#FA58D0'>" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "</font>";
newNode.ToolTip = "批尚未关闭"; newNode.ToolTip = "批尚未关闭";
} }
// 当天批 // 当天批
else if (string.Format("{0:yyyy-MM-dd}", item.StartDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now) else if (string.Format("{0:yyyy-MM-dd}", item.StartDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now)
|| string.Format("{0:yyyy-MM-dd}", item.EndDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now)) || string.Format("{0:yyyy-MM-dd}", item.EndDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now))
{ {
newNode.Text = "<font color='#EE0000'>" + code + "【" + startdate + "】" + "</font>"; newNode.Text = "<font color='#EE0000'>" + code + "【" + startdate + "】" + "【" + item.UnitName + "】" + "</font>";
newNode.ToolTip = "当天批"; newNode.ToolTip = "当天批";
} }
else else
{ {
newNode.Text = code+ "【" + startdate + "】"; newNode.Text = code + "【" + startdate + "】" + "【" + item.UnitName + "】";
} }
e.Node.Nodes.Add(newNode); e.Node.Nodes.Add(newNode);
@@ -454,7 +458,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
if (!string.IsNullOrEmpty(txtpipelinecode.Text.Trim())) if (!string.IsNullOrEmpty(txtpipelinecode.Text.Trim()))
{ {
strSql += " and PipelineCode like @PipelineCode "; strSql += " and PipelineCode like @PipelineCode ";
listStr.Add(new SqlParameter("@PipelineCode", "%"+ txtpipelinecode.Text.Trim() + "%")); listStr.Add(new SqlParameter("@PipelineCode", "%" + txtpipelinecode.Text.Trim() + "%"));
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -641,7 +645,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var batch = BLL.PointBatchService.GetPointBatchById(this.PointBatchId); var batch = BLL.PointBatchService.GetPointBatchById(this.PointBatchId);
if (!batch.EndDate.HasValue) if (!batch.EndDate.HasValue)
{ {
if (!string.IsNullOrEmpty(Grid1.SelectedRowID) ) if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{ {
PointBatchDetailService.UpdatePointBatchDetail(Grid1.SelectedRowID, "1", System.DateTime.Now); PointBatchDetailService.UpdatePointBatchDetail(Grid1.SelectedRowID, "1", System.DateTime.Now);
this.BindGrid(); this.BindGrid();
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.designer.cs
Generated
+20 -4
View File
@@ -7,12 +7,10 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.PointTrust namespace FineUIPro.Web.HJGL.PointTrust {
{
public partial class PointBatch public partial class PointBatch {
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -50,6 +48,24 @@ namespace FineUIPro.Web.HJGL.PointTrust
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelLeftRegion; protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// Toolbar4 控件。 /// Toolbar4 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx
+7
View File
@@ -16,6 +16,13 @@
ShowBorder="true" Layout="VBox" ShowHeader="false" AutoScroll="true" BodyPadding="5px" ShowBorder="true" Layout="VBox" ShowHeader="false" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft"> IconFont="ArrowCircleLeft">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="单位名称"
LabelAlign="Right" Width="300px" LabelWidth="90px" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtWelderCode" runat="server" EmptyText="输入查询条件" <f:TextBox ID="txtWelderCode" runat="server" EmptyText="输入查询条件"
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+24 -20
View File
@@ -16,6 +16,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
this.txtTrustDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.txtTrustDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
//BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpNDEUnit, false, this.CurrUser.LoginProjectId, BLL.Const.UnitType_4, "请选择"); //BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpNDEUnit, false, this.CurrUser.LoginProjectId, BLL.Const.UnitType_4, "请选择");
@@ -69,8 +70,8 @@ namespace FineUIPro.Web.HJGL.PointTrust
//} //}
//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)
@@ -220,7 +221,10 @@ namespace FineUIPro.Web.HJGL.PointTrust
{ {
pointManages = pointManages.Where(x => x.WelderCode.Contains(this.txtWelderCode.Text.Trim())); pointManages = pointManages.Where(x => x.WelderCode.Contains(this.txtWelderCode.Text.Trim()));
} }
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
pointManages = pointManages.Where(x => x.UnitId == this.drpUnit.SelectedValue);
}
foreach (var item in pointManages) foreach (var item in pointManages)
@@ -236,12 +240,12 @@ namespace FineUIPro.Web.HJGL.PointTrust
// 未委托批次红色显示 // 未委托批次红色显示
if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null) if (BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(item.PointBatchId) == null)
{ {
newNode.Text = "<font color='#EE0000'>" + code + "</font>"; newNode.Text = "<font color='#EE0000'>" + code + "【" + item.UnitName + "】" + "</font>";
newNode.ToolTip = "未委托"; newNode.ToolTip = "未委托";
} }
else else
{ {
newNode.Text = code; newNode.Text = code + "【" + item.UnitName + "】";
} }
e.Node.Nodes.Add(newNode); e.Node.Nodes.Add(newNode);
@@ -619,8 +623,8 @@ namespace FineUIPro.Web.HJGL.PointTrust
return; return;
} }
string reportId = this.tvControlItem.SelectedNode.NodeID; string reportId = this.tvControlItem.SelectedNode.NodeID;
// Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID); // Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(this.tvControlItem.SelectedNodeID);
// Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID); // Model.HJGL_Batch_PointBatch batch = BLL.PointBatchService.GetPointBatchById(this.tvControlItem.SelectedNodeID);
var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(reportId); var trust = BLL.Batch_BatchTrustService.GetBatchTrustViewByPointBatchId(reportId);
if (trust != null) if (trust != null)
{ {
@@ -639,10 +643,10 @@ namespace FineUIPro.Web.HJGL.PointTrust
dr["CH_TrustCode"] = trust.TrustBatchCode; dr["CH_TrustCode"] = trust.TrustBatchCode;
} }
/* if (!string.IsNullOrEmpty(trust.CH_NDTCriteria)) /* if (!string.IsNullOrEmpty(trust.CH_NDTCriteria))
{ {
dr["CH_NDTCriteria"] = trust.CH_NDTCriteria; dr["CH_NDTCriteria"] = trust.CH_NDTCriteria;
}*/ }*/
if (!string.IsNullOrEmpty(trust.DetectionTypeCode)) if (!string.IsNullOrEmpty(trust.DetectionTypeCode))
{ {
dr["CH_NDTMethod"] = trust.DetectionTypeCode; dr["CH_NDTMethod"] = trust.DetectionTypeCode;
@@ -680,17 +684,17 @@ namespace FineUIPro.Web.HJGL.PointTrust
{ {
keyValuePairs.Add("supUnit", BLL.UnitService.GetUnitNameByUnitId(unitcheck.UnitId).ToString()); keyValuePairs.Add("supUnit", BLL.UnitService.GetUnitNameByUnitId(unitcheck.UnitId).ToString());
} }
/* if (!string.IsNullOrEmpty(trust.CH_CheckUnit)) /* if (!string.IsNullOrEmpty(trust.CH_CheckUnit))
{ {
keyValuePairs.Add("CheckUnit", BLL.UnitService.GetUnitNameByUnitId(trust.CH_CheckUnit).ToString()); keyValuePairs.Add("CheckUnit", BLL.UnitService.GetUnitNameByUnitId(trust.CH_CheckUnit).ToString());
} }
if (!string.IsNullOrEmpty(trust.CH_TrustUnit)) if (!string.IsNullOrEmpty(trust.CH_TrustUnit))
{ {
keyValuePairs.Add("ConUnit", BLL.UnitService.GetUnitNameByUnitId(trust.CH_TrustUnit).ToString()); keyValuePairs.Add("ConUnit", BLL.UnitService.GetUnitNameByUnitId(trust.CH_TrustUnit).ToString());
} }
*/ */
BLL.FastReportService.ResetData(); BLL.FastReportService.ResetData();
BLL.FastReportService.AddFastreportTable(dt); BLL.FastReportService.AddFastreportTable(dt);
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.designer.cs
Generated
+20 -4
View File
@@ -7,12 +7,10 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.PointTrust namespace FineUIPro.Web.HJGL.PointTrust {
{
public partial class TrustBatch public partial class TrustBatch {
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -50,6 +48,24 @@ namespace FineUIPro.Web.HJGL.PointTrust
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelLeftRegion; protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// Toolbar4 控件。 /// Toolbar4 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx
+7
View File
@@ -39,6 +39,13 @@
</f:DatePicker> </f:DatePicker>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="单位名称"
LabelAlign="Right" Width="265px" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtSearchCode" runat="server" EmptyText="输入查询条件" <f:TextBox ID="txtSearchCode" runat="server" EmptyText="输入查询条件"
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
+8 -3
View File
@@ -14,6 +14,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
this.txtRepairMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.txtRepairMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.InitTreeMenu();//加载树 this.InitTreeMenu();//加载树
@@ -243,6 +244,10 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
&& x.UnitWorkId == ChildNodes.NodeID && x.UnitWorkId == ChildNodes.NodeID
orderby x.RepairRecordCode descending orderby x.RepairRecordCode descending
select x; select x;
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
repairs = repairs.Where(x => x.UnitId == this.drpUnit.SelectedValue).OrderBy(x => x.RepairRecordCode);
}
foreach (var r in repairs) foreach (var r in repairs)
{ {
var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(r.WeldJointId); var jot = BLL.WeldJointService.GetWeldJointByWeldJointId(r.WeldJointId);
@@ -287,16 +292,16 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
} }
if (b) if (b)
{ {
newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark; newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "【" + BLL.UnitService.GetUnitNameByUnitId(r.UnitId) + "】";
} }
else else
{ {
newNode.Text = "<font color='#EE0000'>" + iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "</font>"; newNode.Text = "<font color='#EE0000'>" + iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "【" + BLL.UnitService.GetUnitNameByUnitId(r.UnitId) + "】" + "</font>";
} }
} }
else else
{ {
newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark; newNode.Text = iso.PipelineCode + "-" + jot.WeldJointCode + r.RepairMark + "【" + BLL.UnitService.GetUnitNameByUnitId(r.UnitId) + "】";
} }
newNode.NodeID = r.RepairRecordId; newNode.NodeID = r.RepairRecordId;
newNode.ToolTip = "返修单"; newNode.ToolTip = "返修单";
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.designer.cs
Generated
+18
View File
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand {
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtRepairMonth; protected global::FineUIPro.DatePicker txtRepairMonth;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// Toolbar5 控件。 /// Toolbar5 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx
+7
View File
@@ -25,6 +25,13 @@
</f:DatePicker> </f:DatePicker>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnit" runat="server" Label="单位名称"
LabelAlign="Right" Width="265px" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtSearchCode" runat="server" EmptyText="输入查询条件" <f:TextBox ID="txtSearchCode" runat="server" EmptyText="输入查询条件"
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs
+7 -2
View File
@@ -15,6 +15,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
this.txtTrustDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now); this.txtTrustDateMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
//BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpNDEUnit, false, this.CurrUser.LoginProjectId, BLL.Const.UnitType_4, "请选择"); //BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpNDEUnit, false, this.CurrUser.LoginProjectId, BLL.Const.UnitType_4, "请选择");
@@ -174,18 +175,22 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
&& x.DetectionTypeId == e.NodeID.Split('|')[0] && x.DetectionTypeId == e.NodeID.Split('|')[0]
orderby x.TrustBatchCode descending orderby x.TrustBatchCode descending
select x; select x;
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
trusts = trusts.Where(x => x.UnitId == this.drpUnit.SelectedValue).OrderBy(x => x.TrustBatchCode);
}
foreach (var trust in trusts) foreach (var trust in trusts)
{ {
TreeNode newNode = new TreeNode(); TreeNode newNode = new TreeNode();
string code = "FXWT-" + trust.TrustBatchCode.Substring(trust.TrustBatchCode.Length - 4); string code = "FXWT-" + trust.TrustBatchCode.Substring(trust.TrustBatchCode.Length - 4);
if (string.Format("{0:yyyy-MM-dd}", trust.TrustDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now)) if (string.Format("{0:yyyy-MM-dd}", trust.TrustDate) == string.Format("{0:yyyy-MM-dd}", System.DateTime.Now))
{ {
newNode.Text = "<font color='#EE0000'>" + code + "</font>"; newNode.Text = "<font color='#EE0000'>" + code + "【" + BLL.UnitService.GetUnitNameByUnitId(trust.UnitId) + "】" + "</font>";
newNode.ToolTip = "当天委托单"; newNode.ToolTip = "当天委托单";
} }
else else
{ {
newNode.Text = code; newNode.Text = code + "【" + BLL.UnitService.GetUnitNameByUnitId(trust.UnitId) + "】";
newNode.ToolTip = "非当天委托单"; newNode.ToolTip = "非当天委托单";
} }
newNode.NodeID = trust.TrustBatchId; newNode.NodeID = trust.TrustBatchId;
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.designer.cs
Generated
+20 -4
View File
@@ -7,12 +7,10 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.RepairAndExpand namespace FineUIPro.Web.HJGL.RepairAndExpand {
{
public partial class RepairTrust public partial class RepairTrust {
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -68,6 +66,24 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
/// </remarks> /// </remarks>
protected global::FineUIPro.DatePicker txtTrustDateMonth; protected global::FineUIPro.DatePicker txtTrustDateMonth;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// Toolbar5 控件。 /// Toolbar5 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+5
View File
@@ -468,6 +468,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnAutoInput_Click(object sender, EventArgs e) protected void btnAutoInput_Click(object sender, EventArgs e)
{ {
if (this.drpUnit.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择工艺规程编制单位！", MessageBoxIcon.Warning);
return;
}
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 select x;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+5
View File
@@ -399,6 +399,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param> /// <param name="e"></param>
protected void btnAutoInput_Click(object sender, EventArgs e) protected void btnAutoInput_Click(object sender, EventArgs e)
{ {
if (this.drpUnit.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择工艺规程编制单位！", MessageBoxIcon.Warning);
return;
}
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.JointAttribute == drpJointAttribute.SelectedValue select x; var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x;