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

焊接修改

Browse Source
This commit is contained in:
李鹏飞
2024-12-10 15:18:31 +08:00
parent f4f7f93835
commit b70dec0803
22 changed files with 266 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx
+3
View File
@@ -77,6 +77,9 @@
<f:DropDownList ID="drpStates" runat="server" Label="状态"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList ID="drpCategory" runat="server" Label="类别"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
+10
View File
@@ -53,6 +53,11 @@ namespace FineUIPro.Web.CLGL
drpStates.DataSource = BLL.TwConst.StateMap;
drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates);
drpCategory.DataTextField = "Key";
drpCategory.DataValueField = "Value";
drpCategory.DataSource = BLL.TwConst.CategoryMap;
drpCategory.DataBind();
Funs.FineUIPleaseSelect(this.drpCategory);
}
#region 数据绑定
@@ -72,6 +77,10 @@ namespace FineUIPro.Web.CLGL
{
table.State = Convert.ToInt32(drpStates.SelectedValue);
}
if (drpCategory.SelectedValue != Const._Null)
{
table.Category = Convert.ToInt32(drpCategory.SelectedValue);
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
@@ -284,6 +293,7 @@ namespace FineUIPro.Web.CLGL
ReqUnitName = result.ReqUnitName,
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
CreateManName = !string.IsNullOrEmpty(result.CreateMan) ? BLL.Person_PersonsService.getSignatureUrl(result.CreateMan) : "",
ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
CategoryString = result.CategoryString,
BillName = TwConst.PlanPrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(),
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs
Generated
+9
View File
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// drpCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCategory;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx
+6
View File
@@ -76,6 +76,9 @@
<f:DropDownList ID="drpStates" runat="server" Label="状态"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList ID="drpCategory" runat="server" Label="类别"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
@@ -84,6 +87,9 @@
</f:Button>
<f:Button ID="btnGenOutPlanMaster" Text="生成补料申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click" Hidden="true">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
+40 -1
View File
@@ -10,6 +10,8 @@ using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using MiniExcelLibs;
using NPOI.SS.Formula.Functions;
namespace FineUIPro.Web.CLGL
{
@@ -47,6 +49,11 @@ namespace FineUIPro.Web.CLGL
drpStates.DataSource = BLL.TwConst.StateMap;
drpStates.DataBind();
Funs.FineUIPleaseSelect(this.drpStates);
drpCategory.DataTextField = "Key";
drpCategory.DataValueField = "Value";
drpCategory.DataSource = BLL.TwConst.CategoryMap;
drpCategory.DataBind();
Funs.FineUIPleaseSelect(this.drpCategory);
}
#region 数据绑定
@@ -66,6 +73,10 @@ namespace FineUIPro.Web.CLGL
{
table.State = Convert.ToInt32(drpStates.SelectedValue);
}
if (drpCategory.SelectedValue != Const._Null)
{
table.Category = Convert.ToInt32(drpCategory.SelectedValue);
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
@@ -558,10 +569,11 @@ namespace FineUIPro.Web.CLGL
List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
{
ReqUnitName = result.ReqUnitName,
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
CreateManName = !string.IsNullOrEmpty(result.CreateMan) ? BLL.Person_PersonsService.getSignatureUrl(result.CreateMan) : "",
ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
CategoryString = result.CategoryString,
BillName = TwConst.PrintMap.Where(x => x.Value == result.TypeInt).Select(x => x.Key).FirstOrDefault(),
@@ -650,5 +662,32 @@ namespace FineUIPro.Web.CLGL
#endregion
protected void btnOut_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIDArray.Length > 0)
{
var sheets = new Dictionary<string, object>
{
["出库明细"] = TwOutputdetailService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList()),
["管线材料明细"] = TwInoutplandetailRelationService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList())
};
string path = Funs.RootPath + @"File\Excel\Temp\OutputDetail.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
MiniExcel.SaveAs(path, sheets);
string fileName = "出库明细表.xlsx";
FileInfo info = new FileInfo(path);
long fileSize = info.Length;
System.Web.HttpContext.Current.Response.Clear();
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
System.Web.HttpContext.Current.Response.Close();
File.Delete(path);
}
}
}
}
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.designer.cs
Generated
+18
View File
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// drpCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCategory;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -185,6 +194,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Button btnGenOutPlanMaster;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Grid1 控件。
/// </summary>
SGGL/FineUIPro.Web/File/Fastreport/材料出库单.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/06/2024 16:42:47" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/09/2024 11:08:35" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHshEgxIYkQfIgXTSl13gnL"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREeev+wYP8jmJdmNNn3pXJz"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
SGGL/FineUIPro.Web/File/Fastreport/材料出库计划单.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/06/2024 16:18:48" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/10/2024 09:45:15" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFu0uC3jDjSILbln3ANWj4s"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFS86uT57ZjSzo9HhTkpIww"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
SGGL/FineUIPro.Web/File/Fastreport/管道焊接任务单.frx
+10 -18
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/06/2024 17:43:24" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="12/10/2024 09:49:49" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -59,7 +59,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREMrQAWDh0fqtKcXNzfqqqi"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHWPVF4cawdM/E/6wxiBHsP"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -174,33 +174,25 @@ namespace FastReport
</TableRow>
</TableObject>
<DataFooterBand Name="DataFooter1" Top="246.22" Width="1047.06" Height="175.72">
<TableObject Name="Table6" Left="9.45" Width="1030.03" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
<TableColumn Name="Column65" Width="83.78"/>
<TableColumn Name="Column66" Width="178.33"/>
<TableColumn Name="Column67" Width="178.27"/>
<TableColumn Name="Column85" Width="187.1"/>
<TableColumn Name="Column87" Width="130.4"/>
<TableColumn Name="Column88" Width="272.15"/>
<TableObject Name="Table6" Left="9.45" Width="1030.05" Height="175.72" Border.Lines="Top" ManualBuildEvent="Table6_ManualBuild">
<TableColumn Name="Column65" Width="86.9"/>
<TableColumn Name="Column66" Width="358.73"/>
<TableColumn Name="Column67" Width="188.57"/>
<TableColumn Name="Column85" Width="395.85"/>
<TableRow Name="Row33" Height="74.62">
<TableCell Name="Cell271" Border.Lines="All" Text="备注" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell272" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="5"/>
<TableCell Name="Cell272" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt" ColSpan="3"/>
<TableCell Name="Cell273" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell331" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell335" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell336" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
</TableRow>
<TableRow Name="Row34" Height="101.1">
<TableCell Name="Cell281" Text="分包制单：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell282" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt">
<PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="151.2" Height="75.6" DataColumn="Table1.CreateManName"/>
<PictureObject Name="Picture1" Left="9.45" Top="9.45" Width="170.1" Height="85.05" DataColumn="Table1.CreateManName"/>
</TableCell>
<TableCell Name="Cell283" Text="专工审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell332" HorzAlign="Center" VertAlign="Center">
<PictureObject Name="Picture2" Left="9.45" Top="9.45" Width="160.65" Height="75.6" DataColumn="Table1.AuditManName"/>
</TableCell>
<TableCell Name="Cell337" Text="材控审核：" HorzAlign="Center" VertAlign="Center"/>
<TableCell Name="Cell338" HorzAlign="Center" VertAlign="Center">
<PictureObject Name="Picture3" Left="18.9" Top="9.45" Width="198.45" Height="75.6" DataColumn="Table1.AuditManName２"/>
<PictureObject Name="Picture2" Left="9.45" Top="9.45" Width="160.65" Height="85.05" DataColumn="Table1.AuditManName"/>
</TableCell>
</TableRow>
</TableObject>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+4
View File
@@ -130,6 +130,10 @@
HeaderText="总焊口量" HeaderTextAlign="Center"
TextAlign="Right">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ShopJointCount" DataField="ShopJointCount" FieldType="Int"
HeaderText="预制口量" HeaderTextAlign="Center"
TextAlign="Right">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="PipeAreaStr" DataField="PipeAreaStr" SortField="PipeAreaStr"
FieldType="String" HeaderText="管线划分" HeaderTextAlign="Center"
TextAlign="Center">
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+1
View File
@@ -317,6 +317,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
完成焊口=x.FinishJointCount,
总达因数 =x.TotalDin,
总焊口量=x.JointCount,
预制口量=x.ShopJointCount,
管线划分 = x.PipeAreaStr,
无损检测类型=x.DetectionTypeCode,
探伤比例 =x.DetectionRateCode,
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+1 -3
View File
@@ -87,9 +87,7 @@
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="预制组件打印" ToolTip="预制组件打印" OnClick="btnPrint_Click"></f:Button>
<f:Button ID="btnPassMaster" Text="专工审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster_OnClick" >
</f:Button>
<f:Button ID="btnPassMaster2" Text="材控审核" Icon="ArrowRefresh" runat="server" OnClick="btnPassMaster2_OnClick" >
</f:Button>
</f:Button>
<f:Button ID="btnPrintTask" runat="server" Icon="Printer" EnableAjax="false" Text="焊接任务单打印" ToolTip="焊接任务单打印" OnClick="btnPrintTask_Click"></f:Button>
<f:DatePicker ID="txtTaskDate" Label="计划焊接日期" runat="server"
DateFormatString="yyyy-MM-dd" LabelAlign="Left" LabelWidth="110px" Hidden="true">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+2 -3
View File
@@ -1362,15 +1362,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
where x.ProjectId == this.CurrUser.LoginProjectId &&
x.UnitWorkId == tvControlItem.SelectedNodeID.Split('|')[0] &&
x.UnitId == tvControlItem.SelectedNodeID.Split('|')[1]
&& x.TaskDate.Value.Date == time.Date && x.AuditMan != null && x.AuditMan2 != null &&
&& x.TaskDate.Value.Date == time.Date && x.AuditMan != null &&
x.Tabler != null
select x).FirstOrDefault();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
{
CreateManName = !string.IsNullOrEmpty(weldTask_CreateName?.Tabler) ? BLL.Person_PersonsService.getSignatureUrl(weldTask_CreateName.Tabler) : "",
AuditManName = !string.IsNullOrEmpty(weldTask?.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan) : "",
AuditManName2 = !string.IsNullOrEmpty(weldTask?.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan2) : "",
AuditManName = !string.IsNullOrEmpty(weldTask?.AuditMan) ? BLL.Person_PersonsService.getSignatureUrl(weldTask.AuditMan) : "",
};
tw_PrintMasters.Add(printMaster);
DataTable Table1 = LINQToDataTable(tw_PrintMasters);
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.designer.cs
Generated
-9
View File
@@ -230,15 +230,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Button btnPassMaster;
/// <summary>
/// btnPassMaster2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPassMaster2;
/// <summary>
/// btnPrintTask 控件。
/// </summary>