shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2024-06-27 17:01:31 +08:00
parent fb887d6578
commit 0f6e072684
18 changed files with 219 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DataBase/hjglDB_7_2024.06.25.rar Normal file
View File

Binary file not shown.

BIN
DataBase/hjglDB_7_2024.06.26.rar Normal file
View File

Binary file not shown.

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

28
HJGL/BLL/WeldingProcess/TrustManage/Batch_BatchTrustItemService.cs
View File

@ -100,7 +100,33 @@ namespace BLL
Model.Batch_BatchTrustItem update = db.Batch_BatchTrustItem.FirstOrDefault(e => e.TrustBatchItemId == trustBatchItemId);
if (update != null)
{
update.IsCancelTrust = isCancelTrust;
var updatePoint = db.Batch_PointBatchItem.FirstOrDefault(e => e.PointBatchItemId == update.PointBatchItemId);
if (updatePoint != null)
{
updatePoint.PointDate = null;
updatePoint.PointState = null;
updatePoint.CutDate = null;////更新批明细 切除日期
updatePoint.IsBuildTrust = null;
updatePoint.JLAudit = null;
updatePoint.GLGSAudit = null;
updatePoint.QTAudit = null;
}
var item = from x in db.Batch_BatchTrustItem where x.TrustBatchId == update.TrustBatchId select x;
// 表示这个批里只有它一条明细,删除主表
if (item.Count() == 1)
{
Model.Batch_BatchTrust delTrust = db.Batch_BatchTrust.FirstOrDefault(x => x.TrustBatchId == update.TrustBatchId);
db.Batch_BatchTrustItem.DeleteOnSubmit(update);
if (delTrust != null)
{
db.Batch_BatchTrust.DeleteOnSubmit(delTrust);
}
}
else
{
db.Batch_BatchTrustItem.DeleteOnSubmit(update);
}
//update.IsCancelTrust = isCancelTrust;
db.SubmitChanges();
}
}

2
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

4
HJGL/FineUIPro.Web/Web.config
View File

@ -23,7 +23,7 @@
<add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
<add key="APPUrl" value="https://www.pgyer.com/pWSd111"/>
<add key="Https" value="false"/>
<add key="UsingUnit" value="TCC11"/>
<add key="UsingUnit" value="TCC7"/>
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@ -51,7 +51,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
</httpHandlers>
<compilation debug="true" targetFramework="4.8">
<compilation debug="false" targetFramework="4.8">
<assemblies>
<!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
<add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>

57
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/NDTTrustPrint.aspx.cs
View File

