Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

Models/App.Config

@@ -3,8 +3,5 @@
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
-  <connectionStrings>
+	<connectionStrings><add name="TicketEntities" connectionString="metadata=res://*/SQL_Ti.csdl|res://*/SQL_Ti.ssdl|res://*/SQL_Ti.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SCSERVER\EXPRESS;initial catalog=Ticket;persist security info=True;user id=sa;password=SC971216@server;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /><add name="BatchDyeingCentralEntities" connectionString="metadata=res://*/SQL_BD.csdl|res://*/SQL_BD.ssdl|res://*/SQL_BD.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=scddns.f3322.net,21344;initial catalog=BatchDyeingCentral;persist security info=True;user id=sa;password=SC971216@server;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /></connectionStrings>
-    <add name="BatchDyeingCentralEntities" connectionString="metadata=res://*/SQL_BD.csdl|res://*/SQL_BD.ssdl|res://*/SQL_BD.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SCSERVER\EXPRESS;initial catalog=BatchDyeingCentral;persist security info=True;user id=sa;password=SC971216@server;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="TicketEntities" connectionString="metadata=res://*/SQL_Ti.csdl|res://*/SQL_Ti.ssdl|res://*/SQL_Ti.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SCSERVER\EXPRESS;initial catalog=Ticket;persist security info=True;user id=sa;password=SC971216@server;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-  </connectionStrings>
 </configuration>

Models/ProgramsUsed.cs → Models/AuxDslvQueue.cs

@@ -12,18 +12,18 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class ProgramsUsed
+    public partial class AuxDslvQueue
     {
-        public int ID { get; set; }
+        public Nullable<int> TankNo { get; set; }
         public string Dyelot { get; set; }
         public int ReDye { get; set; }
-        public string Program { get; set; }
+        public Nullable<int> StepNumber { get; set; }
-        public string Name { get; set; }
+        public string Station { get; set; }
-        public string Steps { get; set; }
+        public Nullable<int> Industry { get; set; }
-        public Nullable<int> StepsNoBpCrc { get; set; }
+        public Nullable<int> State { get; set; }
-        public Nullable<double> ComputedTime { get; set; }
-        public Nullable<int> MaxTemperature { get; set; }
         public string Machine { get; set; }
-        public System.DateTime StartTime { get; set; }
+        public string Volume { get; set; }
+        public Nullable<int> ShelfID { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
     }
 }

Models/AuxDslvQueueHistory.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class AuxDslvQueueHistory
+    {
+        public Nullable<int> TankNo { get; set; }
+        public string Dyelot { get; set; }
+        public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public string Station { get; set; }
+        public Nullable<int> Industry { get; set; }
+        public Nullable<int> State { get; set; }
+        public string Machine { get; set; }
+        public string Volume { get; set; }
+        public Nullable<int> ShelfID { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/BucketCrane.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class BucketCrane
+    {
+        public string Dyelot { get; set; }
+        public Nullable<int> ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<int> DevideNo { get; set; }
+        public Nullable<int> BucketNo { get; set; }
+        public string DID { get; set; }
+        public Nullable<int> State { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
+    }
+}

Models/BucketCraneHistory.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class BucketCraneHistory
+    {
+        public string Dyelot { get; set; }
+        public Nullable<int> ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<int> DevideNo { get; set; }
+        public Nullable<int> BucketNo { get; set; }
+        public string DID { get; set; }
+        public Nullable<int> State { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/BucketShelf.cs

@@ -28,5 +28,8 @@ namespace Models
         public Nullable<int> State { get; set; }
         public Nullable<System.DateTime> OnShelfTime { get; set; }
         public string UserAccount { get; set; }
+        public Nullable<int> Locked { get; set; }
+        public string ProductCode { get; set; }
+        public string OriginDyelot { get; set; }
     }
 }

Models/BucketShelfHistory.cs

@@ -28,5 +28,8 @@ namespace Models
         public Nullable<int> State { get; set; }
         public Nullable<System.DateTime> OnShelfTime { get; set; }
         public string UserAccount { get; set; }
+        public Nullable<int> Locked { get; set; }
+        public string ProductCode { get; set; }
+        public string OriginDyelot { get; set; }
     }
 }

Models/record.cs → Models/CleanDevice.cs

@@ -12,10 +12,10 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class record
+    public partial class CleanDevice
     {
-        public int ID { get; set; }
+        public string ID { get; set; }
-        public string record1 { get; set; }
+        public Nullable<int> State { get; set; }
-        public Nullable<System.DateTime> time { get; set; }
+        public Nullable<int> Enabled { get; set; }
     }
 }

Models/DBRDetail.cs

@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DBRDetail
+    {
+        public long ID { get; set; }
+        public string Dyelot { get; set; }
+        public int Redye { get; set; }
+        public int StepNumber { get; set; }
+        public string ProductCode { get; set; }
+        public string ProductName { get; set; }
+        public Nullable<double> Grams { get; set; }
+        public Nullable<double> DispenseGrams { get; set; }
+        public Nullable<int> Buckets { get; set; }
+        public System.DateTime DispenseStartTime { get; set; }
+        public Nullable<System.DateTime> DispenseEndTime { get; set; }
+        public Nullable<int> DispenseSeconds { get; set; }
+        public Nullable<System.DateTime> ProductStartTime { get; set; }
+        public Nullable<System.DateTime> ProductEndTime { get; set; }
+        public Nullable<int> ProductSeconds { get; set; }
+        public Nullable<double> LDXGrams { get; set; }
+        public Nullable<int> LDXBuckets { get; set; }
+        public Nullable<int> IsDeduct { get; set; }
+        public Nullable<int> DeductBox { get; set; }
+        public string BoxNo { get; set; }
+        public Nullable<int> DispenseResult { get; set; }
+        public Nullable<double> BucketWeight { get; set; }
+    }
+}

Models/DispenserEvent.cs

@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DispenserEvent
+    {
+        public int EventID { get; set; }
+        public Nullable<int> EventType { get; set; }
+        public string Dispenser { get; set; }
+        public string Device { get; set; }
+        public string Dyelot { get; set; }
+        public Nullable<int> ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<int> Code { get; set; }
+        public string Description { get; set; }
+        public string Description_BIG { get; set; }
+        public string Description_GB { get; set; }
+        public Nullable<System.DateTime> CreateDate { get; set; }
+        public Nullable<System.DateTime> ConfirmDate { get; set; }
+        public Nullable<System.DateTime> FinishDate { get; set; }
+        public string Shift { get; set; }
+        public string UserAccount { get; set; }
+    }
+}

Models/DispenserLifeStatus.cs

