From 3c887b46d141feca91d5be9f525f1af2b78b781c Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Tue, 13 Jun 2023 15:51:41 +0800
Subject: [PATCH] 2023-06-13

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 0 -> 129024 bytes
 .vs/VSWorkspaceState.json                     |   7 +
 DataBase/版本日志/SGGLDB_V2023-06-13.sql      | 169 ++++++++++++++++++
 .../WeldingManage/PipelineListPDMSIn.aspx.cs  |  34 ++--
 SGGL/Model/Model.cs                           |  20 ++-
 5 files changed, 214 insertions(+), 16 deletions(-)
 create mode 100644 .vs/SGGL_SeDin/v17/.wsuo
 create mode 100644 .vs/VSWorkspaceState.json
 create mode 100644 DataBase/版本日志/SGGLDB_V2023-06-13.sql

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
new file mode 100644
index 0000000000000000000000000000000000000000..01e57270726598fb3a07cdc8ced9d40d559a7185
GIT binary patch
literal 129024
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
XAB@Hoosa(^)PI1kAAS58&%pl$fg%+R

literal 0
HcmV?d00001

diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 00000000..75b31f26
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\SGGL.sln",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_V2023-06-13.sql b/DataBase/版本日志/SGGLDB_V2023-06-13.sql
new file mode 100644
index 00000000..f8ac87c2
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2023-06-13.sql
@@ -0,0 +1,169 @@
+ 
+
+
+ALTER VIEW [dbo].[View_HJGL_WeldJoint]
+AS
+SELECT jot.[ProjectId]   --��ĿId
+      ,pipe.[UnitWorkId]    --�����Id
+	  ,uw.UnitWorkName      --�����
+      ,pipe.[UnitId]        --��λId
+	  ,unit.UnitName        --��λ
+      ,jot.[PipelineCode]  --���ߺ�
+	  ,pipe.[SingleNumber]   --����ͼ��
+	  ,pipe.[SingleName]   --ͼֽ����
+	  ,pipe.[MediumId]     --����Id
+	  ,medium.MediumCode
+	  ,medium.MediumName    --��������
+	  ,pipe.[PipingClassId]   --�ܵ��ȼ�Id
+	  ,pipingClass.PipingClassCode    --�ܵ��ȼ�
+	  ,pipe.[DetectionRateId]   --̽�˱���Id
+	  ,dr.DetectionRateCode  --̽�˱���������5��10��20��
+	  ,pipe.DetectionType  --̽������Id(���ܶ�����м���|�ָ�)
+	  ,STUFF((SELECT ',' + DetectionTypeCode FROM Base_DetectionType 
+	  WHERE CHARINDEX('|'+LTRIM(DetectionTypeId)+'|','|'+ pipe.DetectionType + '|') > 0 FOR XML PATH('') ), 1, 1, '') AS DetectionTypeStr  --̽�����ͣ����ܶ�����м���,�ָ���
+      ,pipe.DesignTemperature   --����¶ȡ�
+	  ,pipe.DesignPress      --���ѹ��Mpa(g)
+	  ,pipe.TestMedium        --ѹ���������Id
+	  ,tm.MediumName AS TestMediumName         --ѹ���������
+	  ,pipe.TestPressure          --ѹ������ѹ��Mpa(g)
+	  ,pipe.PressurePipingClassId    --ѹ���ܵ�����Id
+	  ,ppc.PressurePipingClassCode   --ѹ���ܵ�����
+	  ,pipe.PipeLenth           --���߳���(m)
+	  ,pipe.LeakMedium    --���������Id
+	  ,tm2.MediumName AS LeakMediumName         --���������
+	  ,pipe.LeakPressure     --й¶������ѹ��Mpa(g)
+	  ,pipe.PCMedium        --��ϴҪ��Id
+	  ,pm.PurgeMethodCode     --��ϴҪ��
+	  ,pipe.VacuumPressure    --�������ѹ��Kpa(a)
+	  ,pipe.MaterialId      --����Id
+	  ,mat.MaterialCode AS PipeMaterialCode    --����
+	  ,pipe.Remark AS PipeRemark        --��ע
+	  ,pipe.FlowingSection as FlowingSection --��ˮ��
+	  ,jot.[WeldJointId]  --����Id
+	  ,jot.[WeldJointCode]    --���ں�
+	  ,jot.[Material1Id]    --����1Id
+	  ,mat1.MaterialCode AS Material1Code   --����1
+      ,jot.[Material2Id]    --����2Id
+	  ,mat2.MaterialCode AS Material2Code    --����2
+	  ,jot.[Dia]    --�⾶
+	  ,jot.DNDia   --DN����ֱ��
+	  ,jot.[Size]    --����
+	  ,jot.[Thickness]    --�ں�
+	  ,jot.[Specification]   --���
+	  ,jot.[WeldTypeId]    --��������Id
+	  ,WeldType.WeldTypeCode   --��������
+	  ,jot.[DetectionTypeId]    --�������Id
+	  ,ndt.DetectionTypeCode    --�������
+	  ,jot.[Components1Id]     --���1��Id
+	  ,com1.ComponentsCode AS ComponentsCode1   --���1��
+      ,jot.[Components2Id]     --���2��Id
+	  ,com2.ComponentsCode AS ComponentsCode2   --���2��
+	  ,jot.DesignIsHotProess   --�Ƿ��ȴ���
+	  ,CASE jot.DesignIsHotProess WHEN 1 THEN '��' ELSE '��' END AS DesignIsHotProessStr  --�Ƿ��ȴ���
+	  ,jot.[WeldingMethodId]   --���ӷ���Id
+	  ,WeldingMethod.WeldingMethodCode    --���ӷ���
+	  ,jot.WPQId     --WPS��Id
+	  ,wps.WPQCode    --WPS���
+	  ,jot.[GrooveTypeId]   --�¿�����Id
+	  ,GrooveType.GrooveTypeCode    --�¿�����
+	  ,jot.[WeldingRod]   --����Id
+	  ,rod.ConsumablesCode AS WeldingRodCode   --����
+	  ,jot.[WeldingWire]   --��˿Id
+	  ,wire.ConsumablesCode AS WeldingWireCode    --��˿
+	  ,jot.PreTemperature    --Ԥ���¶�
+	  ,jot.[JointAttribute]   --��������
+	  ,jot.TwoJointType   --�������������
+	  ,daily.WeldingDate as WeldingDateD
+	  ,CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate    --��������
+	  ,BackingWelder.WelderCode AS BackingWelderCode   --��׺���
+	  ,CoverWelder.WelderCode AS CoverWelderCode    --���溸��
+	  ,(CASE (SELECT COUNT(*) FROM [dbo].[HJGL_HotProess_TrustItem] hpti 
+	  WHERE hpti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(ReportNo,'') FROM [dbo].[HJGL_HotProess_Trust] hpt 
+	  LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti ON hpti.HotProessTrustId=hpt.HotProessTrustId
+	  WHERE hpti.WeldJointId=jot.WeldJointId) END) AS HotProessReportNo   --�ȴ���������
+	  ,(CASE (SELECT TOP 1 IsCompleted FROM [dbo].[HJGL_HotProess_TrustItem] hpti 
+	  WHERE hpti.WeldJointId=jot.WeldJointId) WHEN 1 THEN '���' WHEN 0 THEN 'δ���' ELSE 'δ�ȴ���' END) AS HotProessResult   --�ȴ��������
+	  ,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Hard_TrustItem hti 
+	  WHERE hti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(InspectionNum,'') FROM [dbo].HJGL_Hard_Trust ht 
+	  LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID=ht.HardTrustID
+	  WHERE hti.WeldJointId=jot.WeldJointId) END) AS HardReportNo   --Ӳ�ȱ�����
+	  ,(CASE (SELECT TOP 1 IsPass FROM [dbo].HJGL_Hard_TrustItem hti 
+	  WHERE hti.WeldJointId=jot.WeldJointId) WHEN 1 THEN '�ϸ�' WHEN 0 THEN '���ϸ�' ELSE '�����' END) AS HardResult   --Ӳ�ȼ����
+	  ,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Batch_BatchTrustItem bti 
+	  WHERE bti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 TrustBatchCode FROM [dbo].HJGL_Batch_BatchTrust bt 
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId=bt.TrustBatchId
+	  WHERE bti.WeldJointId=jot.WeldJointId) END) AS TrustBatchCode   --ί�е����
+      ,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Batch_NDEItem ndei 
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
+	  WHERE bti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(NDECode,'') FROM [dbo].HJGL_Batch_NDE nde 
+	  LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID=nde.NDEID
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
+	  WHERE bti.WeldJointId=jot.WeldJointId) END) AS NDECode   --��ⵥ���
+	  ,(CASE (SELECT TOP 1 CheckResult FROM [dbo].HJGL_Batch_NDEItem ndei 
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
+	  WHERE bti.WeldJointId=jot.WeldJointId) WHEN '1' THEN '�ϸ�' WHEN '2' THEN '���ϸ�' ELSE '' END) AS CheckResult   --�����
+	  ,jot.PipelineId
+      ,jot.[JointArea]
+      ,jot.[WeldingLocationId]
+      ,jot.[HeartNo1]
+      ,jot.[HeartNo2]
+      ,jot.[IsHotProess]
+      ,jot.[WeldingDailyId]
+      ,jot.[BackingWelderId]
+      ,jot.[CoverWelderId]
+	  ,jot.WeldingMode
+	  ,jot.Remark 
+	  ,jot.IsTwoJoint
+	  ,jot.SubmitMan
+	  ,jot.AuditMan
+	  ,jot.AuditDate
+      ,WeldingLocation.WeldingLocationCode
+      ,CASE WHEN jot.WeldingDailyId IS NULL THEN '��' ELSE '��' END AS IsWelding
+      ,CASE WHEN jot.IsHotProess=1 THEN '��' ELSE '��' END AS IsHotProessStr,
+      BackingWelder.PersonName AS BackingWelderName,
+      CoverWelder.PersonName AS CoverWelderName,
+     (CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
+			THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode
+			ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, --����
+		(CASE WHEN mat1.MaterialCode IS NOT NULL AND mat2.MaterialCode IS NOT NULL
+			THEN mat1.MaterialCode + '/' + mat2.MaterialCode
+			ELSE (ISNULL(mat1.MaterialCode,'') + ISNULL(mat2.MaterialCode,'')) END) AS MaterialCode, --����
+      
+	  daily.WeldingDailyCode,
+	  pointItem.PointBatchId,
+	  point.PointBatchCode,
+	  (CASE WHEN pointItem.PointState='1' THEN '�ѵ��' WHEN pointItem.PointState='2' THEN '����͸' ELSE '' END) AS IsPoint
+  FROM [dbo].[HJGL_WeldJoint] jot
+LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId=jot.PipelineId
+LEFT JOIN dbo.WBS_UnitWork uw ON uw.UnitWorkId=pipe.UnitWorkId
+LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=pipe.UnitId
+LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId
+LEFT JOIN dbo.Base_DetectionRate dr ON dr.DetectionRateId = pipe.DetectionRateId
+LEFT JOIN Base_TestMedium tm ON tm.TestMediumId=pipe.TestMedium
+LEFT JOIN Base_TestMedium tm2 ON tm2.TestMediumId=pipe.LeakMedium
+LEFT JOIN Base_PurgeMethod pm ON pm.PurgeMethodId=pipe.PCMedium
+LEFT JOIN Base_PressurePipingClass ppc ON ppc.PressurePipingClassId=pipe.PressurePipingClassId
+LEFT JOIN Base_Material AS mat ON mat.MaterialId = pipe.MaterialId
+LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id
+LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id
+LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=jot.WeldingMethodId
+LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=jot.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_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=jot.GrooveTypeId
+LEFT JOIN Base_Components AS com1 ON com1.ComponentsId = jot.Components1Id
+LEFT JOIN Base_Components AS com2 ON com2.ComponentsId = jot.Components2Id
+LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=jot.BackingWelderId and BackingWelder.ProjectId=jot.ProjectId
+LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=jot.CoverWelderId and CoverWelder.ProjectId=jot.ProjectId
+LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId=jot.WeldingDailyId
+LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=pipe.PipingClassId
+LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId
+LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId
+LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId
+LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId
+LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
+
+
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
index 6a53ca01..a20dd0c4 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
@@ -1007,10 +1007,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             pipeline.PipeMaterialCode = col17;
                         }
                     }