@ -535,7 +535,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//行0
CellRangeAddress region = new CellRangeAddress(rowIndex, rowIndex + 3, 0, 2);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex).GetCell(0).SetCellValue(tbTitle.Rows[0]["PipelineCode"].ToString());
ws.GetRow(rowIndex).GetCell(0).SetCellValue("NDE-001");
ws.GetRow(rowIndex).GetCell(0).CellStyle = style;
ws.GetRow(rowIndex).GetCell(1).CellStyle = style;
ws.GetRow(rowIndex).GetCell(2).CellStyle = style;
@ -561,7 +561,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//行1
region = new CellRangeAddress(rowIndex + 1, rowIndex + 1, 10, 12);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 1).GetCell(10).SetCellValue("EnProjectName");
ws.GetRow(rowIndex + 1).GetCell(10).SetCellValue(tbTitle.Rows[0]["EnProjectName"].ToString());
ws.GetRow(rowIndex + 1).GetCell(10).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.None, VerticalAlignment.Center, HorizontalAlignment.Justify, 10.5, true, false);
ws.GetRow(rowIndex + 1).GetCell(11).CellStyle = styleNone;
ws.GetRow(rowIndex + 1).GetCell(12).CellStyle = styleNone;
@ -577,7 +577,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
//行3
region = new CellRangeAddress(rowIndex + 3, rowIndex + 3, 10, 12);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 3).GetCell(10).SetCellValue("EnWorkAreaName");
ws.GetRow(rowIndex + 3).GetCell(10).SetCellValue(tbTitle.Rows[0]["EnWorkAreaName"].ToString());
ws.GetRow(rowIndex + 3).GetCell(10).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.None, VerticalAlignment.Center, HorizontalAlignment.Justify, 10.5, true, false);
ws.GetRow(rowIndex + 3).GetCell(11).CellStyle = styleTop;
ws.GetRow(rowIndex + 3).GetCell(12).CellStyle = styleTop;
@ -617,7 +617,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.GetRow(rowIndex + 6).GetCell(6).SetCellValue("表面状态");
region = new CellRangeAddress(rowIndex + 6, rowIndex + 6, 8, 12);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue(tbTitle.Rows[0]["SurfaceState"].ToString());
if (tbTitle.Rows[0]["SurfaceState"].ToString() == "")
{
ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue("打麿");
}
else
{
ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue(tbTitle.Rows[0]["SurfaceState"].ToString());
}
//行7
ws.GetRow(rowIndex + 7).GetCell(0).SetCellValue("检测标准");
@ -668,7 +676,15 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.GetRow(rowIndex + 11).GetCell(0).SetCellValue("检测时机");
region = new CellRangeAddress(rowIndex + 11, rowIndex + 11, 1, 12);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex + 11).GetCell(1).SetCellValue(tbTitle.Rows[0]["DetectionTiming"].ToString());
if (tbTitle.Rows[0]["DetectionTiming"].ToString() == "")
{
ws.GetRow(rowIndex + 11).GetCell(1).SetCellValue("焊后");
}
else
{
ws.GetRow(rowIndex + 11).GetCell(1).SetCellValue(tbTitle.Rows[0]["DetectionTiming"].ToString());
}
ws.GetRow(rowIndex + 11).GetCell(1).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Justify, 10.5, true, false);
//行12
@ -795,9 +811,24 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.GetRow(rowIndex + 3).GetCell(5).SetCellValue("专业/质量工程师：");
ws.GetRow(rowIndex + 3).GetCell(7).SetCellValue("业主代表：");
ws.GetRow(rowIndex + 3).GetCell(11).SetCellValue("接收人：");
//尾部行4
ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
ws.GetRow(rowIndex + 4).GetCell(3).SetCellValue(GLGSAudit);
// 尾部行4
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
}
else
{
ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
}
else
{
ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
}
//尾部行6
ws.GetRow(rowIndex + 6).GetCell(0).SetCellValue("专业工程师：");
//尾部行8
@ -811,16 +842,6 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.GetRow(rowIndex + 8).GetCell(7).SetCellValue(" 年 月 日");
ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue(" 年 月 日");
//尾部行9
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 6, 2, rowIndex + 6, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 6, 5, rowIndex + 6, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
}
#endregion
ws = WsExcelCreateRow(ws, hssfworkbook, rowIndex + 11, rowIndex + 11, style, 0, 12, 3, true);

3
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointForAudit.aspx.cs
View File

