This commit is contained in:
李鹏飞 2024-07-18 14:52:32 +08:00
commit 91b5524e5f
20 changed files with 150 additions and 2852 deletions

15
.gitignore vendored
View File

@ -85,4 +85,19 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll
/HJGL_ZH/packages
/HJGL_ZH/WebAPI/bin
/HJGL_ZH/WebAPI/obj
/DataBase
/HJGL_ZH/.vs/SGGL
/HJGL_ZH/BLL/.vs
/HJGL_ZH/FineUIPro.Web/.vs
/HJGL_ZH/Model/.vs
/HJGL_ZH/WebAPI/.vs
/HJGL_ZH/Model/obj/Debug
/HJGL_ZH/FineUIPro.Web/ErrLog.txt
/HJGL_ZH/FineUIPro.Web/Web.config
/HJGL_ZH/Model/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
/HJGL_ZH/Model/obj/Release/Model.csproj.AssemblyReference.cache
/HJGL_ZH/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
/HJGL_ZH/Model/obj/Release/Model.csproj.FileListAbsolute.txt
/HJGL_ZH/Model/obj/Release/Model.dll
/HJGL_ZH/Model/obj/Release/Model.pdb
/HJGL_ZH/WebAPI/Web.config

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>

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);

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>

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

File diff suppressed because it is too large Load Diff

View File

@ -62,8 +62,9 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.JScript" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.1\lib\net40\NPOI.dll</HintPath>
@ -99,8 +100,8 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
<Reference Include="ThoughtWorks.QRCode">
<HintPath>..\..\..\New\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

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

View File

@ -127,9 +127,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
HotProessItem.RequestTime,HotProessItem.ActualTime,HotProessItem.RecordChartNo,
HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,
(SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport
WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))
WHERE HardTestReportId =t.HardTestReportId)
AS HardnessReportNo,
HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
FROM dbo.HJGL_HotProessItem AS HotProessItem
@ -144,6 +142,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID
where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v
on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId
left join (SELECT distinct re.HardTestReportId,item.JOT_ID,item.HotProessTrustId FROM dbo.HJGL_CH_HardTestReportItem item
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE (re.FileType='R' or re.FileType is null)) t on t.JOT_ID=HotProessItem.JOT_ID and t.HotProessTrustId=HotProessItem.HotProessTrustId
WHERE JointInfo.ProjectId= @ProjectId ";
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
if (this.drpIsoNo.SelectedValue != BLL.Const._Null)
@ -188,9 +189,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
HotProessItem.ActualTime,HotProessItem.RecordChartNo,
HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,HotProessItem.HotProessItemId,HotProessItem.SortIndex,
(SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode FROM dbo.HJGL_CH_HardTestReport
WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))
WHERE HardTestReportId =t.HardTestReportId)
AS HardnessReportNo,
HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
FROM dbo.HJGL_HotProessItem AS HotProessItem
@ -205,6 +204,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID
where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v
on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId
left join (SELECT distinct re.HardTestReportId,item.JOT_ID,item.HotProessTrustId FROM dbo.HJGL_CH_HardTestReportItem item
left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
WHERE (re.FileType='R' or re.FileType is null)) t on t.JOT_ID=HotProessItem.JOT_ID and t.HotProessTrustId=HotProessItem.HotProessTrustId
WHERE CHARINDEX(JointInfo.ProjectId,@ProjectId)>0 ";
listStr.Add(new SqlParameter("@ProjectId", projectIds));
if (this.drpIsoNo.SelectedValue != BLL.Const._Null)

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>

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
}
}