@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DispenserLifeStatus
+    {
+        public string Dispenser { get; set; }
+        public string Device { get; set; }
+        public Nullable<int> HeartBeat { get; set; }
+        public Nullable<int> LifeTime { get; set; }
+        public Nullable<System.DateTime> UpdateDate { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/DispenserUtilization.cs

@@ -15,7 +15,12 @@ namespace Models
     public partial class DispenserUtilization
     {
         public string Dispenser { get; set; }
-        public Nullable<System.DateTime> UtilDate { get; set; }
+        public string Device { get; set; }
+        public string Dyelot { get; set; }
+        public Nullable<int> ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<System.DateTime> UtilStartDate { get; set; }
+        public Nullable<System.DateTime> UtilEndDate { get; set; }
         public Nullable<int> UtilTimes { get; set; }
         public string UserAccount { get; set; }
     }

Models/Dispensers.cs

@@ -23,6 +23,9 @@ namespace Models
         public string Station { get; set; }
         public Nullable<int> State { get; set; }
         public string Status { get; set; }
+        public string Action { get; set; }
+        public string ProductCode { get; set; }
+        public Nullable<int> SN { get; set; }
         public Nullable<int> Automatic { get; set; }
         public Nullable<int> Enabled { get; set; }
         public Nullable<int> HeartBeat { get; set; }

Models/DissolveArt.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DissolveArt
+    {
+        public string Name { get; set; }
+        public Nullable<int> ProductClass { get; set; }
+        public Nullable<double> LiquidRatio { get; set; }
+        public Nullable<double> MinWeight { get; set; }
+        public Nullable<double> MaxWeight { get; set; }
+        public Nullable<int> DissolveTemperature { get; set; }
+        public Nullable<int> UseLiquidDye { get; set; }
+        public Nullable<int> UseChemical { get; set; }
+        public string Process { get; set; }
+        public Nullable<int> TankSize { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/DissolveArtHistory.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class DissolveArtHistory
+    {
+        public string Name { get; set; }
+        public Nullable<int> ProductClass { get; set; }
+        public Nullable<double> LiquidRatio { get; set; }
+        public Nullable<double> MinWeight { get; set; }
+        public Nullable<double> MaxWeight { get; set; }
+        public Nullable<int> DissolveTemperature { get; set; }
+        public Nullable<int> UseLiquidDye { get; set; }
+        public Nullable<int> UseChemical { get; set; }
+        public string Process { get; set; }
+        public Nullable<int> TankSize { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
+    }
+}

Models/Dyelots.cs

@@ -46,38 +46,22 @@ namespace Models
         public string ReferenceDyelot { get; set; }
         public Nullable<int> Final { get; set; }
         public Nullable<int> Shade { get; set; }
+        public Nullable<int> OnSchedule { get; set; }
+        public Nullable<int> DyeStep { get; set; }
+        public Nullable<short> PowderBlocked { get; set; }
+        public Nullable<int> PowderOnSchedule { get; set; }
+        public Nullable<int> PowderStep { get; set; }
+        public string DispensedVolume { get; set; }
+        public Nullable<int> Times { get; set; }
         public string UserAccount { get; set; }
         public string FabricName { get; set; }
+        public string ColorNo { get; set; }
         public string ColorName { get; set; }
         public string CustomerName { get; set; }
         public string CUSTOMER_CODE { get; set; }
         public string FABRIC_CODE { get; set; }
         public Nullable<double> GRAMS_YARD { get; set; }
-        public Nullable<int> NeedDissolving { get; set; }
-        public Nullable<System.DateTime> EarliestStartTime { get; set; }
-        public Nullable<short> Committed { get; set; }
-        public string Parameters { get; set; }
-        public string Notes { get; set; }
-        public Nullable<short> SummarizeResult { get; set; }
-        public string ProgramsUsed { get; set; }
-        public string ColorNo { get; set; }
         public Nullable<System.DateTime> ModifyDT { get; set; }
         public Nullable<System.DateTime> CreateDT { get; set; }
-        public Nullable<int> Yard { get; set; }
-        public string SheetNo { get; set; }
-        public Nullable<double> AlarmTime { get; set; }
-        public string ExRead { get; set; }
-        public string FactoryTicketNo { get; set; }
-        public string DyeingBatch { get; set; }
-        public string EOCAlarms { get; set; }
-        public Nullable<double> RunTime { get; set; }
-        public Nullable<double> ProcessTime { get; set; }
-        public Nullable<double> NormalTime { get; set; }
-        public Nullable<double> SleepTime { get; set; }
-        public Nullable<double> DelayTime { get; set; }
-        public string EOCDelays { get; set; }
-        public Nullable<short> DyelotStartShift { get; set; }
-        public Nullable<short> DyelotEndShift { get; set; }
-        public short DyeDissolving { get; set; }
     }
 }

Models/DyelotsBulkedRecipe.cs

@@ -57,8 +57,8 @@ namespace Models
         public Nullable<int> DissolveTemperature { get; set; }
         public Nullable<System.DateTime> SchDispenseTime { get; set; }
         public string UserAccount { get; set; }
-        public Nullable<int> TargetGrams { get; set; }
+        public Nullable<double> TargetGrams { get; set; }
-        public Nullable<int> ActualGrams { get; set; }
+        public Nullable<double> ActualGrams { get; set; }
         public Nullable<System.DateTime> FinishTime { get; set; }
         public string Tagged { get; set; }
         public Nullable<int> TotalBuckets { get; set; }
@@ -67,16 +67,19 @@ namespace Models
         public Nullable<double> Concentration { get; set; }
         public Nullable<int> DeductTotalBuckets { get; set; }
         public Nullable<int> DeductBuckets { get; set; }
-        public Nullable<double> Kilograms { get; set; }
+        public Nullable<int> Flow { get; set; }
-        public Nullable<double> DKilograms { get; set; }
+        public Nullable<System.DateTime> CallTime { get; set; }
-        public Nullable<int> DyelotID { get; set; }
+        public Nullable<double> BreakGrams { get; set; }
-        public Nullable<int> MixTemperature { get; set; }
+        public Nullable<int> RecoveryAction { get; set; }
-        public Nullable<int> MixVolume { get; set; }
+        public Nullable<int> SmallDye { get; set; }
-        public Nullable<int> MixTime { get; set; }
+        public string PrepareTank { get; set; }
-        public Nullable<int> MixWater { get; set; }
+        public Nullable<int> DeductBox { get; set; }
-        public Nullable<int> RoWater { get; set; }
+        public Nullable<int> Shade { get; set; }
-        public string Notes { get; set; }
+        public string stuffid { get; set; }
-        public Nullable<int> ProductIndex { get; set; }
+        public string tfname { get; set; }
-        public double GRAVITY { get; set; }
+        public string tftips { get; set; }
+        public string program { get; set; }
+        public Nullable<decimal> dosage { get; set; }
+        public string groupid { get; set; }
     }
 }

