diff --git a/DataBase/版本日志/SGGLDB_V2023-12-01.sql b/DataBase/版本日志/SGGLDB_V2023-12-01.sql new file mode 100644 index 00000000..82e1413b --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-12-01.sql @@ -0,0 +1,37 @@ + +ALTER VIEW [dbo].[View_HJGL_NoWeldJointFind] +AS +--δº¸º¸¿Ú²éÕÒ +SELECT jot.WeldJointId, +jot.WeldJointCode, +cast((case when charindex('/',jot.WeldJointCode)>0 +then (case when ISNUMERIC(RIGHT(jot.WeldJointCode,CHARINDEX('/',REVERSE(jot.WeldJointCode))-1))=1 then RIGHT(jot.WeldJointCode,CHARINDEX('/',REVERSE(jot.WeldJointCode))-1) else '1000' end) +else '1000' end) as int) as WeldJointNum, +jot.PipelineId, +jot.WeldingDailyId, +jot.JointAttribute, +jot.Dia, +jot.DNDia, +jot.Size, +jot.Thickness, +jot.Remark, +WeldType.WeldTypeCode, +method.WeldingMethodCode, +rod.ConsumablesCode AS WeldingRodCode, +wire.ConsumablesCode AS WeldingWireCode, +mat1.MaterialCode AS Material1Code , +mat2.MaterialCode AS Material2Code +FROM dbo.HJGL_WeldJoint jot +LEFT JOIN dbo.HJGL_PreWeldingDaily pre ON pre.WeldJointId = jot.WeldJointId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId +LEFT JOIN Base_WeldingMethod AS method ON method.WeldingMethodId=jot.WeldingMethodId +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_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire +LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod +WHERE pre.PreWeldingDailyId IS NULL +and jot.WeldJointId not in (select WeldJointId from HJGL_WeldJoint where IsTwoJoint = 1 and (AuditDate is null or AuditDate='')) + +GO + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 6d6f8e78..938dddbd 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -271804,7 +271804,7 @@ namespace Model private string _WeldJointCode; - private string _WeldJointNum; + private System.Nullable _WeldJointNum; private string _PipelineId; @@ -271870,8 +271870,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointNum", DbType="NVarChar(50)")] - public string WeldJointNum + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointNum", DbType="Int")] + public System.Nullable WeldJointNum { get { @@ -300749,7 +300749,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] public string PackageContent { get @@ -310300,7 +310300,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] public string ContractNo { get @@ -310320,7 +310320,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] public string UnitWorks { get