lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
潘鸿锋 2024-07-24 14:54:26 +08:00
parent a0aca61750 1e4464ca5e
commit 5b87e8e258
16 changed files with 884 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
DataBase/版本日志/SGGLDB_WH_V2024-07-24-li.sql Normal file
View File

@ -0,0 +1,68 @@
ALTER TABLE Transfer_PunchlistFrom ADD Num_NO BigInt NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD System_No NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Sub_Sys_No NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Cat NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Raised_By NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Date_Raised datetime NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Disc NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD IsEng bit NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD IsMatI bit NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Punch_Type NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Required_Date datetime NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD PIC NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD PIC_WUH NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Correction_Action NVARCHAR(500) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Actual_Date datetime NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Cleared_By NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Cleared_Date datetime NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Confirmed_By NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Confirmed_Date datetime NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Verified_By NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Verified_Date datetime NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD [Status] NVARCHAR(50) NULL
GO
ALTER TABLE Transfer_PunchlistFrom ADD Remark NVARCHAR(500) NULL
GO

4
SGGL/BLL/Common/Const.cs
View File

@ -4738,6 +4738,10 @@ namespace BLL
/// 月度计划情况模板文件原始虚拟路径
/// </summary>
public const string MonthPlanOutTemplateUrl = "File\\Excel\\DataOut\\月度计划情况.xlsx";
/// <summary>
/// 周进度计划模板文件原始虚拟路径
/// </summary>
public const string WeekPlanOutTemplateUrl = "File\\Excel\\DataOut\\周进度计划.xlsx";
#endregion
#endregion

7
SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
View File

@ -778,6 +778,13 @@ namespace FineUIPro.Web.AttachFile
}
#endregion
#region PunchlistFrom附件保存成功后处理事件
if (MenuId == BLL.Const.PunchlistFromMenuId)
{
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
#endregion
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}

56
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -450,3 +450,59 @@ IP地址:::1
出错时间:07/15/2024 13:19:20
出错时间:07/15/2024 13:19:20
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:2 的 1 更新失败。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 BLL.ProjectService.UpdateProject(Base_Project project) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\ProjectData\ProjectService.cs:行号 193
在 FineUIPro.Web.ProjectData.ProjectSetSave.SaveData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 284
在 FineUIPro.Web.ProjectData.ProjectSetSave.btnSave_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\ProjectSetSave.aspx.cs:行号 189
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:07/23/2024 17:52:24
出错文件:http://localhost:8579/ProjectData/ProjectSetSave.aspx
IP地址:::1
操作人员:JT
出错时间:07/23/2024 17:52:24
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
出错时间:07/23/2024 18:18:27
出错时间:07/23/2024 18:18:27
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
出错时间:07/24/2024 10:37:35
出错时间:07/24/2024 10:37:35
错误信息开始=====>
错误类型:InvalidOperationException
错误信息:不能添加已经存在的实体。
错误堆栈:
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 318
出错时间:07/24/2024 11:14:23
出错时间:07/24/2024 11:14:23

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板(旧版).xls Normal file
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/PunchlistFrom导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataOut/周进度计划.xlsx Normal file
View File

Binary file not shown.

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19072,7 +19072,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

16
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
View File

