2023-08-25

SGGL/BLL/HJGL/WPQ/WPQListService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Model;
 
 namespace BLL
 {
@@ -175,7 +176,7 @@ namespace BLL
         }
 
         #region  匹配wpq
-        public static List<Model.View_HJGL_WPQ> GetMatchWPQ(Model.HJGL_WeldJoint jot,string projectid)
+        public static List<View_HJGL_WPQ> GetMatchWPQ(HJGL_WeldJoint jot, string projectid, string unitid)
         {
             var pipe = BLL.PipelineService.GetPipelineByPipelineId(jot.PipelineId);
             var weldT = BLL.Base_WeldTypeService.GetWeldTypeByWeldTypeId(jot.WeldTypeId);
@@ -183,7 +184,16 @@ namespace BLL
             string material2 = jot.Material2Id;
             decimal dia = jot.Dia.HasValue ? jot.Dia.Value : 0;
             decimal sch = jot.Thickness.HasValue ? jot.Thickness.Value : 0;
-            string unitId = pipe.UnitId;
+            string unitId = string.Empty;
+            if (unitid!=Const._Null)
+            {
+                unitId = unitid;
+            }
+            else
+            {
+                unitId = pipe.UnitId;
+            }
+              
             string weldType = string.Empty;
             if (weldT != null)
             {