View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.TrustManage {
public partial class TrustManageEdit {
namespace FineUIPro.Web.HJGL.TrustManage
{
public partial class TrustManageEdit
{
/// <summary>
/// Head1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpIsProjectClosed 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsProjectClosed;
/// <summary>
/// drpProjectId 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// drpNdtType 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNdtType;
/// <summary>
/// drpIsPrint 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsPrint;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// PanelTree 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel PanelTree;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnPrint 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint;
/// <summary>
/// btnPrint2 控件。
/// </summary>
@ -164,7 +166,16 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint2;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// btnEdit 控件。
/// </summary>
@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnEdit;
/// <summary>
/// btnDelete 控件。
/// </summary>
@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtCH_TrustCode 控件。
/// </summary>
@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCH_TrustCode;
/// <summary>
/// drpCH_TrustUnit 控件。
/// </summary>
@ -209,7 +220,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_TrustUnit;
/// <summary>
/// drpInstallationId 控件。
/// </summary>
@ -218,7 +229,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpInstallationId;
/// <summary>
/// txtCH_TrustDate 控件。
/// </summary>
@ -227,7 +238,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCH_TrustDate;
/// <summary>
/// txtCH_TrustType 控件。
/// </summary>
@ -236,7 +247,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCH_TrustType;
/// <summary>
/// drpCH_TrustMan 控件。
/// </summary>
@ -245,7 +256,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_TrustMan;
/// <summary>
/// drpCH_NDTMethod 控件。
/// </summary>
@ -254,7 +265,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_NDTMethod;
/// <summary>
/// drpCH_CheckUnit 控件。
/// </summary>
@ -263,7 +274,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_CheckUnit;
/// <summary>
/// drpCH_NDTRate 控件。
/// </summary>
@ -272,7 +283,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_NDTRate;
/// <summary>
/// drpCH_AcceptGrade 控件。
/// </summary>
@ -281,7 +292,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_AcceptGrade;
/// <summary>
/// txtCH_NDTCriteria 控件。
/// </summary>
@ -290,7 +301,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCH_NDTCriteria;
/// <summary>
/// drpCH_SlopeType 控件。
/// </summary>
@ -299,7 +310,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_SlopeType;
/// <summary>
/// drpCH_WeldMethod 控件。
/// </summary>
@ -308,7 +319,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpCH_WeldMethod;
/// <summary>
/// txtCH_Remark 控件。
/// </summary>
@ -317,7 +328,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCH_Remark;
/// <summary>
/// ckbIsPrint 控件。
/// </summary>
@ -326,7 +337,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsPrint;
/// <summary>
/// lbPrinter 控件。
/// </summary>
@ -335,7 +346,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbPrinter;
/// <summary>
/// lbPrintDate 控件。
/// </summary>
@ -344,7 +355,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbPrintDate;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -353,7 +364,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -362,7 +373,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -371,7 +382,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -380,7 +391,7 @@ namespace FineUIPro.Web.HJGL.TrustManage {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>

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>

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">

View File

@ -1 +0,0 @@
ef8b5c00a9ff527f5a7291d35e91314cb426e131e3ad8f695f98b55c1c442b4d

View File

@ -1,177 +0,0 @@
F:\最新\管道焊接\HJGL\HJGL\Model\bin\Release\Model.dll
F:\最新\管道焊接\HJGL\HJGL\Model\bin\Release\Model.pdb
F:\最新\管道焊接\HJGL\HJGL\Model\obj\Release\ResolveAssemblyReference.cache
F:\最新\管道焊接\HJGL\HJGL\Model\obj\Release\Model.dll
F:\最新\管道焊接\HJGL\HJGL\Model\obj\Release\Model.pdb
F:\HJGL\HJGL\HJGL\Model\bin\Release\Model.dll
F:\HJGL\HJGL\HJGL\Model\bin\Release\Model.pdb
F:\HJGL\HJGL\HJGL\Model\obj\Release\ResolveAssemblyReference.cache
F:\HJGL\HJGL\HJGL\Model\obj\Release\Model.dll
F:\HJGL\HJGL\HJGL\Model\obj\Release\Model.pdb
E:\HJGL\HJGL\HJGL\Model\bin\Release\Model.dll
E:\HJGL\HJGL\HJGL\Model\bin\Release\Model.pdb
E:\HJGL\HJGL\HJGL\Model\obj\Release\ResolveAssemblyReference.cache
E:\HJGL\HJGL\HJGL\Model\obj\Release\Model.dll
E:\HJGL\HJGL\HJGL\Model\obj\Release\Model.pdb
E:\HJGL\LUOYANG\HJGL\HJGL\Model\bin\Release\Model.dll
E:\HJGL\LUOYANG\HJGL\HJGL\Model\bin\Release\Model.pdb
E:\HJGL\LUOYANG\HJGL\HJGL\Model\obj\Release\Model.dll
E:\HJGL\LUOYANG\HJGL\HJGL\Model\obj\Release\Model.pdb
E:\HJGL\LuoYang\HJGL\Model\bin\Release\Model.dll
E:\HJGL\LuoYang\HJGL\Model\bin\Release\Model.pdb
E:\HJGL\LuoYang\HJGL\Model\obj\Release\Model.dll
E:\HJGL\LuoYang\HJGL\Model\obj\Release\Model.pdb
E:\HJGL\TongYong\HJGL\Model\bin\Release\Model.dll
E:\HJGL\TongYong\HJGL\Model\bin\Release\Model.pdb
E:\HJGL\TongYong\HJGL\Model\obj\Release\Model.dll
E:\HJGL\TongYong\HJGL\Model\obj\Release\Model.pdb
F:\最新\天辰焊接\HJGL\Model\bin\Release\Model.dll
F:\最新\天辰焊接\HJGL\Model\bin\Release\Model.pdb
F:\最新\天辰焊接\HJGL\Model\obj\Release\ResolveAssemblyReference.cache
F:\最新\天辰焊接\HJGL\Model\obj\Release\Model.dll
F:\最新\天辰焊接\HJGL\Model\obj\Release\Model.pdb
E:\HJGL\TianChen\HJGL\Model\bin\Release\Model.dll
E:\HJGL\TianChen\HJGL\Model\bin\Release\Model.pdb
E:\HJGL\TianChen\HJGL\Model\obj\Release\Model.dll
E:\HJGL\TianChen\HJGL\Model\obj\Release\Model.pdb
E:\HJGL\TianChen\HJGL\Model\obj\Release\Model.csprojResolveAssemblyReference.cache
D:\ExtJs\HJGL\HJGL\Model\bin\Release\Model.dll
D:\ExtJs\HJGL\HJGL\Model\bin\Release\Model.pdb
D:\ExtJs\HJGL\HJGL\Model\obj\Release\ResolveAssemblyReference.cache
D:\ExtJs\HJGL\HJGL\Model\obj\Release\Model.dll
D:\ExtJs\HJGL\HJGL\Model\obj\Release\Model.pdb
E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\bin\Release\Model.dll
E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\bin\Release\Model.pdb
E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\obj\Release\Model.dll
E:\CNCEC\CNCECHSSE\CNCECHSSE\Model\obj\Release\Model.pdb
D:\ExtJs\SGGL\Model\bin\Release\Model.dll
D:\ExtJs\SGGL\Model\bin\Release\Model.pdb
D:\ExtJs\SGGL\Model\obj\Release\ResolveAssemblyReference.cache
D:\ExtJs\SGGL\Model\obj\Release\Model.dll
D:\ExtJs\SGGL\Model\obj\Release\Model.pdb
D:\ExtJs\SGGL\SGGL\Model\bin\Release\Model.dll
D:\ExtJs\SGGL\SGGL\Model\bin\Release\Model.pdb
D:\ExtJs\SGGL\SGGL\Model\obj\Release\ResolveAssemblyReference.cache
D:\ExtJs\SGGL\SGGL\Model\obj\Release\Model.dll
D:\ExtJs\SGGL\SGGL\Model\obj\Release\Model.pdb
H:\工作\SGGL_New\SGGL\SGGL\Model\bin\Release\Model.dll
H:\工作\SGGL_New\SGGL\SGGL\Model\bin\Release\Model.pdb
H:\工作\SGGL_New\SGGL\SGGL\Model\obj\Release\ResolveAssemblyReference.cache
H:\工作\SGGL_New\SGGL\SGGL\Model\obj\Release\Model.dll
H:\工作\SGGL_New\SGGL\SGGL\Model\obj\Release\Model.pdb
D:\ExtJs\SGGL_NB\SGGL\Model\bin\Release\Model.dll
D:\ExtJs\SGGL_NB\SGGL\Model\bin\Release\Model.pdb
D:\ExtJs\SGGL_NB\SGGL\Model\obj\Release\ResolveAssemblyReference.cache
D:\ExtJs\SGGL_NB\SGGL\Model\obj\Release\Model.dll
D:\ExtJs\SGGL_NB\SGGL\Model\obj\Release\Model.pdb
D:\开发代码\SGGL_NB\SGGL\Model\bin\Release\Model.dll
D:\开发代码\SGGL_NB\SGGL\Model\bin\Release\Model.pdb
D:\开发代码\SGGL_NB\SGGL\Model\obj\Release\Model.dll
D:\开发代码\SGGL_NB\SGGL\Model\obj\Release\Model.pdb
D:\开发代码\SGGL_NBBAK\SGGL\Model\bin\Release\Model.dll
D:\开发代码\SGGL_NBBAK\SGGL\Model\bin\Release\Model.pdb
D:\开发代码\SGGL_NBBAK\SGGL\Model\obj\Release\Model.dll
D:\开发代码\SGGL_NBBAK\SGGL\Model\obj\Release\Model.pdb
D:\开发代码\SGGL_NB_\SGGL\Model\bin\Release\Model.dll
D:\开发代码\SGGL_NB_\SGGL\Model\bin\Release\Model.pdb
D:\开发代码\SGGL_NB_\SGGL\Model\obj\Release\Model.dll
D:\开发代码\SGGL_NB_\SGGL\Model\obj\Release\Model.pdb
D:\开发代码\宁波\SGGL_NB_\SGGL\Model\bin\Release\Model.dll
D:\开发代码\宁波\SGGL_NB_\SGGL\Model\bin\Release\Model.pdb
D:\开发代码\宁波\SGGL_NB_\SGGL\Model\obj\Release\Model.dll
D:\开发代码\宁波\SGGL_NB_\SGGL\Model\obj\Release\Model.pdb
D:\开发代码\宁波\SGGL(NB)\SGGL\Model\bin\Release\Model.dll
D:\开发代码\宁波\SGGL(NB)\SGGL\Model\bin\Release\Model.pdb
D:\开发代码\宁波\SGGL(NB)\SGGL\Model\obj\Release\Model.dll
D:\开发代码\宁波\SGGL(NB)\SGGL\Model\obj\Release\Model.pdb
D:\开发代码\SGGL(NB)\SGGL\Model\bin\Release\Model.dll
D:\开发代码\SGGL(NB)\SGGL\Model\bin\Release\Model.pdb
D:\开发代码\SGGL(NB)\SGGL\Model\obj\Release\Model.dll
D:\开发代码\SGGL(NB)\SGGL\Model\obj\Release\Model.pdb
H:\工作\宁波石化平台\SGGL_NB\SGGL\Model\bin\Release\Model.dll
H:\工作\宁波石化平台\SGGL_NB\SGGL\Model\bin\Release\Model.pdb
H:\工作\宁波石化平台\SGGL_NB\SGGL\Model\obj\Release\Model.dll
H:\工作\宁波石化平台\SGGL_NB\SGGL\Model\obj\Release\Model.pdb
D:\ExtJs\HJGL\SGGL\Model\bin\Release\Model.dll
D:\ExtJs\HJGL\SGGL\Model\bin\Release\Model.pdb
D:\ExtJs\HJGL\SGGL\Model\obj\Release\Model.dll
D:\ExtJs\HJGL\SGGL\Model\obj\Release\Model.pdb
H:\工作\镇海焊接\HJGL_2017.11.30\SGGL\Model\bin\Release\Model.dll
H:\工作\镇海焊接\HJGL_2017.11.30\SGGL\Model\bin\Release\Model.pdb
H:\工作\镇海焊接\HJGL_2017.11.30\SGGL\Model\obj\Release\Model.dll
H:\工作\镇海焊接\HJGL_2017.11.30\SGGL\Model\obj\Release\Model.pdb
H:\工作\镇海焊接\HJGL_2017.12.15.002\SGGL\Model\bin\Release\Model.dll
H:\工作\镇海焊接\HJGL_2017.12.15.002\SGGL\Model\bin\Release\Model.pdb
H:\工作\镇海焊接\HJGL_2017.12.15.002\SGGL\Model\obj\Release\Model.dll
H:\工作\镇海焊接\HJGL_2017.12.15.002\SGGL\Model\obj\Release\Model.pdb
H:\工作\镇海焊接\SGGL\Model\bin\Release\Model.dll
H:\工作\镇海焊接\SGGL\Model\bin\Release\Model.pdb
H:\工作\镇海焊接\SGGL\Model\obj\Release\Model.dll
H:\工作\镇海焊接\SGGL\Model\obj\Release\Model.pdb
H:\工作\镇海焊接\HJGL_2018.02.24\SGGL\Model\bin\Release\Model.dll
H:\工作\镇海焊接\HJGL_2018.02.24\SGGL\Model\bin\Release\Model.pdb
H:\工作\镇海焊接\HJGL_2018.02.24\SGGL\Model\obj\Release\Model.dll
H:\工作\镇海焊接\HJGL_2018.02.24\SGGL\Model\obj\Release\Model.pdb
E:\工作\镇海焊接\SGGL\Model\bin\Release\Model.dll
E:\工作\镇海焊接\SGGL\Model\bin\Release\Model.pdb
E:\工作\镇海焊接\SGGL\Model\obj\Release\Model.dll
E:\工作\镇海焊接\SGGL\Model\obj\Release\Model.pdb
E:\ExtJs\HJGL\SGGL\Model\bin\Release\Model.dll
E:\ExtJs\HJGL\SGGL\Model\bin\Release\Model.pdb
E:\ExtJs\HJGL\SGGL\Model\obj\Release\Model.dll
E:\ExtJs\HJGL\SGGL\Model\obj\Release\Model.pdb
E:\ExtJs\HJGL\SGGL\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyProject\ZHJA\HJGL\SGGL\Model\bin\Release\Model.dll
D:\MyProject\ZHJA\HJGL\SGGL\Model\bin\Release\Model.pdb
D:\MyProject\ZHJA\HJGL\SGGL\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyProject\ZHJA\HJGL\SGGL\Model\obj\Release\Model.dll
D:\MyProject\ZHJA\HJGL\SGGL\Model\obj\Release\Model.pdb
D:\MyProject\ZHNew\HJGL\SGGL\Model\bin\Release\Model.dll
D:\MyProject\ZHNew\HJGL\SGGL\Model\bin\Release\Model.pdb
D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Release\Model.dll
D:\MyProject\ZHNew\HJGL\SGGL\Model\obj\Release\Model.pdb
E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\bin\Release\Model.dll
E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\bin\Release\Model.pdb
E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Release\Model.dll
E:\工作\镇海焊接\SGGL_New_2019.09.23\SGGL\Model\obj\Release\Model.pdb
E:\工作\镇海焊接\SGGL_New\SGGL\Model\bin\Release\Model.dll
E:\工作\镇海焊接\SGGL_New\SGGL\Model\bin\Release\Model.pdb
E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Release\Model.dll
E:\工作\镇海焊接\SGGL_New\SGGL\Model\obj\Release\Model.pdb
D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\bin\Release\Model.dll
D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\bin\Release\Model.pdb
D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\obj\Release\Model.dll
D:\MyProject\ZHNew\HJGL_ZH\HJGL_ZH\Model\obj\Release\Model.pdb
E:\工作\镇海焊接\HJGL_ZH\Model\bin\Release\Model.dll
E:\工作\镇海焊接\HJGL_ZH\Model\bin\Release\Model.pdb
E:\工作\镇海焊接\HJGL_ZH\Model\obj\Release\Model.csprojAssemblyReference.cache
E:\工作\镇海焊接\HJGL_ZH\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
E:\工作\镇海焊接\HJGL_ZH\Model\obj\Release\Model.dll
E:\工作\镇海焊接\HJGL_ZH\Model\obj\Release\Model.pdb
E:\工作\镇海焊接\SGGL\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyNewProject\ZHJA\HJGL_ZH\Model\bin\Release\Model.dll
D:\MyNewProject\ZHJA\HJGL_ZH\Model\bin\Release\Model.pdb
D:\MyNewProject\ZHJA\HJGL_ZH\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyNewProject\ZHJA\HJGL_ZH\Model\obj\Release\Model.dll
D:\MyNewProject\ZHJA\HJGL_ZH\Model\obj\Release\Model.pdb
D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Release\Model.dll
D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Release\Model.pdb
D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.dll
D:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.pdb
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Release\Model.dll
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\bin\Release\Model.pdb
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.dll
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.pdb
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Release\Model.csprojAssemblyReference.cache
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\bin\Release\Model.dll
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\bin\Release\Model.pdb
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Release\Model.csproj.AssemblyReference.cache
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Release\Model.csproj.CoreCompileInputs.cache
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Release\Model.dll
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Release\Model.pdb

Binary file not shown.

Binary file not shown.

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>

View File

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