Models/Programs.cs → Models/LA571Tanks.cs

@@ -12,16 +12,12 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class Programs
+    public partial class LA571Tanks
     {
-        public string ProgramGroup { get; set; }
-        public int ProgramNumber { get; set; }
         public string Name { get; set; }
-        public string Steps { get; set; }
+        public string Station { get; set; }
-        public string Notes { get; set; }
+        public Nullable<int> Tank { get; set; }
-        public Nullable<System.DateTime> ModifiedTime { get; set; }
+        public Nullable<double> Volume { get; set; }
-        public Nullable<double> StandardTime { get; set; }
+        public Nullable<int> State { get; set; }
-    
-        public virtual ProgramGroups ProgramGroups { get; set; }
     }
 }

Models/LabDyeDslvQueue.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class LabDyeDslvQueue
+    {
+        public Nullable<int> TankNo { get; set; }
+        public string Dyelot { get; set; }
+        public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<int> State { get; set; }
+        public Nullable<int> ShelfID { get; set; }
+        public Nullable<int> DistID { get; set; }
+        public Nullable<System.DateTime> SchDispenseTime { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
+    }
+}

Models/LabDyeDslvQueueHistory.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class LabDyeDslvQueueHistory
+    {
+        public Nullable<int> TankNo { get; set; }
+        public string Dyelot { get; set; }
+        public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<int> State { get; set; }
+        public Nullable<int> ShelfID { get; set; }
+        public Nullable<int> DistID { get; set; }
+        public Nullable<System.DateTime> SchDispenseTime { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/Machines.cs

@@ -81,35 +81,8 @@ namespace Models
         public string CheDispenseDyelot { get; set; }
         public Nullable<int> CheDispenseReDye { get; set; }
         public Nullable<int> SampleDye { get; set; }
-        public string name1 { get; set; }
+        public string OnDevice { get; set; }
-        public string Parameters { get; set; }
+        public string PwdDispenseDyelot { get; set; }
-        public string ProgramGroup { get; set; }
+        public Nullable<int> PwdDispenseReDye { get; set; }
-        public string ReportGroup { get; set; }
-        public string PortAddress { get; set; }
-        public Nullable<short> Interrupt { get; set; }
-        public Nullable<short> NetworkNumber { get; set; }
-        public string SpecificMachineMimic { get; set; }
-        public Nullable<short> OutOfService { get; set; }
-        public Nullable<short> IsGhost { get; set; }
-        public Nullable<short> ManualDownloadOnly { get; set; }
-        public string LogicArtPort { get; set; }
-        public Nullable<short> GastonLoggedOn { get; set; }
-        public Nullable<short> DEnabled { get; set; }
-        public Nullable<short> DLookAhead { get; set; }
-        public Nullable<short> LogicArtUnlocked { get; set; }
-        public Nullable<short> MaximumGradient { get; set; }
-        public string LoggedOffReason { get; set; }
-        public string LoggedOffNotes { get; set; }
-        public Nullable<short> AutoDispense { get; set; }
-        public Nullable<short> AllowRemoteReschedule { get; set; }
-        public Nullable<short> CorrectionsAbove { get; set; }
-        public Nullable<short> Is161 { get; set; }
-        public Nullable<short> Locked { get; set; }
-        public Nullable<short> AutoDownloadParams { get; set; }
-        public Nullable<short> NoAutoDownloadMessages { get; set; }
-        public string TonelloIP { get; set; }
-        public string Test { get; set; }
-        public string MainTemperature { get; set; }
-        public Nullable<int> CallType { get; set; }
     }
 }

Models/MachinesHistory.cs

@@ -41,6 +41,10 @@ namespace Models
         public Nullable<int> HostRead { get; set; }
         public string DyeDispenseDyelot { get; set; }
         public Nullable<int> DyeDispenseReDye { get; set; }
+        public string CheDispenseDyelot { get; set; }
+        public Nullable<int> CheDispenseReDye { get; set; }
+        public string PwdDispenseDyelot { get; set; }
+        public Nullable<int> PwdDispenseReDye { get; set; }
         public Nullable<System.DateTime> Updated { get; set; }
     }
 }

Models/MachinesHistoryOld.cs

@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class MachinesHistoryOld
+    {
+        public string Machine { get; set; }
+        public string DispenseDyelot { get; set; }
+        public Nullable<int> DispenseReDye { get; set; }
+        public Nullable<int> ChemicalCallOff { get; set; }
+        public Nullable<int> ChemicalState { get; set; }
+        public Nullable<int> ChemicalTank { get; set; }
+        public Nullable<int> ChemicalTankSize { get; set; }
+        public string ChemicalDispenser { get; set; }
+        public Nullable<int> ChemicalError { get; set; }
+        public Nullable<int> ChemicalCallOff2 { get; set; }
+        public Nullable<int> ChemicalState2 { get; set; }
+        public Nullable<int> ChemicalTank2 { get; set; }
+        public Nullable<int> DyeCallOff { get; set; }
+        public Nullable<int> DyeState { get; set; }
+        public Nullable<int> DyeTank { get; set; }
+        public Nullable<int> DyeTankSize { get; set; }
+        public string DyeDispenser { get; set; }
+        public Nullable<int> DyeError { get; set; }
+        public Nullable<int> PowderCallOff { get; set; }
+        public Nullable<int> PowderState { get; set; }
+        public Nullable<int> PowderTank { get; set; }
+        public Nullable<int> PowderTankSize { get; set; }
+        public string PowderDispenser { get; set; }
+        public Nullable<int> PowderError { get; set; }
+        public Nullable<int> HostRead { get; set; }
+        public string DyeDispenseDyelot { get; set; }
+        public Nullable<int> DyeDispenseReDye { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
+    }
+}

Models/Models.csproj

@@ -68,7 +68,16 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Alarms.cs">
+    <Compile Include="AuxDslvQueue.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="AuxDslvQueueHistory.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="BucketCrane.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="BucketCraneHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="BucketInfo.cs">
@@ -86,10 +95,16 @@
     <Compile Include="BucketShelfQueueHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="Customize.cs">
+    <Compile Include="CleanDevice.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DBRDetail.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="Delays.cs">
+    <Compile Include="DispenserEvent.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DispenserLifeStatus.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="Dispensers.cs">
@@ -98,6 +113,12 @@
     <Compile Include="DispenserUtilization.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
