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

焊接修改

This commit is contained in:
李鹏飞 2024-10-17 21:46:32 +08:00
parent 022aebc00d
commit fec4225aff
62 changed files with 4200 additions and 1016 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Basf_TCC7/v17/.wsuo Normal file
View File

Binary file not shown.

79
.vs/Basf_TCC7/v17/DocumentLayout.json Normal file
View File

@ -0,0 +1,79 @@
{
"Version": 1,
"WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u6E5B\u6C5F\u5DF4\u65AF\u592B\\Basf_TCC7\\",
"Documents": [],
"DocumentGroupContainers": [
{
"Orientation": 1,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedHeight": 191,
"SelectedChildIndex": -1,
"Children": [
{
"$type": "Bookmark",
"Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
},
{
"$type": "Bookmark",
"Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
},
{
"$type": "Bookmark",
"Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
},
{
"$type": "Bookmark",
"Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
}
]
}
]
}
]
}

7
.vs/VSWorkspaceState.json Normal file
View File

@ -0,0 +1,7 @@
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\HJGL.sln",
"PreviewInSolutionExplorer": false
}

33
CreateModel_lpf.bat Normal file
View File

@ -0,0 +1,33 @@
@echo off
REM ---------------
REM 发布包生成工具
REM 执行此文件前请先用Release生成WebOA项目
REM --------------
REM --------------
REM 环境变量设置 Project_Src为如WebOA这样的分支
REM --------------
set PROJECT_SRC=%CD%
cd..
REM 源代码Model项目文件夹
set Model_ROOT=%PROJECT_SRC%\HJGL\Model
REM --------------
REM 发布程序包文件夹相关
REM --------------
@echo 设置.net控制台环境
@echo.
@call "D:\Visual Studio 2022\Common7\Tools\VsDevCmd.bat"
SqlMetal /views /server:.\MSSQLSERVER2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

4
HJGL/.vs/HJGL/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site>
<site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
<virtualDirectory path="/" physicalPath="D:\数据\诺必达\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" />
@ -250,7 +250,7 @@
</site>
<site name="FineUIPro.Web(10)" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
<virtualDirectory path="/" physicalPath="D:\数据\诺必达\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:13960:localhost" />

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

Binary file not shown.

2
HJGL/BLL/.vs/BLL.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

5
HJGL/BLL/BLL.csproj
View File

@ -51,8 +51,9 @@
<Reference Include="EmitMapper">
<HintPath>..\FineUIPro.Web\bin\EmitMapper.dll</HintPath>
</Reference>
<Reference Include="FineUIPro">
<HintPath>bin\FineUIPro.dll</HintPath>
<Reference Include="FineUIPro, Version=3.6.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>

5
HJGL/BLL/WeldingProcess/CheckManage/RepairRecordService.cs
View File