@ -30,7 +30,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
(CASE WHEN IsWelderFirst=1 THEN '是' ELSE '否' END) AS IsWelderFirst,
JLAudit,GLGSAudit,QTAudit,IsPointAudit
FROM dbo.View_Batch_PointBatchItem
WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL";
WHERE PointState IS NOT NULL AND TrustBatchItemId IS NULL
AND PointDate>'2024-06-24 23:59:59'";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtPipeCode.Text))
{

12
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx
View File

@ -47,14 +47,24 @@
<f:ListItem Value="2" Text="已处理" />
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar7" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpTrustState" runat="server" Label="委托状态" LabelWidth="90px" Width="300px" LabelAlign="Right"
AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
<f:ListItem Value="0" Text="待委托" Selected="true" />
<f:ListItem Value="1" Text="全部" />
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpNde" runat="server" Label="检测类型" LabelWidth="100px" Width="265px" LabelAlign="Right"
<f:DropDownList ID="drpNde" runat="server" Label="检测类型" LabelWidth="90px" Width="300px" LabelAlign="Right"
AutoPostBack="true" OnSelectedIndexChanged="Tree_TextChanged">
</f:DropDownList>
</Items>
</f:Toolbar>
<%-- <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtWelderCode" runat="server" EmptyText="<%$ Resources:Lan,EnterQueryConditions %>"

27
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
View File

@ -156,8 +156,14 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
var pitem = from x in Funs.DB.Batch_PointBatchItem
where x.PointBatchId == p.PointBatchId && x.WeldingDate >= sar && x.WeldingDate < end
select x;
if (drpTrustState.SelectedValue == "0")
{
pitem = pitem.Where(x => x.PointDate.HasValue && (x.IsBuildTrust == null || x.IsBuildTrust == false));
}
if (pitem.Count() > 0)
{
TreeNode tn2 = new TreeNode
{
NodeID = p.PointBatchId,
@ -341,6 +347,10 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
var q = from x in Funs.DB.Batch_PointBatchItem
where x.PointBatchId == item.PointBatchId && x.WeldingDate >= sar && x.WeldingDate < end
select x;
if (drpTrustState.SelectedValue == "0")
{
q = q.Where(x => x.PointDate.HasValue && (x.IsBuildTrust == null || x.IsBuildTrust == false));
}
if (q.Count() > 0)
{
TreeNode newNode = new TreeNode
@ -896,8 +906,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
select new PointBatchList { PointBatchItemId = x.PointBatchItemId, JointAttribute = y.JointAttribute }).ToList();
// 未处理固定焊口
List<PointBatchList> GJot = jotList.Where(x=>x.JointAttribute == "固定F").ToList();
List<PointBatchList> GJot = jotList.Where(x => x.JointAttribute == "固定F").ToList();
if (Convert.ToInt32(r["DetectionRateValue"]) != 0)
{
// 批中一段的数量
@ -1050,8 +1060,8 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
int modelNum = jotList.Count() % dnum;
// 取整
double doubleNum = Math.Ceiling((double)jotList.Count() / (double)dnum);
int intNum=Convert.ToInt32(doubleNum);
int intNum = Convert.ToInt32(doubleNum);
for (int i = 0; i < intNum; i++)
{
if (modelNum == 0)
@ -1135,6 +1145,12 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
}
}
ShowNotify("批量点口完成", MessageBoxIcon.Success);
}
else
{
ShowNotify("已无待处理焊口", MessageBoxIcon.Warning);
return;
}
}
else
@ -1657,6 +1673,9 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
pointBatchItem.PointState = null;
pointBatchItem.CutDate = null;////更新批明细 切除日期
pointBatchItem.IsBuildTrust = null;
pointBatchItem.JLAudit= null;
pointBatchItem.GLGSAudit= null;
pointBatchItem.QTAudit= null;
db.SubmitChanges();
var trust = db.Batch_BatchTrustItem.FirstOrDefault(p => p.PointBatchItemId == pointBatchItemId);

18
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.designer.cs generated
View File

@ -68,6 +68,24 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
/// </remarks>
protected global::FineUIPro.DropDownList drpTrust;
/// <summary>
/// Toolbar7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar7;
/// <summary>
/// drpTrustState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTrustState;
/// <summary>
/// Toolbar3 控件。
/// </summary>

29
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchManage.aspx.cs
View File

@ -1340,8 +1340,23 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
ws.GetRow(rowIndex + 3).GetCell(11).SetCellValue("接收人：");
// 尾部行4
ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 2, rowIndex + 4, 4, Server.MapPath(getJLInfo.Item1), 1, 1, 10);
}
else
{
ws.GetRow(rowIndex + 4).GetCell(2).SetCellValue(JLAudit);
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 4, 5, rowIndex + 4, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
}
else
{
ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue(GLGSAudit);
}
//尾部行6
ws.GetRow(rowIndex + 6).GetCell(0).SetCellValue("专业工程师：");
@ -1355,15 +1370,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
}
ws.GetRow(rowIndex + 8).GetCell(7).SetCellValue(" 年 月 日");
ws.GetRow(rowIndex + 8).GetCell(11).SetCellValue(" 年 月 日");
//插入签名图片
if (!string.IsNullOrEmpty(getJLInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 6, 2, rowIndex + 6, 4, Server.MapPath(getJLInfo.Item1), 1, 1,10);
}
if (!string.IsNullOrEmpty(getGLGSInfo.Item1))
{
InsertImage(hssfworkbook, ws, rowIndex + 6, 5, rowIndex + 6, 6, Server.MapPath(getJLInfo.Item1), 1, 8);
}
//尾部行9
#endregion

34
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx
View File

