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

11

This commit is contained in:
佘春生 2024-07-17 17:00:37 +08:00
parent 74550ff62a
commit f268912b72
12 changed files with 122 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HJGL_ZH/BLL/Common/Const.cs
View File

@ -1991,6 +1991,11 @@ namespace BLL
/// </summary>
public const string HJGL_SubUnitRepairReportId = "47";
/// <summary>
/// 管道焊口检测委托单
/// </summary>
public const string HJGL_TrustReport3Id = "99";
/// <summary>
/// 材料标签
/// </summary>

1
HJGL_ZH/BLL/Common/ReportPrint/Common_ReportPrintService.cs
View File

@ -46,6 +46,7 @@ namespace BLL
dic.Add("焊接系统_管线硬度检验报告（一）", BLL.Const.HJGL_IsoHardTestReportId1);
dic.Add("焊接系统_管线硬度检验报告（二）", BLL.Const.HJGL_IsoHardTestReportId2);
dic.Add("焊接系统_焊缝检测委托单", BLL.Const.HJGL_TrustReportId);
dic.Add("焊接系统_管道焊口检测委托单", BLL.Const.HJGL_TrustReport3Id);
dic.Add("焊接系统_返修焊缝检测委托单", BLL.Const.HJGL_RepairReportId);
dic.Add("焊接系统_无损检测委托单(承包商)", BLL.Const.HJGL_SubUnitTrustReportId);
dic.Add("焊接系统_返修检测委托单(承包商)", BLL.Const.HJGL_SubUnitRepairReportId);

4
HJGL_ZH/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx
View File

@ -72,8 +72,8 @@
Title="底部面板" ShowBorder="false" ShowHeader="false" Layout="Fit">
<Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
SortDirection="ASC" EnableCheckBoxSelect="true">
DataKeyNames="ISO_ID" AllowSorting="true" SortField="CH_TrustDate" OnSort="Grid2_Sort"
SortDirection="DESC" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items>

14
HJGL_ZH/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs
View File

@ -67,8 +67,15 @@ namespace FineUIPro.Web.ContinuousPrint
{
str += " and isnull(a.CH_PrintDate,'')=''";
}
}
string strSql = @"select a.CH_TrustID,a.CH_TrustCode,a.CH_TrustDate,a.CH_Printer,a.CH_PrintDate,b.ProjectCode,b.ProjectName,b.ShortName,b.StartDate,b.EndDate from HJGL_CH_Trust as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.ProjectId= @ProjectId" + str;
str += " ORDER BY a.CH_TrustDate DESC";
string strSql = @"select a.CH_TrustID,a.CH_TrustCode,a.CH_TrustDate,a.CH_Printer,
a.CH_PrintDate,b.ProjectCode,b.ProjectName,b.ShortName,b.StartDate,b.EndDate
from HJGL_CH_Trust as a
inner join Base_Project as b on a.ProjectId=b.ProjectId
where 1=1 and a.ProjectId= @ProjectId" + str;
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray();
@ -112,6 +119,11 @@ namespace FineUIPro.Web.ContinuousPrint
Grid1.SortField = e.SortField;
BindGrid();
}
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion
#region 选择加载

2
HJGL_ZH/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 />

2
HJGL_ZH/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx
View File

@ -72,6 +72,8 @@
</f:Button>
<f:Button ID="btnPrint2" Text="打印2" Icon="Printer" ToolTip="承包商适用" runat="server" OnClick="btnPrint2_Click">
</f:Button>
<f:Button ID="Button1" Text="打印3" Icon="Printer" ToolTip="管道焊口检测委托单" runat="server" OnClick="btnPrint3_Click">
</f:Button>
<f:Button ID="btnEdit" Text="编辑" ToolTip="修改无损委托信息" Icon="TableEdit" runat="server"
OnClick="btnEdit_Click">
</f:Button>

31
HJGL_ZH/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.cs
View File

@ -681,6 +681,37 @@ namespace FineUIPro.Web.HJGL.TrustManage
return;
}
}
protected void btnPrint3_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
Model.HJGL_CH_Trust trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(this.CH_TrustID);
trust.CH_PrintDate = DateTime.Now.Date;
trust.CH_Printer = this.CurrUser.UserName;
BLL.HJGL_TrustManageEditService.PrintCH_Trust(trust);
this.SetTextTemp();
this.PageInfoLoad();
string projectId = string.Empty;
string project = tvControlItem.SelectedNode.ParentNode.NodeID;
if (!string.IsNullOrEmpty(project))
{
string[] ps = project.Split('|');
if (ps.Count() > 1)
{
projectId = ps[1];
}
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.HJGL_TrustReport3Id, this.tvControlItem.SelectedNodeID, null, "打印 - ")));
}
else
{
Alert.ShowInTop("请选择委托单", MessageBoxIcon.Information);
return;
}
}
#endregion
}
}

15
HJGL_ZH/FineUIPro.Web/HJGL/TrustManage/TrustManageEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.TrustManage {
namespace FineUIPro.Web.HJGL.TrustManage
{
public partial class TrustManageEdit {
public partial class TrustManageEdit
{
/// <summary>
/// Head1 控件。
@ -165,6 +167,15 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// </remarks>
protected global::FineUIPro.Button btnPrint2;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// btnEdit 控件。
/// </summary>

2
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx
View File

@ -31,7 +31,7 @@
<Rows>
<f:FormRow ColumnWidths="25% 25% 20%">
<Items>
<f:DropDownList ID="drpProject" runat="server" LabelWidth="80px" Label="项目" EnableCheckBoxSelect="true" EnableMultiSelect="true">
<f:DropDownList ID="drpProject" runat="server" LabelWidth="80px" Label="项目" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线号">
</f:TextBox>

4
HJGL_ZH/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
View File

@ -82,8 +82,8 @@
<f:RenderField Width="100px" ColumnID="UsingManName" DataField="UsingManName" FieldType="String"
HeaderText="领用人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="UsingDate" DataField="UsingDate" FieldType="Date"
Renderer="Date" HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField Width="140px" ColumnID="UsingDate" DataField="UsingDate" FieldType="String"
HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String"
HeaderText="质保书号" HeaderTextAlign="Center" TextAlign="Center">

10
HJGL_ZH/WebAPI/WebAPI.csproj
View File

@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebAPI</RootNamespace>
<AssemblyName>WebAPI</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
@ -25,6 +25,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -48,14 +49,14 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
@ -109,6 +110,7 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease">
<Private>True</Private>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>

2
HJGL_ZH/WebAPI/WebAPI.csproj.user
View File

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