@ -33,7 +33,9 @@ namespace BLL
/// <param name="NDEItem"></param>
public static void AddRepairRecord(Model.Repair_RepairRecord repair)
{
Model.HJGLDB db = Funs.DB;
using (Model.HJGLDB db = new Model.HJGLDB(Funs.ConnString))
{
Model.Repair_RepairRecord newRepair = new Model.Repair_RepairRecord();
newRepair.RepairRecordId = repair.RepairRecordId;
newRepair.RepairRecordCode = repair.RepairRecordCode;
@ -57,6 +59,7 @@ namespace BLL
db.Repair_RepairRecord.InsertOnSubmit(newRepair);
db.SubmitChanges();
}
}
public static void UpdateRepairRecord(Model.Repair_RepairRecord repair)
{

2
HJGL/BLL/WeldingProcess/DataIn/DataInTempService.cs
View File

@ -68,6 +68,7 @@ namespace BLL
newDataInTemp.Value36 = dataInTemp.Value36;
newDataInTemp.Value37 = dataInTemp.Value37;
newDataInTemp.Value38 = dataInTemp.Value38;
newDataInTemp.Value39 = dataInTemp.Value39;
newDataInTemp.ToopValue = dataInTemp.ToopValue;
db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp);
db.SubmitChanges();
@ -123,6 +124,7 @@ namespace BLL
newDataInTemp.Value36 = dataInTemp.Value36;
newDataInTemp.Value37 = dataInTemp.Value37;
newDataInTemp.Value38 = dataInTemp.Value38;
newDataInTemp.Value39 = dataInTemp.Value39;
newDataInTemp.ToopValue = dataInTemp.ToopValue;
try
{

47
HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs
View File

@ -142,6 +142,13 @@ namespace BLL
db.SubmitChanges();
}
public static List<Model.PTP_PipelineList> getPipelineListByPTP_ID(string PTP_ID)
{
Model.HJGLDB db = Funs.DB;
var view = (from x in db.PTP_PipelineList where x.PTP_ID == PTP_ID select x).ToList();
return view;
}
/// <summary>
/// 根据主键删除试压信息明细
/// </summary>
@ -156,7 +163,31 @@ namespace BLL
db.SubmitChanges();
}
}
/// <summary>
/// 根据试压包和区域主键删除试压信息明细
/// </summary>
/// <param name="testPackageID"></param>
/// <param name="workAreaId"></param>
public static void DeletePipelineListByPTP_IDAndWorkAreaId(string testPackageID,string workAreaId)
{
Model.HJGLDB db = Funs.DB;
var testPackage = from x in db.PTP_PipelineList where x.PTP_ID == testPackageID && x.WorkAreaId==workAreaId select x;
if (testPackage != null)
{
db.PTP_PipelineList.DeleteAllOnSubmit(testPackage);
db.SubmitChanges();
}
}
public static void DeletePipelineListByPT_PipeId(string PT_PipeId)
{
Model.HJGLDB db = Funs.DB;
var testPackage = from x in db.PTP_PipelineList where x.PT_PipeId == PT_PipeId select x;
if (testPackage != null)
{
db.PTP_PipelineList.DeleteAllOnSubmit(testPackage);
db.SubmitChanges();
}
}
/// <summary>
/// 增加试压信息明细
/// </summary>
@ -176,7 +207,19 @@ namespace BLL
db.PTP_PipelineList.InsertOnSubmit(newPipelineList);
db.SubmitChanges();
}
public static bool IsPipelineListExists(string PTP_ID, string PipelineId)
{
Model.HJGLDB db = Funs.DB;
var pipelineList = from x in db.PTP_PipelineList where x.PTP_ID == PTP_ID && x.PipelineId == PipelineId select x;
if (pipelineList.Count() > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 根据单位获取试压
/// </summary>

74
HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
View File

@ -55,7 +55,67 @@ namespace BLL
/// <param name="weldJoint"></param>
public static void AddWeldJoint(Model.Pipeline_WeldJoint weldJoint)
{
Model.HJGLDB db = Funs.DB;
using (Model.HJGLDB db = new Model.HJGLDB(Funs.ConnString))
{
Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint
{
WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)),
ProjectId = weldJoint.ProjectId,
PipelineId = weldJoint.PipelineId,
WeldJointCode = weldJoint.WeldJointCode,
WeldTypeId = weldJoint.WeldTypeId,
Material1Id = weldJoint.Material1Id,
Material2Id = weldJoint.Material2Id,
Thickness = weldJoint.Thickness,
Dia = weldJoint.Dia,
Size = weldJoint.Size,
JointAttribute = weldJoint.JointAttribute,
JointArea = weldJoint.JointArea,
WeldingMethodId = weldJoint.WeldingMethodId,
IsHotProess = weldJoint.IsHotProess,
WeldingLocationId = weldJoint.WeldingLocationId,
WeldMatId = weldJoint.WeldMatId,
WeldSilkId = weldJoint.WeldSilkId,
GrooveTypeId = weldJoint.GrooveTypeId,
PipeSegment = weldJoint.PipeSegment,
PipeAssembly1Id = weldJoint.PipeAssembly1Id,
PipeAssembly2Id = weldJoint.PipeAssembly2Id,
PipeAssemblyCount = weldJoint.PipeAssemblyCount,
HeartNo1 = weldJoint.HeartNo1,
HeartNo2 = weldJoint.HeartNo2,
LastTemp = weldJoint.LastTemp,
CellTemp = weldJoint.CellTemp,
PrepareTemp = weldJoint.PrepareTemp,
Electricity = weldJoint.Electricity,
Voltage = weldJoint.Voltage,
TestPackageNo = weldJoint.TestPackageNo,
WeldingDailyCode = weldJoint.WeldingDailyCode,
BackingWelderId = weldJoint.BackingWelderId,
CoverWelderId = weldJoint.CoverWelderId,
WeldingDailyId = weldJoint.WeldingDailyId,
PipingClassId = weldJoint.PipingClassId,
Specification = weldJoint.Specification,
DoneDin = weldJoint.DoneDin,
SystemNumber = weldJoint.SystemNumber,
Remark = weldJoint.Remark,
IsGoldJoint = weldJoint.IsGoldJoint,
IsPMI = weldJoint.IsPMI,
WPQId = weldJoint.WPQId,
DetectionType = weldJoint.DetectionType,
PageNum = weldJoint.PageNum,
ANSISCH = weldJoint.ANSISCH,
IsBracket = weldJoint.IsBracket,
};
db.Pipeline_WeldJoint.InsertOnSubmit(newWeldJoint);
db.SubmitChanges();
}
}
public static string AddWeldJointRef(Model.Pipeline_WeldJoint weldJoint )
{ string weldJointId = "";
using (Model.HJGLDB db = new Model.HJGLDB(Funs.ConnString))
{
Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint
{
WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)),
@ -108,6 +168,10 @@ namespace BLL
db.Pipeline_WeldJoint.InsertOnSubmit(newWeldJoint);
db.SubmitChanges();
weldJointId = newWeldJoint.WeldJointId;
}
return weldJointId;
}
/// <summary>
@ -164,6 +228,7 @@ namespace BLL
newWeldJoint.DetectionType = weldJoint.DetectionType;
newWeldJoint.PageNum = weldJoint.PageNum;
newWeldJoint.ANSISCH = weldJoint.ANSISCH;
newWeldJoint.IsBracket = weldJoint.IsBracket;
db.SubmitChanges();
}
}
@ -213,6 +278,7 @@ namespace BLL
newWeldJoint.DetectionType = weldJoint.DetectionType;
newWeldJoint.PageNum = weldJoint.PageNum;
newWeldJoint.ANSISCH = weldJoint.ANSISCH;
newWeldJoint.IsBracket = weldJoint.IsBracket;
db.SubmitChanges();
}
}
@ -252,10 +318,8 @@ namespace BLL
{
newWeldJoint.WeldingLocationId = weldJoint.WeldingLocationId;
}
if (!string.IsNullOrEmpty(weldJoint.WeldMatId))
{
newWeldJoint.WeldMatId = weldJoint.WeldMatId;
}
if (!string.IsNullOrEmpty(weldJoint.WeldSilkId))
{
newWeldJoint.WeldSilkId = weldJoint.WeldSilkId;
@ -338,6 +402,8 @@ namespace BLL
newWeldJoint.IsGoldJoint = weldJoint.IsGoldJoint;
newWeldJoint.WPQId = weldJoint.WPQId;
newWeldJoint.DetectionType = weldJoint.DetectionType;
newWeldJoint.IsBracket = weldJoint.IsBracket;
if (!string.IsNullOrEmpty(weldJoint.PageNum))
{
newWeldJoint.PageNum = weldJoint.PageNum;

2
HJGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

9
HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs generated
View File

@ -4272,6 +4272,15 @@ namespace Resources {
}
}
/// <summary>
/// 查找类似 返修扩探追踪清单 的本地化字符串。
/// </summary>
internal static string RepairExpansionTrackingList {
get {
return ResourceManager.GetString("RepairExpansionTrackingList", resourceCulture);
}
}
/// <summary>
/// 查找类似 返修位置 的本地化字符串。
/// </summary>

3
HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
View File

@ -2136,4 +2136,7 @@
<data name="PMICodeNotExists" xml:space="preserve">
<value>不存在此PMI委托</value>
</data>
<data name="RepairExpansionTrackingList" xml:space="preserve">
<value>返修扩探追踪清单</value>
</data>
</root>

BIN
HJGL/FineUIPro.Web/File/Excel/HJGL_DataIn/焊接数据导入模版.xlsx
View File

Binary file not shown.

23
HJGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -64,7 +64,8 @@
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="FineUIPro">
<Reference Include="FineUIPro, Version=3.6.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
@ -96,6 +97,9 @@
<Reference Include="MimeKit, Version=4.6.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
<HintPath>..\packages\MimeKit.4.6.0\lib\net48\MimeKit.dll</HintPath>
</Reference>
<Reference Include="MiniExcel, Version=1.34.2.0, Culture=neutral, PublicKeyToken=e7310002a53eac39, processorArchitecture=MSIL">
<HintPath>..\packages\MiniExcel.1.34.2\lib\net45\MiniExcel.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@ -119,6 +123,7 @@
<Reference Include="System.Formats.Asn1, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Formats.Asn1.8.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
@ -1312,6 +1317,8 @@
<Content Include="WeldingProcess\WeldingReport\IsoCmprehensive.aspx" />
<Content Include="WeldingProcess\WeldingReport\IsoCompreInfo.aspx" />
<Content Include="WeldingProcess\WeldingReport\JointComprehensive.aspx" />
<Content Include="WeldingProcess\WeldingReport\PipelineTraceList.aspx" />
<Content Include="WeldingProcess\WeldingReport\RepairExTrackingList.aspx" />
<Content Include="WeldingProcess\WeldingReport\RTRateConfirm.aspx" />
<Content Include="WeldingProcess\WeldingReport\WeldDailyExport.aspx" />
<Content Include="WeldingProcess\WeldingReport\MediaComprehensive.aspx" />
@ -5793,6 +5800,20 @@
<Compile Include="WeldingProcess\WeldingReport\JointComprehensive.aspx.designer.cs">
<DependentUpon>JointComprehensive.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\WeldingReport\PipelineTraceList.aspx.cs">
<DependentUpon>PipelineTraceList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldingProcess\WeldingReport\PipelineTraceList.aspx.designer.cs">
<DependentUpon>PipelineTraceList.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\WeldingReport\RepairExTrackingList.aspx.cs">
<DependentUpon>RepairExTrackingList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldingProcess\WeldingReport\RepairExTrackingList.aspx.designer.cs">
<DependentUpon>RepairExTrackingList.aspx</DependentUpon>
</Compile>
<Compile Include="WeldingProcess\WeldingReport\RTRateConfirm.aspx.cs">
<DependentUpon>RTRateConfirm.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

3
HJGL/FineUIPro.Web/Global.asax.cs
View File

@ -297,7 +297,8 @@
{
var wpsList = from x in Funs.DB.WPQ_WPQList where x.ProjectId == ((Model.Sys_User)Session["CurrUser"]).LoginProjectId select x;
var welderList = from x in Funs.DB.Welder_ProjectWelder where x.ProjectId == ((Model.Sys_User)Session["CurrUser"]).LoginProjectId select x;
foreach (var wps in wpsList)
foreach (var wps in
wpsList)
{
string testWelder = string.Empty;
string materialStr = string.Empty;

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

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\MSSQLSERVER2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;" />
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>
@ -133,6 +133,10 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

7
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx
View File

@ -35,6 +35,13 @@
AutoPostBack="true" Label="<%$ Resources:Lan,TestNumber %>" LabelWidth="100px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:CheckBox ID="ckUnqualified" ShowLabel="false" runat="server" Text="<%$ Resources:Lan,Unqualified %>" Checked="false">
</f:CheckBox>
</Items>
</f:Toolbar>
</Toolbars>

9
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
View File

@ -203,7 +203,7 @@ namespace FineUIPro.Web.CheckManage
//单号
string ndtTypeId = e.Node.NodeID.Split('|')[0];
var checks = from x in Funs.DB.View_Batch_NDE
var checks = (from x in Funs.DB.View_Batch_NDE
where x.NDEDate < Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.NDEDate >= Convert.ToDateTime(this.txtNDEDateMonth.Text.Trim() + "-01").AddMonths(-1)
&& x.ProjectId == this.CurrUser.LoginProjectId && x.NDECode.Contains(this.txtSearchCode.Text.Trim())
@ -211,7 +211,12 @@ namespace FineUIPro.Web.CheckManage
&& x.UnitId == e.Node.ParentNode.ParentNode.NodeID
&& x.DetectionTypeId == ndtTypeId
orderby x.NDECode descending
select x;
select x).ToList();
if (ckUnqualified.Checked)
{
var q = (from x in Funs.DB.View_NoReportNdt select x.NDEID).ToList().Distinct();
checks = checks.Where(x => q.Contains(x.NDEID)).ToList();
}
foreach (var check in checks)
{
TreeNode newNode = new TreeNode();

24
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CheckManage {
namespace FineUIPro.Web.CheckManage
{
public partial class CheckManage {
public partial class CheckManage
{
/// <summary>
/// form1 控件。
@ -84,6 +86,24 @@ namespace FineUIPro.Web.CheckManage {
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// ckUnqualified 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckUnqualified;
/// <summary>
/// tvControlItem 控件。
/// </summary>

39
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
View File

@ -245,6 +245,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@DetectionTypeId", repairRecord.DetectionTypeId));
#region 旧逻辑
// 如果是第二次返修不加载扩透口
if (!code4.Contains("EX1") && code2 == "R2")
{
@ -275,6 +276,24 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
}
}
#endregion
#region 新逻辑
//var rate = from x in Funs.DB.Pipeline_WeldJoint
// join y in Funs.DB.Pipeline_Pipeline on x.PipelineId equals y.PipelineId
// join z in Funs.DB.Base_DetectionRate on y.DetectionRateId equals z.DetectionRateId
// where x.WeldJointId == repairRecord.WeldJointId
// select z.DetectionRateValue;
//// 如果返修的焊口为100%的检测比例，则不进行扩透
//if (rate.Count() > 0 && rate.First().Value == 100)
//{
// listStr.Add(new SqlParameter("@ProjectId", "0"));
//}
//else
//{
// listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
//}
#endregion
//if (ndt.SysType == "射线检测")
//{
// strSql += " AND Flag = @Flag";
@ -406,6 +425,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
var rjot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(repair.WeldJointId);
rjot.WeldJointCode = rjot.WeldJointCode.Replace("R1","").Replace("P1", "").Replace("S1", "").Trim() + "C1";
rjot.OldWeldJointCode = rjot.WeldJointCode;
rjot.Remark = "返修割口";
Funs.DB.SubmitChanges();
}
else
@ -608,12 +628,14 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
// 回写焊口
var joint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(repair.WeldJointId);
if (!string.IsNullOrEmpty(joint.OldWeldJointCode))
{
joint.WeldJointCode = joint.OldWeldJointCode;
joint.OldWeldJointCode = null;
Funs.DB.SubmitChanges();
}
//if (!string.IsNullOrEmpty(joint.OldWeldJointCode))
//{
// joint.WeldJointCode = joint.OldWeldJointCode;
// joint.OldWeldJointCode = null;
// Funs.DB.SubmitChanges();
//}--应为删除返修口
//var exp = BLL.RepairRecordService.GetExportItem(repairRecordId);
//if (exp != null)
//{
@ -628,6 +650,11 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
//}
db.Repair_RepairRecord.DeleteOnSubmit(repair);
db.SubmitChanges();
if (joint.WeldJointCode.Contains("P") || joint.WeldJointCode.Contains("S") || joint.WeldJointCode.Contains("R"))
{
Pipeline_WeldJointService.DeleteWeldJointById(joint.WeldJointId);
}
this.InitTreeMenu();//加载树
Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
}

225
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
View File

@ -78,68 +78,26 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
newItem.RepairRecordId = SQLHelper.GetNewID(typeof(Model.Repair_RepairRecord));
string code = q.TrustBatchCode;
if (code.Substring(code.Length - 2, 1) == "R")
{
string first = code.Substring(0, code.Length - 1);
string last = code.Substring(code.Length - 1);
int n = Convert.ToInt32(last) + 1;
newItem.RepairRecordCode = first + n.ToString();
newJointCode = q.WeldJointCode.Substring(0, q.WeldJointCode.Length - 2) + "R" + n.ToString();
}
else
{
if (q.CheckResult != "1") // 不合格
{
if (code.Substring(code.Length - 3, 2) == "EX")
{
newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1";
}
else
{
newItem.RepairRecordCode = q.TrustBatchCode + "R1";
}
if (!q.WeldJointCode.Contains("R1"))
{
newJointCode = q.WeldJointCode + "R1";
}
else
{
newJointCode = q.WeldJointCode;
}
}
else // 合格但有修磨或异物
{
if (q.Remark.Contains("修磨"))
{
newItem.RepairRecordCode = q.TrustBatchCode + "P1";
if (!q.WeldJointCode.Contains("P1"))
{
newJointCode = q.WeldJointCode + "P1";
}
else
{
newJointCode = q.WeldJointCode;
}
}
if (q.Remark.Contains("异物"))
{
newItem.RepairRecordCode = q.TrustBatchCode + "S1";
if (!q.WeldJointCode.Contains("S1"))
{
newJointCode = q.WeldJointCode + "S1";
}
else
{
newJointCode = q.WeldJointCode;
}
}
}
#region 原逻辑
//if (code.Substring(code.Length - 2, 1) == "R")
//{
// string first = code.Substring(0, code.Length - 1);
// string last = code.Substring(code.Length - 1);
// int n = Convert.ToInt32(last) + 1;
// newItem.RepairRecordCode = first + n.ToString();
// newJointCode = q.WeldJointCode.Substring(0, q.WeldJointCode.Length - 2) + "R" + n.ToString();
//}
//else
//{
// if (q.CheckResult != "1") // 不合格
// {
// if (code.Substring(code.Length - 3, 2) == "EX")
// {
// newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1";
// }
// else
// {
// newItem.RepairRecordCode = q.TrustBatchCode + "R1";
// }
// if (!q.WeldJointCode.Contains("R1"))
// {
// newJointCode = q.WeldJointCode + "R1";
@ -149,7 +107,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
// newJointCode = q.WeldJointCode;
// }
// }
//else
// else // 合格但有修磨或异物
// {
// if (q.Remark.Contains("修磨"))
// {
@ -163,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
// newJointCode = q.WeldJointCode;
// }
// }
// else if (q.Remark.Contains("异物"))
// if (q.Remark.Contains("异物"))
// {
// newItem.RepairRecordCode = q.TrustBatchCode + "S1";
@ -176,34 +134,147 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
// newJointCode = q.WeldJointCode;
// }
// }
// else
// {
// newItem.RepairRecordCode = q.TrustBatchCode + "R1";
// if (!q.WeldJointCode.Contains("R1"))
// {
// newJointCode = q.WeldJointCode + "R1";
// }
// else
// {
// newJointCode = q.WeldJointCode;
// #region 原逻辑
// //if (code.Substring(code.Length - 3, 2) == "EX")
// //{
// // newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + "EX1R1";
// // if (!q.WeldJointCode.Contains("R1"))
// // {
// // newJointCode = q.WeldJointCode + "R1";
// // }
// // else
// // {
// // newJointCode = q.WeldJointCode;
// // }
// //}
// //else
// //{
// // if (q.Remark.Contains("修磨"))
// // {
// // newItem.RepairRecordCode = q.TrustBatchCode + "P1";
// // if (!q.WeldJointCode.Contains("P1"))
// // {
// // newJointCode = q.WeldJointCode + "P1";
// // }
// // else
// // {
// // newJointCode = q.WeldJointCode;
// // }
// // }
// // else if (q.Remark.Contains("异物"))
// // {
// // newItem.RepairRecordCode = q.TrustBatchCode + "S1";
// // if (!q.WeldJointCode.Contains("S1"))
// // {
// // newJointCode = q.WeldJointCode + "S1";
// // }
// // else
// // {
// // newJointCode = q.WeldJointCode;
// // }
// // }
// // else
// // {
// // newItem.RepairRecordCode = q.TrustBatchCode + "R1";
// // if (!q.WeldJointCode.Contains("R1"))
// // {
// // newJointCode = q.WeldJointCode + "R1";
// // }
// // else
// // {
// // newJointCode = q.WeldJointCode;
// // }
// // }
// //}
// #endregion
//}
// }
//}
#endregion
if (code.Substring(code.Length - 2, 1)=="R"|| code.Substring(code.Length - 2, 1) == "P" || code.Substring(code.Length - 2, 1) == "S")
{
newItem.RepairRecordCode = code.Substring(0,code.Length - 2) + txtRepairMark.Text;
newJointCode = q.WeldJointCode.Substring(0, q.WeldJointCode.Length - 2)+txtRepairMark.Text;
}
else
{
newItem.RepairRecordCode = code + txtRepairMark.Text;
newJointCode = q.WeldJointCode + txtRepairMark.Text;
}
var isExistRepairRecordCode = from x in Funs.DB.Repair_RepairRecord where x.RepairRecordCode == newItem.RepairRecordCode select x;
if (isExistRepairRecordCode.Count() > 0)
{
ShowNotify("该返修号已存在！请修改已存在的返修号", MessageBoxIcon.Warning);
return;
}
// 回写焊口号
var weldJoint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId);
//joint.WeldJointCode = newJointCode;
//joint.OldWeldJointCode = q.WeldJointCode;
//Funs.DB.SubmitChanges();
Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint
{
WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)),
ProjectId = weldJoint.ProjectId,
PipelineId = weldJoint.PipelineId,
WeldJointCode = newJointCode,
WeldTypeId = weldJoint.WeldTypeId,
Material1Id = weldJoint.Material1Id,
Material2Id = weldJoint.Material2Id,
Thickness = weldJoint.Thickness,
Dia = weldJoint.Dia,
Size = weldJoint.Size,
JointAttribute = weldJoint.JointAttribute,
JointArea = weldJoint.JointArea,
WeldingMethodId = weldJoint.WeldingMethodId,
IsHotProess = weldJoint.IsHotProess,
WeldingLocationId = weldJoint.WeldingLocationId,
WeldMatId = weldJoint.WeldMatId,
WeldSilkId = weldJoint.WeldSilkId,
GrooveTypeId = weldJoint.GrooveTypeId,
PipeSegment = weldJoint.PipeSegment,
PipeAssembly1Id = weldJoint.PipeAssembly1Id,
PipeAssembly2Id = weldJoint.PipeAssembly2Id,
PipeAssemblyCount = weldJoint.PipeAssemblyCount,
HeartNo1 = weldJoint.HeartNo1,
HeartNo2 = weldJoint.HeartNo2,
LastTemp = weldJoint.LastTemp,
CellTemp = weldJoint.CellTemp,
PrepareTemp = weldJoint.PrepareTemp,
Electricity = weldJoint.Electricity,
Voltage = weldJoint.Voltage,
TestPackageNo = weldJoint.TestPackageNo,
WeldingDailyCode = weldJoint.WeldingDailyCode,
BackingWelderId = weldJoint.BackingWelderId,
CoverWelderId = weldJoint.CoverWelderId,
WeldingDailyId = weldJoint.WeldingDailyId,
PipingClassId = weldJoint.PipingClassId,
Specification = weldJoint.Specification,
DoneDin = weldJoint.DoneDin,
SystemNumber = weldJoint.SystemNumber,
Remark = weldJoint.Remark,
IsGoldJoint = weldJoint.IsGoldJoint,
IsPMI = weldJoint.IsPMI,
WPQId = weldJoint.WPQId,
DetectionType = weldJoint.DetectionType,
PageNum = weldJoint.PageNum,
ANSISCH = weldJoint.ANSISCH,
OldWeldJointCode = weldJoint.OldWeldJointCode,
};
string WeldJointId= BLL.Pipeline_WeldJointService.AddWeldJointRef(newWeldJoint);
newItem.ProjectId = q.ProjectId;
newItem.UnitId = q.UnitId;
newItem.InstallationId = q.InstallationId;
newItem.WorkAreaId = q.WorkAreaId;
newItem.NoticeDate = DateTime.Now;
newItem.NDEItemID = ndeItemId;
newItem.WeldJointId = q.WeldJointId;
newItem.WeldJointId = WeldJointId;
newItem.DetectionTypeId = q.DetectionTypeId;
newItem.WelderId = q.BackingWelderId;
newItem.RepairLocation = q.RepairLocation;
@ -211,12 +282,6 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
newItem.RepairMark = txtRepairMark.Text;
newItem.PhotoUrl = imgPhoto.ImageUrl;
BLL.RepairRecordService.AddRepairRecord(newItem);
// 回写焊口号
var joint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId);
joint.WeldJointCode = newJointCode;
joint.OldWeldJointCode = q.WeldJointCode;
Funs.DB.SubmitChanges();
}
else
{

3
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx
View File

@ -219,6 +219,9 @@
<f:RenderField Width="80px" HeaderText="焊条" ColumnID="Value37" DataField="Value37"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:RenderField Width="80px" HeaderText="特殊规格" ColumnID="Value39" DataField="Value39"
FieldType="String" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

23
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs
View File

@ -65,7 +65,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,
Value8,Value9,Value10,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,
Value20,Value21,Value22,Value23,Value24,Value25,Value26,Value27,Value28,Value29,Value30,Value31,
Value32,Value33,Value34,Value35,Value36,Value37,Value38
Value32,Value33,Value34,Value35,Value36,Value37,Value38,Value39
FROM Sys_DataInTemp
WHERE UserId=@UserId";
List<SqlParameter> listStr = new List<SqlParameter>();
@ -355,6 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim();
newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim();
newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim();
newDataInTemp.Value39 = ds.Tables[0].Rows[i][38].ToString().Trim();
BLL.DataInTempService.AddDataInTemp(newDataInTemp);
}
@ -1524,6 +1525,12 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
}
if (!string.IsNullOrEmpty(tempData.Value37))
{
if (tempData.Value37=="NULL")
{
weldJoint.WeldMatId = null;
}
else
{
var weldMat = consumabless.FirstOrDefault(x => x.ConsumablesCode == tempData.Value37 && x.ConsumablesType == "2");
if (weldMat == null)
@ -1535,6 +1542,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
weldJoint.WeldMatId = weldMat.ConsumablesId;
}
}
}
else
{
if (jot != null && !string.IsNullOrEmpty(jot.WeldMatId))
@ -1561,6 +1570,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
weldJoint.IsPMI = jot.IsPMI;
}
}
if (!string.IsNullOrEmpty(tempData.Value39))
{
weldJoint.IsBracket = true;
weldJoint.Specification = tempData.Value39;
}
else
{
if (jot != null && jot.IsBracket != null)
{
weldJoint.IsBracket = jot.IsBracket;
}
}
if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口
{

9
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx
View File

@ -20,6 +20,15 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="A项尾工录入节点树" OnNodeCommand="tvControlItem_NodeCommand"

8
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.cs
View File

@ -185,11 +185,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
var dReports = (from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();

24
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class AItemEndCheck {
public partial class AItemEndCheck
{
/// <summary>
/// Head1 控件。
@ -75,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>

10
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx
View File

@ -21,6 +21,16 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压后尾项B检查节点树" OnNodeCommand="tvControlItem_NodeCommand"

8
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.cs
View File

@ -185,11 +185,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
var dReports = (from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();

24
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class BItemEndCheck {
public partial class BItemEndCheck
{
/// <summary>
/// Head1 控件。
@ -75,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>

134
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx
View File

@ -18,7 +18,7 @@
}
.Purple span {
background-color: Purple;
background-color: plum;
}
.f-grid-row.Cyan {
@ -34,7 +34,7 @@
}
.f-grid-row.Purple {
background-color: Purple;
background-color: plum;
}
/*定义父容器*/
@ -61,7 +61,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="230px" Title="试压包" ShowBorder="true" Layout="VBox"
EnableCollapse="true" Width="280px" Title="试压包" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@ -71,6 +71,15 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"
@ -96,22 +105,22 @@
<f:CheckBoxList ID="drpPrintTypeList" ColumnNumber="1" runat="server"></f:CheckBoxList>
</Items>
<toolbars>
<Toolbars>
<f:Toolbar runat="server" Position="Top">
<items>
<Items>
<f:Button runat="server" ID="btnSelectAll" EnablePostBack="false" Text="全选">
<listeners>
<Listeners>
<f:Listener Event="click" Handler="onSelectAllClick" />
</listeners>
</Listeners>
</f:Button>
<f:Button runat="server" ID="btnClearAll" EnablePostBack="false" Text="清空">
<listeners>
<Listeners>
<f:Listener Event="click" Handler="onClearAllClick" />
</listeners>
</Listeners>
</f:Button>
</items>
</Items>
</f:Toolbar>
</toolbars>
</Toolbars>
</f:SimpleForm>
</PopPanel>
@ -223,10 +232,15 @@
</Rows>
</f:Form>
</Items>
<Items>
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="420px" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
<Tabs>
<f:Tab Title="全部" BodyPadding="10px" Layout="Fit" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true" ForceFit="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
@ -295,6 +309,102 @@
</PageItems>
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="RT" BodyPadding="10px"
runat="server">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineCode,WelderCode" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" AllowSorting="true"
SortField="PipelineCode,WelderCode" SortDirection="ASC" EnableTextSelection="True" ForceFit="true" Height="420px"
AllowPaging="true" IsDatabasePaging="true" PageSize="100" >
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="管道编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材质" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="规格" ColumnID="Specification" DataField="Specification" SortField="Specification"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="jointCount" DataField="jointCount" SortField="jointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FjointCount" DataField="FjointCount" SortField="FjointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊工代号" ColumnID="WelderCode" DataField="WelderCode" SortField="WelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="施焊数量" ColumnID="WelderNum" DataField="WelderNum" SortField="WelderNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="NdeNum" DataField="NdeNum" SortField="NdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FNdeNum" DataField="FNdeNum" SortField="FNdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:BoundField DataField="NdeReportNo" DataToolTipField="NdeReportNo" HeaderText="检测报告编号" />
</Columns>
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="PT" BodyPadding="10px" runat="server">
<Items>
<f:Grid ID="Grid3" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineCode,WelderCode" AllowCellEditing="true" ForceFit="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" AllowSorting="true" Height="420px"
SortField="PipelineCode,WelderCode" SortDirection="ASC" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="100">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="管道编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材质" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="规格" ColumnID="Specification" DataField="Specification" SortField="Specification"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="jointCount" DataField="jointCount" SortField="jointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FjointCount" DataField="FjointCount" SortField="FjointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊工代号" ColumnID="WelderCode" DataField="WelderCode" SortField="WelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="施焊数量" ColumnID="WelderNum" DataField="WelderNum" SortField="WelderNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="NdeNum" DataField="NdeNum" SortField="NdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FNdeNum" DataField="FNdeNum" SortField="FNdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:BoundField DataField="NdeReportNo" DataToolTipField="NdeReportNo" HeaderText="检测报告编号" />
</Columns>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Panel>
</Items>
</f:Panel>

889
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
View File

File diff suppressed because it is too large Load Diff

45
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs generated
View File

@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@ -473,6 +491,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DatePicker txtAuditDate;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -590,6 +617,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Grid3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// Window1 控件。
/// </summary>

11
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx
View File

@ -40,7 +40,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="230px" Title="试压包" ShowBorder="true" Layout="VBox"
EnableCollapse="true" Width="280px" Title="试压包" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@ -50,6 +50,15 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"

8
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.cs
View File

@ -169,11 +169,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
var dReports = (from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();

24
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class TestPackageManageComplete {
public partial class TestPackageManageComplete
{
/// <summary>
/// Head1 控件。
@ -75,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>

13
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
View File

@ -20,6 +20,15 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"
@ -162,7 +171,7 @@
runat="server" BoxFlex="1" DataKeyNames="PT_PipeId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PT_PipeId" AllowSorting="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RenderField HeaderText="工作区" ColumnID="WorkAreaCode" DataField="WorkAreaCode" SortField="WorkAreaCode"
@ -183,6 +192,8 @@
<f:RenderField HeaderText="介质" ColumnID="MediumName" DataField="MediumName" SortField="MediumName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" ConfirmTarget="Top"
CommandName="delete" Icon="Delete" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

45
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
View File

@ -182,11 +182,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
var dReports =( from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();
@ -1084,5 +1088,42 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
return dict;
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "delete")
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnDelete))
{
var testPackageManage = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID);
if (testPackageManage != null)
{
if (testPackageManage.AduditDate.HasValue)
{
Alert.ShowInTop("此试压单已审核！", MessageBoxIcon.Warning);
return;
}
if (TestPackageManageEditService.getPipelineListByPTP_ID(PTP_ID).Count == 1)
{
Alert.ShowInTop("此试压单下仅有一条管线，请直接删除试压包！", MessageBoxIcon.Warning);
return;
}
string id = e.RowID;
TestPackageManageEditService.DeletePipelineListByPT_PipeId( id);
this.BindGrid();
}
else
{
ShowNotify("请选择要删除的试压包记录！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
}
}
}

18
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.designer.cs generated
View File

@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>

4
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
View File

@ -19,6 +19,8 @@
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Text="保存" ToolTip="保存试压包信息" ValidateForms="SimpleForm1" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Text="提交" ToolTip="提交试压包信息" ValidateForms="SimpleForm1" Icon="SystemSave" runat="server" OnClick="btnSubmit_Click1" >
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@ -146,7 +148,7 @@
runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="100"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" >
<Columns>
<f:CheckBoxField ColumnID="ckbIsSelected" Width="50px" RenderAsStaticField="false" HeaderText="选择"

65
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
View File

@ -389,9 +389,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
protected void drpInstallation_OnSelectedIndexChanged(object sender, EventArgs e)
{
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(drpWorkArea, true, this.CurrUser.LoginProjectId, drpInstallation.SelectedValue, drpUnit.SelectedValue, null, Resources.Lan.PleaseSelect);
this.CollectGridJointInfo();
/*this.CollectGridJointInfo();
this.BindGrid();
this.ShowGridItem();
this.ShowGridItem();*/
}
/// <summary>
@ -462,6 +462,33 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnSave))
{
Save();
ShowNotify("保存成功！", MessageBoxIcon.Success);
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
protected void btnSubmit_Click1(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnSave))
{
// Save();
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID)
+ ActiveWindow.GetHidePostBackReference());
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
protected void Save()
{
if (BLL.TestPackageManageEditService.IsExistTestPackageCode(this.txtTestPackageNo.Text, this.PTP_ID, this.CurrUser.LoginProjectId))
{
@ -552,7 +579,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
JArray teamGroupData = Grid1.GetMergedData();
if (listSelects.Count > 0)
{
BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID);
//if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue != null)
//{
// BLL.TestPackageManageEditService.DeletePipelineListByPTP_IDAndWorkAreaId(testPackage.PTP_ID, drpWorkArea.SelectedValue);
//}
//else
//{
// BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID);
//}
}
foreach (JObject teamGroupRow in teamGroupData)
{
@ -593,18 +628,12 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
newitem.IsAll = WeldJonintCodes == "全部" ? true : false;
newitem.WeldJonintCode = WeldJonintCodes;
newitem.WorkAreaId = workAreaId;
BLL.TestPackageManageEditService.AddPipelineList(newitem);
}
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID)
+ ActiveWindow.GetHidePostBackReference());
this.BindGrid();
}
else
if (!TestPackageManageEditService.IsPipelineListExists(newitem.PTP_ID, newitem.PipelineId))
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
BLL.TestPackageManageEditService.AddPipelineList(newitem);
}
}
}
}
#endregion
@ -621,10 +650,10 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
string rowID = Grid1.DataKeys[i][0].ToString();
CheckBoxField checkField = (CheckBoxField)Grid1.FindColumn("ckbIsSelected");
if (listSelects.Contains(rowID))
{
listSelects.Remove(rowID);
}
//if (listSelects.Contains(rowID))
//{
// listSelects.Remove(rowID);
//}
if (checkField.GetCheckedState(i))
{
listSelects.Add(rowID);

9
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs generated
View File

@ -86,6 +86,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// SimpleForm1 控件。
/// </summary>

1
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx
View File

@ -135,6 +135,7 @@
</f:DropDownList>
<f:TextBox ID="txtPrepareTemp" Label="预热温度" runat="server" LabelWidth="130px" ></f:TextBox>
<f:CheckBox ID="ckbIsGoldJoint" runat="server" Label="是否黄金口" LabelWidth="130px"></f:CheckBox>
<f:CheckBox ID="ckbIsBracket" runat="server" Label="是否支架，贴底片" LabelWidth="150px" AutoPostBack="true" OnCheckedChanged="ckbIsBracket_CheckedChanged"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 15% 15% 35% ">

16
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs
View File

@ -331,6 +331,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
//是否PMI处理
ckbIsPMI.Checked = (jointInfo.IsPMI.HasValue && jointInfo.IsPMI.Value) ? true : false;
ckbIsBracket.Checked = (jointInfo.IsBracket.HasValue && jointInfo.IsBracket.Value) ? true : false;
if (jointInfo.IsCancel == true)
{
@ -505,6 +506,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
//是否PMI处理
newJointInfo.IsPMI = ckbIsPMI.Checked;
//是否支架，贴底片
newJointInfo.IsBracket = ckbIsBracket.Checked;
if (ckbIsGoldJoint.Checked == true)
{
@ -835,5 +839,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
#endregion
protected void ckbIsBracket_CheckedChanged(object sender, CheckedEventArgs e)
{
if (ckbIsBracket.Checked)
{
txtSpecification.Readonly = false;
}
else
{
txtSpecification.Readonly = true;
}
}
}
}

9
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs generated
View File

@ -320,6 +320,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsGoldJoint;
/// <summary>
/// ckbIsBracket 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsBracket;
/// <summary>
/// drpNDTType 控件。
/// </summary>

14
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
View File

@ -10,6 +10,7 @@ using NPOI.XSSF.UserModel;
using System.Linq;
using BLL;
using System.Web.Configuration;
using NPOI.SS.Formula.Functions;
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
@ -1306,6 +1307,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (isExistFloor && isExistCell)
{
var wps = BLL.WPQListServiceService.GetWPQById(d.WPQId);
var jot = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(jotId);
if (!wps.WelderIds.Contains(cellWelderId))
{
errorCheck += (i + 2) + "行,盖面焊工号：[" + ds.Tables[0].Rows[i]["盖面焊工号"].ToString() + "]验证无焊WPS资质；";
@ -1315,6 +1318,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
errorCheck += (i + 2) + "行,打底焊工号：[" + ds.Tables[0].Rows[i]["打底焊工号"].ToString() + "]验证无焊WPS资质；";
}
if (jot !=null)
{
if (jot.Thickness < wps.MinImpactThickness || jot.Thickness > wps.MaxImpactThickness)
{
errorCheck += (i + 2) + "行，焊口信息与WPS编号不匹配，";
}
if (!wps.MaterialId1.Contains(jot.Material1Id) || !wps.MaterialId1.Contains(jot.Material2Id))
{
errorCheck += (i + 2) + "行，焊口信息与WPS编号不匹配，";
}
}
}

9
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -365,6 +365,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
errorCheck += rowIndex + "行，WPS不能为空，";
}
if (jot .Thickness< wps.MinImpactThickness || jot.Thickness > wps.MaxImpactThickness)
{
errorCheck += rowIndex + "行，焊口信息与WPS编号不匹配，";
}
if (!wps.MaterialId1.Contains(jot.Material1Id)|| !wps.MaterialId1.Contains(jot.Material2Id))
{
errorCheck += rowIndex + "行，焊口信息与WPS编号不匹配，";
}
// 验证数据是否一至
if (!string.IsNullOrEmpty(item.WeldTypeId) && !string.IsNullOrEmpty(jot.WeldTypeId) && item.WeldTypeId != jot.WeldTypeId)