+    <Compile Include="DissolveArt.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DissolveArtHistory.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
     <Compile Include="DyelotBuckets.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
@@ -119,25 +140,19 @@
     <Compile Include="DyelotHead.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="DyelotHistories.cs">
-      <DependentUpon>SQL_BD.tt</DependentUpon>
-    </Compile>
     <Compile Include="Dyelots.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="DyelotsBatch.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="DyelotsBulkedRecipeProvider.cs" />
     <Compile Include="DyelotsBulkedRecipe.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="DyelotsBulkedRecipeHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="DyelotsByShift.cs">
+    <Compile Include="DyelotsBulkedRecipeProvider.cs" />
-      <DependentUpon>SQL_BD.tt</DependentUpon>
-    </Compile>
     <Compile Include="DyelotsHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
@@ -152,12 +167,24 @@
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="IProvider.cs" />
+    <Compile Include="LA571Tanks.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="LabDyeDslvQueue.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="LabDyeDslvQueueHistory.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
     <Compile Include="Machines.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="MachinesHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
+    <Compile Include="MachinesHistoryOld.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
     <Compile Include="MachinesProvider.cs" />
     <Compile Include="MachineState.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
@@ -177,7 +204,10 @@
     <Compile Include="PartsStatusHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="PipeHistory.cs">
+    <Compile Include="PipeRefill.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="PipeRefillHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="Pipes.cs">
@@ -186,16 +216,13 @@
     <Compile Include="Product.cs">
       <DependentUpon>SQL_Ti.tt</DependentUpon>
     </Compile>
-    <Compile Include="ProductProvider.cs" />
+    <Compile Include="ProductLocation.cs">
-    <Compile Include="ProgramGroups.cs">
-      <DependentUpon>SQL_BD.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Programs.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="ProgramsUsed.cs">
+    <Compile Include="ProductLocationHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
+    <Compile Include="ProductProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RecipeDeduct.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
@@ -203,18 +230,36 @@
     <Compile Include="RecipeDeductHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
-    <Compile Include="record.cs">
+    <Compile Include="RecipeDetail.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Recipes.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="RFIDRecordQueue.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
+    <Compile Include="RFIDRecordQueueHistory.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="SampleDyeDslvQueue.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
     <Compile Include="SampleDyeDslvQueueHistory.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
+    <Compile Include="ScheduledDyelot.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
+    <Compile Include="ScheduledDyelotHistory.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
     <Compile Include="SchedulingLog.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
+    <Compile Include="Shelf.cs">
+      <DependentUpon>SQL_BD.tt</DependentUpon>
+    </Compile>
     <Compile Include="SQL_BD.Context.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -245,13 +290,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>SQL_Ti.edmx</DependentUpon>
     </Compile>
-    <Compile Include="Steps.cs">
+    <Compile Include="TagShelf.cs">
-      <DependentUpon>SQL_BD.tt</DependentUpon>
-    </Compile>
-    <Compile Include="StepVisits.cs">
-      <DependentUpon>SQL_BD.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Stoppages.cs">
       <DependentUpon>SQL_BD.tt</DependentUpon>
     </Compile>
     <Compile Include="UserAccount.cs">
@@ -260,21 +299,19 @@
     <Compile Include="UserAccountProvide.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.Config" />
+    <None Include="packages.config" />
+    <EntityDeploy Include="SQL_Ti.edmx">
+      <Generator>EntityModelCodeGenerator</Generator>
+      <LastGenOutput>SQL_Ti.Designer.cs</LastGenOutput>
+    </EntityDeploy>
     <EntityDeploy Include="SQL_BD.edmx">
       <Generator>EntityModelCodeGenerator</Generator>
       <LastGenOutput>SQL_BD.Designer.cs</LastGenOutput>
     </EntityDeploy>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.Config" />
-    <None Include="packages.config" />
     <None Include="SQL_BD.edmx.diagram">
       <DependentUpon>SQL_BD.edmx</DependentUpon>
     </None>
-    <EntityDeploy Include="SQL_Ti.edmx">
-      <Generator>EntityModelCodeGenerator</Generator>
-      <LastGenOutput>SQL_Ti.Designer.cs</LastGenOutput>
-    </EntityDeploy>
     <None Include="SQL_Ti.edmx.diagram">
       <DependentUpon>SQL_Ti.edmx</DependentUpon>
     </None>
@@ -282,8 +319,8 @@
   <ItemGroup>
     <Content Include="SQL_BD.Context.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>SQL_BD.Context.cs</LastGenOutput>
       <DependentUpon>SQL_BD.edmx</DependentUpon>
+      <LastGenOutput>SQL_BD.Context.cs</LastGenOutput>
     </Content>
     <Content Include="SQL_BD.tt">
       <Generator>TextTemplatingFileGenerator</Generator>

Models/PartsStatus.cs

