diff --git a/Audit.csproj b/Audit.csproj index 6c201ba..8d7a98f 100644 --- a/Audit.csproj +++ b/Audit.csproj @@ -36,6 +36,9 @@ prompt 4 + + Audit.App + packages\CommonServiceLocator.2.0.6\lib\net48\CommonServiceLocator.dll @@ -93,275 +96,8 @@ MSBuild:Compile Designer - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - True - True - BatchDyeingCentral.Context.tt - - - True - True - BatchDyeingCentral.tt - - - True - True - BatchDyeingCentral.edmx - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - Ticket.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - Ticket.tt - - - BatchDyeingCentral.tt - - - Ticket.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - Ticket.tt - - - Ticket.tt - - - Ticket.tt - - - Ticket.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - Ticket.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - Ticket.tt - - - Ticket.tt - - - Ticket.tt - - - True - True - Ticket.Context.tt - - - True - True - Ticket.tt - - - True - True - Ticket.edmx - - - Ticket.tt - - - Ticket.tt - - - Ticket.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - - - BatchDyeingCentral.tt - MSBuild:Compile Designer @@ -393,51 +129,15 @@ ResXFileCodeGenerator Resources.Designer.cs - - EntityModelCodeGenerator - BatchDyeingCentral.Designer.cs - - - BatchDyeingCentral.edmx - SettingsSingleFileGenerator Settings.Designer.cs - - EntityModelCodeGenerator - Ticket.Designer.cs - - - Ticket.edmx - - - - TextTemplatingFileGenerator - BatchDyeingCentral.Context.cs - BatchDyeingCentral.edmx - - - TextTemplatingFileGenerator - BatchDyeingCentral.edmx - BatchDyeingCentral.cs - - - TextTemplatingFileGenerator - Ticket.edmx - Ticket.Context.cs - - - TextTemplatingFileGenerator - Ticket.edmx - Ticket.cs - - diff --git a/BatchDyeingCentral.Context.tt b/BatchDyeingCentral.Context.tt deleted file mode 100644 index 6a322ee..0000000 --- a/BatchDyeingCentral.Context.tt +++ /dev/null @@ -1,636 +0,0 @@ -<#@ template language="C#" debug="false" hostspecific="true"#> -<#@ include file="EF6.Utility.CS.ttinclude"#><#@ - output extension=".cs"#><# - -const string inputFile = @"BatchDyeingCentral.edmx"; -var textTransform = DynamicTextTransformation.Create(this); -var code = new CodeGenerationTools(this); -var ef = new MetadataTools(this); -var typeMapper = new TypeMapper(code, ef, textTransform.Errors); -var loader = new EdmMetadataLoader(textTransform.Host, textTransform.Errors); -var itemCollection = loader.CreateEdmItemCollection(inputFile); -var modelNamespace = loader.GetModelNamespace(inputFile); -var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef); - -var container = itemCollection.OfType().FirstOrDefault(); -if (container == null) -{ - return string.Empty; -} -#> -//------------------------------------------------------------------------------ -// -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#> -// -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#> -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#> -// -//------------------------------------------------------------------------------ - -<# - -var codeNamespace = code.VsNamespaceSuggestion(); -if (!String.IsNullOrEmpty(codeNamespace)) -{ -#> -namespace <#=code.EscapeNamespace(codeNamespace)#> -{ -<# - PushIndent(" "); -} - -#> -using System; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; -<# -if (container.FunctionImports.Any()) -{ -#> -using System.Data.Entity.Core.Objects; -using System.Linq; -<# -} -#> - -<#=Accessibility.ForType(container)#> partial class <#=code.Escape(container)#> : DbContext -{ - public <#=code.Escape(container)#>() - : base("name=<#=container.Name#>") - { -<# -if (!loader.IsLazyLoadingEnabled(container)) -{ -#> - this.Configuration.LazyLoadingEnabled = false; -<# -} - -foreach (var entitySet in container.BaseEntitySets.OfType()) -{ - // Note: the DbSet members are defined below such that the getter and - // setter always have the same accessibility as the DbSet definition - if (Accessibility.ForReadOnlyProperty(entitySet) != "public") - { -#> - <#=codeStringGenerator.DbSetInitializer(entitySet)#> -<# - } -} -#> - } - - protected override void OnModelCreating(DbModelBuilder modelBuilder) - { - throw new UnintentionalCodeFirstException(); - } - -<# - foreach (var entitySet in container.BaseEntitySets.OfType()) - { -#> - <#=codeStringGenerator.DbSet(entitySet)#> -<# - } - - foreach (var edmFunction in container.FunctionImports) - { - WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: false); - } -#> -} -<# - -if (!String.IsNullOrEmpty(codeNamespace)) -{ - PopIndent(); -#> -} -<# -} -#> -<#+ - -private void WriteFunctionImport(TypeMapper typeMapper, CodeStringGenerator codeStringGenerator, EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) -{ - if (typeMapper.IsComposable(edmFunction)) - { -#> - - [DbFunction("<#=edmFunction.NamespaceName#>", "<#=edmFunction.Name#>")] - <#=codeStringGenerator.ComposableFunctionMethod(edmFunction, modelNamespace)#> - { -<#+ - codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter); -#> - <#=codeStringGenerator.ComposableCreateQuery(edmFunction, modelNamespace)#> - } -<#+ - } - else - { -#> - - <#=codeStringGenerator.FunctionMethod(edmFunction, modelNamespace, includeMergeOption)#> - { -<#+ - codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter); -#> - <#=codeStringGenerator.ExecuteFunction(edmFunction, modelNamespace, includeMergeOption)#> - } -<#+ - if (typeMapper.GenerateMergeOptionFunction(edmFunction, includeMergeOption)) - { - WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: true); - } - } -} - -public void WriteFunctionParameter(string name, string isNotNull, string notNullInit, string nullInit) -{ -#> - var <#=name#> = <#=isNotNull#> ? - <#=notNullInit#> : - <#=nullInit#>; - -<#+ -} - -public const string TemplateId = "CSharp_DbContext_Context_EF6"; - -public class CodeStringGenerator -{ - private readonly CodeGenerationTools _code; - private readonly TypeMapper _typeMapper; - private readonly MetadataTools _ef; - - public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef) - { - ArgumentNotNull(code, "code"); - ArgumentNotNull(typeMapper, "typeMapper"); - ArgumentNotNull(ef, "ef"); - - _code = code; - _typeMapper = typeMapper; - _ef = ef; - } - - public string Property(EdmProperty edmProperty) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1} {2} {{ {3}get; {4}set; }}", - Accessibility.ForProperty(edmProperty), - _typeMapper.GetTypeName(edmProperty.TypeUsage), - _code.Escape(edmProperty), - _code.SpaceAfter(Accessibility.ForGetter(edmProperty)), - _code.SpaceAfter(Accessibility.ForSetter(edmProperty))); - } - - public string NavigationProperty(NavigationProperty navProp) - { - var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType()); - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1} {2} {{ {3}get; {4}set; }}", - AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)), - navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType, - _code.Escape(navProp), - _code.SpaceAfter(Accessibility.ForGetter(navProp)), - _code.SpaceAfter(Accessibility.ForSetter(navProp))); - } - - public string AccessibilityAndVirtual(string accessibility) - { - return accessibility + (accessibility != "private" ? " virtual" : ""); - } - - public string EntityClassOpening(EntityType entity) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1}partial class {2}{3}", - Accessibility.ForType(entity), - _code.SpaceAfter(_code.AbstractOption(entity)), - _code.Escape(entity), - _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType))); - } - - public string EnumOpening(SimpleType enumType) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} enum {1} : {2}", - Accessibility.ForType(enumType), - _code.Escape(enumType), - _code.Escape(_typeMapper.UnderlyingClrType(enumType))); - } - - public void WriteFunctionParameters(EdmFunction edmFunction, Action writeParameter) - { - var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef); - foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable)) - { - var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null"; - var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")"; - var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))"; - writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit); - } - } - - public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace) - { - var parameters = _typeMapper.GetParameters(edmFunction); - - return string.Format( - CultureInfo.InvariantCulture, - "{0} IQueryable<{1}> {2}({3})", - AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)), - _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace), - _code.Escape(edmFunction), - string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray())); - } - - public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace) - { - var parameters = _typeMapper.GetParameters(edmFunction); - - return string.Format( - CultureInfo.InvariantCulture, - "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});", - _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace), - edmFunction.NamespaceName, - edmFunction.Name, - string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()), - _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()))); - } - - public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) - { - var parameters = _typeMapper.GetParameters(edmFunction); - var returnType = _typeMapper.GetReturnType(edmFunction); - - var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()); - if (includeMergeOption) - { - paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption"; - } - - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1} {2}({3})", - AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)), - returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">", - _code.Escape(edmFunction), - paramList); - } - - public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) - { - var parameters = _typeMapper.GetParameters(edmFunction); - var returnType = _typeMapper.GetReturnType(edmFunction); - - var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())); - if (includeMergeOption) - { - callParams = ", mergeOption" + callParams; - } - - return string.Format( - CultureInfo.InvariantCulture, - "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});", - returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">", - edmFunction.Name, - callParams); - } - - public string DbSet(EntitySet entitySet) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} virtual DbSet<{1}> {2} {{ get; set; }}", - Accessibility.ForReadOnlyProperty(entitySet), - _typeMapper.GetTypeName(entitySet.ElementType), - _code.Escape(entitySet)); - } - - public string DbSetInitializer(EntitySet entitySet) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} = Set<{1}>();", - _code.Escape(entitySet), - _typeMapper.GetTypeName(entitySet.ElementType)); - } - - public string UsingDirectives(bool inHeader, bool includeCollections = true) - { - return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion()) - ? string.Format( - CultureInfo.InvariantCulture, - "{0}using System;{1}" + - "{2}", - inHeader ? Environment.NewLine : "", - includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "", - inHeader ? "" : Environment.NewLine) - : ""; - } -} - -public class TypeMapper -{ - private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName"; - - private readonly System.Collections.IList _errors; - private readonly CodeGenerationTools _code; - private readonly MetadataTools _ef; - - public static string FixNamespaces(string typeName) - { - return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial."); - } - - public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors) - { - ArgumentNotNull(code, "code"); - ArgumentNotNull(ef, "ef"); - ArgumentNotNull(errors, "errors"); - - _code = code; - _ef = ef; - _errors = errors; - } - - public string GetTypeName(TypeUsage typeUsage) - { - return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null); - } - - public string GetTypeName(EdmType edmType) - { - return GetTypeName(edmType, isNullable: null, modelNamespace: null); - } - - public string GetTypeName(TypeUsage typeUsage, string modelNamespace) - { - return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace); - } - - public string GetTypeName(EdmType edmType, string modelNamespace) - { - return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace); - } - - public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace) - { - if (edmType == null) - { - return null; - } - - var collectionType = edmType as CollectionType; - if (collectionType != null) - { - return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace)); - } - - var typeName = _code.Escape(edmType.MetadataProperties - .Where(p => p.Name == ExternalTypeNameAttributeName) - .Select(p => (string)p.Value) - .FirstOrDefault()) - ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ? - _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) : - _code.Escape(edmType)); - - if (edmType is StructuralType) - { - return typeName; - } - - if (edmType is SimpleType) - { - var clrType = UnderlyingClrType(edmType); - if (!IsEnumType(edmType)) - { - typeName = _code.Escape(clrType); - } - - typeName = FixNamespaces(typeName); - - return clrType.IsValueType && isNullable == true ? - String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) : - typeName; - } - - throw new ArgumentException("edmType"); - } - - public Type UnderlyingClrType(EdmType edmType) - { - ArgumentNotNull(edmType, "edmType"); - - var primitiveType = edmType as PrimitiveType; - if (primitiveType != null) - { - return primitiveType.ClrEquivalentType; - } - - if (IsEnumType(edmType)) - { - return GetEnumUnderlyingType(edmType).ClrEquivalentType; - } - - return typeof(object); - } - - public object GetEnumMemberValue(MetadataItem enumMember) - { - ArgumentNotNull(enumMember, "enumMember"); - - var valueProperty = enumMember.GetType().GetProperty("Value"); - return valueProperty == null ? null : valueProperty.GetValue(enumMember, null); - } - - public string GetEnumMemberName(MetadataItem enumMember) - { - ArgumentNotNull(enumMember, "enumMember"); - - var nameProperty = enumMember.GetType().GetProperty("Name"); - return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null); - } - - public System.Collections.IEnumerable GetEnumMembers(EdmType enumType) - { - ArgumentNotNull(enumType, "enumType"); - - var membersProperty = enumType.GetType().GetProperty("Members"); - return membersProperty != null - ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null) - : Enumerable.Empty(); - } - - public bool EnumIsFlags(EdmType enumType) - { - ArgumentNotNull(enumType, "enumType"); - - var isFlagsProperty = enumType.GetType().GetProperty("IsFlags"); - return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null); - } - - public bool IsEnumType(GlobalItem edmType) - { - ArgumentNotNull(edmType, "edmType"); - - return edmType.GetType().Name == "EnumType"; - } - - public PrimitiveType GetEnumUnderlyingType(EdmType enumType) - { - ArgumentNotNull(enumType, "enumType"); - - return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null); - } - - public string CreateLiteral(object value) - { - if (value == null || value.GetType() != typeof(TimeSpan)) - { - return _code.CreateLiteral(value); - } - - return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks); - } - - public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable types, string sourceFile) - { - ArgumentNotNull(types, "types"); - ArgumentNotNull(sourceFile, "sourceFile"); - - var hash = new HashSet(StringComparer.InvariantCultureIgnoreCase); - if (types.Any(item => !hash.Add(item))) - { - _errors.Add( - new CompilerError(sourceFile, -1, -1, "6023", - String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict")))); - return false; - } - return true; - } - - public IEnumerable GetEnumItemsToGenerate(IEnumerable itemCollection) - { - return GetItemsToGenerate(itemCollection) - .Where(e => IsEnumType(e)); - } - - public IEnumerable GetItemsToGenerate(IEnumerable itemCollection) where T: EdmType - { - return itemCollection - .OfType() - .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName)) - .OrderBy(i => i.Name); - } - - public IEnumerable GetAllGlobalItems(IEnumerable itemCollection) - { - return itemCollection - .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i)) - .Select(g => GetGlobalItemName(g)); - } - - public string GetGlobalItemName(GlobalItem item) - { - if (item is EdmType) - { - return ((EdmType)item).Name; - } - else - { - return ((EntityContainer)item).Name; - } - } - - public IEnumerable GetSimpleProperties(EntityType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type); - } - - public IEnumerable GetSimpleProperties(ComplexType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type); - } - - public IEnumerable GetComplexProperties(EntityType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type); - } - - public IEnumerable GetComplexProperties(ComplexType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type); - } - - public IEnumerable GetPropertiesWithDefaultValues(EntityType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null); - } - - public IEnumerable GetPropertiesWithDefaultValues(ComplexType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null); - } - - public IEnumerable GetNavigationProperties(EntityType type) - { - return type.NavigationProperties.Where(np => np.DeclaringType == type); - } - - public IEnumerable GetCollectionNavigationProperties(EntityType type) - { - return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many); - } - - public FunctionParameter GetReturnParameter(EdmFunction edmFunction) - { - ArgumentNotNull(edmFunction, "edmFunction"); - - var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters"); - return returnParamsProperty == null - ? edmFunction.ReturnParameter - : ((IEnumerable)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault(); - } - - public bool IsComposable(EdmFunction edmFunction) - { - ArgumentNotNull(edmFunction, "edmFunction"); - - var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute"); - return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null); - } - - public IEnumerable GetParameters(EdmFunction edmFunction) - { - return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef); - } - - public TypeUsage GetReturnType(EdmFunction edmFunction) - { - var returnParam = GetReturnParameter(edmFunction); - return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage); - } - - public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption) - { - var returnType = GetReturnType(edmFunction); - return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType; - } -} - -public static void ArgumentNotNull(T arg, string name) where T : class -{ - if (arg == null) - { - throw new ArgumentNullException(name); - } -} -#> \ No newline at end of file diff --git a/BatchDyeingCentral.tt b/BatchDyeingCentral.tt deleted file mode 100644 index dd50f58..0000000 --- a/BatchDyeingCentral.tt +++ /dev/null @@ -1,733 +0,0 @@ -<#@ template language="C#" debug="false" hostspecific="true"#> -<#@ include file="EF6.Utility.CS.ttinclude"#><#@ - output extension=".cs"#><# - -const string inputFile = @"BatchDyeingCentral.edmx"; -var textTransform = DynamicTextTransformation.Create(this); -var code = new CodeGenerationTools(this); -var ef = new MetadataTools(this); -var typeMapper = new TypeMapper(code, ef, textTransform.Errors); -var fileManager = EntityFrameworkTemplateFileManager.Create(this); -var itemCollection = new EdmMetadataLoader(textTransform.Host, textTransform.Errors).CreateEdmItemCollection(inputFile); -var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef); - -if (!typeMapper.VerifyCaseInsensitiveTypeUniqueness(typeMapper.GetAllGlobalItems(itemCollection), inputFile)) -{ - return string.Empty; -} - -WriteHeader(codeStringGenerator, fileManager); - -foreach (var entity in typeMapper.GetItemsToGenerate(itemCollection)) -{ - fileManager.StartNewFile(entity.Name + ".cs"); - BeginNamespace(code); -#> -<#=codeStringGenerator.UsingDirectives(inHeader: false)#> -<#=codeStringGenerator.EntityClassOpening(entity)#> -{ -<# - var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(entity); - var collectionNavigationProperties = typeMapper.GetCollectionNavigationProperties(entity); - var complexProperties = typeMapper.GetComplexProperties(entity); - - if (propertiesWithDefaultValues.Any() || collectionNavigationProperties.Any() || complexProperties.Any()) - { -#> - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public <#=code.Escape(entity)#>() - { -<# - foreach (var edmProperty in propertiesWithDefaultValues) - { -#> - this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>; -<# - } - - foreach (var navigationProperty in collectionNavigationProperties) - { -#> - this.<#=code.Escape(navigationProperty)#> = new HashSet<<#=typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType())#>>(); -<# - } - - foreach (var complexProperty in complexProperties) - { -#> - this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>(); -<# - } -#> - } - -<# - } - - var simpleProperties = typeMapper.GetSimpleProperties(entity); - if (simpleProperties.Any()) - { - foreach (var edmProperty in simpleProperties) - { -#> - <#=codeStringGenerator.Property(edmProperty)#> -<# - } - } - - if (complexProperties.Any()) - { -#> - -<# - foreach(var complexProperty in complexProperties) - { -#> - <#=codeStringGenerator.Property(complexProperty)#> -<# - } - } - - var navigationProperties = typeMapper.GetNavigationProperties(entity); - if (navigationProperties.Any()) - { -#> - -<# - foreach (var navigationProperty in navigationProperties) - { - if (navigationProperty.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many) - { -#> - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] -<# - } -#> - <#=codeStringGenerator.NavigationProperty(navigationProperty)#> -<# - } - } -#> -} -<# - EndNamespace(code); -} - -foreach (var complex in typeMapper.GetItemsToGenerate(itemCollection)) -{ - fileManager.StartNewFile(complex.Name + ".cs"); - BeginNamespace(code); -#> -<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#> -<#=Accessibility.ForType(complex)#> partial class <#=code.Escape(complex)#> -{ -<# - var complexProperties = typeMapper.GetComplexProperties(complex); - var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(complex); - - if (propertiesWithDefaultValues.Any() || complexProperties.Any()) - { -#> - public <#=code.Escape(complex)#>() - { -<# - foreach (var edmProperty in propertiesWithDefaultValues) - { -#> - this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>; -<# - } - - foreach (var complexProperty in complexProperties) - { -#> - this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>(); -<# - } -#> - } - -<# - } - - var simpleProperties = typeMapper.GetSimpleProperties(complex); - if (simpleProperties.Any()) - { - foreach(var edmProperty in simpleProperties) - { -#> - <#=codeStringGenerator.Property(edmProperty)#> -<# - } - } - - if (complexProperties.Any()) - { -#> - -<# - foreach(var edmProperty in complexProperties) - { -#> - <#=codeStringGenerator.Property(edmProperty)#> -<# - } - } -#> -} -<# - EndNamespace(code); -} - -foreach (var enumType in typeMapper.GetEnumItemsToGenerate(itemCollection)) -{ - fileManager.StartNewFile(enumType.Name + ".cs"); - BeginNamespace(code); -#> -<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#> -<# - if (typeMapper.EnumIsFlags(enumType)) - { -#> -[Flags] -<# - } -#> -<#=codeStringGenerator.EnumOpening(enumType)#> -{ -<# - var foundOne = false; - - foreach (MetadataItem member in typeMapper.GetEnumMembers(enumType)) - { - foundOne = true; -#> - <#=code.Escape(typeMapper.GetEnumMemberName(member))#> = <#=typeMapper.GetEnumMemberValue(member)#>, -<# - } - - if (foundOne) - { - this.GenerationEnvironment.Remove(this.GenerationEnvironment.Length - 3, 1); - } -#> -} -<# - EndNamespace(code); -} - -fileManager.Process(); - -#> -<#+ - -public void WriteHeader(CodeStringGenerator codeStringGenerator, EntityFrameworkTemplateFileManager fileManager) -{ - fileManager.StartHeader(); -#> -//------------------------------------------------------------------------------ -// -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#> -// -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#> -// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#> -// -//------------------------------------------------------------------------------ -<#=codeStringGenerator.UsingDirectives(inHeader: true)#> -<#+ - fileManager.EndBlock(); -} - -public void BeginNamespace(CodeGenerationTools code) -{ - var codeNamespace = code.VsNamespaceSuggestion(); - if (!String.IsNullOrEmpty(codeNamespace)) - { -#> -namespace <#=code.EscapeNamespace(codeNamespace)#> -{ -<#+ - PushIndent(" "); - } -} - -public void EndNamespace(CodeGenerationTools code) -{ - if (!String.IsNullOrEmpty(code.VsNamespaceSuggestion())) - { - PopIndent(); -#> -} -<#+ - } -} - -public const string TemplateId = "CSharp_DbContext_Types_EF6"; - -public class CodeStringGenerator -{ - private readonly CodeGenerationTools _code; - private readonly TypeMapper _typeMapper; - private readonly MetadataTools _ef; - - public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef) - { - ArgumentNotNull(code, "code"); - ArgumentNotNull(typeMapper, "typeMapper"); - ArgumentNotNull(ef, "ef"); - - _code = code; - _typeMapper = typeMapper; - _ef = ef; - } - - public string Property(EdmProperty edmProperty) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1} {2} {{ {3}get; {4}set; }}", - Accessibility.ForProperty(edmProperty), - _typeMapper.GetTypeName(edmProperty.TypeUsage), - _code.Escape(edmProperty), - _code.SpaceAfter(Accessibility.ForGetter(edmProperty)), - _code.SpaceAfter(Accessibility.ForSetter(edmProperty))); - } - - public string NavigationProperty(NavigationProperty navProp) - { - var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType()); - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1} {2} {{ {3}get; {4}set; }}", - AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)), - navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType, - _code.Escape(navProp), - _code.SpaceAfter(Accessibility.ForGetter(navProp)), - _code.SpaceAfter(Accessibility.ForSetter(navProp))); - } - - public string AccessibilityAndVirtual(string accessibility) - { - return accessibility + (accessibility != "private" ? " virtual" : ""); - } - - public string EntityClassOpening(EntityType entity) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1}partial class {2}{3}", - Accessibility.ForType(entity), - _code.SpaceAfter(_code.AbstractOption(entity)), - _code.Escape(entity), - _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType))); - } - - public string EnumOpening(SimpleType enumType) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} enum {1} : {2}", - Accessibility.ForType(enumType), - _code.Escape(enumType), - _code.Escape(_typeMapper.UnderlyingClrType(enumType))); - } - - public void WriteFunctionParameters(EdmFunction edmFunction, Action writeParameter) - { - var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef); - foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable)) - { - var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null"; - var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")"; - var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))"; - writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit); - } - } - - public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace) - { - var parameters = _typeMapper.GetParameters(edmFunction); - - return string.Format( - CultureInfo.InvariantCulture, - "{0} IQueryable<{1}> {2}({3})", - AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)), - _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace), - _code.Escape(edmFunction), - string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray())); - } - - public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace) - { - var parameters = _typeMapper.GetParameters(edmFunction); - - return string.Format( - CultureInfo.InvariantCulture, - "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});", - _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace), - edmFunction.NamespaceName, - edmFunction.Name, - string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()), - _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()))); - } - - public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) - { - var parameters = _typeMapper.GetParameters(edmFunction); - var returnType = _typeMapper.GetReturnType(edmFunction); - - var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()); - if (includeMergeOption) - { - paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption"; - } - - return string.Format( - CultureInfo.InvariantCulture, - "{0} {1} {2}({3})", - AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)), - returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">", - _code.Escape(edmFunction), - paramList); - } - - public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) - { - var parameters = _typeMapper.GetParameters(edmFunction); - var returnType = _typeMapper.GetReturnType(edmFunction); - - var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())); - if (includeMergeOption) - { - callParams = ", mergeOption" + callParams; - } - - return string.Format( - CultureInfo.InvariantCulture, - "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});", - returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">", - edmFunction.Name, - callParams); - } - - public string DbSet(EntitySet entitySet) - { - return string.Format( - CultureInfo.InvariantCulture, - "{0} virtual DbSet<{1}> {2} {{ get; set; }}", - Accessibility.ForReadOnlyProperty(entitySet), - _typeMapper.GetTypeName(entitySet.ElementType), - _code.Escape(entitySet)); - } - - public string UsingDirectives(bool inHeader, bool includeCollections = true) - { - return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion()) - ? string.Format( - CultureInfo.InvariantCulture, - "{0}using System;{1}" + - "{2}", - inHeader ? Environment.NewLine : "", - includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "", - inHeader ? "" : Environment.NewLine) - : ""; - } -} - -public class TypeMapper -{ - private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName"; - - private readonly System.Collections.IList _errors; - private readonly CodeGenerationTools _code; - private readonly MetadataTools _ef; - - public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors) - { - ArgumentNotNull(code, "code"); - ArgumentNotNull(ef, "ef"); - ArgumentNotNull(errors, "errors"); - - _code = code; - _ef = ef; - _errors = errors; - } - - public static string FixNamespaces(string typeName) - { - return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial."); - } - - public string GetTypeName(TypeUsage typeUsage) - { - return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null); - } - - public string GetTypeName(EdmType edmType) - { - return GetTypeName(edmType, isNullable: null, modelNamespace: null); - } - - public string GetTypeName(TypeUsage typeUsage, string modelNamespace) - { - return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace); - } - - public string GetTypeName(EdmType edmType, string modelNamespace) - { - return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace); - } - - public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace) - { - if (edmType == null) - { - return null; - } - - var collectionType = edmType as CollectionType; - if (collectionType != null) - { - return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace)); - } - - var typeName = _code.Escape(edmType.MetadataProperties - .Where(p => p.Name == ExternalTypeNameAttributeName) - .Select(p => (string)p.Value) - .FirstOrDefault()) - ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ? - _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) : - _code.Escape(edmType)); - - if (edmType is StructuralType) - { - return typeName; - } - - if (edmType is SimpleType) - { - var clrType = UnderlyingClrType(edmType); - if (!IsEnumType(edmType)) - { - typeName = _code.Escape(clrType); - } - - typeName = FixNamespaces(typeName); - - return clrType.IsValueType && isNullable == true ? - String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) : - typeName; - } - - throw new ArgumentException("edmType"); - } - - public Type UnderlyingClrType(EdmType edmType) - { - ArgumentNotNull(edmType, "edmType"); - - var primitiveType = edmType as PrimitiveType; - if (primitiveType != null) - { - return primitiveType.ClrEquivalentType; - } - - if (IsEnumType(edmType)) - { - return GetEnumUnderlyingType(edmType).ClrEquivalentType; - } - - return typeof(object); - } - - public object GetEnumMemberValue(MetadataItem enumMember) - { - ArgumentNotNull(enumMember, "enumMember"); - - var valueProperty = enumMember.GetType().GetProperty("Value"); - return valueProperty == null ? null : valueProperty.GetValue(enumMember, null); - } - - public string GetEnumMemberName(MetadataItem enumMember) - { - ArgumentNotNull(enumMember, "enumMember"); - - var nameProperty = enumMember.GetType().GetProperty("Name"); - return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null); - } - - public System.Collections.IEnumerable GetEnumMembers(EdmType enumType) - { - ArgumentNotNull(enumType, "enumType"); - - var membersProperty = enumType.GetType().GetProperty("Members"); - return membersProperty != null - ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null) - : Enumerable.Empty(); - } - - public bool EnumIsFlags(EdmType enumType) - { - ArgumentNotNull(enumType, "enumType"); - - var isFlagsProperty = enumType.GetType().GetProperty("IsFlags"); - return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null); - } - - public bool IsEnumType(GlobalItem edmType) - { - ArgumentNotNull(edmType, "edmType"); - - return edmType.GetType().Name == "EnumType"; - } - - public PrimitiveType GetEnumUnderlyingType(EdmType enumType) - { - ArgumentNotNull(enumType, "enumType"); - - return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null); - } - - public string CreateLiteral(object value) - { - if (value == null || value.GetType() != typeof(TimeSpan)) - { - return _code.CreateLiteral(value); - } - - return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks); - } - - public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable types, string sourceFile) - { - ArgumentNotNull(types, "types"); - ArgumentNotNull(sourceFile, "sourceFile"); - - var hash = new HashSet(StringComparer.InvariantCultureIgnoreCase); - if (types.Any(item => !hash.Add(item))) - { - _errors.Add( - new CompilerError(sourceFile, -1, -1, "6023", - String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict")))); - return false; - } - return true; - } - - public IEnumerable GetEnumItemsToGenerate(IEnumerable itemCollection) - { - return GetItemsToGenerate(itemCollection) - .Where(e => IsEnumType(e)); - } - - public IEnumerable GetItemsToGenerate(IEnumerable itemCollection) where T: EdmType - { - return itemCollection - .OfType() - .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName)) - .OrderBy(i => i.Name); - } - - public IEnumerable GetAllGlobalItems(IEnumerable itemCollection) - { - return itemCollection - .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i)) - .Select(g => GetGlobalItemName(g)); - } - - public string GetGlobalItemName(GlobalItem item) - { - if (item is EdmType) - { - return ((EdmType)item).Name; - } - else - { - return ((EntityContainer)item).Name; - } - } - - public IEnumerable GetSimpleProperties(EntityType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type); - } - - public IEnumerable GetSimpleProperties(ComplexType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type); - } - - public IEnumerable GetComplexProperties(EntityType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type); - } - - public IEnumerable GetComplexProperties(ComplexType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type); - } - - public IEnumerable GetPropertiesWithDefaultValues(EntityType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null); - } - - public IEnumerable GetPropertiesWithDefaultValues(ComplexType type) - { - return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null); - } - - public IEnumerable GetNavigationProperties(EntityType type) - { - return type.NavigationProperties.Where(np => np.DeclaringType == type); - } - - public IEnumerable GetCollectionNavigationProperties(EntityType type) - { - return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many); - } - - public FunctionParameter GetReturnParameter(EdmFunction edmFunction) - { - ArgumentNotNull(edmFunction, "edmFunction"); - - var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters"); - return returnParamsProperty == null - ? edmFunction.ReturnParameter - : ((IEnumerable)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault(); - } - - public bool IsComposable(EdmFunction edmFunction) - { - ArgumentNotNull(edmFunction, "edmFunction"); - - var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute"); - return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null); - } - - public IEnumerable GetParameters(EdmFunction edmFunction) - { - return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef); - } - - public TypeUsage GetReturnType(EdmFunction edmFunction) - { - var returnParam = GetReturnParameter(edmFunction); - return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage); - } - - public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption) - { - var returnType = GetReturnType(edmFunction); - return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType; - } -} - -public static void ArgumentNotNull(T arg, string name) where T : class -{ - if (arg == null) - { - throw new ArgumentNullException(name); - } -} -#> \ No newline at end of file diff --git a/CHEMICAL_QUEUE.cs b/CHEMICAL_QUEUE.cs deleted file mode 100644 index cbc1893..0000000 --- a/CHEMICAL_QUEUE.cs +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class CHEMICAL_QUEUE - { - public string tmp_field { get; set; } - public string ID_NO { get; set; } - public Nullable STEP_NO { get; set; } - public string CREATE_DATE { get; set; } - public string CREATE_TIME { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public Nullable PRIORITY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/DYESTUFF_QUEUE.cs b/DYESTUFF_QUEUE.cs deleted file mode 100644 index 2f35fc3..0000000 --- a/DYESTUFF_QUEUE.cs +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class DYESTUFF_QUEUE - { - public string tmp_field { get; set; } - public string ID_NO { get; set; } - public Nullable STEP_NO { get; set; } - public string CREATE_DATE { get; set; } - public string CREATE_TIME { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public Nullable PRIORITY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/JOBTKT.cs b/JOBTKT.cs deleted file mode 100644 index 6969bc9..0000000 --- a/JOBTKT.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class JOBTKT - { - public string tmp_field { get; set; } - public string IDNO { get; set; } - public Nullable FNDATE { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/Alarms.cs b/Models/Alarms.cs similarity index 98% rename from Alarms.cs rename to Models/Alarms.cs index f5f9af3..e11a077 100644 --- a/Alarms.cs +++ b/Models/Alarms.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Models/App.Config b/Models/App.Config new file mode 100644 index 0000000..679346b --- /dev/null +++ b/Models/App.Config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/AuxDslvQueue.cs b/Models/AuxDslvQueue.cs similarity index 98% rename from AuxDslvQueue.cs rename to Models/AuxDslvQueue.cs index dc6773c..b9bddbc 100644 --- a/AuxDslvQueue.cs +++ b/Models/AuxDslvQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/AuxDslvQueueHistory.cs b/Models/AuxDslvQueueHistory.cs similarity index 98% rename from AuxDslvQueueHistory.cs rename to Models/AuxDslvQueueHistory.cs index dd0f955..42287b5 100644 --- a/AuxDslvQueueHistory.cs +++ b/Models/AuxDslvQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/BucketInfo.cs b/Models/BucketInfo.cs similarity index 97% rename from BucketInfo.cs rename to Models/BucketInfo.cs index e601221..31b47a6 100644 --- a/BucketInfo.cs +++ b/Models/BucketInfo.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/BucketShelf.cs b/Models/BucketShelf.cs similarity index 98% rename from BucketShelf.cs rename to Models/BucketShelf.cs index e9a7c23..a2c2a86 100644 --- a/BucketShelf.cs +++ b/Models/BucketShelf.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/BucketShelfHistory.cs b/Models/BucketShelfHistory.cs similarity index 98% rename from BucketShelfHistory.cs rename to Models/BucketShelfHistory.cs index bc52971..bcb3525 100644 --- a/BucketShelfHistory.cs +++ b/Models/BucketShelfHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/BucketShelfQueue.cs b/Models/BucketShelfQueue.cs similarity index 98% rename from BucketShelfQueue.cs rename to Models/BucketShelfQueue.cs index 14f1be3..bad4ada 100644 --- a/BucketShelfQueue.cs +++ b/Models/BucketShelfQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/BucketShelfQueueHistory.cs b/Models/BucketShelfQueueHistory.cs similarity index 98% rename from BucketShelfQueueHistory.cs rename to Models/BucketShelfQueueHistory.cs index f0fe1a0..5585f7e 100644 --- a/BucketShelfQueueHistory.cs +++ b/Models/BucketShelfQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/CleanDevice.cs b/Models/CleanDevice.cs similarity index 97% rename from CleanDevice.cs rename to Models/CleanDevice.cs index 0874fd9..59e91a5 100644 --- a/CleanDevice.cs +++ b/Models/CleanDevice.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Customize.cs b/Models/Customize.cs similarity index 97% rename from Customize.cs rename to Models/Customize.cs index de06d1d..2bdcc07 100644 --- a/Customize.cs +++ b/Models/Customize.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Delays.cs b/Models/Delays.cs similarity index 98% rename from Delays.cs rename to Models/Delays.cs index 9367b69..4060a96 100644 --- a/Delays.cs +++ b/Models/Delays.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DispenserEvent.cs b/Models/DispenserEvent.cs similarity index 98% rename from DispenserEvent.cs rename to Models/DispenserEvent.cs index 5cbc8b4..1862e8c 100644 --- a/DispenserEvent.cs +++ b/Models/DispenserEvent.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DispenserLifeStatus.cs b/Models/DispenserLifeStatus.cs similarity index 97% rename from DispenserLifeStatus.cs rename to Models/DispenserLifeStatus.cs index ba2c683..38d4b4f 100644 --- a/DispenserLifeStatus.cs +++ b/Models/DispenserLifeStatus.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DispenserUtilization.cs b/Models/DispenserUtilization.cs similarity index 97% rename from DispenserUtilization.cs rename to Models/DispenserUtilization.cs index 1fb2ab9..eb22bfd 100644 --- a/DispenserUtilization.cs +++ b/Models/DispenserUtilization.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Dispensers.cs b/Models/Dispensers.cs similarity index 98% rename from Dispensers.cs rename to Models/Dispensers.cs index 29fb23f..7a7d073 100644 --- a/Dispensers.cs +++ b/Models/Dispensers.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotBucketSummary.cs b/Models/DyelotBucketSummary.cs similarity index 97% rename from DyelotBucketSummary.cs rename to Models/DyelotBucketSummary.cs index 8aa79ee..865adac 100644 --- a/DyelotBucketSummary.cs +++ b/Models/DyelotBucketSummary.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotBuckets.cs b/Models/DyelotBuckets.cs similarity index 98% rename from DyelotBuckets.cs rename to Models/DyelotBuckets.cs index 7f8e40e..daf3396 100644 --- a/DyelotBuckets.cs +++ b/Models/DyelotBuckets.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotBucketsHistory.cs b/Models/DyelotBucketsHistory.cs similarity index 98% rename from DyelotBucketsHistory.cs rename to Models/DyelotBucketsHistory.cs index 4ada755..33962e1 100644 --- a/DyelotBucketsHistory.cs +++ b/Models/DyelotBucketsHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotDetail.cs b/Models/DyelotDetail.cs similarity index 98% rename from DyelotDetail.cs rename to Models/DyelotDetail.cs index da8ab7a..5d7df35 100644 --- a/DyelotDetail.cs +++ b/Models/DyelotDetail.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotDslvQueue.cs b/Models/DyelotDslvQueue.cs similarity index 98% rename from DyelotDslvQueue.cs rename to Models/DyelotDslvQueue.cs index d55449b..c6c63f6 100644 --- a/DyelotDslvQueue.cs +++ b/Models/DyelotDslvQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotDslvQueueHistory.cs b/Models/DyelotDslvQueueHistory.cs similarity index 98% rename from DyelotDslvQueueHistory.cs rename to Models/DyelotDslvQueueHistory.cs index 73be26f..9b28807 100644 --- a/DyelotDslvQueueHistory.cs +++ b/Models/DyelotDslvQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotHead.cs b/Models/DyelotHead.cs similarity index 99% rename from DyelotHead.cs rename to Models/DyelotHead.cs index 71ce40e..306f5e4 100644 --- a/DyelotHead.cs +++ b/Models/DyelotHead.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotHistories.cs b/Models/DyelotHistories.cs similarity index 97% rename from DyelotHistories.cs rename to Models/DyelotHistories.cs index a8e5be0..cc9d7aa 100644 --- a/DyelotHistories.cs +++ b/Models/DyelotHistories.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Dyelots.cs b/Models/Dyelots.cs similarity index 99% rename from Dyelots.cs rename to Models/Dyelots.cs index 16e6482..ac1cbea 100644 --- a/Dyelots.cs +++ b/Models/Dyelots.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsBatch.cs b/Models/DyelotsBatch.cs similarity index 98% rename from DyelotsBatch.cs rename to Models/DyelotsBatch.cs index 4cdd438..8a93f75 100644 --- a/DyelotsBatch.cs +++ b/Models/DyelotsBatch.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsBulkedRecipe.cs b/Models/DyelotsBulkedRecipe.cs similarity index 99% rename from DyelotsBulkedRecipe.cs rename to Models/DyelotsBulkedRecipe.cs index 5eea25f..f29cfdf 100644 --- a/DyelotsBulkedRecipe.cs +++ b/Models/DyelotsBulkedRecipe.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsBulkedRecipeHistory.cs b/Models/DyelotsBulkedRecipeHistory.cs similarity index 99% rename from DyelotsBulkedRecipeHistory.cs rename to Models/DyelotsBulkedRecipeHistory.cs index c597341..f3a5ecc 100644 --- a/DyelotsBulkedRecipeHistory.cs +++ b/Models/DyelotsBulkedRecipeHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsByShift.cs b/Models/DyelotsByShift.cs similarity index 98% rename from DyelotsByShift.cs rename to Models/DyelotsByShift.cs index 99ecf12..f5c296e 100644 --- a/DyelotsByShift.cs +++ b/Models/DyelotsByShift.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsHistory.cs b/Models/DyelotsHistory.cs similarity index 99% rename from DyelotsHistory.cs rename to Models/DyelotsHistory.cs index 81d5b06..78aa62f 100644 --- a/DyelotsHistory.cs +++ b/Models/DyelotsHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsInAuto.cs b/Models/DyelotsInAuto.cs similarity index 98% rename from DyelotsInAuto.cs rename to Models/DyelotsInAuto.cs index b513991..6d8f4be 100644 --- a/DyelotsInAuto.cs +++ b/Models/DyelotsInAuto.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/DyelotsInAutoHistory.cs b/Models/DyelotsInAutoHistory.cs similarity index 98% rename from DyelotsInAutoHistory.cs rename to Models/DyelotsInAutoHistory.cs index 790ffac..a6e412f 100644 --- a/DyelotsInAutoHistory.cs +++ b/Models/DyelotsInAutoHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/EventList.cs b/Models/EventList.cs similarity index 97% rename from EventList.cs rename to Models/EventList.cs index eb5e535..c16e6a4 100644 --- a/EventList.cs +++ b/Models/EventList.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/LA571Tanks.cs b/Models/LA571Tanks.cs similarity index 97% rename from LA571Tanks.cs rename to Models/LA571Tanks.cs index 5fabb0f..7069018 100644 --- a/LA571Tanks.cs +++ b/Models/LA571Tanks.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/LabDyeDslvQueue.cs b/Models/LabDyeDslvQueue.cs similarity index 98% rename from LabDyeDslvQueue.cs rename to Models/LabDyeDslvQueue.cs index 5abc801..c5bac6b 100644 --- a/LabDyeDslvQueue.cs +++ b/Models/LabDyeDslvQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/LabDyeDslvQueueHistory.cs b/Models/LabDyeDslvQueueHistory.cs similarity index 98% rename from LabDyeDslvQueueHistory.cs rename to Models/LabDyeDslvQueueHistory.cs index d85119b..c974e48 100644 --- a/LabDyeDslvQueueHistory.cs +++ b/Models/LabDyeDslvQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/MachineState.cs b/Models/MachineState.cs similarity index 99% rename from MachineState.cs rename to Models/MachineState.cs index 097a9b5..5d43a0f 100644 --- a/MachineState.cs +++ b/Models/MachineState.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/MachineStateHistory.cs b/Models/MachineStateHistory.cs similarity index 99% rename from MachineStateHistory.cs rename to Models/MachineStateHistory.cs index 72104b0..2aa5f5a 100644 --- a/MachineStateHistory.cs +++ b/Models/MachineStateHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Machines.cs b/Models/Machines.cs similarity index 99% rename from Machines.cs rename to Models/Machines.cs index 5cf99be..cd55140 100644 --- a/Machines.cs +++ b/Models/Machines.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/MachinesHistory.cs b/Models/MachinesHistory.cs similarity index 99% rename from MachinesHistory.cs rename to Models/MachinesHistory.cs index d19478b..562e255 100644 --- a/MachinesHistory.cs +++ b/Models/MachinesHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/ManualWeightQueue.cs b/Models/ManualWeightQueue.cs similarity index 98% rename from ManualWeightQueue.cs rename to Models/ManualWeightQueue.cs index db0f49d..e33da63 100644 --- a/ManualWeightQueue.cs +++ b/Models/ManualWeightQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/ManualWeightQueueHistory.cs b/Models/ManualWeightQueueHistory.cs similarity index 98% rename from ManualWeightQueueHistory.cs rename to Models/ManualWeightQueueHistory.cs index 1fc318b..e6ad04d 100644 --- a/ManualWeightQueueHistory.cs +++ b/Models/ManualWeightQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Models/Models.csproj b/Models/Models.csproj index 10d7712..fac70fe 100644 --- a/Models/Models.csproj +++ b/Models/Models.csproj @@ -31,8 +31,17 @@ 4 + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + + @@ -41,7 +50,245 @@ + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + True + True + SQL_BD.Context.tt + + + True + True + SQL_BD.tt + + + True + True + SQL_BD.edmx + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + + + + EntityModelCodeGenerator + SQL_BD.Designer.cs + + + + + + + SQL_BD.edmx + + + + + TextTemplatingFileGenerator + SQL_BD.Context.cs + SQL_BD.edmx + + + TextTemplatingFileGenerator + SQL_BD.edmx + SQL_BD.cs + + + + \ No newline at end of file diff --git a/PartsStatus.cs b/Models/PartsStatus.cs similarity index 98% rename from PartsStatus.cs rename to Models/PartsStatus.cs index bc68935..d3542c0 100644 --- a/PartsStatus.cs +++ b/Models/PartsStatus.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/PartsStatusHistory.cs b/Models/PartsStatusHistory.cs similarity index 98% rename from PartsStatusHistory.cs rename to Models/PartsStatusHistory.cs index 87a4764..c7a1942 100644 --- a/PartsStatusHistory.cs +++ b/Models/PartsStatusHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/PipeFill.cs b/Models/PipeFill.cs similarity index 98% rename from PipeFill.cs rename to Models/PipeFill.cs index 8782601..1260077 100644 --- a/PipeFill.cs +++ b/Models/PipeFill.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/PipeHistory.cs b/Models/PipeHistory.cs similarity index 98% rename from PipeHistory.cs rename to Models/PipeHistory.cs index 975afe6..f261134 100644 --- a/PipeHistory.cs +++ b/Models/PipeHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Pipes.cs b/Models/Pipes.cs similarity index 98% rename from Pipes.cs rename to Models/Pipes.cs index 35b7a4b..c686e9a 100644 --- a/Pipes.cs +++ b/Models/Pipes.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/ProgramGroups.cs b/Models/ProgramGroups.cs similarity index 98% rename from ProgramGroups.cs rename to Models/ProgramGroups.cs index baacda1..45d930f 100644 --- a/ProgramGroups.cs +++ b/Models/ProgramGroups.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Programs.cs b/Models/Programs.cs similarity index 98% rename from Programs.cs rename to Models/Programs.cs index c2166b4..93aa2f4 100644 --- a/Programs.cs +++ b/Models/Programs.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/ProgramsUsed.cs b/Models/ProgramsUsed.cs similarity index 98% rename from ProgramsUsed.cs rename to Models/ProgramsUsed.cs index 0509daf..ae86d5a 100644 --- a/ProgramsUsed.cs +++ b/Models/ProgramsUsed.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/RFIDRecordQueue.cs b/Models/RFIDRecordQueue.cs similarity index 98% rename from RFIDRecordQueue.cs rename to Models/RFIDRecordQueue.cs index a93ed4b..fc36e6a 100644 --- a/RFIDRecordQueue.cs +++ b/Models/RFIDRecordQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/RFIDRecordQueueHistory.cs b/Models/RFIDRecordQueueHistory.cs similarity index 98% rename from RFIDRecordQueueHistory.cs rename to Models/RFIDRecordQueueHistory.cs index 576b4b1..6bc317c 100644 --- a/RFIDRecordQueueHistory.cs +++ b/Models/RFIDRecordQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/RecipeDeduct.cs b/Models/RecipeDeduct.cs similarity index 98% rename from RecipeDeduct.cs rename to Models/RecipeDeduct.cs index c55c202..e02ae03 100644 --- a/RecipeDeduct.cs +++ b/Models/RecipeDeduct.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/RecipeDeductHistory.cs b/Models/RecipeDeductHistory.cs similarity index 98% rename from RecipeDeductHistory.cs rename to Models/RecipeDeductHistory.cs index 2dfad1c..5c8b0e3 100644 --- a/RecipeDeductHistory.cs +++ b/Models/RecipeDeductHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/BatchDyeingCentral.Context.cs b/Models/SQL_BD.Context.cs similarity index 99% rename from BatchDyeingCentral.Context.cs rename to Models/SQL_BD.Context.cs index 3fc9631..0a7bec4 100644 --- a/BatchDyeingCentral.Context.cs +++ b/Models/SQL_BD.Context.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Data.Entity; diff --git a/Ticket.Context.tt b/Models/SQL_BD.Context.tt similarity index 99% rename from Ticket.Context.tt rename to Models/SQL_BD.Context.tt index dce4902..f4e6bdc 100644 --- a/Ticket.Context.tt +++ b/Models/SQL_BD.Context.tt @@ -2,7 +2,7 @@ <#@ include file="EF6.Utility.CS.ttinclude"#><#@ output extension=".cs"#><# -const string inputFile = @"Ticket.edmx"; +const string inputFile = @"SQL_BD.edmx"; var textTransform = DynamicTextTransformation.Create(this); var code = new CodeGenerationTools(this); var ef = new MetadataTools(this); diff --git a/BatchDyeingCentral.Designer.cs b/Models/SQL_BD.Designer.cs similarity index 83% rename from BatchDyeingCentral.Designer.cs rename to Models/SQL_BD.Designer.cs index 674b9e4..f689657 100644 --- a/BatchDyeingCentral.Designer.cs +++ b/Models/SQL_BD.Designer.cs @@ -1,4 +1,4 @@ -// 为模型“D:\Visual Studio\Audit\BatchDyeingCentral.edmx”启用了 T4 代码生成。 +// 为模型“C:\Users\24018\source\repos\Audit_APP\Models\SQL_BD.edmx”启用了 T4 代码生成。 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/BatchDyeingCentral.cs b/Models/SQL_BD.cs similarity index 100% rename from BatchDyeingCentral.cs rename to Models/SQL_BD.cs diff --git a/BatchDyeingCentral.edmx b/Models/SQL_BD.edmx similarity index 100% rename from BatchDyeingCentral.edmx rename to Models/SQL_BD.edmx diff --git a/BatchDyeingCentral.edmx.diagram b/Models/SQL_BD.edmx.diagram similarity index 99% rename from BatchDyeingCentral.edmx.diagram rename to Models/SQL_BD.edmx.diagram index c7e2678..5d3a760 100644 --- a/BatchDyeingCentral.edmx.diagram +++ b/Models/SQL_BD.edmx.diagram @@ -4,7 +4,7 @@ - + diff --git a/Ticket.tt b/Models/SQL_BD.tt similarity index 99% rename from Ticket.tt rename to Models/SQL_BD.tt index 7199bed..2e0b435 100644 --- a/Ticket.tt +++ b/Models/SQL_BD.tt @@ -2,7 +2,7 @@ <#@ include file="EF6.Utility.CS.ttinclude"#><#@ output extension=".cs"#><# -const string inputFile = @"Ticket.edmx"; +const string inputFile = @"SQL_BD.edmx"; var textTransform = DynamicTextTransformation.Create(this); var code = new CodeGenerationTools(this); var ef = new MetadataTools(this); diff --git a/SampleDyeDslvQueue.cs b/Models/SampleDyeDslvQueue.cs similarity index 98% rename from SampleDyeDslvQueue.cs rename to Models/SampleDyeDslvQueue.cs index 7507bc7..55fa023 100644 --- a/SampleDyeDslvQueue.cs +++ b/Models/SampleDyeDslvQueue.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/SampleDyeDslvQueueHistory.cs b/Models/SampleDyeDslvQueueHistory.cs similarity index 98% rename from SampleDyeDslvQueueHistory.cs rename to Models/SampleDyeDslvQueueHistory.cs index 8500ae2..884a85d 100644 --- a/SampleDyeDslvQueueHistory.cs +++ b/Models/SampleDyeDslvQueueHistory.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/SchedulingLog.cs b/Models/SchedulingLog.cs similarity index 98% rename from SchedulingLog.cs rename to Models/SchedulingLog.cs index c48634a..4d82d8c 100644 --- a/SchedulingLog.cs +++ b/Models/SchedulingLog.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Shelf.cs b/Models/Shelf.cs similarity index 97% rename from Shelf.cs rename to Models/Shelf.cs index 315609c..faca010 100644 --- a/Shelf.cs +++ b/Models/Shelf.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/StepVisits.cs b/Models/StepVisits.cs similarity index 99% rename from StepVisits.cs rename to Models/StepVisits.cs index d45fc48..5a5b27e 100644 --- a/StepVisits.cs +++ b/Models/StepVisits.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Steps.cs b/Models/Steps.cs similarity index 98% rename from Steps.cs rename to Models/Steps.cs index a6f0391..10437d8 100644 --- a/Steps.cs +++ b/Models/Steps.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Stoppages.cs b/Models/Stoppages.cs similarity index 98% rename from Stoppages.cs rename to Models/Stoppages.cs index c9f0bb3..b147a06 100644 --- a/Stoppages.cs +++ b/Models/Stoppages.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/TagShelf.cs b/Models/TagShelf.cs similarity index 98% rename from TagShelf.cs rename to Models/TagShelf.cs index 3361d93..f41643f 100644 --- a/TagShelf.cs +++ b/Models/TagShelf.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/UserGroup.cs b/Models/UserGroup.cs similarity index 97% rename from UserGroup.cs rename to Models/UserGroup.cs index b7fff8f..bc8f100 100644 --- a/UserGroup.cs +++ b/Models/UserGroup.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Users.cs b/Models/Users.cs similarity index 97% rename from Users.cs rename to Models/Users.cs index 1a155da..759ba81 100644 --- a/Users.cs +++ b/Models/Users.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/WaitChemical.cs b/Models/WaitChemical.cs similarity index 98% rename from WaitChemical.cs rename to Models/WaitChemical.cs index d52f7ca..f71f5fa 100644 --- a/WaitChemical.cs +++ b/Models/WaitChemical.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/Models/packages.config b/Models/packages.config new file mode 100644 index 0000000..1e53006 --- /dev/null +++ b/Models/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/record.cs b/Models/record.cs similarity index 97% rename from record.cs rename to Models/record.cs index 1d855ac..4382161 100644 --- a/record.cs +++ b/Models/record.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Audit +namespace Models { using System; using System.Collections.Generic; diff --git a/POWDER_QUEUE.cs b/POWDER_QUEUE.cs deleted file mode 100644 index 0a6ef0d..0000000 --- a/POWDER_QUEUE.cs +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class POWDER_QUEUE - { - public string tmp_field { get; set; } - public string ID_NO { get; set; } - public Nullable STEP_NO { get; set; } - public string CREATE_DATE { get; set; } - public string CREATE_TIME { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public Nullable PRIORITY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/Product.cs b/Product.cs deleted file mode 100644 index ee04255..0000000 --- a/Product.cs +++ /dev/null @@ -1,78 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class Product - { - public string ProductCode { get; set; } - public string ProductName { get; set; } - public Nullable Price { get; set; } - public Nullable Deduct { get; set; } - public Nullable FullWeight { get; set; } - public Nullable LampPosition { get; set; } - public string TablePosition { get; set; } - public string AREA { get; set; } - public Nullable SafetyStock { get; set; } - public Nullable ProductUnit { get; set; } - public Nullable ProductType { get; set; } - public Nullable ProductClass { get; set; } - public Nullable CurrentStock { get; set; } - public string ProductLot { get; set; } - public Nullable RplDate { get; set; } - public Nullable UsedDate { get; set; } - public string CuMonth { get; set; } - public Nullable LaStock { get; set; } - public Nullable ThStock { get; set; } - public Nullable ThUsed { get; set; } - public Nullable Color { get; set; } - public Nullable LastTime { get; set; } - public Nullable CalTime { get; set; } - public Nullable BackflowTime { get; set; } - public Nullable Tol_G { get; set; } - public Nullable Tol_P { get; set; } - public Nullable Alarm { get; set; } - public Nullable Change_Bucket { get; set; } - public Nullable Small_Volume_by_manual { get; set; } - public Nullable Target_Weight { get; set; } - public Nullable Pre_Weight { get; set; } - public Nullable One_Sec { get; set; } - public Nullable GetscalTime { get; set; } - public Nullable DelayOpenValve { get; set; } - public string ValveMap { get; set; } - public string PumpMap { get; set; } - public Nullable Includepump { get; set; } - public Nullable Once_minimum_weight { get; set; } - public Nullable Once_minimum_max_weight { get; set; } - public Nullable Once_minimum_time { get; set; } - public string Res_S1 { get; set; } - public string Res_S2 { get; set; } - public string Res_S3 { get; set; } - public string Res_S4 { get; set; } - public Nullable Res_I1 { get; set; } - public Nullable Res_I2 { get; set; } - public Nullable Res_I3 { get; set; } - public Nullable Res_I4 { get; set; } - public Nullable Res_F1 { get; set; } - public Nullable Res_F2 { get; set; } - public Nullable Res_F3 { get; set; } - public Nullable Res_F4 { get; set; } - public string Batch_NO { get; set; } - public Nullable Concentration { get; set; } - public Nullable Pump { get; set; } - public Nullable PRODUCT_KIND { get; set; } - public string SUPPLIER { get; set; } - public Nullable PRODUCT_MODIFY_DATE { get; set; } - public double GRAVITY { get; set; } - public string UserAccount { get; set; } - } -} diff --git a/ProductInventory.cs b/ProductInventory.cs deleted file mode 100644 index b2d469f..0000000 --- a/ProductInventory.cs +++ /dev/null @@ -1,22 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class ProductInventory - { - public string ProductCode { get; set; } - public Nullable Quantity { get; set; } - public Nullable Price { get; set; } - public Nullable CreateDate { get; set; } - } -} diff --git a/ProductUsed.cs b/ProductUsed.cs deleted file mode 100644 index f0336c1..0000000 --- a/ProductUsed.cs +++ /dev/null @@ -1,21 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class ProductUsed - { - public string ProductCode { get; set; } - public Nullable UsedQty { get; set; } - public Nullable CreateDate { get; set; } - } -} diff --git a/REMOTETERMINAL.cs b/REMOTETERMINAL.cs deleted file mode 100644 index 8fcb8d4..0000000 --- a/REMOTETERMINAL.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class REMOTETERMINAL - { - public string tmp_field { get; set; } - public string IDNO { get; set; } - public Nullable FNDATE { get; set; } - public string IDTYPE { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/TEMPCHEMICALTKT.cs b/TEMPCHEMICALTKT.cs deleted file mode 100644 index 62dc02d..0000000 --- a/TEMPCHEMICALTKT.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class TEMPCHEMICALTKT - { - public string tmp_field { get; set; } - public string IDNO { get; set; } - public Nullable FNDATE { get; set; } - public string IDTYPE { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/TEMPDYESTUFFTKT.cs b/TEMPDYESTUFFTKT.cs deleted file mode 100644 index e3c4e6d..0000000 --- a/TEMPDYESTUFFTKT.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class TEMPDYESTUFFTKT - { - public string tmp_field { get; set; } - public string IDNO { get; set; } - public Nullable FNDATE { get; set; } - public string IDTYPE { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/TEMPPOWDER.cs b/TEMPPOWDER.cs deleted file mode 100644 index ca60caa..0000000 --- a/TEMPPOWDER.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class TEMPPOWDER - { - public string tmp_field { get; set; } - public string IDNO { get; set; } - public Nullable FNDATE { get; set; } - public string IDTYPE { get; set; } - public string FIRST_KEY { get; set; } - public string SECOND_KEY { get; set; } - public int ReDye { get; set; } - } -} diff --git a/TICKET_DETAIL.cs b/TICKET_DETAIL.cs deleted file mode 100644 index 1330fea..0000000 --- a/TICKET_DETAIL.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class TICKET_DETAIL - { - public string ID_NO { get; set; } - public Nullable STEP_NO { get; set; } - public string PRODUCT_CODE { get; set; } - public string PRODUCT_TYPE { get; set; } - public Nullable TARGET_WT { get; set; } - public Nullable ACTUAL_WT { get; set; } - public string UNIT { get; set; } - public string COMP_DATE { get; set; } - public string COMP_TIME { get; set; } - public Nullable TRANSFER_STATE { get; set; } - public string ERROR_CODE { get; set; } - public string MACHINE { get; set; } - public string TANK_NO { get; set; } - public string ID_TYPE { get; set; } - public string PRODUCT_LOT { get; set; } - public string RECIPE_CODE { get; set; } - public Nullable LR { get; set; } - public string RECIPE_TYPE { get; set; } - public string CONC { get; set; } - public string CONCUNIT { get; set; } - public string REMARK { get; set; } - public string ADJUST { get; set; } - public Nullable PRICE { get; set; } - public Nullable RES_DOUBLE1 { get; set; } - public Nullable RES_DOUBLE2 { get; set; } - public Nullable RES_DOUBLE3 { get; set; } - public Nullable RES_DOUBLE4 { get; set; } - public string RES_STRING1 { get; set; } - public string RES_STRING2 { get; set; } - public string RES_STRING3 { get; set; } - public string RES_STRING4 { get; set; } - public string REWEIGHT { get; set; } - public Nullable Redye { get; set; } - public Nullable DyeWeightTime { get; set; } - public string UserAccount { get; set; } - public string Batch_NO { get; set; } - public Nullable lldmxid { get; set; } - public string Station { get; set; } - public string UserCode { get; set; } - public Nullable FABRIC_WEIGHT { get; set; } - public Nullable VOLUME { get; set; } - public Nullable RECORD_ORDER { get; set; } - public string Process { get; set; } - public double GRAVITY { get; set; } - public Nullable CurrentStock { get; set; } - } -} diff --git a/Ticket.Context.cs b/Ticket.Context.cs deleted file mode 100644 index f0d80a9..0000000 --- a/Ticket.Context.cs +++ /dev/null @@ -1,43 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Data.Entity; - using System.Data.Entity.Infrastructure; - - public partial class TicketEntities : DbContext - { - public TicketEntities() - : base("name=TicketEntities") - { - } - - protected override void OnModelCreating(DbModelBuilder modelBuilder) - { - throw new UnintentionalCodeFirstException(); - } - - public virtual DbSet Product { get; set; } - public virtual DbSet ProductInventory { get; set; } - public virtual DbSet ProductUsed { get; set; } - public virtual DbSet CHEMICAL_QUEUE { get; set; } - public virtual DbSet DYESTUFF_QUEUE { get; set; } - public virtual DbSet JOBTKT { get; set; } - public virtual DbSet POWDER_QUEUE { get; set; } - public virtual DbSet REMOTETERMINAL { get; set; } - public virtual DbSet TEMPCHEMICALTKT { get; set; } - public virtual DbSet TEMPDYESTUFFTKT { get; set; } - public virtual DbSet TEMPPOWDER { get; set; } - public virtual DbSet TICKET_DETAIL { get; set; } - public virtual DbSet TicketSerial { get; set; } - public virtual DbSet UserAccount { get; set; } - } -} diff --git a/Ticket.Designer.cs b/Ticket.Designer.cs deleted file mode 100644 index ae071f0..0000000 --- a/Ticket.Designer.cs +++ /dev/null @@ -1,10 +0,0 @@ -// 为模型“D:\Visual Studio\Audit\Ticket.edmx”启用了 T4 代码生成。 -// 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 -// 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 -// “属性”窗口中。 - -// 如果没有生成任何上下文和实体类，可能是因为您创建了空模型但是 -// 尚未选择要使用的实体框架版本。要为您的模型生成一个上下文类和实体 -// 类，请在设计器中打开该模型，右键单击设计器图面，然后 -// 选择“从数据库更新模型...”、“从模型生成数据库...”或“添加代码生成 -// 项...”。 \ No newline at end of file diff --git a/Ticket.cs b/Ticket.cs deleted file mode 100644 index 69c6b92..0000000 --- a/Ticket.cs +++ /dev/null @@ -1,9 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - diff --git a/Ticket.edmx b/Ticket.edmx deleted file mode 100644 index aac76cf..0000000 --- a/Ticket.edmx +++ /dev/null @@ -1,1103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT - [CHEMICAL_QUEUE].[tmp_field] AS [tmp_field], - [CHEMICAL_QUEUE].[ID_NO] AS [ID_NO], - [CHEMICAL_QUEUE].[STEP_NO] AS [STEP_NO], - [CHEMICAL_QUEUE].[CREATE_DATE] AS [CREATE_DATE], - [CHEMICAL_QUEUE].[CREATE_TIME] AS [CREATE_TIME], - [CHEMICAL_QUEUE].[FIRST_KEY] AS [FIRST_KEY], - [CHEMICAL_QUEUE].[SECOND_KEY] AS [SECOND_KEY], - [CHEMICAL_QUEUE].[PRIORITY] AS [PRIORITY], - [CHEMICAL_QUEUE].[ReDye] AS [ReDye] - FROM [dbo].[CHEMICAL_QUEUE] AS [CHEMICAL_QUEUE] - - - SELECT - [DYESTUFF_QUEUE].[tmp_field] AS [tmp_field], - [DYESTUFF_QUEUE].[ID_NO] AS [ID_NO], - [DYESTUFF_QUEUE].[STEP_NO] AS [STEP_NO], - [DYESTUFF_QUEUE].[CREATE_DATE] AS [CREATE_DATE], - [DYESTUFF_QUEUE].[CREATE_TIME] AS [CREATE_TIME], - [DYESTUFF_QUEUE].[FIRST_KEY] AS [FIRST_KEY], - [DYESTUFF_QUEUE].[SECOND_KEY] AS [SECOND_KEY], - [DYESTUFF_QUEUE].[PRIORITY] AS [PRIORITY], - [DYESTUFF_QUEUE].[ReDye] AS [ReDye] - FROM [dbo].[DYESTUFF_QUEUE] AS [DYESTUFF_QUEUE] - - - SELECT - [JOBTKT].[tmp_field] AS [tmp_field], - [JOBTKT].[IDNO] AS [IDNO], - [JOBTKT].[FNDATE] AS [FNDATE], - [JOBTKT].[FIRST_KEY] AS [FIRST_KEY], - [JOBTKT].[SECOND_KEY] AS [SECOND_KEY], - [JOBTKT].[ReDye] AS [ReDye] - FROM [dbo].[JOBTKT] AS [JOBTKT] - - - SELECT - [POWDER_QUEUE].[tmp_field] AS [tmp_field], - [POWDER_QUEUE].[ID_NO] AS [ID_NO], - [POWDER_QUEUE].[STEP_NO] AS [STEP_NO], - [POWDER_QUEUE].[CREATE_DATE] AS [CREATE_DATE], - [POWDER_QUEUE].[CREATE_TIME] AS [CREATE_TIME], - [POWDER_QUEUE].[FIRST_KEY] AS [FIRST_KEY], - [POWDER_QUEUE].[SECOND_KEY] AS [SECOND_KEY], - [POWDER_QUEUE].[PRIORITY] AS [PRIORITY], - [POWDER_QUEUE].[ReDye] AS [ReDye] - FROM [dbo].[POWDER_QUEUE] AS [POWDER_QUEUE] - - - SELECT - [REMOTETERMINAL].[tmp_field] AS [tmp_field], - [REMOTETERMINAL].[IDNO] AS [IDNO], - [REMOTETERMINAL].[FNDATE] AS [FNDATE], - [REMOTETERMINAL].[IDTYPE] AS [IDTYPE], - [REMOTETERMINAL].[FIRST_KEY] AS [FIRST_KEY], - [REMOTETERMINAL].[SECOND_KEY] AS [SECOND_KEY], - [REMOTETERMINAL].[ReDye] AS [ReDye] - FROM [dbo].[REMOTETERMINAL] AS [REMOTETERMINAL] - - - SELECT - [TEMPCHEMICALTKT].[tmp_field] AS [tmp_field], - [TEMPCHEMICALTKT].[IDNO] AS [IDNO], - [TEMPCHEMICALTKT].[FNDATE] AS [FNDATE], - [TEMPCHEMICALTKT].[IDTYPE] AS [IDTYPE], - [TEMPCHEMICALTKT].[FIRST_KEY] AS [FIRST_KEY], - [TEMPCHEMICALTKT].[SECOND_KEY] AS [SECOND_KEY], - [TEMPCHEMICALTKT].[ReDye] AS [ReDye] - FROM [dbo].[TEMPCHEMICALTKT] AS [TEMPCHEMICALTKT] - - - SELECT - [TEMPDYESTUFFTKT].[tmp_field] AS [tmp_field], - [TEMPDYESTUFFTKT].[IDNO] AS [IDNO], - [TEMPDYESTUFFTKT].[FNDATE] AS [FNDATE], - [TEMPDYESTUFFTKT].[IDTYPE] AS [IDTYPE], - [TEMPDYESTUFFTKT].[FIRST_KEY] AS [FIRST_KEY], - [TEMPDYESTUFFTKT].[SECOND_KEY] AS [SECOND_KEY], - [TEMPDYESTUFFTKT].[ReDye] AS [ReDye] - FROM [dbo].[TEMPDYESTUFFTKT] AS [TEMPDYESTUFFTKT] - - - SELECT - [TEMPPOWDER].[tmp_field] AS [tmp_field], - [TEMPPOWDER].[IDNO] AS [IDNO], - [TEMPPOWDER].[FNDATE] AS [FNDATE], - [TEMPPOWDER].[IDTYPE] AS [IDTYPE], - [TEMPPOWDER].[FIRST_KEY] AS [FIRST_KEY], - [TEMPPOWDER].[SECOND_KEY] AS [SECOND_KEY], - [TEMPPOWDER].[ReDye] AS [ReDye] - FROM [dbo].[TEMPPOWDER] AS [TEMPPOWDER] - - - SELECT - [TICKET_DETAIL].[ID_NO] AS [ID_NO], - [TICKET_DETAIL].[STEP_NO] AS [STEP_NO], - [TICKET_DETAIL].[PRODUCT_CODE] AS [PRODUCT_CODE], - [TICKET_DETAIL].[PRODUCT_TYPE] AS [PRODUCT_TYPE], - [TICKET_DETAIL].[TARGET_WT] AS [TARGET_WT], - [TICKET_DETAIL].[ACTUAL_WT] AS [ACTUAL_WT], - [TICKET_DETAIL].[UNIT] AS [UNIT], - [TICKET_DETAIL].[COMP_DATE] AS [COMP_DATE], - [TICKET_DETAIL].[COMP_TIME] AS [COMP_TIME], - [TICKET_DETAIL].[TRANSFER_STATE] AS [TRANSFER_STATE], - [TICKET_DETAIL].[ERROR_CODE] AS [ERROR_CODE], - [TICKET_DETAIL].[MACHINE] AS [MACHINE], - [TICKET_DETAIL].[TANK_NO] AS [TANK_NO], - [TICKET_DETAIL].[ID_TYPE] AS [ID_TYPE], - [TICKET_DETAIL].[PRODUCT_LOT] AS [PRODUCT_LOT], - [TICKET_DETAIL].[RECIPE_CODE] AS [RECIPE_CODE], - [TICKET_DETAIL].[LR] AS [LR], - [TICKET_DETAIL].[RECIPE_TYPE] AS [RECIPE_TYPE], - [TICKET_DETAIL].[CONC] AS [CONC], - [TICKET_DETAIL].[CONCUNIT] AS [CONCUNIT], - [TICKET_DETAIL].[REMARK] AS [REMARK], - [TICKET_DETAIL].[ADJUST] AS [ADJUST], - [TICKET_DETAIL].[PRICE] AS [PRICE], - [TICKET_DETAIL].[RES_DOUBLE1] AS [RES_DOUBLE1], - [TICKET_DETAIL].[RES_DOUBLE2] AS [RES_DOUBLE2], - [TICKET_DETAIL].[RES_DOUBLE3] AS [RES_DOUBLE3], - [TICKET_DETAIL].[RES_DOUBLE4] AS [RES_DOUBLE4], - [TICKET_DETAIL].[RES_STRING1] AS [RES_STRING1], - [TICKET_DETAIL].[RES_STRING2] AS [RES_STRING2], - [TICKET_DETAIL].[RES_STRING3] AS [RES_STRING3], - [TICKET_DETAIL].[RES_STRING4] AS [RES_STRING4], - [TICKET_DETAIL].[REWEIGHT] AS [REWEIGHT], - [TICKET_DETAIL].[Redye] AS [Redye], - [TICKET_DETAIL].[DyeWeightTime] AS [DyeWeightTime], - [TICKET_DETAIL].[UserAccount] AS [UserAccount], - [TICKET_DETAIL].[Batch_NO] AS [Batch_NO], - [TICKET_DETAIL].[lldmxid] AS [lldmxid], - [TICKET_DETAIL].[Station] AS [Station], - [TICKET_DETAIL].[UserCode] AS [UserCode], - [TICKET_DETAIL].[FABRIC_WEIGHT] AS [FABRIC_WEIGHT], - [TICKET_DETAIL].[VOLUME] AS [VOLUME], - [TICKET_DETAIL].[RECORD_ORDER] AS [RECORD_ORDER], - [TICKET_DETAIL].[Process] AS [Process], - [TICKET_DETAIL].[GRAVITY] AS [GRAVITY], - [TICKET_DETAIL].[CurrentStock] AS [CurrentStock] - FROM [dbo].[TICKET_DETAIL] AS [TICKET_DETAIL] - - - SELECT - [TicketSerial].[tmp_field] AS [tmp_field], - [TicketSerial].[ID_NO] AS [ID_NO], - [TicketSerial].[REDYE_NOW] AS [REDYE_NOW] - FROM [dbo].[TicketSerial] AS [TicketSerial] - - - SELECT - [UserAccount].[tmp_field] AS [tmp_field], - [UserAccount].[UserCode] AS [UserCode], - [UserAccount].[PassWord] AS [PassWord], - [UserAccount].[JobTicket] AS [JobTicket], - [UserAccount].[Report] AS [Report], - [UserAccount].[PathSetup] AS [PathSetup], - [UserAccount].[UserSetup] AS [UserSetup], - [UserAccount].[GROUP_CODE] AS [GROUP_CODE] - FROM [dbo].[UserAccount] AS [UserAccount] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Ticket.edmx.diagram b/Ticket.edmx.diagram deleted file mode 100644 index 5aefbd2..0000000 --- a/Ticket.edmx.diagram +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TicketSerial.cs b/TicketSerial.cs deleted file mode 100644 index 457be95..0000000 --- a/TicketSerial.cs +++ /dev/null @@ -1,21 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class TicketSerial - { - public string tmp_field { get; set; } - public string ID_NO { get; set; } - public int REDYE_NOW { get; set; } - } -} diff --git a/UserAccount.cs b/UserAccount.cs deleted file mode 100644 index b2efd05..0000000 --- a/UserAccount.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -namespace Audit -{ - using System; - using System.Collections.Generic; - - public partial class UserAccount - { - public string tmp_field { get; set; } - public string UserCode { get; set; } - public string PassWord { get; set; } - public Nullable JobTicket { get; set; } - public Nullable Report { get; set; } - public Nullable PathSetup { get; set; } - public Nullable UserSetup { get; set; } - public string GROUP_CODE { get; set; } - } -}