264
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx Normal file
View File

@ -0,0 +1,264 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PipelineTraceList.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingReport.PipelineTraceList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>管道追溯表</title>
<style>
.f-grid-row-summary .f-grid-cell-inner {
font-weight: bold;
color: red;
}
/*定义父容器*/
.content {
width: 550px;
height: 30px;
background: #E4F1FB;
margin: 0 auto;
}
/*定义进度条*/
.box {
width: 0px;
height: 30px;
line-height: 30px;
text-align: center;
background: #3BAAE3;
color: #fff;
}
</style>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<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="<%$ Resources:Lan,JointComprehensive %>"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
AllowSorting="true" SortField="WorkAreaCode,PipelineCode,WeldJointCode" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>" EnableMultiSelect="true" EnableCheckBoxSelect="true"
AutoPostBack="true" LabelAlign="Right" Width="480px" OnSelectedIndexChanged="drpWorkAreaId_OnSelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpPipeLine" runat="server" Label="管线" LabelAlign="Right" Width="480px" EmptyText="请选择管线"
LabelWidth="60px" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
<f:TextBox ID="txtTestPackageNo" runat="server" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px" Width="265px" LabelAlign="Left">
</f:TextBox>
<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>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" HeaderText="<%$ Resources:Lan,SerialNumber %>"
Width="70px" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="<%$ Resources:Lan,Area %>" ColumnID="WorkAreaCode" DataField="WorkAreaCode"
SortField="WorkAreaCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="试压包号" ColumnID="TestPackageNo"
DataField="TestPackageNo" SortField="TestPackageNo" FieldType="String" HeaderTextAlign="Center"
Width="180px">
</f:RenderField>
<f:RenderField HeaderText="单线图号" ColumnID="SingleNumber"
DataField="SingleNumber" FieldType="String" HeaderTextAlign="Center"
Width="180px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,PipelineCode %>" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
Width="180px">
</f:RenderField>
<f:RenderField HeaderText="压力管道分级" ColumnID="PIPClassCode"
DataField="PIPClassCode" FieldType="String" HeaderTextAlign="Center"
Width="110px">
</f:RenderField>
<f:RenderField HeaderText="图纸版次" ColumnID="DrawingsNum"
DataField="DrawingsNum" FieldType="String" HeaderTextAlign="Center"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="页码" ColumnID="PageNum"
DataField="PageNum" FieldType="String" HeaderTextAlign="Center"
Width="80px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊缝类型" ColumnID="WeldTypeCode"
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
Width="80px">
</f:RenderField>
<f:RenderField HeaderText="焊接位置" ColumnID="WeldingLocationCode"
DataField="WeldingLocationCode" SortField="WeldingLocationCode" FieldType="String" HeaderTextAlign="Center"
Width="80px">
</f:RenderField>
<f:RenderField HeaderText="规格" ColumnID="Specification"
DataField="Specification" SortField="Thickness" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="材质1" ColumnID="MaterialCode1"
DataField="MaterialCode1" SortField="MaterialCode1" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材质2" ColumnID="MaterialCode2"
DataField="MaterialCode2" SortField="MaterialCode2" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="组件1" ColumnID="PipeAssembly1"
DataField="PipeAssembly1" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="组件2" ColumnID="PipeAssembly2"
DataField="PipeAssembly2" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="炉批号1" ColumnID="HeartNo1"
DataField="HeartNo1" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="炉批号2" ColumnID="HeartNo2"
DataField="HeartNo2" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,FloorWelder %>" ColumnID="BackingWelderCode"
DataField="BackingWelderCode" SortField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,CoveringWelder %>" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" SortField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,WeldingMethod %>" ColumnID="WeldingMethodName"
DataField="WeldingMethodName" SortField="WeldingMethodName" FieldType="String"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,Medium %>" ColumnID="MediumName" DataField="MediumName"
SortField="MediumName" FieldType="String" HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,WeldingDate %>" ColumnID="WeldingDate"
DataField="WeldingDate" SortField="WeldingDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="检测类型" ColumnID="DetectionTypeCode"
DataField="DetectionTypeCode" FieldType="String" HeaderTextAlign="Center"
Width="80px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,IsDK %>" ColumnID="if_dk"
DataField="if_dk" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="检测比例" ColumnID="DetectionRateCode"
DataField="DetectionRateCode" SortField="DetectionRateCode" FieldType="String" HeaderTextAlign="Center"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="合格等级" ColumnID="AcceptLevel"
DataField="AcceptLevel" SortField="AcceptLevel" FieldType="String" HeaderTextAlign="Center"
Width="90px">
</f:RenderField>
<f:RenderField HeaderText="检测报告" ColumnID="NDEReportNo"
DataField="NDEReportNo" SortField="NDEReportNo" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,IsHot %>" ColumnID="IsHotProess"
DataField="IsHotProess" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="热处理报告号" ColumnID="HotReportCode"
DataField="HotReportCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="硬度报告号" ColumnID="HotReportCode"
DataField="HotReportCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<%--<f:RenderField HeaderText="<%$ Resources:Lan,WeldingWireBrand %>" ColumnID="hsCode"
DataField="hsCode" SortField="hsCode" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>--%>
<f:TemplateField Width="150px" HeaderText="<%$ Resources:Lan,WeldingWireBrand %>"
HeaderTextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# ConvertWeldSilk(Eval("WeldSilkId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="<%$ Resources:Lan,ElectrodeBrand %>" ColumnID="WMT_MatCode"
DataField="WMT_MatCode" SortField="WMT_MatCode" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:TemplateField Width="150px" HeaderText="焊剂"
HeaderTextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertWeldFlux(Eval("WeldSilkId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:RenderField HeaderText="焊剂" ColumnID="UserFlux"
DataField="UserFlux" SortField="UserFlux" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>--%>
<f:RenderField HeaderText="备注" ColumnID="Remark"
DataField="Remark" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="WindowExport" Hidden="true" runat="server" MinHeight="30px"
Target="Parent" ShowHeader="false" BodyPadding="0" Margin="0"
IsModal="true" Width="550px" Height="30px">
<Items>
<f:ContentPanel ShowBorder="false" Height="30px" ShowHeader="false" ID="ContentPanel3" runat="server">
<div class="content" id="content">
<div class="box" id="box"></div>
</div>
</f:ContentPanel>
</Items>
</f:Window>
<asp:ScriptManager ID="ScriptManager2" runat="server" EnablePageMethods="true">
<Scripts>
<asp:ScriptReference Path="~/res/ProcessBar.js" />
</Scripts>
</asp:ScriptManager>
</form>
</body>
</html>

389
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.cs Normal file
View File

@ -0,0 +1,389 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using NPOI.HSSF.Util;
using NPOI.POIFS.Properties;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using System.IO;
using System.Security.Policy;
using System.Threading;
using MiniExcelLibs;
namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
public partial class PipelineTraceList : PageBase
{
public static int percent { get; set; }
public static string url { get; set; }
[System.Web.Services.WebMethod]
public static int getPercent()
{
return percent;
}
[System.Web.Services.WebMethod]
public static string getUrl()
{
return url;
}
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, string.Empty, string.Empty, Resources.Lan.PleaseSelect);//区域
}
}
private DataTable GetDataTable()
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (drpWorkAreaId.SelectedValue != Const._Null && drpWorkAreaId.SelectedValue != null)
{
string[] areaList = drpWorkAreaId.SelectedValueArray;
string workAreaIds = string.Join(",", areaList);
listStr.Add(new SqlParameter("@workAreaIds", workAreaIds));
// listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue));
}
if (!string.IsNullOrEmpty(drpPipeLine.SelectedValue) && drpPipeLine.SelectedValue != Const._Null)
{
string[] pipeList = drpPipeLine.SelectedValueArray;
string pipeLineIds = string.Join(",", pipeList);
listStr.Add(new SqlParameter("@pipelineIds", pipeLineIds));
}
else
{
listStr.Add(new SqlParameter("@pipelineIds", null));
}
if (!string.IsNullOrEmpty(txtTestPackageNo.Text.Trim()))
{
listStr.Add(new SqlParameter("@TestPackageNo", '%'+txtTestPackageNo.Text.Trim()+"%"));
}
else
{
listStr.Add(new SqlParameter("@TestPackageNo", null));
}
//if (!string.IsNullOrEmpty(this.drpWorkAreaId.Text.Trim()))
//{
// listStr.Add(new SqlParameter("@pipelineCode", this.txtPipelineCode.Text.Trim()));
//}
//else
//{
// listStr.Add(new SqlParameter("@pipelineCode", null));
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunProc("sp_rpt_JointComprehensive", parameter);
return dt;
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
DataTable tb = GetDataTable();
this.Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineId")).Select(group => group.First());
var distinctSingleNumber = tb.AsEnumerable().GroupBy(row => row.Field<string>("SingleNumber")).Select(group => group.First());
var backingWelder = tb.AsEnumerable().Where(row => row.Field<string>("BackingWelderCode") != null).GroupBy(row => row.Field<string>("BackingWelderCode")).Select(group => group.First());
var coverWelder = tb.AsEnumerable().Where(row => row.Field<string>("CoverWelderCode") != null).GroupBy(row => row.Field<string>("CoverWelderCode")).Select(group => group.First());
var jotNum = from x in tb.AsEnumerable()
group x by new { pipe = x.Field<string>("PipelineId"), jot = x.Field<string>("WeldJointCode"), Size = x.Field<string>("JOT_Size") }
into g
select new { pipe = g.Key.pipe, jot = g.Key.jot, Size = g.Key.Size };
JObject summary = new JObject();
summary.Add("tfNumber", "合计");
summary.Add("SingleNumber", distinctSingleNumber.Count().ToString());
summary.Add("PipelineCode", distinctPipelineCode.Count().ToString());
summary.Add("WeldJointCode", jotNum.Count());
summary.Add("BackingWelderCode", backingWelder.Count().ToString());
summary.Add("CoverWelderCode", coverWelder.Count().ToString());
Grid1.SummaryData = summary;
}
protected void drpWorkAreaId_OnSelectedIndexChanged(object sender, EventArgs e)
{
string[] workAreaIds = drpWorkAreaId.SelectedValueArray;
if (workAreaIds.Length == 1)
{
BLL.Pipeline_PipelineService.InitPipelineDropDownList(drpPipeLine, workAreaIds[0], Resources.Lan.PleaseSelect);
}
}
/// <summary>
/// 改变索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
this.BindGrid();
}
#endregion
#region 统计按钮事件
/// <summary>
/// 统计
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
percent = 0;
url = "";
Thread t = new Thread(new ThreadStart(() => { Export(); }));
t.Start();
PageContext.RegisterStartupScript("showProcessBar()");
}
private void Export()
{
string templatePath = Funs.RootPath + @"File\Excel\HJGL_DataOut\管道追溯表.xlsx";
string path = Funs.RootPath + @"File\Excel\Temp\管道追溯表.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
DataTable tb = GetDataTable();
DataColumn dc = null;
dc = tb.Columns.Add("Index", Type.GetType("System.Int32"));
dc = tb.Columns.Add("WeldSilk", Type.GetType("System.String"));
dc = tb.Columns.Add("WeldFlux", Type.GetType("System.String"));
int totalNum = tb.Rows.Count;
var rowIndex = 1;
foreach (DataRow row in tb.Rows)
{
row["Index"] = row.Table.Rows.IndexOf(row) + 1;
row["WeldSilk"] = ConvertWeldSilk(row["WeldSilkId"]);
row["WeldFlux"] = ConvertWeldFlux(row["WeldSilkId"]);
if ((int)(90 * (rowIndex) / totalNum) > percent)
{
percent = (int)(100 * (rowIndex) / totalNum);
}
rowIndex++;
}
tb.TableName = "Data";
var value = new Dictionary<string, object>()
{
["Data"] = tb,
};
MiniExcel.SaveAsByTemplate(path, templatePath, value);
percent = 100;
url = path.Replace(Server.MapPath("~/"), "");
/*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);*/
}
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
//private string GetGridTableHtml(Grid grid)
//{
// StringBuilder sb = new StringBuilder();
// grid.PageSize = 500000;
// BindGrid();
// sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
// sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
// sb.Append("<tr>");
// foreach (GridColumn column in grid.Columns)
// {
// sb.AppendFormat("<td>{0}</td>", column.HeaderText);
// }
// sb.Append("</tr>");
// foreach (GridRow row in grid.Rows)
// {
// sb.Append("<tr>");
// foreach (GridColumn column in grid.Columns)
// {
// string html = row.Values[column.ColumnIndex].ToString();
// if (column.ColumnID == "tfNumber")
// {
// html = (row.FindControl("labNumber") as AspNet.Label).Text;
// }
// if (column.ColumnID == "tfIsHotProess")
// {
// html = (row.FindControl("lblIsHotProess") as AspNet.Label).Text;
// }
// if (column.ColumnID == "tfif_dk")
// {
// html = (row.FindControl("lblif_dk") as AspNet.Label).Text;
// }
// sb.AppendFormat("<td>{0}</td>", html);
// }
// sb.Append("</tr>");
// }
// sb.Append("</table>");
// return sb.ToString();
//}
#endregion
#region 格式化字符串
/// <summary>
/// 是否热处理
/// </summary>
/// <param name="isHotProess"></param>
/// <returns></returns>
protected string ConvertIsHotProess(object isHotProess)
{
if (isHotProess != null)
{
if (isHotProess.ToString() == "True")
{
return Resources.Lan.Yes;
}
else
{
return Resources.Lan.No;
}
}
return null;
}
/// <summary>
/// 是否点口
/// </summary>
/// <param name="if_dk"></param>
/// <returns></returns>
protected string Convertif_dk(object if_dk)
{
if (if_dk != null)
{
if (if_dk.ToString() == "1")
{
return Resources.Lan.Yes;
}
else
{
return Resources.Lan.No;
}
}
return null;
}
protected string ConvertWeldSilk(object WeldSilkId)
{
string weldSilkName = string.Empty;
if (WeldSilkId != null)
{
string[] weldSilkIds = WeldSilkId.ToString().Split(',');
if (weldSilkIds.Count() > 0)
{
foreach (string s in weldSilkIds)
{
var silk = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(s);
if (silk != null)
{
weldSilkName = weldSilkName + silk.ConsumablesName + ',';
}
}
if (weldSilkName.Length > 0)
{
weldSilkName = weldSilkName.Substring(0, weldSilkName.Length - 1);
}
}
}
return weldSilkName;
}
protected string ConvertWeldFlux(object WeldSilkId)
{
string weldFlux = string.Empty;
string[] weldSilkIds = WeldSilkId.ToString().Split(',');
if (weldSilkIds.Count() > 0)
{
foreach (string s in weldSilkIds)
{
var silk = BLL.Base_ConsumablesService.GetConsumablesByConsumablesId(s);
if (silk != null && !string.IsNullOrEmpty(silk.UserFlux))
{
weldFlux = weldFlux + silk.UserFlux + ',';
}
}
if (weldFlux.Length > 0)
{
weldFlux = weldFlux.Substring(0, weldFlux.Length - 1);
}
}
return weldFlux;
}
#endregion
}
}