@@ -16,6 +16,7 @@ namespace Models
     {
         public string CUST_CODE { get; set; }
         public string Dispenser { get; set; }
+        public string Device { get; set; }
         public string PartsCode { get; set; }
         public string PartsName { get; set; }
         public Nullable<int> PartsType { get; set; }

Models/PartsStatusHistory.cs

@@ -16,6 +16,7 @@ namespace Models
     {
         public string CUST_CODE { get; set; }
         public string Dispenser { get; set; }
+        public string Device { get; set; }
         public string PartsCode { get; set; }
         public string PartsName { get; set; }
         public Nullable<int> PartsType { get; set; }

Models/PipeRefill.cs

@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class PipeRefill
+    {
+        public string ProductCode { get; set; }
+        public string ProductName { get; set; }
+        public Nullable<int> ProductType { get; set; }
+        public string ProductLot { get; set; }
+        public string Dispenser { get; set; }
+        public Nullable<int> No { get; set; }
+        public Nullable<double> Qty { get; set; }
+        public Nullable<double> Percentage { get; set; }
+        public Nullable<System.DateTime> RefillTime { get; set; }
+        public Nullable<System.DateTime> AlarmTime { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
+    }
+}

Models/PipeHistory.cs → Models/PipeRefillHistory.cs

@@ -12,16 +12,17 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class PipeHistory
+    public partial class PipeRefillHistory
     {
         public string ProductCode { get; set; }
         public string ProductName { get; set; }
         public Nullable<int> ProductType { get; set; }
+        public string ProductLot { get; set; }
         public string Dispenser { get; set; }
         public Nullable<int> No { get; set; }
         public Nullable<double> Qty { get; set; }
-        public Nullable<System.DateTime> StartTime { get; set; }
+        public Nullable<double> Percentage { get; set; }
-        public Nullable<System.DateTime> EndTime { get; set; }
+        public Nullable<System.DateTime> RefillTime { get; set; }
         public Nullable<System.DateTime> AlarmTime { get; set; }
         public Nullable<System.DateTime> Created { get; set; }
     }

Models/Pipes.cs

@@ -17,6 +17,7 @@ namespace Models
         public string ProductCode { get; set; }
         public string ProductName { get; set; }
         public Nullable<int> ProductType { get; set; }
+        public string ProductLot { get; set; }
         public string Dispenser { get; set; }
         public Nullable<int> Enabled { get; set; }
         public Nullable<int> No { get; set; }

Models/ProductLocation.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class ProductLocation
+    {
+        public string ProductCode { get; set; }
+        public string ProductName { get; set; }
+        public string Type { get; set; }
+        public string Dispenser { get; set; }
+        public Nullable<int> Position { get; set; }
+        public string TablePosition { get; set; }
+        public Nullable<System.DateTime> StockDate { get; set; }
+        public Nullable<double> StockUsage { get; set; }
+        public Nullable<double> StockOnHand { get; set; }
+        public string Alarm { get; set; }
+        public Nullable<System.DateTime> AlarmTime { get; set; }
+        public Nullable<int> Enabled { get; set; }
+    }
+}

Models/ProductLocationHistory.cs

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class ProductLocationHistory
+    {
+        public string ProductCode { get; set; }
+        public string ProductName { get; set; }
+        public string Type { get; set; }
+        public string Dispenser { get; set; }
+        public Nullable<int> Position { get; set; }
+        public string TablePosition { get; set; }
+        public Nullable<System.DateTime> StockDate { get; set; }
+        public Nullable<double> StockUsage { get; set; }
+        public Nullable<double> StockOnHand { get; set; }
+        public string Alarm { get; set; }
+        public Nullable<System.DateTime> AlarmTime { get; set; }
+        public Nullable<int> Enabled { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
+    }
+}

Models/ProgramGroups.cs

@@ -1,40 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Models
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class ProgramGroups
-    {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public ProgramGroups()
-        {
-            this.Programs = new HashSet<Programs>();
-        }
-    
-        public string Name { get; set; }
-        public string UserPrompts { get; set; }
-        public byte[] TypeLibrary { get; set; }
-        public string Sections { get; set; }
-        public Nullable<int> MaximumPrograms { get; set; }
-        public Nullable<short> OutOfService { get; set; }
-        public string DyelotParameterCommands { get; set; }
-        public string CommandHelp { get; set; }
-        public string UsesProgramsFromGroup { get; set; }
-        public Nullable<short> MaximumGradient { get; set; }
-        public Nullable<short> QQMinutes { get; set; }
-        public Nullable<short> MessageMinutes { get; set; }
-        public string Inefficiencies { get; set; }
-    
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Programs> Programs { get; set; }
-    }
-}

Models/RFIDRecordQueue.cs

@@ -24,6 +24,9 @@ namespace Models
         public Nullable<int> State { get; set; }
         public Nullable<int> BucketNo { get; set; }
         public string DID { get; set; }
+        public string Source { get; set; }
+        public string Dest { get; set; }
+        public string ProductCode { get; set; }
         public Nullable<System.DateTime> Updated { get; set; }
     }
 }

Models/RFIDRecordQueueHistory.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class RFIDRecordQueueHistory
+    {
+        public Nullable<int> Station { get; set; }
+        public string Dyelot { get; set; }
+        public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public string Machine { get; set; }
+        public Nullable<int> DevideNo { get; set; }
+        public Nullable<int> TotalBuckets { get; set; }
+        public Nullable<int> State { get; set; }
+        public Nullable<int> BucketNo { get; set; }
+        public string DID { get; set; }
+        public string ProductCode { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/RecipeDetail.cs

@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class RecipeDetail
+    {
+        public string RcpCode { get; set; }
+        public string ProductCode { get; set; }
+        public string ProductName { get; set; }
+        public Nullable<double> Conc { get; set; }
+        public Nullable<int> HostRead { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
+    }
+}

Models/Customize.cs → Models/Recipes.cs

@@ -12,12 +12,11 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class Customize
+    public partial class Recipes
     {
-        public int AutoKey { get; set; }
+        public string RcpCode { get; set; }
-        public string StoppageReasons { get; set; }
+        public string RcpName { get; set; }
-        public string Inefficiencies { get; set; }
+        public string Unit { get; set; }
-        public string Company { get; set; }
+        public Nullable<System.DateTime> Created { get; set; }
-        public string Shifts { get; set; }
     }
 }

Models/SQL_BD.Context.cs

@@ -25,30 +25,29 @@ namespace Models
             throw new UnintentionalCodeFirstException();
         }
     
-        public virtual DbSet<Alarms> Alarms { get; set; }
+        public virtual DbSet<DBRDetail> DBRDetail { get; set; }
-        public virtual DbSet<Customize> Customize { get; set; }
-        public virtual DbSet<Delays> Delays { get; set; }
         public virtual DbSet<DyelotHead> DyelotHead { get; set; }
-        public virtual DbSet<DyelotHistories> DyelotHistories { get; set; }
         public virtual DbSet<Dyelots> Dyelots { get; set; }
-        public virtual DbSet<DyelotsByShift> DyelotsByShift { get; set; }
+        public virtual DbSet<DyelotsBulkedRecipe> DyelotsBulkedRecipe { get; set; }
         public virtual DbSet<Machines> Machines { get; set; }
         public virtual DbSet<MachineState> MachineState { get; set; }
-        public virtual DbSet<ProgramGroups> ProgramGroups { get; set; }
-        public virtual DbSet<Programs> Programs { get; set; }
-        public virtual DbSet<ProgramsUsed> ProgramsUsed { get; set; }
-        public virtual DbSet<record> record { get; set; }
         public virtual DbSet<SchedulingLog> SchedulingLog { get; set; }
-        public virtual DbSet<Steps> Steps { get; set; }
+        public virtual DbSet<AuxDslvQueue> AuxDslvQueue { get; set; }
-        public virtual DbSet<StepVisits> StepVisits { get; set; }
+        public virtual DbSet<AuxDslvQueueHistory> AuxDslvQueueHistory { get; set; }
-        public virtual DbSet<Stoppages> Stoppages { get; set; }
+        public virtual DbSet<BucketCrane> BucketCrane { get; set; }
+        public virtual DbSet<BucketCraneHistory> BucketCraneHistory { get; set; }
         public virtual DbSet<BucketInfo> BucketInfo { get; set; }
         public virtual DbSet<BucketShelf> BucketShelf { get; set; }
         public virtual DbSet<BucketShelfHistory> BucketShelfHistory { get; set; }
         public virtual DbSet<BucketShelfQueue> BucketShelfQueue { get; set; }
         public virtual DbSet<BucketShelfQueueHistory> BucketShelfQueueHistory { get; set; }
