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

2023-02-17 焊接任务单修改

Browse Source
This commit is contained in:
李鹏飞
2023-02-17 15:30:04 +08:00
parent 5f6569d82e
commit 86b9931597
8 changed files with 393 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx
+11 -4
View File
@@ -26,7 +26,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="200px" Title="点口管理" ShowBorder="true" Layout="VBox"
EnableCollapse="true" Width="300px" Title="点口管理" ShowBorder="true" Layout="VBox"
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
@@ -74,9 +74,14 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Label ID="txtPointBatchCode" Label="批次编号" runat="server" LabelAlign="Right" LabelWidth="110px">
</f:Label>
<f:TextBox runat="server" ID="txtpipelinecode" Label ="管线号" LabelWidth="100px" LabelAlign="Right"> </f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" Text="查询" ToolTip="查询" Icon="SystemSearch" runat="server"
OnClick="btnQuery_Click">
</f:Button>
<f:Button ID="btnManual" Text="手动点口" ToolTip="生成" Icon="cmy" runat="server"
OnClick="btnManual_Click">
</f:Button>
<f:Button ID="btnAutoPoint" Text="自动点口" ToolTip="生成" Icon="cmy" runat="server"
OnClick="btnAutoPoint_Click">
</f:Button>
@@ -101,7 +106,7 @@
</f:Toolbar>
<f:Toolbar ID="TbPipeline" Position="Top" runat="server" ToolbarAlign="Left" Hidden="true">
<Items>
<f:Label ID="lbPipelineCode" Label="管线号" runat="server" LabelAlign="Right" LabelWidth="100px">
<f:Label ID="lbPipelineCode" Label="管线号" runat="server" LabelAlign="Right" LabelWidth="100px" >
</f:Label>
<f:Label ID="lbRate" Label="检测比例" runat="server" LabelAlign="Right" LabelWidth="100px">
</f:Label>
@@ -127,6 +132,8 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Label ID="txtPointBatchCode" Label="批次编号" runat="server" LabelAlign="Right" LabelWidth="110px">
</f:Label>
<f:Label ID="txtStartDate" Label="批次开始时间" runat="server" LabelAlign="Right" LabelWidth="110px">
</f:Label>
<f:Label ID="txtEndDate" Label="批次关闭日期" runat="server" LabelAlign="Right" LabelWidth="110px">
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+38 -3
View File
@@ -1,4 +1,5 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
@@ -257,6 +258,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
EnableClickEvent = true,
};
var pipeline= PointBatchService.GetPointBatchById(item.PointBatchId);
string startdate = string.Format("{0:yyyy-MM-dd}", pipeline.StartDate);
string PipeArea = "";
if (!string.IsNullOrEmpty(pipeline.PipelineId))
{
@@ -273,19 +275,19 @@ namespace FineUIPro.Web.HJGL.PointTrust
string code = "DK-" + item.PointBatchCode.Substring(item.PointBatchCode.Length - 4)+ PipeArea;
if (!item.EndDate.HasValue) ////批 没有关闭 粉色
{
newNode.Text = "<font color='#FA58D0'>" + code + "</font>";
newNode.Text = "<font color='#FA58D0'>" + code +"【"+startdate + "】"+"</font>";
newNode.ToolTip = "批尚未关闭";
}
// 当天批
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))
{
newNode.Text = "<font color='#EE0000'>" + code + "</font>";
newNode.Text = "<font color='#EE0000'>" + code + "【" + startdate + "】" + "</font>";
newNode.ToolTip = "当天批";
}
else
{
newNode.Text = code;
newNode.Text = code+ "【" + startdate + "】";
}
e.Node.Nodes.Add(newNode);
@@ -449,6 +451,11 @@ namespace FineUIPro.Web.HJGL.PointTrust
{
listStr.Add(new SqlParameter("@PointBatchId", this.PointBatchId));
}
if (!string.IsNullOrEmpty(txtpipelinecode.Text.Trim()))
{
strSql += " and PipelineCode like @PipelineCode ";
listStr.Add(new SqlParameter("@PipelineCode", "%"+ txtpipelinecode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -483,6 +490,10 @@ namespace FineUIPro.Web.HJGL.PointTrust
{
this.BindGrid();
}
protected void btnQuery_Click(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 分页排序
@@ -624,7 +635,31 @@ namespace FineUIPro.Web.HJGL.PointTrust
}
protected void btnManual_Click(object sender, EventArgs e)
{
var batch = BLL.PointBatchService.GetPointBatchById(this.PointBatchId);
if (!batch.EndDate.HasValue)
{
if (!string.IsNullOrEmpty(Grid1.SelectedRowID) )
{
PointBatchDetailService.UpdatePointBatchDetail(Grid1.SelectedRowID, "1", System.DateTime.Now);
this.BindGrid();
Alert.ShowInTop("已成功点口！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop("请选择点口！", MessageBoxIcon.Warning);
}
}
else
{
Alert.ShowInTop("批已关闭，不能点口！", MessageBoxIcon.Success);
}
}
/// <summary>
/// 手动点口关闭
/// </summary>
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.designer.cs
Generated
+29 -2
View File
@@ -123,13 +123,31 @@ namespace FineUIPro.Web.HJGL.PointTrust
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtPointBatchCode 控件。
/// txtpipelinecode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtPointBatchCode;
protected global::FineUIPro.TextBox txtpipelinecode;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnManual 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnManual;
/// <summary>
/// btnAutoPoint 控件。
@@ -302,6 +320,15 @@ namespace FineUIPro.Web.HJGL.PointTrust
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtPointBatchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtPointBatchCode;
/// <summary>
/// txtStartDate 控件。
/// </summary>