修改WBS导入

SGGL/BLL/CQMS/WBS/WorkPackageService.cs

@@ -84,6 +84,18 @@ namespace BLL
         {
             return (from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == null && x.UnitWorkId.ToString() == unitWorkId && x.IsApprove == true orderby x.WorkPackageCode select x).ToList();
         }
+
+        /// <summary>
+        /// 根据分部分项名称和单位工程id获取项目分部分项内容
+        /// </summary>
+        /// <param name="workPackageCode"></param>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static Model.WBS_WorkPackage GetWorkPackageByPackageContent(string packageContent, string unitWorkId)
+        {
+            return Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.PackageContent == packageContent && x.UnitWorkId == unitWorkId);
+        }
+
         /// <summary>
         /// 根据单位工程Id获取所有分部信息
         /// </summary>

SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2In.aspx.cs

@@ -207,6 +207,8 @@ namespace FineUIPro.Web.CQMS.WBS
                                 result += "第" + (i + 2).ToString() + "行," + "导入项" + "," + "分项为必填项！" + "|";
                             }
                             else
+                            {
+                                if (BLL.WorkPackageService.GetWorkPackageByPackageContent(col0 + "-" + col1 + "-" + col2, UnitWorkId) == null)   //数据库中不存在同样位号记录
                                 {
                                     Model.WBS_WorkPackage newWorkPackage = new Model.WBS_WorkPackage
                                     {
@@ -233,6 +235,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                     }
 
                                     ViewWorkPackages.Add(newWorkPackage);
+                                }
                                 if (!string.IsNullOrEmpty(result))
                                 {
                                     results += result;
@@ -392,6 +395,8 @@ namespace FineUIPro.Web.CQMS.WBS
                                     result += "第" + (i + 2).ToString() + "行," + "导入项" + "," + "分项为必填项！" + "|";
                                 }
                                 else
+                                {
+                                    if (BLL.WorkPackageService.GetWorkPackageByPackageContent(col0 + "-" + col1 + "-" + col2, UnitWorkId) == null)   //数据库中不存在同样位号记录
                                     {
                                         Model.WBS_WorkPackage newWorkPackage = new Model.WBS_WorkPackage
                                         {
@@ -425,6 +430,7 @@ namespace FineUIPro.Web.CQMS.WBS
                                     }
                                 }
                             }
+                        }
                         if (!string.IsNullOrEmpty(results))
                         {
                             results = "数据导入失败，未成功数据：" + results.Substring(0, results.LastIndexOf("|"));
@@ -467,6 +473,8 @@ namespace FineUIPro.Web.CQMS.WBS
                 string txtName = values.Value<string>("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)  //循环至新的分部
@@ -519,6 +527,7 @@ namespace FineUIPro.Web.CQMS.WBS
                         num++;
                     }
                 }
+            }
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             ShowNotify("保存成功！", MessageBoxIcon.Success);
         }