From 89af71fd6860d66b2c3dcd6db5957e480a8ab6d6 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 21 Nov 2023 16:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BLL/CQMS/WBS/WorkPackageProjectService.cs | 2 +-
SGGL/BLL/Common/Const.cs | 4 +
.../CQMS/WBS/WorkPackageSet2.aspx | 1 +
.../CQMS/WBS/WorkPackageSet2.aspx.cs | 16 +-
.../CQMS/WBS/WorkPackageSet2.aspx.designer.cs | 9 +
.../CQMS/WBS/WorkPackageSet2In2.aspx | 80 +++
.../CQMS/WBS/WorkPackageSet2In2.aspx.cs | 534 ++++++++++++++++++
.../WBS/WorkPackageSet2In2.aspx.designer.cs | 141 +++++
.../Excel/DataIn/WBS定制导入模板(电仪).xls | Bin 0 -> 19456 bytes
.../File/Excel/DataIn/材料信息导入模板.xls | Bin 26112 -> 26112 bytes
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 +
11 files changed, 792 insertions(+), 3 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx
create mode 100644 SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In2.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/WBS定制导入模板(电仪).xls
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 0000000000000000000000000000000000000000..b3adbf10ed901434ee3a0e8e2e6810e01e5bc8cd
GIT binary patch
literal 19456
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
F{{zF=GsFM@
literal 0
HcmV?d00001
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料信息导入模板.xls
index 378eebfa550c4b3bd3c8275f5685b64a1eb890c8..93bcae86c5c1510cb95ef4058af4a284f1e572ea 100644
GIT binary patch
delta 482
zcmZoT!`N_!aYGIZ`+>r136>JKHW#z3Vq)AhS&m&CnUvhb#OPVQzs`_BgkcK<1H=FN
z35-CBp$)7OA*;ZU0Tef5fXl99SFT6W%fiSAl-XpjXaXc91SPORcg4B}WVU|`_FA#Q?QJeYwKy99#`R&hoKd#ny(V6cO$
s->k%WBZ!Zmfejdtj12rh$i}vrBW4Q=XT#D2P&_g+PiAzrUX;iR0C%5n5&!@I
delta 482
zcmZoT!`N_!aYGIZd%(*SiyXI`n~PaiF)<2FmSY!3CMAWK7(J`^*BLU1Fl=F9VEA7@
zfe}bCw1HJ3WEB`PfZ}EhaM^Y2%JoQkSr{3CvU`{ydJ$&cVZbHM0JITi8nSu@20^Ui
zj0_xT=GTK94YI%lO#&v)iB+75K^&_E3=CX2#7(e^2QzSDmte5LD$dAYkJUj840dq!
qo0T|k1o4RhO=bXkObiG)IX82}Y+>PKNQwf*BO~)
+
@@ -7389,6 +7390,13 @@
WorkPackageSet2In.aspx
+
+ WorkPackageSet2In2.aspx
+ ASPXCodeBehind
+
+
+ WorkPackageSet2In2.aspx
+
Accident.aspx
ASPXCodeBehind