197
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/PipelineTraceList.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,197 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
public partial class PipelineTraceList
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// drpPipeLine 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPipeLine;
/// <summary>
/// txtTestPackageNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackageNo;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </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>
/// labNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// WindowExport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowExport;
/// <summary>
/// ContentPanel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel3;
/// <summary>
/// ScriptManager2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.ScriptManager ScriptManager2;
}
}

150
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx Normal file
View File

@ -0,0 +1,150 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RepairExTrackingList.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingReport.RepairExTrackingList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>返修扩探追踪清单</title>
<style>
.f-grid-row-summary .f-grid-cell-inner {
font-weight: bold;
color: red;
}
/*定义父容器*/
.content {
width: 550px;
height: 30px;
background: #E4F1FB;
margin: 0 auto;
}
/*定义进度条*/
.box {
width: 0px;
height: 30px;
line-height: 30px;
text-align: center;
background: #3BAAE3;
color: #fff;
}
</style>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<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="<%$ Resources:Lan,RepairExpansionTrackingList %>"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
AllowSorting="true" SortField="WorkAreaCode,PipelineCode,WeldJointCode" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" EnableSummary="true" SummaryPosition="Flow">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>" EnableMultiSelect="true" EnableCheckBoxSelect="true"
AutoPostBack="true" LabelAlign="Right" Width="480px" OnSelectedIndexChanged="drpWorkAreaId_OnSelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpPipeLine" runat="server" Label="管线" LabelAlign="Right" Width="480px" EmptyText="请选择管线"
LabelWidth="60px" EnableEdit="true" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
<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>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" HeaderText="<%$ Resources:Lan,SerialNumber %>"
Width="70px" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="<%$ Resources:Lan,Area %>" ColumnID="WorkAreaCode" DataField="WorkAreaCode"
SortField="WorkAreaCode" FieldType="String" HeaderTextAlign="Center" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,PipelineCode %>" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
Width="180px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,WeldingJointNumber %>" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WelderCode" DataField="WelderCode" FieldType="String"
HeaderText="<%$ Resources:Lan,WelderCode %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="WelderCode">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="TeamGroupName" DataField="TeamGroupName" FieldType="String"
HeaderText="施工队" HeaderTextAlign="Center" TextAlign="Left"
SortField="WelderCode">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Specification" DataField="Specification" FieldType="String"
HeaderText="<%$ Resources:Lan,Specifications %>" HeaderTextAlign="Center" TextAlign="Left"
SortField="Specifications">
</f:RenderField>
<f:RenderField HeaderText="原委托号" ColumnID="TrustBatchCode"
DataField="TrustBatchCode" SortField="TrustBatchCode" FieldType="String" HeaderTextAlign="Center"
Width="180px">
</f:RenderField>
<f:RenderField HeaderText="返修委托号" ColumnID="TrustBatchCodeRepair"
DataField="TrustBatchCodeRepair" SortField="TrustBatchCodeRepair" FieldType="String" HeaderTextAlign="Center"
Width="200px">
</f:RenderField>
<f:RenderField HeaderText="扩探焊口号1" ColumnID="WeldJointCodeEx1"
DataField="WeldJointCodeEx1" SortField="WeldJointCodeEx1" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="扩探焊口号2" ColumnID="WeldJointCodeEx2"
DataField="WeldJointCodeEx2" SortField="WeldJointCodeEx2" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="是否关闭" ColumnID="IsClose"
DataField="IsClose" SortField="IsClose" FieldType="String" HeaderTextAlign="Center"
Width="120px">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="WindowExport" Hidden="true" runat="server" MinHeight="30px"
Target="Parent" ShowHeader="false" BodyPadding="0" Margin="0"
IsModal="true" Width="550px" Height="30px">
<Items>
<f:ContentPanel ShowBorder="false" Height="30px" ShowHeader="false" ID="ContentPanel3" runat="server">
<div class="content" id="content">
<div class="box" id="box"></div>
</div>
</f:ContentPanel>
</Items>
</f:Window>
<asp:ScriptManager ID="ScriptManager2" runat="server" EnablePageMethods="true">
<Scripts>
<asp:ScriptReference Path="~/res/ProcessBar.js" />
</Scripts>
</asp:ScriptManager>
</form>
</body>
</html>

