diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs index 9c252348..2a63d1db 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageProjectService.cs @@ -32,7 +32,7 @@ namespace BLL public static void UpdateWorkPackageProject(Model.WBS_WorkPackageProject workPack) { Model.SGGLDB db = Funs.DB; - Model.WBS_WorkPackageProject newPack = db.WBS_WorkPackageProject.First(e => e.WorkPackageCode == workPack.WorkPackageCode); + Model.WBS_WorkPackageProject newPack = db.WBS_WorkPackageProject.First(e => e.WorkPackageCode == workPack.WorkPackageCode && e.ProjectId == workPack.ProjectId); newPack.WorkPackageCode = workPack.WorkPackageCode; newPack.IsChild = workPack.IsChild; newPack.PackageContent = workPack.PackageContent; diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 59aced14..3a88432f 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3338,6 +3338,10 @@ namespace BLL /// public const string WBSWorkPackageTemplateUrl = "File\\Excel\\DataIn\\WBS定制导入模板.xls"; /// + /// WBS定制导入模板 + /// + public const string WBSWorkPackageTemplate2Url = "File\\Excel\\DataIn\\WBS定制导入模板(电仪).xls"; + /// /// WBS编码规则 /// public const string WBSCodeTemplateUrl = "File\\Excel\\DataIn\\WBS编码规则.xlsx"; diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx index 9a9ee096..efe46b98 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx @@ -41,6 +41,7 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs index f47e26b6..36bb2281 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs @@ -139,10 +139,15 @@ namespace FineUIPro.Web.CQMS.WBS } } } - var equipment = workPackages.FirstOrDefault(x => x.PackageContent == "机泵" || x.PackageContent == "静止设备"); + this.hdType.Text = string.Empty; + var equipment = workPackages.FirstOrDefault(x => x.PackageContent == "机泵" || x.PackageContent == "静止设备" || x.PackageContent == "桥架" || x.PackageContent == "仪表回路"); if (equipment != null) { this.btnImport.Hidden = false; + if (equipment.PackageContent == "桥架" || equipment.PackageContent == "仪表回路") + { + this.hdType.Text = "DY"; //电仪 + } } else { @@ -810,7 +815,14 @@ namespace FineUIPro.Web.CQMS.WBS protected void btnImport_Click(object sender, EventArgs e) { SaveData(); - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkPackageSet2In.aspx?WorkPackageId={0}", WorkPackageId, "导入 - "))); + if (string.IsNullOrEmpty(this.hdType.Text.Trim())) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkPackageSet2In.aspx?WorkPackageId={0}", WorkPackageId, "导入 - "))); + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkPackageSet2In2.aspx?WorkPackageId={0}", WorkPackageId, "导入 - "))); + } } protected void Window1_Close(object sender, WindowCloseEventArgs e) diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.designer.cs index ad7e5a05..6a26e72e 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.designer.cs @@ -138,6 +138,15 @@ namespace FineUIPro.Web.CQMS.WBS { /// protected global::FineUIPro.HiddenField hdTotalValue; + /// + /// hdType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdType; + /// /// cbSelect 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx new file mode 100644 index 00000000..b62cafac --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx @@ -0,0 +1,80 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WorkPackageSet2In2.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.WorkPackageSet2In2" %> + + + + + + 导入 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.cs new file mode 100644 index 00000000..7ad65f67 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.cs @@ -0,0 +1,534 @@ +using BLL; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.OleDb; +using System.IO; +using System.Linq; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.CQMS.WBS +{ + public partial class WorkPackageSet2In2 : PageBase + { + #region 定义变量 + /// + /// 上传预设的虚拟路径 + /// + private string initPath = Const.ExcelUrl; + + /// + /// 导入集合 + /// + private List ViewWorkPackages = new List(); + + /// + /// 错误集合 + /// + public static string errorInfos = string.Empty; + /// + /// 主键 + /// + public string WorkPackageId + { + get + { + return (string)ViewState["WorkPackageId"]; + } + set + { + ViewState["WorkPackageId"] = value; + } + } + /// + /// 单位工程 + /// + public string UnitWorkId + { + get + { + return (string)ViewState["UnitWorkId"]; + } + set + { + ViewState["UnitWorkId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.hdFileName.Text = string.Empty; + this.hdCheckResult.Text = string.Empty; + if (ViewWorkPackages != null) + { + ViewWorkPackages.Clear(); + } + errorInfos = string.Empty; + WorkPackageId = Request.Params["WorkPackageId"]; + var workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(WorkPackageId); + if (workPackage != null) + { + UnitWorkId = workPackage.UnitWorkId; + } + + } + } + #endregion + + #region 数据导入 + /// + /// 数据导入 + /// + /// + /// + protected void btnAudit_Click(object sender, EventArgs e) + { + try + { + if (this.fuAttachUrl.HasFile == false) + { + Alert.ShowInTop("请您选择Excel文件！", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls") + { + Alert.ShowInTop("只可以选择Excel文件！", MessageBoxIcon.Warning); + return; + } + if (ViewWorkPackages != null) + { + ViewWorkPackages.Clear(); + } + if (!string.IsNullOrEmpty(errorInfos)) + { + errorInfos = string.Empty; + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + + this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + string filePath = initFullPath + this.hdFileName.Text; + this.fuAttachUrl.PostedFile.SaveAs(filePath); + ImportXlsToData(rootPath + initPath + this.hdFileName.Text); + } + catch (Exception ex) + { + ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + + #region 读Excel提取数据 + /// + /// 从Excel提取数据--》Dataset + /// + /// Excel文件路径名 + private void ImportXlsToData(string fileName) + { + try + { + ViewWorkPackages.Clear(); + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += fileName; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + AddDatasetToSQL(ds.Tables[0]); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 将Dataset的数据导入数据库 + /// + /// 将Dataset的数据导入数据库 + /// + /// 数据集 + /// 数据集行数 + /// + private bool AddDatasetToSQL(DataTable pds) + { + + string results = string.Empty; + int ir = pds.Rows.Count; + if (pds != null && ir > 0) + { + Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(WorkPackageId); + var workPackageProjects = BLL.WorkPackageProjectService.GetWorkPackageProjects2ByWorkPackageCode(workPackage.InitWorkPackageCode, this.CurrUser.LoginProjectId); + if (workPackage != null) + { + for (int i = 0; i < ir; i++) + { + string result = string.Empty; + string col0 = pds.Rows[i][0].ToString().Trim(); + string col1 = pds.Rows[i][1].ToString().Trim(); + if (!string.IsNullOrEmpty(col0)) + { + if (string.IsNullOrEmpty(col0)) + { + result += "第" + (i + 2).ToString() + "行," + "导入项" + "," + "第二级为必填项！" + "|"; + } + else + { + if (BLL.WorkPackageService.GetWorkPackageByPackageContent(col0 + "-" + col1, UnitWorkId) == null) //数据库中不存在同样位号记录 + { + Model.WBS_WorkPackage newWorkPackage = new Model.WBS_WorkPackage + { + WorkPackageId = SQLHelper.GetNewID(typeof(Model.WBS_WorkPackage)), + + + }; + if (!string.IsNullOrEmpty(col1)) + { + newWorkPackage.SuperWorkPack = col1; + } + foreach (var item in workPackageProjects) + { + if (col0 == item.PackageContent) + { + newWorkPackage.PackageContent = col0; + newWorkPackage.WorkPackageCode = item.WorkPackageCode; + } + + } + if (string.IsNullOrEmpty(newWorkPackage.PackageContent)) + { + result += "第" + (i + 2).ToString() + "行," + "定制输入值有误！" + "|"; + } + + ViewWorkPackages.Add(newWorkPackage); + } + if (!string.IsNullOrEmpty(result)) + { + results += result; + } + } + } + } + if (!string.IsNullOrEmpty(results)) + { + results = "数据导入失败，未成功数据：" + results.Substring(0, results.LastIndexOf("|")); + errorInfos = results; + Alert.ShowInParent(results, MessageBoxIcon.Warning); + } + else + { + ViewWorkPackages = ViewWorkPackages.Distinct().ToList(); + this.Grid1.Hidden = false; + this.Grid1.DataSource = ViewWorkPackages; + this.Grid1.DataBind(); + errorInfos = string.Empty; + ShowNotify("导入成功！", MessageBoxIcon.Success); + } + } + } + else + { + Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Warning); + } + + BLL.UploadFileService.DeleteFile(Funs.RootPath, initPath + this.hdFileName.Text); + return true; + } + #endregion + #endregion + + #region 下载模板 + /// + /// 下载模板按钮 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 下载导入模板 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string filePath = Const.WBSWorkPackageTemplate2Url; + string uploadfilepath = rootPath + filePath; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + } + #endregion + /// + /// 保存数据 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + try + { + if (this.fuAttachUrl.HasFile == false) + { + Alert.ShowInTop("请您选择Excel文件！", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls") + { + Alert.ShowInTop("只可以选择Excel文件！", MessageBoxIcon.Warning); + return; + } + if (ViewWorkPackages != null) + { + ViewWorkPackages.Clear(); + } + if (!string.IsNullOrEmpty(errorInfos)) + { + errorInfos = string.Empty; + } + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + + this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + string filePath = initFullPath + this.hdFileName.Text; + this.fuAttachUrl.PostedFile.SaveAs(filePath); + + ViewWorkPackages.Clear(); + string oleDBConnString = String.Empty; + oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + oleDBConnString += "Data Source="; + oleDBConnString += rootPath + initPath + this.hdFileName.Text; + oleDBConnString += ";Extended Properties=Excel 8.0;"; + OleDbConnection oleDBConn = null; + OleDbDataAdapter oleAdMaster = null; + DataTable m_tableName = new DataTable(); + DataSet ds = new DataSet(); + + oleDBConn = new OleDbConnection(oleDBConnString); + oleDBConn.Open(); + m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + + if (m_tableName != null && m_tableName.Rows.Count > 0) + { + m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + } + string sqlMaster; + sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + oleAdMaster.Fill(ds, "m_tableName"); + oleAdMaster.Dispose(); + oleDBConn.Close(); + oleDBConn.Dispose(); + + DataTable pds = ds.Tables[0]; + string results = string.Empty; + int ir = pds.Rows.Count; + if (pds != null && ir > 0) + { + Model.WBS_WorkPackage workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(WorkPackageId); + var workPackageProjects = BLL.WorkPackageProjectService.GetWorkPackageProjects2ByWorkPackageCode(workPackage.InitWorkPackageCode, this.CurrUser.LoginProjectId); + if (workPackage != null) + { + for (int i = 0; i < ir; i++) + { + string result = string.Empty; + string col0 = pds.Rows[i][0].ToString().Trim(); + string col1 = pds.Rows[i][1].ToString().Trim(); + if (!string.IsNullOrEmpty(col0)) + { + if (string.IsNullOrEmpty(col0)) + { + result += "第" + (i + 2).ToString() + "行," + "导入项" + "," + "第二级为必填项！" + "|"; + } + else + { + if (BLL.WorkPackageService.GetWorkPackageByPackageContent(col0 + "-" + col1, UnitWorkId) == null) //数据库中不存在同样位号记录 + { + Model.WBS_WorkPackage newWorkPackage = new Model.WBS_WorkPackage + { + WorkPackageId = SQLHelper.GetNewID(typeof(Model.WBS_WorkPackage)), + + + }; + if (!string.IsNullOrEmpty(col1)) + { + newWorkPackage.SuperWorkPack = col1; + } + foreach (var item in workPackageProjects) + { + if (col0 == item.PackageContent) + { + newWorkPackage.PackageContent = col0; + newWorkPackage.WorkPackageCode = item.WorkPackageCode; + } + + } + if (string.IsNullOrEmpty(newWorkPackage.PackageContent)) + { + result += "第" + (i + 2).ToString() + "行," + "定制输入值有误！" + "|"; + } + + ViewWorkPackages.Add(newWorkPackage); + if (!string.IsNullOrEmpty(result)) + { + results += result; + } + } + } + } + } + if (!string.IsNullOrEmpty(results)) + { + results = "数据导入失败，未成功数据：" + results.Substring(0, results.LastIndexOf("|")); + errorInfos = results; + Alert.ShowInParent(results, MessageBoxIcon.Warning); + return; + } + else + { + ViewWorkPackages = ViewWorkPackages.Distinct().ToList(); + this.Grid1.Hidden = false; + this.Grid1.DataSource = ViewWorkPackages; + this.Grid1.DataBind(); + errorInfos = string.Empty; + } + } + } + else + { + Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Warning); + } + BLL.UploadFileService.DeleteFile(Funs.RootPath, initPath + this.hdFileName.Text); + } + catch (Exception ex) + { + ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning); + return; + } + string workPackageCode = string.Empty; + int num = 1; + string code = string.Empty; + Model.WBS_WorkPackage parentWorkPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(WorkPackageId); + foreach (JObject mergedRow in Grid1.GetMergedData()) + { + JObject values = mergedRow.Value("values"); + int i = mergedRow.Value("index"); + string workPackageId = this.Grid1.Rows[i].DataKeys[0].ToString(); + Model.WBS_WorkPackage oldWorkPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(workPackageId); + string workPackageCode2 = this.Grid1.Rows[i].DataKeys[1].ToString(); + string txtName = values.Value("SuperWorkPack"); + Model.WBS_WorkPackageProject workPackageProject = BLL.WorkPackageProjectService.GetWorkPackageProjectByWorkPackageCode(workPackageCode2, this.CurrUser.LoginProjectId); + if (oldWorkPackage == null) //新增内容 + { + if (BLL.WorkPackageService.GetWorkPackageByPackageContent(workPackageProject.PackageContent + "-" + txtName, UnitWorkId) == null) //数据库中不存在同样位号记录 + { + Model.WBS_WorkPackage newWorkPackage = new Model.WBS_WorkPackage(); + if (workPackageCode != workPackageProject.WorkPackageCode) //循环至新的分部 + { + workPackageCode = workPackageProject.WorkPackageCode; + var oldWorkPackages = BLL.WorkPackageService.GetWorkPackagesByInitWorkPackageCodeAndUnitWorkId(workPackageCode, UnitWorkId); + if (oldWorkPackages.Count > 0) //该工作包已存在内容 + { + var old = oldWorkPackages.First(); + string oldStr = old.WorkPackageCode.Substring(old.WorkPackageCode.Length - 2); + num = Convert.ToInt32(oldStr) + 1; + if (num < 10) + { + code = "0" + num.ToString(); + } + else + { + code = num.ToString(); + } + } + else + { + num = 1; + code = "01"; + } + } + else + { + if (num < 10) + { + code = "0" + num.ToString(); + } + else + { + code = num.ToString(); + } + } + newWorkPackage.WorkPackageId = SQLHelper.GetNewID(typeof(Model.WBS_WorkPackage)); + newWorkPackage.WorkPackageCode = parentWorkPackage.WorkPackageCode + workPackageCode.Substring(workPackageCode.IndexOf(parentWorkPackage.InitWorkPackageCode) + parentWorkPackage.InitWorkPackageCode.Length).Replace("00", "0000") + code; + newWorkPackage.ProjectId = this.CurrUser.LoginProjectId; + newWorkPackage.UnitWorkId = UnitWorkId; + newWorkPackage.PackageContent = workPackageProject.PackageContent + "-" + txtName; + newWorkPackage.SuperWorkPack = workPackageProject.SuperWorkPack; + newWorkPackage.SuperWorkPackageId = WorkPackageId; + newWorkPackage.PackageCode = workPackageProject.PackageCode; + newWorkPackage.ProjectType = workPackageProject.ProjectType; + newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode; + newWorkPackage.IsApprove = true; + BLL.WorkPackageService.AddWorkPackage(newWorkPackage); + num++; + } + } + } + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.designer.cs new file mode 100644 index 00000000..3a347250 --- /dev/null +++ b/SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.designer.cs @@ -0,0 +1,141 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.CQMS.WBS { + + + public partial class WorkPackageSet2In2 { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// btnAudit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAudit; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnDownLoad 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDownLoad; + + /// + /// fuAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.FileUpload fuAttachUrl; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// txtName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtName; + + /// + /// hdFileName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdFileName; + + /// + /// hdCheckResult 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdCheckResult; + + /// + /// hdTotalValue 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdTotalValue; + + /// + /// lblBottom 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblBottom; + } +} diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS定制导入模板(电仪).xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS定制导入模板(电仪).xls new file mode 100644 index 00000000..b3adbf10 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/WBS定制导入模板(电仪).xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls index 378eebfa..93bcae86 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index bf1404e0..f02c8c41 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -491,6 +491,7 @@ + @@ -7389,6 +7390,13 @@ WorkPackageSet2In.aspx + + WorkPackageSet2In2.aspx + ASPXCodeBehind + + + WorkPackageSet2In2.aspx + Accident.aspx ASPXCodeBehind