@ -246,7 +246,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
if (safePersonQuality != null)
{
this.drpCertificate.SelectedValue = safePersonQuality.CertificateId;
this.txtCertificateCode.Text = safePersonQuality.CertificateNo;
@ -334,16 +334,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
else
{
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN" && (IdCard.Length != 18 && IdCard.Length != 15))
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN" && (IdCard.Length != 18 && IdCard.Length != 15) && (project.IsForeign == null || project.IsForeign == false))
{
ShowNotify("身份证号码位数不对！", MessageBoxIcon.Warning);
return;
}
//判断是否在黑名单中
var model = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == IdCard && x.IsBlacklist == true);
if (model!=null)
if (model != null)
{
ShowNotify("该身份证号码在系统黑名单中（"+ ProjectService.GetProjectNameByProjectId(model.ProjectId) +"），请联系管理员！", MessageBoxIcon.Warning);
ShowNotify("该身份证号码在系统黑名单中（" + ProjectService.GetProjectNameByProjectId(model.ProjectId) + "），请联系管理员！", MessageBoxIcon.Warning);
return;
}
}
@ -636,14 +637,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
#region 安管人员资质
var safePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(person.PersonId);
if (safePersonQuality!=null)
if (safePersonQuality != null)
{
if (this.drpCertificate.SelectedValue != BLL.Const._Null)
{
safePersonQuality.CertificateId = this.drpCertificate.SelectedValue;
safePersonQuality.CertificateName = this.drpCertificate.SelectedItem.Text;
}
safePersonQuality.CertificateNo = this.txtCertificateCode.Text.Trim();
safePersonQuality.LimitDate = Funs.GetNewDateTime(this.txtCertificateLimitTime.Text);
safePersonQuality.CompileMan = this.CurrUser.UserId;
@ -955,7 +956,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
ShowNotify("输入的身份证号码已存在！", MessageBoxIcon.Warning);
}
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN")
var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
if (this.drpIdcardType.SelectedValue == "SHENFEN_ZHENGJIAN" && (project.IsForeign == null || project.IsForeign == false))
{
if (!IDCardValid.CheckIDCard(idCard))
{

5
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
View File

@ -35,6 +35,9 @@
<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationGet" runat="server"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@ -45,7 +48,7 @@
<f:Tab ID="Tab1" Title="本周计划完成情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server"
TitleToolTip="本周计划完成情况">
<Items>
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" Height="500px"
<f:Grid ID="Grid2" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" Height="500px" PageSize="1000"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"

273
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.cs
View File

@ -8,6 +8,8 @@ using System.Data;
using System.Data.SqlClient;
using BLL;
using Newtonsoft.Json.Linq;
using System.IO;
using NPOI.SS.Util;
namespace FineUIPro.Web.JDGL.Check
{
@ -290,5 +292,276 @@ where mp.ProjectId=@ProjectId2 and mp.WeekNo=@WeekNo2 order by mp.SortIndex";
{
BindGrid();
}
#region 导出按钮
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
if (Grid1.Rows.Count == 0)
{
ShowNotify("无数据可导出！", MessageBoxIcon.Warning);
return;
}
string rootPath = Server.MapPath("~/");
string initTemplatePath = string.Empty;
string uploadfilepath = string.Empty;
string newUrl = string.Empty;
string filePath = string.Empty;
initTemplatePath = Const.WeekPlanOutTemplateUrl;
uploadfilepath = rootPath + initTemplatePath;
newUrl = uploadfilepath.Replace(".xlsx", "(" + this.drpWeekNo.SelectedItem.Text + ").xlsx");
File.Copy(uploadfilepath, newUrl);
// 第一步：读取文件流
NPOI.SS.UserModel.IWorkbook workbook;
using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
{
workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
}
Model.SGGLDB db = Funs.DB;
var units = from x in db.Base_Unit select x;
var users = from x in db.Sys_User select x;
string weekNo2 = string.Empty;
var weekPlan = Funs.DB.JDGL_WeekPlan.FirstOrDefault(x => x.WeekNo == this.drpWeekNo.SelectedValue);
if (weekPlan != null)
{
if (weekPlan.StartDate != null)
{
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.StartDate);
}
if (weekPlan.EndDate != null)
{
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekPlan.EndDate);
}
var lastWeekPlan = (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.CurrUser.LoginProjectId && x.StartDate < weekPlan.StartDate orderby x.StartDate descending select x).FirstOrDefault();
if (lastWeekPlan != null)
{
weekNo2 = lastWeekPlan.WeekNo;
}
}
else
{
this.txtStartDate.Text = string.Empty;
this.txtEndDate.Text = string.Empty;
}
string strSql = @"select mp.*,u.UnitName,us.UserName as DutyPersonName,uw.UnitWorkName,cn.ProfessionalName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr from [dbo].[JDGL_WeekPlan] mp
left join Base_Unit u on u.UnitId=mp.UnitId
left join Sys_User us on us.UserId=mp.DutyPerson
left join WBS_UnitWork uw on uw.UnitWorkId=mp.UnitWork
left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major
where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
string weekNo = string.Empty;
if (!string.IsNullOrEmpty(this.drpWeekNo.SelectedValue))
{
weekNo = this.drpWeekNo.SelectedValue;
}
listStr.Add(new SqlParameter("@WeekNo", weekNo));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
string strSql2 = @"select mp.*,u.UnitName,us.UserName as DutyPersonName,uw.UnitWorkName,cn.ProfessionalName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr from [dbo].[JDGL_WeekPlan] mp
left join Base_Unit u on u.UnitId=mp.UnitId
left join Sys_User us on us.UserId=mp.DutyPerson
left join WBS_UnitWork uw on uw.UnitWorkId=mp.UnitWork
left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major
where mp.ProjectId=@ProjectId2 and mp.WeekNo=@WeekNo2 order by mp.SortIndex";
List<SqlParameter> listStr2 = new List<SqlParameter>();
listStr2.Add(new SqlParameter("@ProjectId2", this.CurrUser.LoginProjectId));
listStr2.Add(new SqlParameter("@WeekNo2", weekNo2));
SqlParameter[] parameter2 = listStr2.ToArray();
DataTable tb2 = SQLHelper.GetDataTableRunText(strSql2, parameter2);
// 创建单元格样式
NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
cellStyle.WrapText = true;
var font = workbook.CreateFont();
font.FontHeightInPoints = 11;
cellStyle.SetFont(font);
NPOI.SS.UserModel.ICellStyle cellStyleT = workbook.CreateCellStyle();
cellStyleT.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyleT.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyleT.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyleT.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
cellStyleT.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
cellStyleT.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
cellStyleT.WrapText = true;
var fontT = workbook.CreateFont();
fontT.FontHeightInPoints = 16;
cellStyleT.SetFont(fontT);
// 第二步：创建新数据行
NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
NPOI.SS.UserModel.IRow row = null;
NPOI.SS.UserModel.ICell cell;
int i = 2;
for (int j = 0; j < tb2.Rows.Count; j++)
{
// 第二步：创建新数据行
row = sheet.CreateRow(i);
// 添加数据
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.SetCellValue((i-1).ToString());
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["UnitWorkName"].ToString());
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["ProfessionalName"].ToString());
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["WorkContent"].ToString());
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["UnitName"].ToString());
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["DutyPersonName"].ToString());
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
string planDate = string.Empty;
if (tb2.Rows[j]["PlanDate"] != DBNull.Value)
{
planDate = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(tb2.Rows[j]["PlanDate"].ToString()));
}
cell.SetCellValue(planDate);
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["IsOKStr"].ToString());
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb2.Rows[j]["Remark"].ToString());
i++;
}
row = sheet.CreateRow(i);
// 添加数据
cell = row.CreateCell(0);
cell.CellStyle = cellStyleT;
cell.SetCellValue("下周计划");
cell = row.CreateCell(1);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(2);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(3);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(4);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(5);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(6);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(7);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
cell = row.CreateCell(8);
cell.CellStyle = cellStyleT;
cell.SetCellValue(string.Empty);
sheet.AddMergedRegion(new CellRangeAddress(i, i, 0, 8));
row.Height = (short)(30 * 17);
i++;
row = sheet.CreateRow(i);
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.SetCellValue("序号");
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
cell.SetCellValue("工序/单位工程");
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
cell.SetCellValue("专业");
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue("工作项");
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue("责任单位");
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue("五环责任人");
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
cell.SetCellValue("计划完成时间");
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue("完成状态");
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue("备注");
i++;
int a = 1;
for (int j = 0; j < tb.Rows.Count; j++)
{
// 第二步：创建新数据行
row = sheet.CreateRow(i);
// 添加数据
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.SetCellValue(a.ToString());
cell = row.CreateCell(1);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["UnitWorkName"].ToString());
cell = row.CreateCell(2);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["ProfessionalName"].ToString());
cell = row.CreateCell(3);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["WorkContent"].ToString());
cell = row.CreateCell(4);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["UnitName"].ToString());
cell = row.CreateCell(5);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["DutyPersonName"].ToString());
cell = row.CreateCell(6);
cell.CellStyle = cellStyle;
string planDate = string.Empty;
if (tb.Rows[j]["PlanDate"] != DBNull.Value)
{
planDate = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(tb.Rows[j]["PlanDate"].ToString()));
}
cell.SetCellValue(planDate);
cell = row.CreateCell(7);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["IsOKStr"].ToString());
cell = row.CreateCell(8);
cell.CellStyle = cellStyle;
cell.SetCellValue(tb.Rows[j]["Remark"].ToString());
i++;
a++;
}
// 第三步：写入文件流
using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
{
workbook.Write(stream);
workbook.Close();
}
string fileName = Path.GetFileName(newUrl);
FileInfo info = new FileInfo(newUrl);
long fileSize = info.Length;
Response.Clear();
Response.ContentType = "application/x-zip-compressed";
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
Response.AddHeader("Content-Length", fileSize.ToString());
Response.TransmitFile(newUrl, 0, fileSize);
Response.Flush();
Response.Close();
File.Delete(newUrl);
}
#endregion
}
}