232
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.cs Normal file
View File

@ -0,0 +1,232 @@
using BLL;
using MiniExcelLibs;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Model;
namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
public partial class RepairExTrackingList : PageBase
{
public static int percent { get; set; }
public static string url { get; set; }
[System.Web.Services.WebMethod]
public static int getPercent()
{
return percent;
}
[System.Web.Services.WebMethod]
public static string getUrl()
{
return url;
}
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(this.drpWorkAreaId, true, this.CurrUser.LoginProjectId, string.Empty, string.Empty, string.Empty, Resources.Lan.PleaseSelect);//区域
}
}
private DataTable GetDataTable()
{ //创建表
DataTable dt = new DataTable();
//1、添加列
dt.Columns.Add("WorkAreaCode", typeof(string));
dt.Columns.Add("PipelineCode", typeof(string));
dt.Columns.Add("WeldJointId", typeof(string));
dt.Columns.Add("WeldJointCode", typeof(string));
dt.Columns.Add("WelderCode", typeof(string));
dt.Columns.Add("TeamGroupName", typeof(string));
dt.Columns.Add("Specification", typeof(string));
dt.Columns.Add("TrustBatchCode", typeof(string));
dt.Columns.Add("TrustBatchCodeRepair", typeof(string));
dt.Columns.Add("WeldJointCodeEx1", typeof(string));
dt.Columns.Add("WeldJointCodeEx2", typeof(string));
dt.Columns.Add("IsClose", typeof(string));
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
var view_Batch_BatchTrustItemSelect = (from x in Funs.DB.View_Batch_BatchTrustItemSelect
where x.ProjectId == this.CurrUser.LoginProjectId
select x).ToList();
if (drpWorkAreaId.SelectedValue != Const._Null && drpWorkAreaId.SelectedValue != null)
{
view_Batch_BatchTrustItemSelect= view_Batch_BatchTrustItemSelect.Where(x => drpWorkAreaId.SelectedValueArray.Contains(x.WorkAreaId)).ToList();
}
if (!string.IsNullOrEmpty(drpPipeLine.SelectedValue) && drpPipeLine.SelectedValue != Const._Null)
{
view_Batch_BatchTrustItemSelect = view_Batch_BatchTrustItemSelect.Where(x => drpPipeLine.SelectedValueArray.Contains(x.PipelineId)).ToList();
}
var list = view_Batch_BatchTrustItemSelect.Where(x => x.IsWelderFirst == "是");
foreach (var item in list)
{
DataRow dr = dt.NewRow();
dr["WorkAreaCode"] = item.WorkAreaCode;
dr["PipelineCode"] = item.PipelineCode;
dr["WeldJointId"] = item.WeldJointId;
dr["WeldJointCode"] = item.WeldJointCode;
dr["WelderCode"] = item.WelderCode;
dr["TeamGroupName"] = item.TeamGroupName;
dr["Specification"] = item.Specification;
dr["TrustBatchCode"] = item.TrustBatchCode;
dr["TrustBatchCodeRepair"] = view_Batch_BatchTrustItemSelect.Where(x=>x.TrustBatchCode.Contains(item.TrustBatchCode+"R"))?.FirstOrDefault()?.TrustBatchCode;
var exWeldJointCodeList = view_Batch_BatchTrustItemSelect.Where(x => x.TrustBatchCode.Contains(item.TrustBatchCode + "EX")).Select(x=>x.WeldJointCode).ToList();
if (exWeldJointCodeList.Count == 1)
{
dr["WeldJointCodeEx1"] = exWeldJointCodeList[0]?.ToString();
}
else if (exWeldJointCodeList.Count == 2)
{
dr["WeldJointCodeEx1"] = exWeldJointCodeList[0]?.ToString();
dr["WeldJointCodeEx2"] = exWeldJointCodeList[1]?.ToString();
}
if (!string.IsNullOrEmpty(dr["WeldJointCodeEx2"].ToString()) && !string.IsNullOrEmpty(dr["WeldJointCodeEx2"].ToString()))
{
dr["IsClose"] = "是";
}
dt.Rows.Add(dr);
}
return dt;
}
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
DataTable tb = GetDataTable();
this.Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
protected void drpWorkAreaId_OnSelectedIndexChanged(object sender, EventArgs e)
{
string[] workAreaIds = drpWorkAreaId.SelectedValueArray;
if (workAreaIds.Length == 1)
{
BLL.Pipeline_PipelineService.InitPipelineDropDownList(drpPipeLine, workAreaIds[0], Resources.Lan.PleaseSelect);
}
}
/// <summary>
/// 改变索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
this.BindGrid();
}
#endregion
#region 统计按钮事件
/// <summary>
/// 统计
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
percent = 0;
url = "";
Thread t = new Thread(new ThreadStart(() => { Export(); }));
t.Start();
PageContext.RegisterStartupScript("showProcessBar()");
}
private void Export()
{
string templatePath = Funs.RootPath + @"File\Excel\HJGL_DataOut\返修扩探追踪报表.xlsx";
string path = Funs.RootPath + @"File\Excel\Temp\返修扩探追踪报表.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
DataTable tb = GetDataTable();
tb.TableName = "Data";
var value = new Dictionary<string, object>()
{
["Data"] = tb,
};
MiniExcel.SaveAsByTemplate(path, templatePath, value);
percent = 100;
url = path.Replace(Server.MapPath("~/"), "");
/*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);*/
}
#endregion
}
}