-                    pipeline.Remark = Convert.ToString(pds[i].S);
+                    pipeline.FlowingSection= Convert.ToString(pds[i].S);
+                    pipeline.Remark = Convert.ToString(pds[i].T);
 
                     // 以下是焊口信息
-                    string col19 = Convert.ToString(pds[i].T);
+                    string col19 = Convert.ToString(pds[i].U);
                     if (string.IsNullOrEmpty(col19))
                     {
                         result.Add("第" + (i + 1).ToString() + "行," + "焊口号" + "," + "此项为必填项！" + "|");
@@ -1030,9 +1031,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     }
 
                     string col20 = "";
-                    if (pds[i].U!=null)
+                    if (pds[i].V!=null)
                     {
-                        col20 = pds[i].U.ToString();
+                        col20 = pds[i].V.ToString();
                     }
                    
                     if (!string.IsNullOrEmpty(col20))
@@ -1055,9 +1056,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     }
 
                     string col21 = "";
-                    if (pds[i].V!=null)
+                    if (pds[i].W!=null)
                     {
-                        col21 = pds[i].V.ToString();
+                        col21 = pds[i].W.ToString();
                     }
                    
                     if (!string.IsNullOrEmpty(col21))
@@ -1079,11 +1080,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         result.Add("第" + (i + 1).ToString() + "行," + "材质2" + "," + "此项为必填项！" + "|");
                     }
 