9
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx.designer.cs generated
View File

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

159
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
View File

@ -4,33 +4,33 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<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" EnableCollapse="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true">
EnableRowDoubleClickEvent="true" EnableTextSelection="true">
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtPunch_No" Label="Punch_No" LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtSYSTEM" Label="SYSTEM" LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtSUBSYSTEM" Label="SUBSYSTEM" LabelWidth="100px" LabelAlign="Right" Width="170px"></f:TextBox>
<f:DatePicker runat="server" Label="PUNCH_ITEM_FINISH_DATE" ID="txtStarTime" LabelAlign="Right" LabelWidth="200px"
Width="320px">
<f:TextBox runat="server" ID="txtNum_NO" Label="No." LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtSub_Sys_No" Label="Sub Sys No" LabelWidth="100px" LabelAlign="Right" Width="170px"></f:TextBox>
<f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="200px"
Width="320px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
<f:DatePicker runat="server" ID="txtEndDate_Raised" LabelAlign="Right" Width="150px">
</f:DatePicker>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
@ -38,60 +38,57 @@
<f:ToolbarFill runat="server"></f:ToolbarFill>
<%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
<%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
</f:Button>--%>
<%--<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" ToolTip="附件上传" runat="server" OnClick="btnAttach_Click">
</f:Button>--%>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" ToolTip="附件上传" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtTestPackage" Label="Test Package" LabelWidth="105px" LabelAlign="Right" Width="300px"></f:TextBox>
<f:TextBox runat="server" ID="txtDiscipline" Label="Discipline" LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtIdentified" Label="Identified during/by" LabelWidth="150px" LabelAlign="Right" Width="300px"></f:TextBox>
<f:TextBox runat="server" ID="txtCategory" Label="Select Punch List Category" LabelWidth="220px" LabelAlign="Right" Width="300px"></f:TextBox>
<f:DatePicker runat="server" Label="Required Date" ID="txtStartRequired_Date" LabelAlign="Right" LabelWidth="130px"
Width="320px">
</f:DatePicker>
<f:Label ID="Label2" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndRequired_Date" LabelAlign="Right" Width="150px">
</f:DatePicker>
<f:DatePicker runat="server" Label="Actual_Date" ID="txtStartActual_Date" LabelAlign="Right" LabelWidth="130px"
Width="320px">
</f:DatePicker>
<f:Label ID="Label3" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="150px">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:GroupField HeaderText="PUNCH LIST FORM" TextAlign="Center">
<%--<f:GroupField HeaderText="PUNCH LIST FORM" TextAlign="Center">
<Columns>
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Item_No" DataField="Item_No" HeaderText="Item No." />
<f:BoundField Width="90px" TextAlign="Center" ColumnID="Punch_No" DataField="Punch_No" HeaderText="Punch No" />
<f:BoundField Width="80px" TextAlign="Center" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" />
<f:BoundField Width="108px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="SUBSYSTEM" TextAlign="Center"/>
<f:BoundField Width="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField Width="85px" ColumnID="Discipline" DataField="Discipline" HeaderText="Discipline" TextAlign="Center"/>
<f:BoundField Width="250px" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="PUNCH LIST ITEM DESCRIPTION" TextAlign="Center"/>
<f:BoundField Width="250px" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="PUNCH LIST ITEM DESCRIPTION" TextAlign="Center"/>
<f:BoundField Width="145px" ColumnID="Identified" DataField="Identified" HeaderText="Identified during/by" TextAlign="Center"/>
<f:BoundField Width="110px" ColumnID="Category" DataField="Category" HeaderText="Select Punch<br/>List Category" TextAlign="Center"/>
<f:RenderField Width="110px" ColumnID="PUNCH_ITEM_FINISH_DATE" DataField="PUNCH_ITEM_FINISH_DATE"
HeaderText="PUNCH ITEM<br/>FINISH DATE" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
<f:BoundField Width="100px" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" TextAlign="Center"/>
<f:BoundField Width="100px" ColumnID="Required_By" DataField="Required_By" HeaderText="Required By" TextAlign="Center"/>
<f:BoundField Width="110px" ColumnID="PUNCH_ITEM_STATUS" DataField="PUNCH_ITEM_STATUS" HeaderText="PUNCH ITEM<br/>STATUS" TextAlign="Center"/>
<f:BoundField Width="110px" ColumnID="PUNCH_ITEM_STATUS" DataField="PUNCH_ITEM_STATUS" HeaderText="PUNCH ITEM<br/>STATUS" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Comments" DataField="Comments" HeaderText="Comments" TextAlign="Center"/>
</Columns>
</f:GroupField>
<%--<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
</f:GroupField>--%>
<%--<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField Width="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" TextAlign="Center"/>
<f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
@ -110,6 +107,84 @@
<f:BoundField MinWidth="200px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center"/>--%>
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Num_NO" DataField="Num_NO" HeaderText="No." />
<f:BoundField Width="150px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
<f:BoundField Width="150px" TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="Sub-sys. No." />
<f:BoundField Width="150px" TextAlign="Center" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="Description" />
<f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbPhotoesImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_A") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Photoes" DataField="Photoes" HeaderText="Photoes" />--%>
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Cat" DataField="Cat" HeaderText="Cat." />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Raised_By" DataField="Raised_By" HeaderText="Raised By" />
<f:RenderField Width="100px" TextAlign="Center" ColumnID="Date_Raised" DataField="Date_Raised" HeaderText="Date Raised" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Disc" DataField="Disc" HeaderText="Disc." />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="IsEng" DataField="IsEngStr" HeaderText="Eng(Y/N)" />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="IsMatI" DataField="IsMatIStr" HeaderText="Mat’l(Y/N)" />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Punch_Type" DataField="Punch_Type" HeaderText="Punch Type" />
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="PIC" DataField="PIC" HeaderText="PIC" />
<f:BoundField Width="100px" TextAlign="Center" ColumnID="PIC_WUH" DataField="PIC_WUH" HeaderText="PIC-WUH" />
<f:BoundField Width="150px" TextAlign="Center" ColumnID="Correction_Action" DataField="Correction_Action" HeaderText="Correction Action" />
<f:TemplateField ColumnID="ImageCorrected_Photos" Width="150px" HeaderText="Corrected Photos" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="labCorrected_Photos" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_B") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%>
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:GroupField HeaderText="Cleared(PIC）" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField Width="100px" ColumnID="Cleared_By" DataField="Cleared_By" HeaderText="By" TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="Cleared_Date" DataField="Cleared_Date" HeaderText="Date" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Confirmed(WUH)" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField Width="100px" ColumnID="Confirmed_By" DataField="Confirmed_By" HeaderText="By" TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="Confirmed_Date" DataField="Confirmed_Date" HeaderText="Date" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Verified(BASF)" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField Width="100px" ColumnID="Verified_By" DataField="Verified_By" HeaderText="By" TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="Verified_Date" DataField="Verified_Date" HeaderText="Date" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
</Columns>
</f:GroupField>
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="Status" />
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="Remark" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -143,6 +218,10 @@
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton>
<f:MenuButton ID="btnMenuAttachA" runat="server" Icon="FolderUp" Text="Photoes附件" OnClick="btnMenuAttachA_Click" Hidden="true">
</f:MenuButton>
<f:MenuButton ID="btnMenuAttachB" runat="server" Icon="FolderUp" Text="Corrected_Photos附件" OnClick="btnMenuAttachB_Click" Hidden="true">
</f:MenuButton>
</Items>
</f:Menu>
</form>
@ -156,4 +235,4 @@
}
</script>
</body>
</html>
</html>

