0914-修改材料接口、焊接管理及三四级看板

This commit is contained in:
2022-09-14 16:38:27 +08:00
parent c3cbd62265
commit 456be52603
88 changed files with 11052 additions and 444 deletions
+4
View File
@@ -33,6 +33,10 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>
</Items>
@@ -78,6 +78,26 @@ namespace FineUIPro.Web.HJGL.FL
this.BindGrid();
}
/// <summary>
/// 内网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
}
/// <summary>
/// 绑定数据
/// </summary>
+18
View File
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnUrlN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>
+29 -17
View File
@@ -11,7 +11,7 @@
word-break: break-all;
}
.f-grid-colheader-text {
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
@@ -23,17 +23,21 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道焊接工程量" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="OneOKRateId" EnableColumnLines="true" ForceFit="true"
DataIDField="OneOKRateId" AllowSorting="true" SortField="DeviceName,DeviceCode,ZoneCode"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道焊接工程量" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="OneOKRateId" EnableColumnLines="true" ForceFit="true"
DataIDField="OneOKRateId" AllowSorting="true" SortField="DeviceName,DeviceCode,ZoneCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>
</Items>
</f:Toolbar>
@@ -41,25 +45,25 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName"
<f:RenderField Width="100px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName"
FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
<f:RenderField Width="100px" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode"
FieldType="String" HeaderText="装置号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ZoneCode" DataField="ZoneCode" SortField="ZoneCode"
<f:RenderField Width="100px" ColumnID="ZoneCode" DataField="ZoneCode" SortField="ZoneCode"
FieldType="String" HeaderText="单元号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
<f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TestWeldAmount" DataField="TestWeldAmount" SortField="TestWeldAmount"
<f:RenderField Width="100px" ColumnID="TestWeldAmount" DataField="TestWeldAmount" SortField="TestWeldAmount"
FieldType="String" HeaderText="检测焊口数量" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OnceQualifiedQuantity" DataField="OnceQualifiedQuantity" SortField="OnceQualifiedQuantity"
FieldType="String" HeaderText="一次合格数量" HeaderTextAlign="Center" TextAlign="Left" >
FieldType="String" HeaderText="一次合格数量" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OneOKRate" DataField="OneOKRate" SortField="OneOKRate"
<f:RenderField Width="100px" ColumnID="OneOKRate" DataField="OneOKRate" SortField="OneOKRate" RendererFunction="renderGender"
FieldType="String" HeaderText="一次检测合格率" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OneTimeFilmAmount" DataField="OneTimeFilmAmount" SortField="OneTimeFilmAmount"
@@ -68,7 +72,7 @@
<f:RenderField Width="100px" ColumnID="OneTimeFilmQualifiedAmount" DataField="OneTimeFilmQualifiedAmount" SortField="OneTimeFilmQualifiedAmount"
FieldType="String" HeaderText="一次拍片合格量" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OneOKFilmRate" DataField="OneOKFilmRate" SortField="OneOKFilmRate"
<f:RenderField Width="100px" ColumnID="OneOKFilmRate" DataField="OneOKFilmRate" SortField="OneOKFilmRate" RendererFunction="renderGender"
FieldType="String" HeaderText="一次拍片合格率" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
@@ -78,7 +82,7 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Value="10" Text="10" Selected="true" />
<f:ListItem Value="20" Text="20" />
<f:ListItem Value="50" Text="50" />
@@ -93,6 +97,14 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function renderGender(value) {
var returnValue = null;
if (value != null) {
returnValue = (value * 1).toFixed(2).toString() + "%";
}
return returnValue;
}
</script>
</body>
</html>
+24 -1
View File
@@ -28,6 +28,26 @@ namespace FineUIPro.Web.HJGL.FL
}
}
/// <summary>
/// 内网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
}
/// <summary>
/// 获取
/// </summary>
@@ -102,7 +122,10 @@ namespace FineUIPro.Web.HJGL.FL
/// </summary>
private void BindGrid()
{
string strSql = @"select *
string strSql = @"select OneOKRateId,DeviceName,DeviceCode,ZoneCode,UnitName,cast(TestWeldAmount as int) as TestWeldAmount,cast(OnceQualifiedQuantity as int) as OnceQualifiedQuantity,
cast(REPLACE(OneOKRate,'%','') as DECIMAL(9,2)) as OneOKRate,
cast(OneTimeFilmAmount as int) as OneTimeFilmAmount,cast(OneTimeFilmQualifiedAmount as int) as OneTimeFilmQualifiedAmount,
cast(REPLACE(OneOKFilmRate,'%','') as DECIMAL(9,2)) as OneOKFilmRate
from dbo.HJGL_FL_OneOKRate c
where c.ProjectId=@ProjectId order by c.DeviceName,DeviceCode,ZoneCode";
List<SqlParameter> listStr = new List<SqlParameter>();
+18
View File
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnUrlN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>
@@ -33,6 +33,10 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>
</Items>
@@ -28,6 +28,26 @@ namespace FineUIPro.Web.HJGL.FL
}
}
/// <summary>
/// 内网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
}
/// <summary>
/// 获取
/// </summary>
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnUrlN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>
+4
View File
@@ -39,6 +39,10 @@
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>
</Items>
@@ -28,6 +28,26 @@ namespace FineUIPro.Web.HJGL.FL
}
}
/// <summary>
/// 内网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
}
/// <summary>
/// 获取
/// </summary>
+18
View File
@@ -84,6 +84,24 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnUrlN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>
@@ -33,6 +33,10 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>
</Items>
@@ -28,6 +28,26 @@ namespace FineUIPro.Web.HJGL.FL
}
}
/// <summary>
/// 内网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
}
/// <summary>
/// 获取
/// </summary>
+18
View File
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnUrlN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>
@@ -31,6 +31,10 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnUrlN" Text="内网进入软件" ToolTip="内网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlN_Click">
</f:Button>
<f:Button ID="btnUrlW" Text="外网进入软件" ToolTip="外网进入焊接软件" Icon="FolderPage" runat="server" OnClick="btnUrlW_Click">
</f:Button>
<f:Button ID="btnGet" Text="获取" ToolTip="从4D系统中获取数据" Icon="FolderPage" runat="server" OnClick="btnGet_Click">
</f:Button>
</Items>
@@ -54,6 +58,9 @@
<f:RenderField Width="150px" ColumnID="TotalCompleted" DataField="TotalCompleted" SortField="TotalCompleted"
FieldType="String" HeaderText="已完成总量" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" SortField="Rate" RendererFunction="renderGender"
FieldType="String" HeaderText="完成比例" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -76,6 +83,14 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function renderGender(value) {
var returnValue = null;
if (value != null) {
returnValue = (value * 1).toFixed(2).toString() + "%";
}
return returnValue;
}
</script>
</body>
</html>
@@ -28,6 +28,26 @@ namespace FineUIPro.Web.HJGL.FL
}
}
/// <summary>
/// 内网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlN_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://192.168.30.40:8102/pcms/');"));
}
/// <summary>
/// 外网进入软件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnUrlW_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(String.Format("window.open('http://221.232.143.174:8102/pcms');"));
}
/// <summary>
/// 获取
/// </summary>
@@ -78,7 +98,9 @@ namespace FineUIPro.Web.HJGL.FL
/// </summary>
private void BindGrid()
{
string strSql = @"select *
string strSql = @"select TotalQuantityId,ProjectId,DeviceName,DeviceCode,Unit,(case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 else cast(c.TotalWeldQuantity as DECIMAL(9,2)) end) as TotalWeldQuantity,
(case when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else cast(c.TotalCompleted as DECIMAL(9,2)) end) as TotalCompleted,
cast((case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else 100.0 * cast(c.TotalCompleted as DECIMAL(9,2))/(1.0 * cast(c.TotalWeldQuantity as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate
from dbo.HJGL_FL_TotalQuantity c
where c.ProjectId=@ProjectId order by c.DeviceName,DeviceCode ";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -57,6 +57,24 @@ namespace FineUIPro.Web.HJGL.FL {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// btnUrlN 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlN;
/// <summary>
/// btnUrlW 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUrlW;
/// <summary>
/// btnGet 控件。
/// </summary>