-                    string col22 = Convert.ToString(pds[i].W);
+                    string col22 = Convert.ToString(pds[i].X);
                     string col27 = ""; 
-                    if (pds[i].AB!=null)
+                    if (pds[i].AC!=null)
                     {
-                        col27= pds[i].AB.ToString();
+                        col27= pds[i].AC.ToString();
                     }
                     if (rbDiaType.SelectedValue == "1")
                     {
@@ -1125,7 +1126,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     }
 
 
-                    var col23 = Convert.ToString(pds[i].X);
+                    var col23 = Convert.ToString(pds[i].Y);
                     if (col23!=null)
                     {
                         try
@@ -1143,7 +1144,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         result.Add("第" + (i + 1).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|");
                     }
 
-                    var col24 = Convert.ToString(pds[i].Y);
+                    var col24 = Convert.ToString(pds[i].Z);
                     if (col24!=null)
                     {
                         try
@@ -1180,7 +1181,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                     }
 
-                    string col25 = Convert.ToString(pds[i].Z);
+                    string col25 = Convert.ToString(pds[i].AA);
                     if (!string.IsNullOrEmpty(col25))
                     {
                         var weldType = getWeldType.FirstOrDefault(x => x.WeldTypeCode == col25);
@@ -1238,7 +1239,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     {
                         result.Add("第" + (i + 1).ToString() + "行," + "焊缝类型" + "," + "此项为必填项！" + "|");
                     }
-                    string col26 = Convert.ToString(pds[i].AA);
+                    string col26 = Convert.ToString(pds[i].AB);
                     if (!string.IsNullOrEmpty(col26))
                     {
                         var JointAttribute = BLL.DropListService.HJGL_JointAttribute();
@@ -1557,7 +1558,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                              VacuumPressure = x.VacuumPressure,
                              PCMedium = x.PCMedium,
                              MaterialId = x.MaterialId,
-                             Remark = x.Remark
+                             Remark = x.Remark,
+                             FlowingSection=x.FlowingSection
                          }).DistinctBy(temp => new
                          {
                              temp.PipelineId,
@@ -1582,7 +1584,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                              temp.VacuumPressure,
                              temp.PCMedium,
                              temp.MaterialId,
-                             temp.Remark
+                             temp.Remark,
+                             temp.FlowingSection
                          }).ToList();
             for (int i = 0; i < pipelines.Count(); i++)
             {
@@ -1610,6 +1613,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 pipeline.PCMedium = pipelines[i].PCMedium;
                 pipeline.MaterialId = pipelines[i].MaterialId;
                 pipeline.Remark = pipelines[i].Remark;
+                pipeline.FlowingSection = pipelines[i].FlowingSection;
 
                 var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId);
                 if (isExistPipelineCode!=null) // 更新管线
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index edce9b3b..3b73046d 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -232282,7 +232282,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ErrMessage", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ErrMessage", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string ErrMessage
 		{
 			get
@@ -267302,6 +267302,8 @@ namespace Model
 		
 		private string _PipeRemark;
 		
+		private string _FlowingSection;
+		
 		private string _WeldJointId;
 		
 		private string _WeldJointCode;
@@ -267992,6 +267994,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")]
+		public string FlowingSection
+		{
+			get
+			{
+				return this._FlowingSection;
+			}
+			set
+			{
+				if ((this._FlowingSection != value))
+				{
+					this._FlowingSection = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
 		public string WeldJointId
 		{