焊接任务单修改

DataBase/版本日志/SGGLDB_V2024-12-26.sql

@@ -0,0 +1,61 @@
+
+alter view dbo.View_HJGL_WeldingTask as
+    SELECT T.WeldTaskId,
+           T.WeldJointId,
+           T.CoverWelderId,
+           T.BackingWelderId,
+           cov.WelderCode                                                                             AS CoverWelderCode,
+           back.WelderCode                                                                            AS BackingWelderCode,
+           case when jot.JointAttribute is not null then jot.JointAttribute else T.JointAttribute end as JointAttribute,
+           T.WeldingMode,
+           T.ProjectId,
+           T.UnitWorkId,
+           T.UnitId,
+           T.TaskDate,
+           T.Tabler,
+           T.TableDate,
+           T.SerialNumber,
+           T.PipeLineSortIndex,
+           jot.WeldJointCode,
+           jot.Dia,
+           jot.DNDia,
+           jot.Thickness,
+           jot.Size,
+           jot.WeldingLocationId,
+           jot.Specification,
+           CASE WHEN jot.WeldingDailyId IS NULL THEN '·ñ' ELSE 'ÊÇ' END                               AS IsWelding,
+           P.PipelineCode,
+           p.PipelineId,
+           B.WeldTypeCode,
+           M.WeldingMethodCode,
+           L.WeldingLocationCode,
+           t.CanWelderCode,
+           t.CanWelderId,
+           rod.ConsumablesName                                                                        AS WeldingRodCode,
+           T.CanWeldingRodName,
+           T.CanWeldingWireName,
+           wire.ConsumablesName                                                                       AS WeldingWireCode,
+           jot.WeldingDailyId,
+           p.PipeArea,
+           mater.MaterialCode,
+           (case
+                when charindex('/', jot.WeldJointCode) > 0
+                    then RIGHT(jot.WeldJointCode, CHARINDEX('/', REVERSE(jot.WeldJointCode)) - 1)
+                else jot.WeldJointCode end)                                                           as WeldJointNum
+    from HJGL_WeldTask T
+             left join HJGL_WeldJoint jot on T.WeldJointId = jot.WeldJointId
+             LEFT JOIN dbo.SitePerson_Person cov ON cov.PersonId = t.CoverWelderId and cov.ProjectId = t.ProjectId
+             LEFT JOIN dbo.SitePerson_Person back ON back.PersonId = t.BackingWelderId and back.ProjectId = t.ProjectId
+             LEFT join HJGL_Pipeline P on jot.PipelineId = P.PipelineId
+             left join Base_WeldType B on jot.WeldTypeId = B.WeldTypeId
+             LEFT join Base_WeldingMethod M on jot.WeldingMethodId = M.WeldingMethodId
+             left join Base_WeldingLocation L on jot.WeldingLocationId = L.WeldingLocationId
+             LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId = jot.WeldingWire
+             LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId = jot.WeldingRod
+             left join Base_Material as mater on jot.Material1Id = mater.MaterialId
+go
+ 
+
+alter table HJGL_WeldTask add  SerialNumber nvarchar(50)
+go
+alter table HJGL_WeldTask add  PipeLineSortIndex int

SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs

@@ -93,12 +93,17 @@ namespace BLL
         {
             var q = from x in Funs.DB.View_HJGL_WeldingTask
                     where x.ProjectId == ProjectId && x.UnitWorkId == UnitWorkId
-                          && x.TaskDate.Value.Date == taskDate.Date  && x.SerialNumber==serialNumber
+                          && x.TaskDate.Value.Date == taskDate.Date  
                     select x;
+
             if (!string.IsNullOrEmpty(unitId))
             {
                 q = q.Where(x => x.UnitId == unitId);
             }
+            if (!string.IsNullOrEmpty(serialNumber))
+            {
+                q = q.Where(x => x.SerialNumber == serialNumber);
+            }
             if (canWelder == "0")
             {
                 q = q.Where(x => x.CanWelderId == null);