170
HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/RepairExTrackingList.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,170 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingReport
{
public partial class RepairExTrackingList
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpWorkAreaId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWorkAreaId;
/// <summary>
/// drpPipeLine 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPipeLine;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </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>
/// labNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// WindowExport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowExport;
/// <summary>
/// ContentPanel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel3;
/// <summary>
/// ScriptManager2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.ScriptManager ScriptManager2;
}
}

1
HJGL/FineUIPro.Web/packages.config
View File

@ -4,6 +4,7 @@
<package id="Microsoft.ReportingServices.ReportViewerControl.WebForms" version="150.1404.0" targetFramework="net461" />
<package id="Microsoft.SqlServer.Types" version="14.0.1016.290" targetFramework="net40" />
<package id="MimeKit" version="4.6.0" targetFramework="net48" />
<package id="MiniExcel" version="1.34.2" targetFramework="net48" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
<package id="NPOI" version="2.5.3" targetFramework="net461" />
<package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net461" />

8
HJGL/FineUIPro/readme.txt Normal file
View File

@ -0,0 +1,8 @@
FineUI（专业版）v3.6.0.0
客户：合肥诺必达信息技术有限责任公司
http://fineui.com/pro
合肥三生石上软件有限公司

1
HJGL/Model/.vs/Model.csproj.dtbcache.json Normal file
View File