115
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
View File

@ -30,57 +30,60 @@ namespace FineUIPro.Web.Transfer
/// </summary>
public void BindGrid()
{
string strSql = @"select*from Transfer_PunchlistFrom
string strSql = @"select *
,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr
,(CASE isnull(IsMatI,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsMatIStr
from Transfer_PunchlistFrom
where ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(this.txtPunch_No.Text.Trim()))
if (!string.IsNullOrEmpty(this.txtNum_NO.Text.Trim()))
{
strSql += " AND Punch_No like @Punch_No";
listStr.Add(new SqlParameter("@Punch_No", "%" + this.txtPunch_No.Text.Trim() + "%"));
strSql += " AND Num_NO like @Num_NO";
listStr.Add(new SqlParameter("@Num_NO", "%" + this.txtNum_NO.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSYSTEM.Text.Trim()))
if (!string.IsNullOrEmpty(this.txtSystem_No.Text.Trim()))
{
strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSYSTEM.Text.Trim() + "%"));
strSql += " AND System_No like @System_No";
listStr.Add(new SqlParameter("@System_No", "%" + this.txtSystem_No.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtSUBSYSTEM.Text.Trim()))
if (!string.IsNullOrEmpty(this.txtSub_Sys_No.Text.Trim()))
{
strSql += " AND Subsystem like @Subsystem";
listStr.Add(new SqlParameter("@Subsystem", "%" + this.txtSUBSYSTEM.Text.Trim() + "%"));
strSql += " AND Sub_Sys_No like @Sub_Sys_No";
listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
{
strSql += " AND PUNCH_ITEM_FINISH_DATE >= @InspectionDateA";
listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
strSql += " AND Date_Raised >= @StartDate_Raised";
listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
{
strSql += " AND PUNCH_ITEM_FINISH_DATE <= @InspectionDateZ";
listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
strSql += " AND Date_Raised <= @EndDate_Raised";
listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
}
if (!string.IsNullOrEmpty(this.txtTestPackage.Text.Trim()))
if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
{
strSql += " AND Test_Package like @Test_Package";
listStr.Add(new SqlParameter("@Test_Package", "%" + this.txtTestPackage.Text.Trim() + "%"));
strSql += " AND Required_Date >= @Required_Date";
listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(this.txtDiscipline.Text.Trim()))
if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
{
strSql += " AND Discipline like @Discipline";
listStr.Add(new SqlParameter("@Discipline", "%" + this.txtDiscipline.Text.Trim() + "%"));
strSql += " AND Required_Date <= @Required_Date";
listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(this.txtIdentified.Text.Trim()))
if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
{
strSql += " AND Identified like @Identified";
listStr.Add(new SqlParameter("@Identified", "%" + this.txtIdentified.Text.Trim() + "%"));
strSql += " AND Actual_Date >= @Actual_Date";
listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(this.txtCategory.Text.Trim()))
if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
{
strSql += " AND Category like @Category";
listStr.Add(new SqlParameter("@Category", "%" + this.txtCategory.Text.Trim() + "%"));
strSql += " AND Actual_Date <= @Actual_Date";
listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
}
strSql += " order by Punch_No ";
strSql += " order by Num_No ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@ -175,6 +178,56 @@ namespace FineUIPro.Web.Transfer
}
#endregion
#region Photoes附件
/// <summary>
/// 右键附件上传功能
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuAttachA_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}_A&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", Grid1.SelectedRowID, BLL.Const.PunchlistFromMenuId)));
}
}
#endregion
#region Corrected_Photos附件
/// <summary>
/// 右键附件上传功能
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuAttachB_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}_B&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", Grid1.SelectedRowID, BLL.Const.PunchlistFromMenuId)));
}
}
#endregion
/// <summary>
/// 获取附件(放于Img中)
/// </summary>
/// <param name="Id_type"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage(object Id_type)
{
string url = string.Empty;
if (Id_type != null)
{
var registration = BLL.AttachFileService.GetAttachFile(Id_type.ToString(), BLL.Const.PunchlistFromMenuId);
if (registration != null)
{
url = BLL.UploadAttachmentService.ShowImage("../../", registration.AttachUrl);
}
}
return url;
}
#region 导入
/// <summary>
/// 导入按钮
@ -205,11 +258,15 @@ namespace FineUIPro.Web.Transfer
if (buttonList.Contains(BLL.Const.BtnAdd))
{
//this.btnNew.Hidden = false;
btnMenuAttachA.Hidden=false;
btnMenuAttachB.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
//this.btnMenuModify.Hidden = false;
this.Grid1.EnableRowDoubleClickEvent = true;
btnMenuAttachA.Hidden = false;
btnMenuAttachB.Hidden = false;
}
else
{

157
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Transfer {
public partial class PunchlistFrom {
namespace FineUIPro.Web.Transfer
{
public partial class PunchlistFrom
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolSearch 控件。
/// </summary>
@ -56,43 +58,43 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// txtPunch_No 控件。
/// txtNum_NO 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPunch_No;
protected global::FineUIPro.TextBox txtNum_NO;
/// <summary>
/// txtSYSTEM 控件。
/// txtSystem_No 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSYSTEM;
protected global::FineUIPro.TextBox txtSystem_No;
/// <summary>
/// txtSUBSYSTEM 控件。
/// txtSub_Sys_No 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSUBSYSTEM;
protected global::FineUIPro.TextBox txtSub_Sys_No;
/// <summary>
/// txtStarTime 控件。
/// txtStartDate_Raised 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
protected global::FineUIPro.DatePicker txtStartDate_Raised;
/// <summary>
/// Label1 控件。
/// </summary>
@ -101,16 +103,16 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndTime 控件。
/// txtEndDate_Raised 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
protected global::FineUIPro.DatePicker txtEndDate_Raised;
/// <summary>
/// btnSearch 控件。
/// </summary>
@ -119,16 +121,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// btnImport 控件。
/// </summary>
@ -137,7 +130,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -146,43 +139,79 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtTestPackage 控件。
/// txtStartRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackage;
protected global::FineUIPro.DatePicker txtStartRequired_Date;
/// <summary>
/// txtDiscipline 控件。
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDiscipline;
protected global::FineUIPro.Label Label2;
/// <summary>
/// txtIdentified 控件。
/// txtEndRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIdentified;
protected global::FineUIPro.DatePicker txtEndRequired_Date;
/// <summary>
/// txtCategory 控件。
/// txtStartActual_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCategory;
protected global::FineUIPro.DatePicker txtStartActual_Date;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtEndActual_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndActual_Date;
/// <summary>
/// lbPhotoesImageUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbPhotoesImageUrl;
/// <summary>
/// labCorrected_Photos 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labCorrected_Photos;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -191,7 +220,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -200,7 +229,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// WindowAtt 控件。
/// </summary>
@ -209,7 +238,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window2 控件。
/// </summary>
@ -218,7 +247,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -227,7 +256,7 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuDel 控件。
/// </summary>
@ -236,5 +265,23 @@ namespace FineUIPro.Web.Transfer {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDel;
/// <summary>
/// btnMenuAttachA 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuAttachA;
/// <summary>
/// btnMenuAttachB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuAttachB;
}
}

201
SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs
View File

@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 14);
AddDatasetToSQL(ds.Tables[0], 24);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@ -168,18 +168,99 @@ namespace FineUIPro.Web.Transfer
{
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][9].ToString();
if (!string.IsNullOrEmpty(row4))
string allRowData = string.Empty;
for (int j = 0; j < 24; j++)
{
allRowData += pds.Rows[i][j].ToString();
}
if (string.IsNullOrWhiteSpace(allRowData))
continue;
string row3 = pds.Rows[i][3].ToString();
if (row3 != "" && row3 != "A" && row3 != "B" && row3 != "C" && row3 != "D")
{
result += (i + 2).ToString() + "," + " Cat. " + "," + "[" + row3 + "]错误！不是ABCD！" + "|";
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row4.Trim());
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "PUNCH ITEM FINISH DATE" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
result += (i + 2).ToString() + "," + " Date Raised " + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
}
}
string row10 = pds.Rows[i][10].ToString();
if (!string.IsNullOrEmpty(row10))
{
try
{
DateTime date = Convert.ToDateTime(row10.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Required Date " + "," + "[" + row10 + "]错误！不是日期格式！" + "|";
}
}
string row15 = pds.Rows[i][15].ToString();
if (!string.IsNullOrEmpty(row15))
{
try
{
DateTime date = Convert.ToDateTime(row15.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Actual Date " + "," + "[" + row15 + "]错误！不是日期格式！" + "|";
}
}
string row17 = pds.Rows[i][17].ToString();
if (!string.IsNullOrEmpty(row17))
{
try
{
DateTime date = Convert.ToDateTime(row17.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Cleared(PIC） Date " + "," + "[" + row17 + "]错误！不是日期格式！" + "|";
}
}
string row19 = pds.Rows[i][19].ToString();
if (!string.IsNullOrEmpty(row19))
{
try
{
DateTime date = Convert.ToDateTime(row19.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Confirmed(WUH) Date " + "," + "[" + row19 + "]错误！不是日期格式！" + "|";
}
}
string row21 = pds.Rows[i][21].ToString();
if (!string.IsNullOrEmpty(row21))
{
try
{
DateTime date = Convert.ToDateTime(row21.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Verified(BASF) Date " + "," + "[" + row21 + "]错误！不是日期格式！" + "|";
}
}
}
if (!string.IsNullOrEmpty(result))
{
@ -286,7 +367,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 14);
AddDatasetToSQL2(ds.Tables[0], 24);
}
catch (Exception ex)
{
@ -312,6 +393,7 @@ namespace FineUIPro.Web.Transfer
}
string result = string.Empty;
ir = pds.Rows.Count;
long? maxNumNO = -1;
if (pds != null && ir > 0)
{
List<Model.Transfer_PunchlistFrom> list = new List<Model.Transfer_PunchlistFrom>();
@ -320,57 +402,66 @@ namespace FineUIPro.Web.Transfer
if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim()))
{
//查询第一列，没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(x => x.Punch_No == pds.Rows[i][1].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
{
Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Item_No = pds.Rows[i][0].ToString().Trim();
model.Punch_No = pds.Rows[i][1].ToString().Trim();
model.SystemName = pds.Rows[i][2].ToString().Trim();
model.Subsystem = pds.Rows[i][3].ToString().Trim();
model.Test_Package = pds.Rows[i][4].ToString().Trim();
model.Discipline = pds.Rows[i][5].ToString().Trim();
model.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
model.Identified = pds.Rows[i][7].ToString().Trim();
model.Category = pds.Rows[i][8].ToString().Trim();
DateTime t1;
if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
model.PUNCH_ITEM_FINISH_DATE = t1;
model.Action_By = pds.Rows[i][10].ToString().Trim();
model.Required_By = pds.Rows[i][11].ToString().Trim();
model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
model.Comments = pds.Rows[i][13].ToString().Trim();
list.Add(model);
if (maxNumNO == -1) {
maxNumNO = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == CurrUser.LoginProjectId).Max(p => p.Num_NO);
if (maxNumNO == null)
maxNumNO = 1001;
}
Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Num_NO = maxNumNO;
model.System_No = pds.Rows[i][0].ToString().Trim();
model.Sub_Sys_No = pds.Rows[i][1].ToString().Trim();
model.DESCRIPTION = pds.Rows[i][2].ToString().Trim();
model.Cat = pds.Rows[i][3].ToString().Trim();
model.Raised_By = pds.Rows[i][4].ToString().Trim();
DateTime t5;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t5) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.Date_Raised = t5;
model.Disc = pds.Rows[i][6].ToString().Trim();
if (pds.Rows[i][7].ToString().Trim().Contains("Y"))
model.IsEng = true;
else
{
//修改
modelOnly.Item_No = pds.Rows[i][0].ToString().Trim();
modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim();
modelOnly.SystemName = pds.Rows[i][2].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim();
modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim();
modelOnly.Discipline = pds.Rows[i][5].ToString().Trim();
modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
modelOnly.Identified = pds.Rows[i][7].ToString().Trim();
modelOnly.Category = pds.Rows[i][8].ToString().Trim();
DateTime t1;
if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
modelOnly.PUNCH_ITEM_FINISH_DATE = t1;
modelOnly.Action_By = pds.Rows[i][10].ToString().Trim();
modelOnly.Required_By = pds.Rows[i][11].ToString().Trim();
modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
modelOnly.Comments = pds.Rows[i][13].ToString().Trim();
Funs.DB.SubmitChanges();
}
model.IsEng = false;
if (pds.Rows[i][8].ToString().Trim().Contains("Y"))
model.IsMatI = true;
else
model.IsMatI = false;
model.Punch_Type = pds.Rows[i][9].ToString().Trim();
DateTime t10;
if (DateTime.TryParse(pds.Rows[i][10].ToString(), out t10) && !string.IsNullOrEmpty(pds.Rows[i][10].ToString()))
model.Required_Date = t10;
model.Action_By = pds.Rows[i][11].ToString().Trim();
model.PIC = pds.Rows[i][12].ToString().Trim();
model.PIC_WUH = pds.Rows[i][13].ToString().Trim();
model.Correction_Action = pds.Rows[i][14].ToString().Trim();
DateTime t15;
if (DateTime.TryParse(pds.Rows[i][15].ToString(), out t15) && !string.IsNullOrEmpty(pds.Rows[i][15].ToString()))
model.PUNCH_ITEM_FINISH_DATE = t15;
model.Cleared_By = pds.Rows[i][16].ToString().Trim();
DateTime t17;
if (DateTime.TryParse(pds.Rows[i][17].ToString(), out t17) && !string.IsNullOrEmpty(pds.Rows[i][17].ToString()))
model.Cleared_Date = t17;
model.Confirmed_By = pds.Rows[i][18].ToString().Trim();
DateTime t19;
if (DateTime.TryParse(pds.Rows[i][19].ToString(), out t19) && !string.IsNullOrEmpty(pds.Rows[i][19].ToString()))
model.Confirmed_Date = t19;
model.Verified_By = pds.Rows[i][20].ToString().Trim();
DateTime t21;
if (DateTime.TryParse(pds.Rows[i][21].ToString(), out t21) && !string.IsNullOrEmpty(pds.Rows[i][21].ToString()))
model.Verified_Date = t21;
model.Status = pds.Rows[i][22].ToString().Trim();
model.Remark = pds.Rows[i][23].ToString().Trim();
list.Add(model);
maxNumNO++;
}
}
if (list.Count > 0)