+        public virtual DbSet<CleanDevice> CleanDevice { get; set; }
+        public virtual DbSet<DispenserEvent> DispenserEvent { get; set; }
+        public virtual DbSet<DispenserLifeStatus> DispenserLifeStatus { get; set; }
         public virtual DbSet<Dispensers> Dispensers { get; set; }
         public virtual DbSet<DispenserUtilization> DispenserUtilization { get; set; }
+        public virtual DbSet<DissolveArt> DissolveArt { get; set; }
+        public virtual DbSet<DissolveArtHistory> DissolveArtHistory { get; set; }
         public virtual DbSet<DyelotBuckets> DyelotBuckets { get; set; }
         public virtual DbSet<DyelotBucketsHistory> DyelotBucketsHistory { get; set; }
         public virtual DbSet<DyelotBucketSummary> DyelotBucketSummary { get; set; }
@@ -56,23 +55,37 @@ namespace Models
         public virtual DbSet<DyelotDslvQueue> DyelotDslvQueue { get; set; }
         public virtual DbSet<DyelotDslvQueueHistory> DyelotDslvQueueHistory { get; set; }
         public virtual DbSet<DyelotsBatch> DyelotsBatch { get; set; }
-        public virtual DbSet<DyelotsBulkedRecipe> DyelotsBulkedRecipe { get; set; }
         public virtual DbSet<DyelotsBulkedRecipeHistory> DyelotsBulkedRecipeHistory { get; set; }
         public virtual DbSet<DyelotsHistory> DyelotsHistory { get; set; }
         public virtual DbSet<DyelotsInAuto> DyelotsInAuto { get; set; }
         public virtual DbSet<DyelotsInAutoHistory> DyelotsInAutoHistory { get; set; }
         public virtual DbSet<EventList> EventList { get; set; }
+        public virtual DbSet<LA571Tanks> LA571Tanks { get; set; }
+        public virtual DbSet<LabDyeDslvQueue> LabDyeDslvQueue { get; set; }
+        public virtual DbSet<LabDyeDslvQueueHistory> LabDyeDslvQueueHistory { get; set; }
         public virtual DbSet<MachinesHistory> MachinesHistory { get; set; }
+        public virtual DbSet<MachinesHistoryOld> MachinesHistoryOld { get; set; }
         public virtual DbSet<MachineStateHistory> MachineStateHistory { get; set; }
         public virtual DbSet<ManualWeightQueue> ManualWeightQueue { get; set; }
         public virtual DbSet<ManualWeightQueueHistory> ManualWeightQueueHistory { get; set; }
         public virtual DbSet<PartsStatus> PartsStatus { get; set; }
         public virtual DbSet<PartsStatusHistory> PartsStatusHistory { get; set; }
-        public virtual DbSet<PipeHistory> PipeHistory { get; set; }
+        public virtual DbSet<PipeRefill> PipeRefill { get; set; }
+        public virtual DbSet<PipeRefillHistory> PipeRefillHistory { get; set; }
         public virtual DbSet<Pipes> Pipes { get; set; }
+        public virtual DbSet<ProductLocation> ProductLocation { get; set; }
+        public virtual DbSet<ProductLocationHistory> ProductLocationHistory { get; set; }
         public virtual DbSet<RecipeDeduct> RecipeDeduct { get; set; }
         public virtual DbSet<RecipeDeductHistory> RecipeDeductHistory { get; set; }
+        public virtual DbSet<RecipeDetail> RecipeDetail { get; set; }
+        public virtual DbSet<Recipes> Recipes { get; set; }
         public virtual DbSet<RFIDRecordQueue> RFIDRecordQueue { get; set; }
+        public virtual DbSet<RFIDRecordQueueHistory> RFIDRecordQueueHistory { get; set; }
+        public virtual DbSet<SampleDyeDslvQueue> SampleDyeDslvQueue { get; set; }
         public virtual DbSet<SampleDyeDslvQueueHistory> SampleDyeDslvQueueHistory { get; set; }
+        public virtual DbSet<ScheduledDyelot> ScheduledDyelot { get; set; }
+        public virtual DbSet<ScheduledDyelotHistory> ScheduledDyelotHistory { get; set; }
+        public virtual DbSet<Shelf> Shelf { get; set; }
+        public virtual DbSet<TagShelf> TagShelf { get; set; }
     }
 }

Models/SQL_BD.Designer.cs

@@ -1,4 +1,4 @@
-// 为模型“C:\Users\24018\source\repos\Audit_APP\Models\SQL_BD.edmx”启用了 T4 代码生成。
+// 为模型“C:\Users\尚彩-沈忱\source\repos\Audit_APP\Models\SQL_BD.edmx”启用了 T4 代码生成。
 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值
 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
 // “属性”窗口中。

Models/SQL_BD.edmx.diagram