@ -0,0 +1 @@
{"RootPath":"D:\\数据\\诺必达\\湛江巴斯夫\\Basf_TCC7\\HJGL\\Model","ProjectFileName":"Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIItem\\BaseInfoItem.cs"},{"SourceFile":"APIItem\\CheckItem.cs"},{"SourceFile":"APIItem\\PipeLineQueryItem.cs"},{"SourceFile":"APIItem\\ResponeData.cs"},{"SourceFile":"APIItem\\UserItem.cs"},{"SourceFile":"APIItem\\WelderPerformanceItem.cs"},{"SourceFile":"APIItem\\WeldJointItem.cs"},{"SourceFile":"APIItem\\WorkloadItem.cs"},{"SourceFile":"Chart\\DataSourceChart.cs"},{"SourceFile":"Chart\\DataSourcePoint.cs"},{"SourceFile":"Chart\\DataSourceTeam.cs"},{"SourceFile":"ErrorInfo.cs"},{"SourceFile":"HandleStep.cs"},{"SourceFile":"Model.cs"},{"SourceFile":"ModelProc.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SpSysMenuItem.cs"},{"SourceFile":"SpTDesktopItem.cs"},{"SourceFile":"SpWeldingDailyItem.cs"},{"SourceFile":"ViewModels\\ImportErrorViewModel.cs"},{"SourceFile":"ViewModels\\TestPackageInfoViewModel.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\数据\\诺必达\\湛江巴斯夫\\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.dll","OutputItemRelativePath":"Model.dll"},{"OutputItemFullPath":"D:\\数据\\诺必达\\湛江巴斯夫\\Basf_TCC7\\HJGL\\Model\\bin\\Debug\\Model.pdb","OutputItemRelativePath":"Model.pdb"}],"CopyToOutputEntries":[]}