@ -48,16 +48,17 @@
</f:TextBox>
<f:CheckBox ID="ckbFirstTwo" runat="server" Label="是否首三口" LabelAlign="Right" Width="130px" LabelWidth="100"></f:CheckBox>
<f:Label runat="server" Width="100px"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="<%$ Resources:Lan,Statistics %>" Icon="ChartPie"
runat="server" OnClick="BtnAnalyse_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="<%$ Resources:Lan,Export %>"
Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
<f:Button ID="btnExport" BoxConfigAlign="Center" runat="server" Text="导出RT日委托表" ToolTip="日管道焊口检测委托汇总表（RT）" Icon="DoorOut" EnableAjax="false" DisableControlBeforePostBack="false" OnClick="btnExport_Click" EnablePress="true" Pressed="false">
<f:Button ID="btnExport" BoxConfigAlign="Center" runat="server" Text="导出RT日委托表" ToolTip="日管道焊口检测委托汇总表（RT）" Icon="DoorOut" EnableAjax="false" DisableControlBeforePostBack="false" OnClick="btnExport_Click" EnablePress="true" Pressed="false" Hidden="true">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
@ -66,10 +67,10 @@
HeaderText="<%$ Resources:Lan,RequestSheetNumber %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="TrustBatchCode">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="InstallationCode" DataField="InstallationCode" FieldType="String"
<%--<f:RenderField Width="80px" ColumnID="InstallationCode" DataField="InstallationCode" FieldType="String"
HeaderText="<%$ Resources:Lan,InstallationCode %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="InstallationCode">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="220px" ColumnID="PipelineCode" DataField="PipelineCode" FieldType="String"
HeaderText="<%$ Resources:Lan,PipelineCode %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="PipelineCode">
@ -78,10 +79,10 @@
HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" HeaderTextAlign="Center"
TextAlign="Left" SortField="WeldJointCode">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="JointArea" DataField="JointArea" FieldType="String"
<%--<f:RenderField Width="80px" ColumnID="JointArea" DataField="JointArea" FieldType="String"
HeaderText="<%$ Resources:Lan,WeldingArea %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="JointArea">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField Width="120px" ColumnID="MaterialCode" DataField="MaterialCode" FieldType="String"
HeaderText="<%$ Resources:Lan,MaterialSpecification %>" HeaderTextAlign="Center" TextAlign="Left"
@ -91,9 +92,9 @@
HeaderText="<%$ Resources:Lan,InchDiameter %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="Size">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="Thickness" DataField="Thickness" FieldType="Double"
HeaderText="<%$ Resources:Lan,WallThickness %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="Thickness">
<f:RenderField Width="90px" ColumnID="Specification" DataField="Specification" FieldType="String"
HeaderText="<%$ Resources:Lan,Specifications %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="Specifications">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="WeldTypeCode" DataField="WeldTypeCode" FieldType="String"
HeaderText="<%$ Resources:Lan,WeldingJointType %>" HeaderTextAlign="Center" TextAlign="Left"
@ -103,9 +104,13 @@
HeaderText="<%$ Resources:Lan,WelderCode %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="WelderCode">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WeldingMethodCode" DataField="WeldingMethodCode"
<f:RenderField Width="100px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String"
HeaderText="施工队" HeaderTextAlign="Center" TextAlign="Left"
SortField="WelderCode">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WeldingMethodCode" DataField="WeldingMethodCode"
HeaderText="<%$ Resources:Lan,WeldingMethod %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="WeldingMethodCode" FieldType="String" >
SortField="WeldingMethodCode" FieldType="String">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="DetectionRateCode" DataField="DetectionRateCode"
HeaderText="<%$ Resources:Lan,TestPercentage %>" HeaderTextAlign="Center" TextAlign="Left"
@ -114,7 +119,10 @@
<f:RenderField Width="90px" ColumnID="AcceptLevel" DataField="AcceptLevel" FieldType="String" HeaderText="合格等级"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="Sheet" DataField="Sheet" FieldType="String" HeaderText="页数"
<f:RenderField Width="90px" ColumnID="PIPClassCode" DataField="PIPClassCode" FieldType="String" HeaderText="压力管道分级"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="Sheet" DataField="Sheet" FieldType="String" HeaderText="页数"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="TrustDate" DataField="TrustDate"

100
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/TrustBatchSelect.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TrustManage {
public partial class TrustBatchSelect {
namespace FineUIPro.Web.WeldingProcess.TrustManage
{
public partial class TrustBatchSelect
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpInstallation 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallation;
/// <summary>
/// txtTrustBatchCode 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTrustBatchCode;
/// <summary>
/// txtTrustDate 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtTrustDate;
/// <summary>
/// txtPipeLineCode 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipeLineCode;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// txtWelderCode 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWelderCode;
/// <summary>
/// ckbFirstTwo 控件。
/// </summary>
@ -137,34 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbFirstTwo;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnExport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnExport;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -173,7 +148,34 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// btnExport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnExport;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>

2
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx
View File

@ -41,7 +41,7 @@
LabelWidth="90px">
</f:DropDownList>
<f:DropDownList ID="drpTeamGroup" runat="server" Label="班组" EnableCheckBoxSelect="true" EnableMultiSelect="true"
LabelAlign="Right" Width="160px" LabelWidth="80px">
LabelAlign="Right" Width="200px" LabelWidth="80px">
</f:DropDownList>
<f:DropDownList ID="drpAudit" runat="server" Label="审核状态" LabelWidth="80" Width="160" EmptyText="请选择">
<f:ListItem Value="全部" Text="全部" />

4
HJGL/Model/Model.cs
View File

@ -29,6 +29,10 @@ namespace Model
#region 可扩展性方法定义
partial void OnCreated();
partial void OnCreated()
{
this.CommandTimeout = 600;
}
partial void InsertAttachFile(AttachFile instance);
partial void UpdateAttachFile(AttachFile instance);
partial void DeleteAttachFile(AttachFile instance);

2
HJGL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

BIN
HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache
View File

Binary file not shown.