diff --git a/DataBase/版本日志/SGGLDB_V2023-03-15.sql b/DataBase/版本日志/SGGLDB_V2023-03-15.sql new file mode 100644 index 00000000..6af1299c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-03-15.sql @@ -0,0 +1,2 @@ +alter table Train_TrainPlan add AttachUrl nvarchar(1000) null +GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs index de72a83b..f4784d9b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs @@ -428,11 +428,11 @@ namespace FineUIPro.Web.CQMS.Material { err += "请选择单位!"; } - var att = BLL.AttachFileService.GetAttachFileByToKeyId(this.InspectionId); - if (att == null) - { - err += "请上传质量证明文件!"; - } + //var att = BLL.AttachFileService.GetAttachFileByToKeyId(this.InspectionId); + //if (att == null) + //{ + // err += "请上传质量证明文件!"; + //} if (!string.IsNullOrWhiteSpace(err)) { Alert.ShowInTop(err, MessageBoxIcon.Warning); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 264bee57..a794e290 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -74047,7 +74047,7 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] public string MaterialCode { get @@ -74151,7 +74151,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string MaterialDef { get @@ -78741,7 +78741,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] public string MaterialCode { get @@ -83089,7 +83089,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")] public string CanWelderCode { get @@ -122458,7 +122458,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(100)")] public string MaterialName { get @@ -122478,7 +122478,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(200)")] public string SpecificationAndModel { get @@ -122498,7 +122498,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(100)")] public string MaterialCode { get @@ -122518,7 +122518,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(100)")] public string Material { get @@ -181587,7 +181587,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(100)")] public string RewardAndPunishDecision { get @@ -236068,7 +236068,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")] public string CanWelderCode { get