@@ -4,57 +4,69 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="ba808e87d99646bab9fba0afc7823f2a" Name="Diagram1">
+      <Diagram DiagramId="b36b8a03bd1f4d3fa1db2360f80bde25" Name="Diagram1" ZoomLevel="75">
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Alarms" Width="1.5" PointX="5.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DBRDetail" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Customize" Width="1.5" PointX="0.75" PointY="5.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotHead" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Delays" Width="1.5" PointX="2.75" PointY="5.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.Dyelots" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotHead" Width="1.5" PointX="5.75" PointY="4.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsBulkedRecipe" Width="1.5" PointX="6.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotHistories" Width="1.5" PointX="7.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.Machines" Width="1.5" PointX="8.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Dyelots" Width="1.5" PointX="7.75" PointY="3.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachineState" Width="1.5" PointX="10.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsByShift" Width="1.5" PointX="9.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.SchedulingLog" Width="1.5" PointX="10.75" PointY="6.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Machines" Width="1.5" PointX="0.75" PointY="9.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.AuxDslvQueue" Width="1.5" PointX="10.75" PointY="10.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachineState" Width="1.5" PointX="2.75" PointY="9.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.AuxDslvQueueHistory" Width="1.5" PointX="0.75" PointY="11.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.ProgramGroups" Width="1.5" PointX="0.75" PointY="1" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketCrane" Width="1.5" PointX="2.75" PointY="11.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Programs" Width="1.5" PointX="3" PointY="1.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketCraneHistory" Width="1.5" PointX="12.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.ProgramsUsed" Width="1.5" PointX="9.75" PointY="4.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketInfo" Width="1.5" PointX="12.75" PointY="4.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.record" Width="1.5" PointX="9.75" PointY="8.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelf" Width="1.5" PointX="12.75" PointY="7.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.SchedulingLog" Width="1.5" PointX="11.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelfHistory" Width="1.5" PointX="12.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Steps" Width="1.5" PointX="11.75" PointY="4.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelfQueue" Width="1.5" PointX="14.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.StepVisits" Width="1.5" PointX="11.75" PointY="9.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelfQueueHistory" Width="1.5" PointX="14.75" PointY="4.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Stoppages" Width="1.5" PointX="13.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.CleanDevice" Width="1.5" PointX="14.75" PointY="8.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketInfo" Width="1.5" PointX="15.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DispenserEvent" Width="1.5" PointX="14.75" PointY="11.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelf" Width="1.5" PointX="2.75" PointY="15.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DispenserLifeStatus" Width="1.5" PointX="0.75" PointY="15.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelfHistory" Width="1.5" PointX="15.75" PointY="3.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.Dispensers" Width="1.5" PointX="2.75" PointY="15.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelfQueue" Width="1.5" PointX="4.75" PointY="15.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DispenserUtilization" Width="1.5" PointX="4.75" PointY="15.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.BucketShelfQueueHistory" Width="1.5" PointX="15.75" PointY="8.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DissolveArt" Width="1.5" PointX="6.75" PointY="15.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Dispensers" Width="1.5" PointX="9.75" PointY="16.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DissolveArtHistory" Width="1.5" PointX="8.75" PointY="15.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DispenserUtilization" Width="1.5" PointX="17.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotBuckets" Width="1.5" PointX="16.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotBuckets" Width="1.5" PointX="17.75" PointY="3.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotBucketsHistory" Width="1.5" PointX="16.75" PointY="4.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotBucketsHistory" Width="1.5" PointX="6.75" PointY="17.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotBucketSummary" Width="1.5" PointX="16.75" PointY="8.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotBucketSummary" Width="1.5" PointX="17.75" PointY="7.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotDetail" Width="1.5" PointX="16.75" PointY="11.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotDetail" Width="1.5" PointX="17.75" PointY="10.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotDslvQueue" Width="1.5" PointX="10.75" PointY="17.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotDslvQueue" Width="1.5" PointX="17.75" PointY="16.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotDslvQueueHistory" Width="1.5" PointX="12.75" PointY="17.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotDslvQueueHistory" Width="1.5" PointX="19.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsBatch" Width="1.5" PointX="14.75" PointY="17.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsBatch" Width="1.5" PointX="19.75" PointY="4.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsBulkedRecipeHistory" Width="1.5" PointX="16.75" PointY="17.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsBulkedRecipe" Width="1.5" PointX="19.75" PointY="10.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsHistory" Width="1.5" PointX="18.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsBulkedRecipeHistory" Width="1.5" PointX="2.75" PointY="20.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsInAuto" Width="1.5" PointX="18.75" PointY="9.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsHistory" Width="1.5" PointX="11.75" PointY="20.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsInAutoHistory" Width="1.5" PointX="18.75" PointY="13.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsInAuto" Width="1.5" PointX="13.75" PointY="20.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.EventList" Width="1.5" PointX="18.75" PointY="17.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.DyelotsInAutoHistory" Width="1.5" PointX="15.75" PointY="20.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.LA571Tanks" Width="1.5" PointX="4.75" PointY="19.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.EventList" Width="1.5" PointX="21.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.LabDyeDslvQueue" Width="1.5" PointX="6.75" PointY="19.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachinesHistory" Width="1.5" PointX="6.75" PointY="21.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.LabDyeDslvQueueHistory" Width="1.5" PointX="20.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachineStateHistory" Width="1.5" PointX="8.75" PointY="21.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachinesHistory" Width="1.5" PointX="20.75" PointY="4.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.ManualWeightQueue" Width="1.5" PointX="21.75" PointY="10.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachinesHistoryOld" Width="1.5" PointX="20.75" PointY="12.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.ManualWeightQueueHistory" Width="1.5" PointX="21.75" PointY="14.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.MachineStateHistory" Width="1.5" PointX="18.75" PointY="20.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.PartsStatus" Width="1.5" PointX="21.75" PointY="18.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.ManualWeightQueue" Width="1.5" PointX="20.75" PointY="19.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.PartsStatusHistory" Width="1.5" PointX="23.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.ManualWeightQueueHistory" Width="1.5" PointX="0.75" PointY="21.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.PipeHistory" Width="1.5" PointX="23.75" PointY="9.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.PartsStatus" Width="1.5" PointX="8.75" PointY="21.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.Pipes" Width="1.5" PointX="23.75" PointY="13.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.PartsStatusHistory" Width="1.5" PointX="10.75" PointY="21.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.RecipeDeduct" Width="1.5" PointX="23.75" PointY="18.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.PipeRefill" Width="1.5" PointX="22.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.RecipeDeductHistory" Width="1.5" PointX="21.75" PointY="23.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.PipeRefillHistory" Width="1.5" PointX="2.75" PointY="22.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.RFIDRecordQueue" Width="1.5" PointX="23.75" PointY="22.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.Pipes" Width="1.5" PointX="22.75" PointY="4.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="BatchDyeingCentralModel.SampleDyeDslvQueueHistory" Width="1.5" PointX="17.75" PointY="24.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.ProductLocation" Width="1.5" PointX="22.75" PointY="9.75" IsExpanded="true" />
-        <AssociationConnector Association="BatchDyeingCentralModel.FKProgramGroups" ManuallyRouted="false" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.ProductLocationHistory" Width="1.5" PointX="22.75" PointY="13.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.RecipeDeduct" Width="1.5" PointX="22.75" PointY="18.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.RecipeDeductHistory" Width="1.5" PointX="22.75" PointY="22.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.RecipeDetail" Width="1.5" PointX="4.75" PointY="23.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.Recipes" Width="1.5" PointX="12.75" PointY="23.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.RFIDRecordQueue" Width="1.5" PointX="24.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.RFIDRecordQueueHistory" Width="1.5" PointX="24.75" PointY="5.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.SampleDyeDslvQueue" Width="1.5" PointX="24.75" PointY="9.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.SampleDyeDslvQueueHistory" Width="1.5" PointX="24.75" PointY="13.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.ScheduledDyelot" Width="1.5" PointX="24.75" PointY="17.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.ScheduledDyelotHistory" Width="1.5" PointX="24.75" PointY="21.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.Shelf" Width="1.5" PointX="24.75" PointY="25.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="BatchDyeingCentralModel.TagShelf" Width="1.5" PointX="26.75" PointY="0.75" IsExpanded="true" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

