2022-11-23 焊接导入修改

SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs

@@ -1,6 +1,7 @@
 namespace BLL
 {
     using Model;
+    using System.Collections.Generic;
     using System.Linq;
     public static class MaterialCodeLibService
     {
@@ -12,7 +13,11 @@
         {
             return Funs.DB.HJGL_MaterialCodeLib.FirstOrDefault(e => e.MaterialCode == materialCode);
         }
-
+        public static List<Model.HJGL_MaterialCodeLib> GetMaterialCodeLibList()
+        {
+            var q = (from x in Funs.DB.HJGL_MaterialCodeLib select x).ToList();
+            return q;
+        }
         /// <summary>
         /// 增加材料库信息
         /// </summary>
@@ -34,7 +39,12 @@
             db.HJGL_MaterialCodeLib.InsertOnSubmit(newCodeLib);
             db.SubmitChanges();
         }
-
+        public static void AddBulkMaterialCodeLib(List<Model.HJGL_MaterialCodeLib> codeLib)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.HJGL_MaterialCodeLib.InsertAllOnSubmit(codeLib);
+            db.SubmitChanges();
+        }
         /// <summary>
         /// 修改材料库信息 
         /// </summary>

SGGL/BLL/HJGL/WeldingManage/PipelineService.cs

@@ -60,7 +60,11 @@ namespace BLL
             list[1] = new ListItem("现场安装", PipeArea_FIELD);
             return list;
         }
-
+        public static void RestPipelineAndJoints(string projectid )
+        {
+            PipelineService.hJGL_Pipelines = PipelineService.GetPipelinesByProjectId(projectid);
+            WeldJointService.hJGL_WeldJoints = WeldJointService.GetWeldJointByProjectid(projectid);
+        }
         /// <summary>
         /// 根据管线ID获取管线信息
         /// </summary>
@@ -71,11 +75,7 @@ namespace BLL
             return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipelineId);
         }
         public static void GetStateByPipelineId(string pipelineId)
-        {//< f:ListItem Value = "0" Text = "未开始" />
-        //                                < f:ListItem Value = "1" Text = "未开始且延误" />
-        //                                < f:ListItem Value = "2" Text = "开始" />
-        //                                < f:ListItem Value = "3" Text = "已开始且延误" />
-        //                                < f:ListItem Value = "4" Text = "完成" />
+        {
             var mdoel = GetPipelineByPipelineId(pipelineId);
             var PlanStartDate = mdoel.PlanStartDate;
             var PlanEndDate = mdoel.PlanEndDate;