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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2024-03-31 12:05:56 +08:00
parent 066ce71002 3ea9f6278c
commit cb86e6e805
17 changed files with 781 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+31 -11
View File
@@ -69,14 +69,6 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@@ -102,7 +94,8 @@
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
<Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\MicrosoftOfficeCore.15.0.0\lib\net35\Office.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore" />
@@ -110,8 +103,8 @@
<Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
<HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=3.7.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll</HintPath>
<Reference Include="Quartz, Version=3.8.1.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.8.1\lib\netstandard2.0\Quartz.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
@@ -850,6 +843,33 @@
<WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>6</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
SGGL/BLL/Common/PrinterDocService.cs
+395 -5
View File
@@ -56,6 +56,32 @@
System.Web.HttpContext.Current.Response.End();
}
}
public static void PrinterRectifyNoticesHtmlAll(string projectId, string type)
{
System.Web.HttpContext.Current.Response.ClearContent();
string htmlStr = string.Empty;
string name = "隐患整改通知单";
if (type == "1")
{
htmlStr = GetRectifyNoticesTableHtmlAll(projectId);
}
else
{
htmlStr = GetRectifyNoticesTableHtmlAll2(projectId);
name = "隐患整改反馈单";
}
if (!string.IsNullOrEmpty(htmlStr))
{
string filename = name + Funs.GetNewFileName();
System.Web.HttpContext.Current.Response.AddHeader("content-disposition", "attachment; filename="
+ System.Web.HttpUtility.UrlEncode(filename, Encoding.UTF8) + ".doc");
System.Web.HttpContext.Current.Response.ContentType = "application/word";
System.Web.HttpContext.Current.Response.ContentEncoding = Encoding.UTF8;
System.Web.HttpContext.Current.Response.Write(htmlStr);
System.Web.HttpContext.Current.Response.End();
}
}
#region 隐患整改通知单
/// <summary>
@@ -237,6 +263,190 @@
}
return sb.ToString();
}
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
public static string GetRectifyNoticesTableHtmlAll(string projectId)
{
StringBuilder sb = new StringBuilder();
var getRectifyNoticesAll = from x in Funs.DB.Check_RectifyNotices
orderby x.RectifyNoticesCode
where x.ProjectId == projectId
select x;
sb.Append("<meta http-equiv=\"content-type\" content=\"application/word; charset=UTF-8\"/>");
foreach (var getRectifyNotices in getRectifyNoticesAll)
{
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;font-size: 11pt;\">");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" style=\"width: 100%; font-size: 12pt; font-weight: bold;border-right: none;border-left: none;border-bottom: none;border-top: none; \">{0}</td> ", "安全隐患整改通知单");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"3\" style=\"border-right: none;border-left: none;border-top: none; \">{0}</td> ", "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(getRectifyNotices.ProjectId));
sb.AppendFormat("<td align=\"center\" style=\"border-right: none;border-left: none;border-top: none; \">{0}</td> ", "编号：" + getRectifyNotices.RectifyNoticesCode);
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 18%; \">{0}</td> ", "受检单位名称");
sb.AppendFormat("<td align=\"left\" style=\"width: 32%; \">{0}</td> ", UnitService.GetUnitNameByUnitId(getRectifyNotices.UnitId));
sb.AppendFormat("<td align=\"center\" style=\"width: 18%; \">{0}</td> ", "单位工程名称");
sb.AppendFormat("<td align=\"left\" style=\"width: 32%; \">{0}</td> ", UnitWorkService.GetUnitWorkName(getRectifyNotices.WorkAreaId));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "检查人员");
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", Person_PersonsService.getPersonsNamesPersonIds(getRectifyNotices.CheckManIds));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "检查日期");
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", string.Format("{0:yyyy-MM-dd}", getRectifyNotices.CheckedDate));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "隐患类别");
if (getRectifyNotices.HiddenHazardType == "3")
{
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", "☐一般 ☐较大 √重大");
}
else if (getRectifyNotices.HiddenHazardType == "2")
{
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", "☐一般 √较大 ☐重大");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", "√一般 ☐较大 ☐重大");
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-bottom: none;\" >{0}</td> ", "贵公司存在的安全隐患及整改要求如下：");
sb.Append("</tr>");
var getItem = from x in Funs.DB.Check_RectifyNoticesItem
where x.RectifyNoticesId == getRectifyNotices.RectifyNoticesId
orderby x.RectifyNoticesItemId
select x;
int i = 1;
foreach (var item in getItem)
{
string contStr = "&nbsp; &nbsp;" + i.ToString() + "." + item.WrongContent + "（详见附图" + i.ToString() + "），整改要求：" + item.Requirement;
if (item.LimitTime.HasValue)
{
contStr += " 整改期限" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", item.LimitTime);
}
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", contStr);
sb.Append("</tr>");
i++;
}
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"right\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "总包单位项目安全经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.SignPerson) + "&nbsp; &nbsp;");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"right\" colspan=\"4\" style=\"border-top: none;\">{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.SignDate) + "&nbsp; &nbsp;");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" rowspan=\"3\">{0}</td> ", "抄送：");
if (string.IsNullOrEmpty(getRectifyNotices.ProfessionalEngineerId))
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "☐专业工程师：");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "√专业工程师：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProfessionalEngineerId));
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProfessionalEngineerTime1));
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
if (string.IsNullOrEmpty(getRectifyNotices.ConstructionManagerId))
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "☐施工经理：");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "√施工经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ConstructionManagerId));
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ConstructionManagerTime1));
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
if (string.IsNullOrEmpty(getRectifyNotices.ProjectManagerId))
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "☐项目经理：");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "√项目经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProjectManagerId));
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProjectManagerTime1));
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "接收人");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", Person_PersonsService.getSignatureName(getRectifyNotices.DutyPersonId));
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "接收日期");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.DutyPersonTime));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-bottom: none;\" >{0}</td> ", "注： 1.本表由总包单位项目安全经理签发，一般隐患抄送专业工程师监督；较大隐患抄送施工经理监督；重大隐患需要由项目经理签字并报公司施工管理部备案。");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;\">{0}</td> ", "&nbsp; &nbsp;2.本表一式2份，签发单位和接收单位各一份。");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"width: 100%; font-size: 11pt; font-weight: bold;border-right: none;border-left: none;border-bottom: none;border-top: none; \">{0}</td> ", "附图：");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" >{0}</td> ", "整改前的照片");
sb.Append("</tr>");
int j = 1;
foreach (var item in getItem)
{
var att = AttachFileService.GetAttachFile(item.RectifyNoticesItemId.ToString() + "#1", BLL.Const.ProjectRectifyNoticesMenuId);
if (att != null && !string.IsNullOrEmpty(att.AttachUrl))
{
string imgStr = string.Empty;
List<string> listStr = Funs.GetStrListByStr(att.AttachUrl, ',');
foreach (var urlItem in listStr)
{
imgStr += "<img width='100' height='100' src='" + (Funs.SGGLUrl + urlItem).Replace('\\', '/') + "'></img>&nbsp;&nbsp;";
}
sb.Append("<tr>");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" style=\"border-bottom: none;\">{0}</td> ", imgStr);
sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" style=\"border-top: none;\">{0}</td> ", "图 " + j.ToString());
sb.Append("</tr>");
j++;
}
}
sb.Append("</table>");
}
return sb.ToString();
}
#endregion
#region 安全隐患整改反馈单
@@ -421,6 +631,186 @@
}
return sb.ToString();
}
public static string GetRectifyNoticesTableHtmlAll2(string projectId)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/word; charset=UTF-8\"/>");
var getRectifyNoticesAll = from x in Funs.DB.Check_RectifyNotices
orderby x.RectifyNoticesCode
where x.ProjectId == projectId
select x;
foreach (var getRectifyNotices in getRectifyNoticesAll)
{
sb.Append("<table width=\"100% \" cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;font-size: 11pt;\">");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" style=\"width: 100%; font-size: 12pt; font-weight: bold;border-right: none;border-left: none;border-bottom: none;border-top: none; \">{0}</td> ", "安全隐患整改反馈单");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"3\" style=\"border-right: none;border-left: none;border-top: none; \">{0}</td> ", "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(getRectifyNotices.ProjectId));
sb.AppendFormat("<td align=\"center\" style=\"border-right: none;border-left: none;border-top: none; \">{0}</td> ", "编号：" + getRectifyNotices.RectifyNoticesCode);
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" style=\"width: 18%; \">{0}</td> ", "受检单位名称");
sb.AppendFormat("<td align=\"left\" style=\"width: 32%; \">{0}</td> ", UnitService.GetUnitNameByUnitId(getRectifyNotices.UnitId));
sb.AppendFormat("<td align=\"center\" style=\"width: 18%; \">{0}</td> ", "单位工程名称");
sb.AppendFormat("<td align=\"left\" style=\"width: 32%; \">{0}</td> ", UnitWorkService.GetUnitWorkName(getRectifyNotices.WorkAreaId));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "检查人员");
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", Person_PersonsService.getPersonsNamesPersonIds(getRectifyNotices.CheckManIds));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "检查日期");
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", string.Format("{0:yyyy-MM-dd}", getRectifyNotices.CheckedDate));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "隐患类别");
if (getRectifyNotices.HiddenHazardType == "3")
{
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", "☐一般 ☐较大 √重大");
}
else if (getRectifyNotices.HiddenHazardType == "2")
{
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", "☐一般 √较大 ☐重大");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"3\">{0}</td> ", "√一般 ☐较大 ☐重大");
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-bottom: none;\" >{0}</td> ", "&nbsp; &nbsp;我单位接到编号为 " + getRectifyNotices.RectifyNoticesCode + " 的安全隐患整改通知单后，现已按要求完成了整改，具体整改情况如下：");
sb.Append("</tr>");
var getItem = from x in Funs.DB.Check_RectifyNoticesItem
where x.RectifyNoticesId == getRectifyNotices.RectifyNoticesId
orderby x.RectifyNoticesItemId
select x;
int i = 1;
foreach (var item in getItem)
{
string contStr = "&nbsp; &nbsp;" + i.ToString() + "." + item.RectifyResults + "（详见附图" + i.ToString() + "）。是否合格：" + (item.IsRectify.HasValue ? (item.IsRectify == true ? "合格" : "不合格") : "");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", contStr);
sb.Append("</tr>");
i++;
}
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"right\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "施工单位项目安全经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.DutyPersonId) + "&nbsp; &nbsp;"
+ "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.CompleteDate) + "&nbsp; &nbsp;");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"right\" colspan=\"4\" style=\"border-top: none;\" >{0}</td> ", "施工单位项目负责人：" + Person_PersonsService.getSignatureName(getRectifyNotices.UnitHeadManId) + "&nbsp; &nbsp;"
+ "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.UnitHeadManDate) + "&nbsp; &nbsp;");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-bottom: none;\" >{0}</td> ", "总包单位复查意见：");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "&nbsp; &nbsp;" + getRectifyNotices.ReCheckOpinion);
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"right\" colspan=\"4\" style=\"border-top: none;border-bottom: none;\" >{0}</td> ", "安全经理/安全工程师：" + Person_PersonsService.getSignatureName(getRectifyNotices.CheckPerson) + "&nbsp; &nbsp;");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"right\" colspan=\"4\" style=\"border-top: none;\">{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ReCheckDate) + "&nbsp; &nbsp;");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" rowspan=\"3\">{0}</td> ", "抄送：");
if (string.IsNullOrEmpty(getRectifyNotices.ProfessionalEngineerId))
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "☐专业工程师：");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "√专业工程师：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProfessionalEngineerId));
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProfessionalEngineerTime2));
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
if (string.IsNullOrEmpty(getRectifyNotices.ConstructionManagerId))
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "☐施工经理：");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "√施工经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ConstructionManagerId));
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ConstructionManagerTime2));
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
if (string.IsNullOrEmpty(getRectifyNotices.ProjectManagerId))
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "☐项目经理：");
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：");
}
else
{
sb.AppendFormat("<td align=\"left\" colspan=\"2\">{0}</td> ", "√项目经理：" + Person_PersonsService.getSignatureName(getRectifyNotices.ProjectManagerId));
sb.AppendFormat("<td align=\"left\" >{0}</td> ", "日期：" + string.Format("{0:yyyy-MM-dd HH:mm:ss}", getRectifyNotices.ProjectManagerTime2));
}
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" style=\"width: 100%; font-size: 11pt; font-weight: bold;border-right: none;border-left: none;border-bottom: none;border-top: none; \">{0}</td> ", "附图：");
sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"left\" colspan=\"4\" >{0}</td> ", "整改后的照片");
sb.Append("</tr>");
int j = 1;
foreach (var item in getItem)
{
var att = AttachFileService.GetAttachFile(item.RectifyNoticesItemId.ToString() + "#2", BLL.Const.ProjectRectifyNoticesMenuId);
if (att != null && !string.IsNullOrEmpty(att.AttachUrl))
{
string imgStr = string.Empty;
List<string> listStr = Funs.GetStrListByStr(att.AttachUrl, ',');
foreach (var urlItem in listStr)
{
imgStr += "<img width='100' height='100' src='" + (Funs.SGGLUrl + urlItem).Replace('\\', '/') + "'></img>&nbsp;&nbsp;";
}
sb.Append("<tr>");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" style=\"border-bottom: none;\">{0}</td> ", imgStr);
sb.Append("</tr>");
sb.Append("<tr style=\"height: 20px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" style=\"border-top: none;\">{0}</td> ", "图 " + j.ToString());
sb.Append("</tr>");
j++;
}
}
sb.Append("</table>");
}
return sb.ToString();
}
#endregion
#region 安全月报
@@ -1795,7 +2185,7 @@
sb.Append("<tr style=\"height: 35px\">");
sb.AppendFormat("<td align=\"center\" colspan=\"2\" >{0}</td> ", "项目名称");
sb.AppendFormat("<td align=\"center\" colspan=\"4\" >{0}</td> ", BLL.ProjectService.GetProjectNameByProjectId(getCostManage.ProjectId));
sb.AppendFormat("<td align=\"center\" colspan=\"4\" >{0}</td> ", BLL.ProjectService.GetProjectNameByProjectId(getCostManage.ProjectId));
sb.Append("</tr>");
sb.Append("<tr style=\"height: 35px\">");
@@ -1833,7 +2223,7 @@
sb.AppendFormat("<td align=\"center\" style=\"width: 20%; \" >{0}</td> ", "分项名称");
sb.AppendFormat("<td align=\"center\" style=\"width: 15%; \" >{0}</td> ", "子项名称");
sb.Append("</tr>");
var getItem = BLL.CostManageItemService.GetCostManageItemByCostManageId(costManageId);
var getItem = BLL.CostManageItemService.GetCostManageItemByCostManageId(costManageId);
int i = 1;
foreach (var item in getItem)
{
@@ -1843,12 +2233,12 @@
sb.AppendFormat("<td align=\"center\" >{0}</td> ", item.CostTypeName);
sb.AppendFormat("<td align=\"center\" >{0}</td> ", item.InvestCostProject);
sb.AppendFormat("<td align=\"center\" >{0}</td> ", item.PriceMoney.ToString());
sb.AppendFormat("<td align=\"center\" >{0}</td> ","");
sb.AppendFormat("<td align=\"center\" >{0}</td> ", "");
sb.Append("</tr>");
i++;
}
string opinin1 = string.Empty;string date1 = string.Empty;string signatureName1 = string.Empty;
string opinin1 = string.Empty; string date1 = string.Empty; string signatureName1 = string.Empty;
var getFlow1 = Funs.DB.CostGoods_CostManageFlowOperate.FirstOrDefault(x => x.CostManageId == costManageId && x.SortIndex == 1);
if (getFlow1 != null)
{
@@ -1937,7 +2327,7 @@
}
return sb.ToString();
}
#endregion
}
}
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
+2 -2
View File
@@ -121,7 +121,7 @@ namespace BLL
}
return PlanStartDate;
}
public static List<PackagingManageItem> GetPackagingManageList(string projectId, string PackagingCode)
public static List<PackagingManageItem> GetPackagingManageList(string projectId, string PackagingCode, int pageIndex, int pageSize)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -147,7 +147,7 @@ namespace BLL
Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1),
}).Distinct();
return q.OrderByDescending(x => x.Code).ToList();
return q.OrderByDescending(x => x.Code).Skip(pageIndex * pageSize).Take(pageSize).ToList();
}
}
SGGL/FineUIPro.Mobile/PHTGL/ContractCompile/ContractReviewDetail.aspx.cs
+4 -6
View File
@@ -194,12 +194,10 @@ namespace FineUIPro.Mobile.Mobile
btnAgree.Enabled = false;
btnDisgree.Enabled = false;
}
DataTable tb = BLL.PHTGL_ApproveService.GetAllApproveData(ContractReviewId);
//Grid1.RecordCount = tb.Rows.Count;
//var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = tb;
////Grid1.RecordCount = tb.Rows.Count;
////var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = BLL.PHTGL_ApproveService.GetAllApproveData(ContractReviewId); ;
Grid1.DataBind();
}
SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.pdf
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+23 -9
View File
@@ -107,14 +107,6 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@@ -136,6 +128,10 @@
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\MicrosoftOfficeCore.15.0.0\lib\net35\Office.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
@@ -14449,6 +14445,24 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
@@ -14469,7 +14483,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8653/</IISUrl>
<IISUrl>http://localhost:6233/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+3 -3
View File
@@ -130,9 +130,9 @@
HeaderText="总焊口量" HeaderTextAlign="Center"
TextAlign="Right">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center"
TextAlign="Left">
<f:RenderField Width="200px" ColumnID="PipeAreaStr" DataField="PipeAreaStr" SortField="PipeAreaStr"
FieldType="String" HeaderText="管线划分" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:TemplateField Width="130px" HeaderText="无损检测类型" HeaderTextAlign="Center"
TextAlign="Center" SortField="DetectionType">
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+1 -1
View File
@@ -317,7 +317,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
完成焊口=x.FinishJointCount,
总达因数 =x.TotalDin,
总焊口量=x.JointCount,
单位名称=x.UnitName,
管线划分 = x.PipeAreaStr,
无损检测类型=x.DetectionTypeCode,
探伤比例 =x.DetectionRateCode,
介质名称=x.MediumName,
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
+10 -9
View File
@@ -66,8 +66,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
//var table = this.GetPagedDataTable(Grid1, tb);
//Grid1.DataSource = table;
//Grid1.DataBind();
var list= BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim());
Grid1.RecordCount = list.Count;
var list2 = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), 0, 10000);
var list = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
Grid1.RecordCount = list2.Count;
Grid1.DataSource = list;
Grid1.DataBind();
}
@@ -145,13 +146,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
#endregion
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "cmd_detail" )
if (e.CommandName == "cmd_detail")
{
string id = Grid1.SelectedRowID;
string url = "PackagingManageView.aspx?PackagingManageId={0}";
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - ")));
}
else if (e.CommandName== "cmd_print")
else if (e.CommandName == "cmd_print")
{
string Id = this.Grid1.SelectedRowID;
Pring(Id);
@@ -219,9 +220,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
string url = string.Empty;
var wpq = BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(id);
if (wpq != null)
{
url = "PackagingManageEdit.aspx?PackagingManageId={0}";
{
url = "PackagingManageEdit.aspx?PackagingManageId={0}";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url, id, "操作 - ")));
}
}
@@ -429,9 +430,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
if (state != null)
{
string txt= HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
string txt = HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
return txt;
return txt;
}
return "";
}
SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx
+15 -9
View File
@@ -6,7 +6,7 @@
<head runat="server">
<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<title>隐患整改通知单</title>
</head>
<body>
@@ -16,7 +16,7 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改通知单" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="RectifyNoticesId" DataIDField="RectifyNoticesId" AllowSorting="true"
runat="server" BoxFlex="1" DataKeyNames="RectifyNoticesId" DataIDField="RectifyNoticesId" AllowSorting="true"
SortField="RectifyNoticesCode" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
@@ -62,7 +62,7 @@
<f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" runat="server"
Hidden="true">
</f:Button>
<%-- <f:Button ID="btnPrint" ToolTip="打印" Icon="Printer" Hidden="true" runat="server"
<%-- <f:Button ID="btnPrint" ToolTip="打印" Icon="Printer" Hidden="true" runat="server"
OnClick="btnPrint_Click">
</f:Button>--%>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
@@ -115,30 +115,36 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1100px" Height="620px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnView" EnablePostBack="true" runat="server"
Text="查看" Icon="Find" OnClick="btnView_Click">
</f:MenuButton>
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
Text="导出[通知单]" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<f:MenuButton ID="btnPrinterReturn" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnAll" EnablePostBack="true" runat="server"
Text="导出全部[通知单]" Icon="Printer" OnClick="btnAll_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<f:MenuButton ID="btnPrinterReturn" EnablePostBack="true" runat="server"
Text="导出[反馈单]" Icon="Printer" OnClick="btnPrinterReturn_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<f:MenuButton ID="btnAll2" EnablePostBack="true" runat="server"
Text="导出全部[反馈单]" Icon="Printer" OnClick="btnAll2_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
</f:MenuButton>
SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs
+15 -1
View File
@@ -397,7 +397,12 @@ namespace FineUIPro.Web.HSSE.Check
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
printRectify(getRectify);
}
private void printRectify(Model.Check_RectifyNotices getRectify)
{
string rootPath = Server.MapPath("~/");
string initTemplatePath = string.Empty;
string uploadfilepath = string.Empty;
@@ -714,7 +719,7 @@ namespace FineUIPro.Web.HSSE.Check
Response.Close();
File.Delete(newUrl);
File.Delete(pdfUrl);
//PrinterDocService.PrinterDocMethod(Const.ProjectRectifyNoticesMenuId + "#1", Grid1.SelectedRowID, "隐患整改通知单");
//PrinterDocService.PrinterDocMethod(Const.ProjectRectifyNoticesMenuId + "#1", Grid1.SelectedRowID, "隐患整改通知单");
}
#endregion
@@ -1109,5 +1114,14 @@ namespace FineUIPro.Web.HSSE.Check
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RectifyNoticesView.aspx?RectifyNoticesId={0}", Grid1.SelectedRowID, "查看 - ")));
}
protected void btnAll_Click(object sender, EventArgs e)
{
PrinterDocService.PrinterRectifyNoticesHtmlAll(this.ProjectId,"1");
}
protected void btnAll2_Click(object sender, EventArgs e)
{
PrinterDocService.PrinterRectifyNoticesHtmlAll(this.ProjectId, "2");
}
}
}
SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.designer.cs
Generated
+50 -30
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Check {
public partial class RectifyNotices {
namespace FineUIPro.Web.HSSE.Check
{
public partial class RectifyNotices
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtUnitName 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// txtWorkAreaName 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkAreaName;
/// <summary>
/// txtRectifyNoticesCode 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRectifyNoticesCode;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// rbStates 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbStates;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarFill2;
/// <summary>
/// rbrbHiddenHazardType 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rbrbHiddenHazardType;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnView 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnView;
/// <summary>
/// btnPrinter 控件。
/// </summary>
@@ -227,7 +229,16 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnPrinter;
/// <summary>
/// btnAll 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnAll;
/// <summary>
/// btnPrinterReturn 控件。
/// </summary>
@@ -236,7 +247,16 @@ namespace FineUIPro.Web.HSSE.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnPrinterReturn;
/// <summary>
/// btnAll2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnAll2;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx
+2 -2
View File
@@ -161,9 +161,9 @@
EnableColumnLines="true" DataIDField="PipeArea"
PageSize="15">
<Columns>
<f:RenderField HeaderText="管线划分" ColumnID="PipeArea"
<f:RenderField HeaderText="统计类型" ColumnID="PipeArea"
DataField="PipeArea" SortField="PipeArea" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="100px">
TextAlign="Center" Width="110px">
</f:RenderField>
<f:RenderField HeaderText="总达因数" ColumnID="TotalDin" ExpandUnusedSpace="true"
DataField="TotalDin" SortField="TotalDin" FieldType="Double" HeaderTextAlign="Center"
SGGL/FineUIPro.Web/common/mainMenu_HJGL3.aspx.cs
+4 -4
View File
@@ -181,7 +181,7 @@ CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.rbType.SelectedValue == "1")
{
strSql = @"select '工厂预制' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
strSql = @"select '工厂预制焊口' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(FinishSize,0)/(1.0 * TotalDin) END) AS DECIMAL(8,2))))+'%'
AS Rate from
(select b.UnitWorkId,CAST((SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='预制口') AS DECIMAL(12,3)) AS TotalDin,
@@ -189,7 +189,7 @@ CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left
CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='预制口' AND jot.WeldingDailyId IS NOT NULL and d.WeldingDate<=@WeldingDate) AS DECIMAL(12,3)) AS FinishSize
from WBS_UnitWork b) v where UnitWorkId=@UnitWorkId
union
select '现场施工' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
select '现场施工焊口' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(FinishSize,0)/(1.0 * TotalDin) END) AS DECIMAL(8,2))))+'%'
AS Rate from
(select b.UnitWorkId,CAST((SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='2')+(SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='安装口') AS DECIMAL(12,3)) AS TotalDin,
@@ -201,7 +201,7 @@ select '现场施工' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
}
else
{
strSql = @"select '工厂预制' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
strSql = @"select '工厂预制焊口' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(FinishSize,0)/(1.0 * TotalDin) END) AS DECIMAL(8,2))))+'%'
AS Rate from
(select b.UnitWorkId,CAST((SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='预制口') AS DECIMAL(12,3)) AS TotalDin,
@@ -209,7 +209,7 @@ select '现场施工' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize
CAST((SELECT ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId left join dbo.HJGL_WeldingDaily d on d.WeldingDailyId=jot.WeldingDailyId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='预制口' AND jot.WeldingDailyId IS NOT NULL and d.WeldingDate<=@WeldingEndDate) AS DECIMAL(12,3)) AS FinishSize
from WBS_UnitWork b) v where UnitWorkId=@UnitWorkId
union
select '现场施工' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
select '现场施工焊口' as PipeArea,UnitWorkId,TotalDin,TodayFinishSize,FinishSize,CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(TotalDin,0) WHEN 0 THEN 0
ELSE 100.0 * ISNULL(FinishSize,0)/(1.0 * TotalDin) END) AS DECIMAL(8,2))))+'%'
AS Rate from
(select b.UnitWorkId,CAST((SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='2')+(SELECT ISNULL(SUM(ISNULL(Size,0)),0) FROM dbo.HJGL_WeldJoint jot left join dbo.HJGL_Pipeline pipeline on jot.PipelineId=pipeline.PipelineId WHERE pipeline.UnitWorkId=b.UnitWorkId and PipeArea='1' and jot.JointAttribute='安装口') AS DECIMAL(12,3)) AS TotalDin,
SGGL/Model/Model.cs
+154 -136
View File
@@ -11823,7 +11823,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
public string ApproveIdea
{
get
@@ -151511,7 +151511,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
public string AttentPerson
{
get
@@ -182470,7 +182470,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string ProjectDescription
{
get
@@ -182590,7 +182590,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string CalculationRule
{
get
@@ -182650,7 +182650,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
public string ConstructionSubcontractor
{
get
@@ -183034,7 +183034,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@@ -183339,6 +183339,16 @@ namespace Model
private string _ProjectId;
private string _ContractId;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderInDate;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
private System.Nullable<int> _State;
private string _InvoiceCode;
@@ -183367,16 +183377,6 @@ namespace Model
private string _CreateUser;
private string _ContractId;
private System.Nullable<System.DateTime> _OrderInDate;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -183385,6 +183385,16 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable<int> value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@@ -183413,16 +183423,6 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@@ -183470,6 +183470,106 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable<int> State
{
@@ -183750,106 +183850,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -205073,7 +205073,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WrongContent", DbType="NChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WrongContent", DbType="NVarChar(500)")]
public string WrongContent
{
get
@@ -205093,7 +205093,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Requirement", DbType="NChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Requirement", DbType="NVarChar(500)")]
public string Requirement
{
get
@@ -205133,7 +205133,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyResults", DbType="NChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyResults", DbType="NVarChar(500)")]
public string RectifyResults
{
get
@@ -274903,6 +274903,8 @@ namespace Model
private string _PipeArea;
private string _PipeAreaStr;
private string _FlowingSection;
private string _MaterialCode;
@@ -275387,6 +275389,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeAreaStr", DbType="VarChar(8) NOT NULL", CanBeNull=false)]
public string PipeAreaStr
{
get
{
return this._PipeAreaStr;
}
set
{
if ((this._PipeAreaStr != value))
{
this._PipeAreaStr = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")]
public string FlowingSection
{
@@ -296026,7 +296044,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
public string Name
{
get
@@ -296603,7 +296621,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -296794,7 +296812,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -302081,7 +302099,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -303553,7 +303571,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
public string PackageContent
{
get
@@ -313104,7 +313122,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
public string ContractNo
{
get
@@ -313124,7 +313142,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
public string UnitWorks
{
get