106
HJGL/Model/Model.cs
View File

@ -20956,6 +20956,8 @@ namespace Model
private System.Nullable<bool> _IsSuperQueWelding;
private System.Nullable<bool> _IsBracket;
private EntitySet<Batch_BatchTrustItem> _Batch_BatchTrustItem;
private EntitySet<Batch_PointBatchItem> _Batch_PointBatchItem;
@ -21100,6 +21102,8 @@ namespace Model
partial void OnAuditStatusChanged();
partial void OnIsSuperQueWeldingChanging(System.Nullable<bool> value);
partial void OnIsSuperQueWeldingChanged();
partial void OnIsBracketChanging(System.Nullable<bool> value);
partial void OnIsBracketChanged();
#endregion
public Pipeline_WeldJoint()
@ -22194,6 +22198,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBracket", DbType="Bit")]
public System.Nullable<bool> IsBracket
{
get
{
return this._IsBracket;
}
set
{
if ((this._IsBracket != value))
{
this.OnIsBracketChanging(value);
this.SendPropertyChanging();
this._IsBracket = value;
this.SendPropertyChanged("IsBracket");
this.OnIsBracketChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
public EntitySet<Batch_BatchTrustItem> Batch_BatchTrustItem
{
@ -28832,6 +28856,8 @@ namespace Model
private string _Value38;
private string _Value39;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Sys_User> _Sys_User;
@ -28928,6 +28954,8 @@ namespace Model
partial void OnValue37Changed();
partial void OnValue38Changing(string value);
partial void OnValue38Changed();
partial void OnValue39Changing(string value);
partial void OnValue39Changed();
#endregion
public Sys_DataInTemp()
@ -29825,6 +29853,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Value39", DbType="NVarChar(50)")]
public string Value39
{
get
{
return this._Value39;
}
set
{
if ((this._Value39 != value))
{
this.OnValue39Changing(value);
this.SendPropertyChanging();
this._Value39 = value;
this.SendPropertyChanged("Value39");
this.OnValue39Changed();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Sys_DataInTemp_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@ -34549,6 +34597,8 @@ namespace Model
private string _PipelineCode;
private string _PipelineId;
private string _PipingClassCode;
private string _WeldJointCode;
@ -34867,6 +34917,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")]
public string PipelineId
{
get
{
return this._PipelineId;
}
set
{
if ((this._PipelineId != value))
{
this._PipelineId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipingClassCode", DbType="NVarChar(50)")]
public string PipingClassCode
{
@ -34883,7 +34949,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(51)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")]
public string WeldJointCode
{
get
@ -42169,6 +42235,8 @@ namespace Model
private string _WeldSilkCode;
private string _WeldSilkName;
private string _GrooveTypeCode;
private string _Is_hjName;
@ -42201,6 +42269,8 @@ namespace Model
private System.Nullable<bool> _IsPMI;
private System.Nullable<bool> _IsBracket;
private System.Nullable<bool> _IsGoldJoint;
private string _WPQId;
@ -43095,7 +43165,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilkCode", DbType="VarChar(1) NOT NULL", CanBeNull=false)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilkCode", DbType="NVarChar(50)")]
public string WeldSilkCode
{
get
@ -43111,6 +43181,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilkName", DbType="NVarChar(50)")]
public string WeldSilkName
{
get
{
return this._WeldSilkName;
}
set
{
if ((this._WeldSilkName != value))
{
this._WeldSilkName = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeCode", DbType="NVarChar(50)")]
public string GrooveTypeCode
{
@ -43367,6 +43453,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsBracket", DbType="Bit")]
public System.Nullable<bool> IsBracket
{
get
{
return this._IsBracket;
}
set
{
if ((this._IsBracket != value))
{
this._IsBracket = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsGoldJoint", DbType="Bit")]
public System.Nullable<bool> IsGoldJoint
{

2
HJGL/WebApi/.vs/WebApi.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

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

Binary file not shown.

169
ReleasePacker - 副本.bat Normal file
View File

@ -0,0 +1,169 @@
@echo off
REM ---------------
REM 发布包生成工具
REM 执行此文件前请先用Release生成publisher项目
REM --------------
REM --------------
REM 环境变量设置 Project_Src为如PUBLISHER4_CODING这样的分支
REM --------------
set PROJECT_SRC=%CD%
REM 源代码publisher项目文件夹
set PUBLISHER_SRC_ROOT=%PROJECT_SRC%\HJGL\FineUIPro.Web
REM 源代码版本日志文件夹
set VerLog_SRC_ROOT=%PROJECT_SRC%\database\版本日志
REM 源代码报表文件夹
set Report_SRC_ROOT=%PROJECT_SRC%\ReportServer
REM 包文件夹名
SET ReleasePack=PackFile
REM 发布程序包文件夹
SET ReleasePackFolder=%PROJECT_SRC%\HJGL%ReleasePack%
REM 发布包publisher文件所在文件夹
SET RELEASE_PUBLISHER_ROOT=%PROJECT_SRC%\HJGL%ReleasePack%\%ReleasePack%
REM 发布包版本日志文件所在文件夹
SET RELEASE_VerLog_ROOT=%PROJECT_SRC%\HJGL%ReleasePack%\版本日志
REM 发布包报表文件所在文件夹
SET RELEASE_Report_ROOT=%PROJECT_SRC%\HJGL%ReleasePack%\ReportServer
REM --------------
REM 发布程序包文件夹相关
REM --------------
IF exist %ReleasePackFolder%\nul.ext (
@echo 删除已存在的发布程序包文件夹
@echo.
rd %ReleasePackFolder% /S /Q
)
mkdir %ReleasePackFolder%
IF exist %RELEASE_VerLog_ROOT%\nul.ext (
rd %RELEASE_VerLog_ROOT% /S /Q
)
mkdir %RELEASE_VerLog_ROOT%
IF exist %RELEASE_Report_ROOT%\nul.ext (
rd %RELEASE_Report_ROOT% /S /Q
)
mkdir %RELEASE_Report_ROOT%
IF errorlevel 1 goto delReleasePackError
@echo 设置.net控制台环境
@echo.
@call "D:\Visual Studio 2022\Common7\Tools\VsDevCmd.bat"
IF errorlevel 1 goto netEnvironmentError
@echo 开始预编译...
@echo.
aspnet_compiler -p %PUBLISHER_SRC_ROOT% %RELEASE_PUBLISHER_ROOT% -u -v /
IF errorlevel 1 goto aspnet_compilerError
@echo 预编译完成
@echo.
@echo 开始合并程序集...
@echo.
Aspnet_merge %RELEASE_PUBLISHER_ROOT% -o UI
IF errorlevel 1 goto Aspnet_mergeError
@echo 合并程序集完成
@echo.
REM --------------
REM 删除不必要的文件
REM --------------
@echo 开始清理垃圾文件...
@echo.
del %RELEASE_PUBLISHER_ROOT%\*.cs /s /f
del %RELEASE_PUBLISHER_ROOT%\*.designer.cs /s /f
del %RELEASE_PUBLISHER_ROOT%\*.csproj /s /f
del %RELEASE_PUBLISHER_ROOT%\*.csproj.* /s /f
del %RELEASE_PUBLISHER_ROOT%\*.pdb /s /f
del %RELEASE_PUBLISHER_ROOT%\*.resx /s /f
del %RELEASE_PUBLISHER_ROOT%\*.xml /s /f
del %RELEASE_PUBLISHER_ROOT%\*.db /s /f
del %RELEASE_PUBLISHER_ROOT%\*.bak /s /f
del %RELEASE_PUBLISHER_ROOT%\*.*.bak /s /f
del %RELEASE_PUBLISHER_ROOT%\*.sln /s /f
del %RELEASE_PUBLISHER_ROOT%\*.suo /s /f
del %RELEASE_PUBLISHER_ROOT%\*.scc /s /f
rd %RELEASE_PUBLISHER_ROOT%\obj /s /q
del %RELEASE_PUBLISHER_ROOT%\ReadMe.txt /s /f
del %RELEASE_PUBLISHER_ROOT%\*.pfx /s /f
del %RELEASE_PUBLISHER_ROOT%\*.StyleCop /s /f
@echo 清理完成
@echo.
REM --------------
REM 拷贝版本日志
REM --------------
@echo 拷贝版本日志...
@echo.
copy %VerLog_SRC_ROOT%\*.* %RELEASE_VerLog_ROOT% /Y
REM --------------
REM 拷贝报表文件
REM --------------
@echo 拷贝表文件...
@echo.
xcopy %Report_SRC_ROOT%\*.* %RELEASE_Report_ROOT% /s
@echo 发布包已生成,存放路径为%ReleasePackFolder%
@echo.
goto END
:delReleasePackError
@echo.
@echo 删除包存储文件夹失败!
goto END
:netEnvironmentError
@echo.
@echo .net环境设置失败!
goto END
:aspnet_compilerError
@echo.
@echo 预编译失败!
goto END
:Aspnet_mergeError
@echo.
@echo 合并程序集失败!
goto END
:END
pause