Models/DyelotsByShift.cs → Models/SampleDyeDslvQueue.cs

@@ -12,16 +12,17 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class DyelotsByShift
+    public partial class SampleDyeDslvQueue
     {
-        public int ID { get; set; }
+        public Nullable<int> TankNo { get; set; }
         public string Dyelot { get; set; }
         public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public Nullable<int> State { get; set; }
+        public Nullable<int> PassAuto { get; set; }
+        public Nullable<int> ShelfID { get; set; }
         public string Machine { get; set; }
-        public System.DateTime StartTime { get; set; }
+        public Nullable<System.DateTime> SchDispenseTime { get; set; }
-        public System.DateTime EndTime { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
-        public double Duration { get; set; }
-        public string Shift { get; set; }
-        public string SingleShift { get; set; }
     }
 }

Models/Alarms.cs → Models/ScheduledDyelot.cs

@@ -12,18 +12,18 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class Alarms
+    public partial class ScheduledDyelot
     {
         public int ID { get; set; }
         public string Dyelot { get; set; }
         public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public string Process { get; set; }
+        public string Dispenser { get; set; }
         public string Machine { get; set; }
-        public string Name { get; set; }
+        public Nullable<int> TankNo { get; set; }
-        public string Category { get; set; }
+        public Nullable<System.DateTime> ScheduledTime { get; set; }
-        public string Variable { get; set; }
+        public string Checked { get; set; }
-        public System.DateTime StartTime { get; set; }
+        public string UserAccount { get; set; }
-        public System.DateTime EndTime { get; set; }
-        public double Duration { get; set; }
-        public string Shift { get; set; }
     }
 }

Models/Delays.cs → Models/ScheduledDyelotHistory.cs

@@ -12,17 +12,19 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class Delays
+    public partial class ScheduledDyelotHistory
     {
         public int ID { get; set; }
         public string Dyelot { get; set; }
         public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public string Process { get; set; }
+        public string Dispenser { get; set; }
         public string Machine { get; set; }
-        public string Name { get; set; }
+        public Nullable<int> TankNo { get; set; }
-        public int Number { get; set; }
+        public Nullable<System.DateTime> ScheduledTime { get; set; }
-        public System.DateTime StartTime { get; set; }
+        public string Checked { get; set; }
-        public System.DateTime EndTime { get; set; }
+        public string UserAccount { get; set; }
-        public double Duration { get; set; }
+        public Nullable<System.DateTime> Updated { get; set; }
-        public string Shift { get; set; }
     }
 }

Models/DyelotHistories.cs → Models/Shelf.cs

@@ -12,10 +12,10 @@ namespace Models
     using System;
     using System.Collections.Generic;
     
-    public partial class DyelotHistories
+    public partial class Shelf
     {
-        public string Dyelot { get; set; }
+        public int ShelfID { get; set; }
-        public int ReDye { get; set; }
+        public Nullable<int> MaxLayer { get; set; }
-        public byte[] History { get; set; }
+        public Nullable<int> MaxPosition { get; set; }
     }
 }

Models/StepVisits.cs

@@ -1,42 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Models
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class StepVisits
-    {
-        public int ID { get; set; }
-        public string Dyelot { get; set; }
-        public int ReDye { get; set; }
-        public string Machine { get; set; }
-        public Nullable<int> OverallStepNumber { get; set; }
-        public string XX { get; set; }
-        public string Parameter1 { get; set; }
-        public string Parameter2 { get; set; }
-        public string Parameter3 { get; set; }
-        public string Parameter4 { get; set; }
-        public string Parameter5 { get; set; }
-        public string Command { get; set; }
-        public string Parameters { get; set; }
-        public string Notes { get; set; }
-        public System.DateTime StartTime { get; set; }
-        public System.DateTime EndTime { get; set; }
-        public double Duration { get; set; }
-        public Nullable<double> PlannedDuration { get; set; }
-        public Nullable<double> OverRun { get; set; }
-        public Nullable<int> TemperatureAfter { get; set; }
-        public string ProgramNumber { get; set; }
-        public Nullable<int> StepNumber { get; set; }
-        public Nullable<int> StartTemperature { get; set; }
-        public Nullable<int> EndTemperature { get; set; }
-    }
-}

Models/Steps.cs

@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Models
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Steps
-    {
-        public int ID { get; set; }
-        public string Dyelot { get; set; }
-        public int ReDye { get; set; }
-        public string Machine { get; set; }
-        public Nullable<int> OverallStepNumber { get; set; }
-        public string XX { get; set; }
-        public string ParameterValues { get; set; }
-        public string Command { get; set; }
-        public string Parameters { get; set; }
-        public string Notes { get; set; }
-        public Nullable<double> PlannedDuration { get; set; }
-        public Nullable<double> ActualDuration { get; set; }
-        public Nullable<double> OverRun { get; set; }
-        public Nullable<int> TemperatureAfter { get; set; }
-        public string ProgramNumber { get; set; }
-        public Nullable<int> StepNumber { get; set; }
-    }
-}

Models/Stoppages.cs

@@ -1,27 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Models
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Stoppages
-    {
-        public int AutoKey { get; set; }
-        public string Machine { get; set; }
-        public string Reason { get; set; }
-        public System.DateTime StartTime { get; set; }
-        public Nullable<System.DateTime> EndTime { get; set; }
-        public string Notes { get; set; }
-        public Nullable<double> Duration { get; set; }
-        public string Shift { get; set; }
-        public string SingleShift { get; set; }
-    }
-}

Models/TagShelf.cs

@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码已从模板生成。
+//
+//     手动更改此文件可能导致应用程序出现意外的行为。
+//     如果重新生成代码，将覆盖对此文件的手动更改。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Models
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class TagShelf
+    {
+        public Nullable<int> BucketNo { get; set; }
+        public string Dyelot { get; set; }
+        public string Machines { get; set; }
+        public Nullable<int> TagManagerNo { get; set; }
+        public int ReDye { get; set; }
+        public Nullable<int> StepNumber { get; set; }
+        public string DID { get; set; }
+        public Nullable<int> TotalBuckets { get; set; }
+        public Nullable<int> DevideNo { get; set; }
+        public Nullable<System.DateTime> OnShelfTime { get; set; }
+    }
+}