diff --git a/Models/App.Config b/Models/App.Config index 994d613..89b21ce 100644 --- a/Models/App.Config +++ b/Models/App.Config @@ -3,8 +3,5 @@ - - - - + \ No newline at end of file diff --git a/Models/ProgramsUsed.cs b/Models/AuxDslvQueue.cs similarity index 58% rename from Models/ProgramsUsed.cs rename to Models/AuxDslvQueue.cs index ae86d5a..b9bddbc 100644 --- a/Models/ProgramsUsed.cs +++ b/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 TankNo { get; set; } public string Dyelot { get; set; } public int ReDye { get; set; } - public string Program { get; set; } - public string Name { get; set; } - public string Steps { get; set; } - public Nullable StepsNoBpCrc { get; set; } - public Nullable ComputedTime { get; set; } - public Nullable MaxTemperature { get; set; } + public Nullable StepNumber { get; set; } + public string Station { get; set; } + public Nullable Industry { get; set; } + public Nullable State { get; set; } public string Machine { get; set; } - public System.DateTime StartTime { get; set; } + public string Volume { get; set; } + public Nullable ShelfID { get; set; } + public Nullable Updated { get; set; } } } diff --git a/Models/AuxDslvQueueHistory.cs b/Models/AuxDslvQueueHistory.cs new file mode 100644 index 0000000..42287b5 --- /dev/null +++ b/Models/AuxDslvQueueHistory.cs @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class AuxDslvQueueHistory + { + public Nullable TankNo { get; set; } + public string Dyelot { get; set; } + public int ReDye { get; set; } + public Nullable StepNumber { get; set; } + public string Station { get; set; } + public Nullable Industry { get; set; } + public Nullable State { get; set; } + public string Machine { get; set; } + public string Volume { get; set; } + public Nullable ShelfID { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/BucketCrane.cs b/Models/BucketCrane.cs new file mode 100644 index 0000000..1a6f8ce --- /dev/null +++ b/Models/BucketCrane.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class BucketCrane + { + public string Dyelot { get; set; } + public Nullable ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable DevideNo { get; set; } + public Nullable BucketNo { get; set; } + public string DID { get; set; } + public Nullable State { get; set; } + public Nullable Updated { get; set; } + } +} diff --git a/Models/BucketCraneHistory.cs b/Models/BucketCraneHistory.cs new file mode 100644 index 0000000..5647989 --- /dev/null +++ b/Models/BucketCraneHistory.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class BucketCraneHistory + { + public string Dyelot { get; set; } + public Nullable ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable DevideNo { get; set; } + public Nullable BucketNo { get; set; } + public string DID { get; set; } + public Nullable State { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/BucketShelf.cs b/Models/BucketShelf.cs index a2c2a86..dfb20a6 100644 --- a/Models/BucketShelf.cs +++ b/Models/BucketShelf.cs @@ -28,5 +28,8 @@ namespace Models public Nullable State { get; set; } public Nullable OnShelfTime { get; set; } public string UserAccount { get; set; } + public Nullable Locked { get; set; } + public string ProductCode { get; set; } + public string OriginDyelot { get; set; } } } diff --git a/Models/BucketShelfHistory.cs b/Models/BucketShelfHistory.cs index bcb3525..492014a 100644 --- a/Models/BucketShelfHistory.cs +++ b/Models/BucketShelfHistory.cs @@ -28,5 +28,8 @@ namespace Models public Nullable State { get; set; } public Nullable OnShelfTime { get; set; } public string UserAccount { get; set; } + public Nullable Locked { get; set; } + public string ProductCode { get; set; } + public string OriginDyelot { get; set; } } } diff --git a/Models/record.cs b/Models/CleanDevice.cs similarity index 73% rename from Models/record.cs rename to Models/CleanDevice.cs index 4382161..59e91a5 100644 --- a/Models/record.cs +++ b/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 record1 { get; set; } - public Nullable time { get; set; } + public string ID { get; set; } + public Nullable State { get; set; } + public Nullable Enabled { get; set; } } } diff --git a/Models/DBRDetail.cs b/Models/DBRDetail.cs new file mode 100644 index 0000000..6b5a017 --- /dev/null +++ b/Models/DBRDetail.cs @@ -0,0 +1,40 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +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 Grams { get; set; } + public Nullable DispenseGrams { get; set; } + public Nullable Buckets { get; set; } + public System.DateTime DispenseStartTime { get; set; } + public Nullable DispenseEndTime { get; set; } + public Nullable DispenseSeconds { get; set; } + public Nullable ProductStartTime { get; set; } + public Nullable ProductEndTime { get; set; } + public Nullable ProductSeconds { get; set; } + public Nullable LDXGrams { get; set; } + public Nullable LDXBuckets { get; set; } + public Nullable IsDeduct { get; set; } + public Nullable DeductBox { get; set; } + public string BoxNo { get; set; } + public Nullable DispenseResult { get; set; } + public Nullable BucketWeight { get; set; } + } +} diff --git a/Models/DispenserEvent.cs b/Models/DispenserEvent.cs new file mode 100644 index 0000000..e40815b --- /dev/null +++ b/Models/DispenserEvent.cs @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class DispenserEvent + { + public int EventID { get; set; } + public Nullable EventType { get; set; } + public string Dispenser { get; set; } + public string Device { get; set; } + public string Dyelot { get; set; } + public Nullable ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable Code { get; set; } + public string Description { get; set; } + public string Description_BIG { get; set; } + public string Description_GB { get; set; } + public Nullable CreateDate { get; set; } + public Nullable ConfirmDate { get; set; } + public Nullable FinishDate { get; set; } + public string Shift { get; set; } + public string UserAccount { get; set; } + } +} diff --git a/Models/DispenserLifeStatus.cs b/Models/DispenserLifeStatus.cs new file mode 100644 index 0000000..c6d890d --- /dev/null +++ b/Models/DispenserLifeStatus.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class DispenserLifeStatus + { + public string Dispenser { get; set; } + public string Device { get; set; } + public Nullable HeartBeat { get; set; } + public Nullable LifeTime { get; set; } + public Nullable UpdateDate { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/DispenserUtilization.cs b/Models/DispenserUtilization.cs index eb22bfd..17dbf31 100644 --- a/Models/DispenserUtilization.cs +++ b/Models/DispenserUtilization.cs @@ -15,7 +15,12 @@ namespace Models public partial class DispenserUtilization { public string Dispenser { get; set; } - public Nullable UtilDate { get; set; } + public string Device { get; set; } + public string Dyelot { get; set; } + public Nullable ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable UtilStartDate { get; set; } + public Nullable UtilEndDate { get; set; } public Nullable UtilTimes { get; set; } public string UserAccount { get; set; } } diff --git a/Models/Dispensers.cs b/Models/Dispensers.cs index 7a7d073..1db2963 100644 --- a/Models/Dispensers.cs +++ b/Models/Dispensers.cs @@ -23,6 +23,9 @@ namespace Models public string Station { get; set; } public Nullable State { get; set; } public string Status { get; set; } + public string Action { get; set; } + public string ProductCode { get; set; } + public Nullable SN { get; set; } public Nullable Automatic { get; set; } public Nullable Enabled { get; set; } public Nullable HeartBeat { get; set; } diff --git a/Models/DissolveArt.cs b/Models/DissolveArt.cs new file mode 100644 index 0000000..ee2dec3 --- /dev/null +++ b/Models/DissolveArt.cs @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class DissolveArt + { + public string Name { get; set; } + public Nullable ProductClass { get; set; } + public Nullable LiquidRatio { get; set; } + public Nullable MinWeight { get; set; } + public Nullable MaxWeight { get; set; } + public Nullable DissolveTemperature { get; set; } + public Nullable UseLiquidDye { get; set; } + public Nullable UseChemical { get; set; } + public string Process { get; set; } + public Nullable TankSize { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/DissolveArtHistory.cs b/Models/DissolveArtHistory.cs new file mode 100644 index 0000000..9bb1e32 --- /dev/null +++ b/Models/DissolveArtHistory.cs @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class DissolveArtHistory + { + public string Name { get; set; } + public Nullable ProductClass { get; set; } + public Nullable LiquidRatio { get; set; } + public Nullable MinWeight { get; set; } + public Nullable MaxWeight { get; set; } + public Nullable DissolveTemperature { get; set; } + public Nullable UseLiquidDye { get; set; } + public Nullable UseChemical { get; set; } + public string Process { get; set; } + public Nullable TankSize { get; set; } + public Nullable Updated { get; set; } + } +} diff --git a/Models/Dyelots.cs b/Models/Dyelots.cs index ac1cbea..985faf0 100644 --- a/Models/Dyelots.cs +++ b/Models/Dyelots.cs @@ -46,38 +46,22 @@ namespace Models public string ReferenceDyelot { get; set; } public Nullable Final { get; set; } public Nullable Shade { get; set; } + public Nullable OnSchedule { get; set; } + public Nullable DyeStep { get; set; } + public Nullable PowderBlocked { get; set; } + public Nullable PowderOnSchedule { get; set; } + public Nullable PowderStep { get; set; } + public string DispensedVolume { get; set; } + public Nullable 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 GRAMS_YARD { get; set; } - public Nullable NeedDissolving { get; set; } - public Nullable EarliestStartTime { get; set; } - public Nullable Committed { get; set; } - public string Parameters { get; set; } - public string Notes { get; set; } - public Nullable SummarizeResult { get; set; } - public string ProgramsUsed { get; set; } - public string ColorNo { get; set; } public Nullable ModifyDT { get; set; } public Nullable CreateDT { get; set; } - public Nullable Yard { get; set; } - public string SheetNo { get; set; } - public Nullable 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 RunTime { get; set; } - public Nullable ProcessTime { get; set; } - public Nullable NormalTime { get; set; } - public Nullable SleepTime { get; set; } - public Nullable DelayTime { get; set; } - public string EOCDelays { get; set; } - public Nullable DyelotStartShift { get; set; } - public Nullable DyelotEndShift { get; set; } - public short DyeDissolving { get; set; } } } diff --git a/Models/DyelotsBulkedRecipe.cs b/Models/DyelotsBulkedRecipe.cs index f29cfdf..e5c07b1 100644 --- a/Models/DyelotsBulkedRecipe.cs +++ b/Models/DyelotsBulkedRecipe.cs @@ -57,8 +57,8 @@ namespace Models public Nullable DissolveTemperature { get; set; } public Nullable SchDispenseTime { get; set; } public string UserAccount { get; set; } - public Nullable TargetGrams { get; set; } - public Nullable ActualGrams { get; set; } + public Nullable TargetGrams { get; set; } + public Nullable ActualGrams { get; set; } public Nullable FinishTime { get; set; } public string Tagged { get; set; } public Nullable TotalBuckets { get; set; } @@ -67,16 +67,19 @@ namespace Models public Nullable Concentration { get; set; } public Nullable DeductTotalBuckets { get; set; } public Nullable DeductBuckets { get; set; } - public Nullable Kilograms { get; set; } - public Nullable DKilograms { get; set; } - public Nullable DyelotID { get; set; } - public Nullable MixTemperature { get; set; } - public Nullable MixVolume { get; set; } - public Nullable MixTime { get; set; } - public Nullable MixWater { get; set; } - public Nullable RoWater { get; set; } - public string Notes { get; set; } - public Nullable ProductIndex { get; set; } - public double GRAVITY { get; set; } + public Nullable Flow { get; set; } + public Nullable CallTime { get; set; } + public Nullable BreakGrams { get; set; } + public Nullable RecoveryAction { get; set; } + public Nullable SmallDye { get; set; } + public string PrepareTank { get; set; } + public Nullable DeductBox { get; set; } + public Nullable Shade { get; set; } + public string stuffid { get; set; } + public string tfname { get; set; } + public string tftips { get; set; } + public string program { get; set; } + public Nullable dosage { get; set; } + public string groupid { get; set; } } } diff --git a/Models/Programs.cs b/Models/LA571Tanks.cs similarity index 56% rename from Models/Programs.cs rename to Models/LA571Tanks.cs index 93aa2f4..7069018 100644 --- a/Models/Programs.cs +++ b/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 Notes { get; set; } - public Nullable ModifiedTime { get; set; } - public Nullable StandardTime { get; set; } - - public virtual ProgramGroups ProgramGroups { get; set; } + public string Station { get; set; } + public Nullable Tank { get; set; } + public Nullable Volume { get; set; } + public Nullable State { get; set; } } } diff --git a/Models/LabDyeDslvQueue.cs b/Models/LabDyeDslvQueue.cs new file mode 100644 index 0000000..c5bac6b --- /dev/null +++ b/Models/LabDyeDslvQueue.cs @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class LabDyeDslvQueue + { + public Nullable TankNo { get; set; } + public string Dyelot { get; set; } + public int ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable State { get; set; } + public Nullable ShelfID { get; set; } + public Nullable DistID { get; set; } + public Nullable SchDispenseTime { get; set; } + public Nullable Updated { get; set; } + } +} diff --git a/Models/LabDyeDslvQueueHistory.cs b/Models/LabDyeDslvQueueHistory.cs new file mode 100644 index 0000000..c974e48 --- /dev/null +++ b/Models/LabDyeDslvQueueHistory.cs @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class LabDyeDslvQueueHistory + { + public Nullable TankNo { get; set; } + public string Dyelot { get; set; } + public int ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable State { get; set; } + public Nullable ShelfID { get; set; } + public Nullable DistID { get; set; } + public Nullable SchDispenseTime { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/Machines.cs b/Models/Machines.cs index cd55140..ea78431 100644 --- a/Models/Machines.cs +++ b/Models/Machines.cs @@ -81,35 +81,8 @@ namespace Models public string CheDispenseDyelot { get; set; } public Nullable CheDispenseReDye { get; set; } public Nullable SampleDye { get; set; } - public string name1 { get; set; } - public string Parameters { get; set; } - public string ProgramGroup { get; set; } - public string ReportGroup { get; set; } - public string PortAddress { get; set; } - public Nullable Interrupt { get; set; } - public Nullable NetworkNumber { get; set; } - public string SpecificMachineMimic { get; set; } - public Nullable OutOfService { get; set; } - public Nullable IsGhost { get; set; } - public Nullable ManualDownloadOnly { get; set; } - public string LogicArtPort { get; set; } - public Nullable GastonLoggedOn { get; set; } - public Nullable DEnabled { get; set; } - public Nullable DLookAhead { get; set; } - public Nullable LogicArtUnlocked { get; set; } - public Nullable MaximumGradient { get; set; } - public string LoggedOffReason { get; set; } - public string LoggedOffNotes { get; set; } - public Nullable AutoDispense { get; set; } - public Nullable AllowRemoteReschedule { get; set; } - public Nullable CorrectionsAbove { get; set; } - public Nullable Is161 { get; set; } - public Nullable Locked { get; set; } - public Nullable AutoDownloadParams { get; set; } - public Nullable NoAutoDownloadMessages { get; set; } - public string TonelloIP { get; set; } - public string Test { get; set; } - public string MainTemperature { get; set; } - public Nullable CallType { get; set; } + public string OnDevice { get; set; } + public string PwdDispenseDyelot { get; set; } + public Nullable PwdDispenseReDye { get; set; } } } diff --git a/Models/MachinesHistory.cs b/Models/MachinesHistory.cs index 562e255..4f601b8 100644 --- a/Models/MachinesHistory.cs +++ b/Models/MachinesHistory.cs @@ -41,6 +41,10 @@ namespace Models public Nullable HostRead { get; set; } public string DyeDispenseDyelot { get; set; } public Nullable DyeDispenseReDye { get; set; } + public string CheDispenseDyelot { get; set; } + public Nullable CheDispenseReDye { get; set; } + public string PwdDispenseDyelot { get; set; } + public Nullable PwdDispenseReDye { get; set; } public Nullable Updated { get; set; } } } diff --git a/Models/MachinesHistoryOld.cs b/Models/MachinesHistoryOld.cs new file mode 100644 index 0000000..2cf3521 --- /dev/null +++ b/Models/MachinesHistoryOld.cs @@ -0,0 +1,46 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class MachinesHistoryOld + { + public string Machine { get; set; } + public string DispenseDyelot { get; set; } + public Nullable DispenseReDye { get; set; } + public Nullable ChemicalCallOff { get; set; } + public Nullable ChemicalState { get; set; } + public Nullable ChemicalTank { get; set; } + public Nullable ChemicalTankSize { get; set; } + public string ChemicalDispenser { get; set; } + public Nullable ChemicalError { get; set; } + public Nullable ChemicalCallOff2 { get; set; } + public Nullable ChemicalState2 { get; set; } + public Nullable ChemicalTank2 { get; set; } + public Nullable DyeCallOff { get; set; } + public Nullable DyeState { get; set; } + public Nullable DyeTank { get; set; } + public Nullable DyeTankSize { get; set; } + public string DyeDispenser { get; set; } + public Nullable DyeError { get; set; } + public Nullable PowderCallOff { get; set; } + public Nullable PowderState { get; set; } + public Nullable PowderTank { get; set; } + public Nullable PowderTankSize { get; set; } + public string PowderDispenser { get; set; } + public Nullable PowderError { get; set; } + public Nullable HostRead { get; set; } + public string DyeDispenseDyelot { get; set; } + public Nullable DyeDispenseReDye { get; set; } + public Nullable Updated { get; set; } + } +} diff --git a/Models/Models.csproj b/Models/Models.csproj index e4c91dc..f2cfa26 100644 --- a/Models/Models.csproj +++ b/Models/Models.csproj @@ -68,7 +68,16 @@ - + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + + SQL_BD.tt @@ -86,10 +95,16 @@ SQL_BD.tt - + + SQL_BD.tt + + SQL_BD.tt - + + SQL_BD.tt + + SQL_BD.tt @@ -98,6 +113,12 @@ SQL_BD.tt + + SQL_BD.tt + + + SQL_BD.tt + SQL_BD.tt @@ -119,25 +140,19 @@ SQL_BD.tt - - SQL_BD.tt - SQL_BD.tt SQL_BD.tt - SQL_BD.tt SQL_BD.tt - - SQL_BD.tt - + SQL_BD.tt @@ -152,12 +167,24 @@ SQL_BD.tt + + SQL_BD.tt + + + SQL_BD.tt + + + SQL_BD.tt + SQL_BD.tt SQL_BD.tt + + SQL_BD.tt + SQL_BD.tt @@ -177,7 +204,10 @@ SQL_BD.tt - + + SQL_BD.tt + + SQL_BD.tt @@ -186,16 +216,13 @@ SQL_Ti.tt - - - SQL_BD.tt - - + SQL_BD.tt - + SQL_BD.tt + SQL_BD.tt @@ -203,18 +230,36 @@ 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 @@ -245,13 +290,7 @@ True SQL_Ti.edmx - - SQL_BD.tt - - - SQL_BD.tt - - + SQL_BD.tt @@ -260,21 +299,19 @@ + + + + EntityModelCodeGenerator + SQL_Ti.Designer.cs + EntityModelCodeGenerator SQL_BD.Designer.cs - - - - SQL_BD.edmx - - EntityModelCodeGenerator - SQL_Ti.Designer.cs - SQL_Ti.edmx @@ -282,8 +319,8 @@ TextTemplatingFileGenerator - SQL_BD.Context.cs SQL_BD.edmx + SQL_BD.Context.cs TextTemplatingFileGenerator diff --git a/Models/PartsStatus.cs b/Models/PartsStatus.cs index d3542c0..b800173 100644 --- a/Models/PartsStatus.cs +++ b/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 PartsType { get; set; } diff --git a/Models/PartsStatusHistory.cs b/Models/PartsStatusHistory.cs index c7a1942..1eff9d8 100644 --- a/Models/PartsStatusHistory.cs +++ b/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 PartsType { get; set; } diff --git a/Models/PipeRefill.cs b/Models/PipeRefill.cs new file mode 100644 index 0000000..8569eba --- /dev/null +++ b/Models/PipeRefill.cs @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class PipeRefill + { + public string ProductCode { get; set; } + public string ProductName { get; set; } + public Nullable ProductType { get; set; } + public string ProductLot { get; set; } + public string Dispenser { get; set; } + public Nullable No { get; set; } + public Nullable Qty { get; set; } + public Nullable Percentage { get; set; } + public Nullable RefillTime { get; set; } + public Nullable AlarmTime { get; set; } + public Nullable Updated { get; set; } + } +} diff --git a/Models/PipeHistory.cs b/Models/PipeRefillHistory.cs similarity index 81% rename from Models/PipeHistory.cs rename to Models/PipeRefillHistory.cs index f261134..132d4a5 100644 --- a/Models/PipeHistory.cs +++ b/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 ProductType { get; set; } + public string ProductLot { get; set; } public string Dispenser { get; set; } public Nullable No { get; set; } public Nullable Qty { get; set; } - public Nullable StartTime { get; set; } - public Nullable EndTime { get; set; } + public Nullable Percentage { get; set; } + public Nullable RefillTime { get; set; } public Nullable AlarmTime { get; set; } public Nullable Created { get; set; } } diff --git a/Models/Pipes.cs b/Models/Pipes.cs index c686e9a..03956fb 100644 --- a/Models/Pipes.cs +++ b/Models/Pipes.cs @@ -17,6 +17,7 @@ namespace Models public string ProductCode { get; set; } public string ProductName { get; set; } public Nullable ProductType { get; set; } + public string ProductLot { get; set; } public string Dispenser { get; set; } public Nullable Enabled { get; set; } public Nullable No { get; set; } diff --git a/Models/ProductLocation.cs b/Models/ProductLocation.cs new file mode 100644 index 0000000..2ab6fe3 --- /dev/null +++ b/Models/ProductLocation.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +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 Position { get; set; } + public string TablePosition { get; set; } + public Nullable StockDate { get; set; } + public Nullable StockUsage { get; set; } + public Nullable StockOnHand { get; set; } + public string Alarm { get; set; } + public Nullable AlarmTime { get; set; } + public Nullable Enabled { get; set; } + } +} diff --git a/Models/ProductLocationHistory.cs b/Models/ProductLocationHistory.cs new file mode 100644 index 0000000..f2136bc --- /dev/null +++ b/Models/ProductLocationHistory.cs @@ -0,0 +1,31 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +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 Position { get; set; } + public string TablePosition { get; set; } + public Nullable StockDate { get; set; } + public Nullable StockUsage { get; set; } + public Nullable StockOnHand { get; set; } + public string Alarm { get; set; } + public Nullable AlarmTime { get; set; } + public Nullable Enabled { get; set; } + public Nullable Updated { get; set; } + } +} diff --git a/Models/ProgramGroups.cs b/Models/ProgramGroups.cs deleted file mode 100644 index 45d930f..0000000 --- a/Models/ProgramGroups.cs +++ /dev/null @@ -1,40 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -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(); - } - - public string Name { get; set; } - public string UserPrompts { get; set; } - public byte[] TypeLibrary { get; set; } - public string Sections { get; set; } - public Nullable MaximumPrograms { get; set; } - public Nullable OutOfService { get; set; } - public string DyelotParameterCommands { get; set; } - public string CommandHelp { get; set; } - public string UsesProgramsFromGroup { get; set; } - public Nullable MaximumGradient { get; set; } - public Nullable QQMinutes { get; set; } - public Nullable MessageMinutes { get; set; } - public string Inefficiencies { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Programs { get; set; } - } -} diff --git a/Models/RFIDRecordQueue.cs b/Models/RFIDRecordQueue.cs index fc36e6a..0614fbb 100644 --- a/Models/RFIDRecordQueue.cs +++ b/Models/RFIDRecordQueue.cs @@ -24,6 +24,9 @@ namespace Models public Nullable State { get; set; } public Nullable 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 Updated { get; set; } } } diff --git a/Models/RFIDRecordQueueHistory.cs b/Models/RFIDRecordQueueHistory.cs new file mode 100644 index 0000000..1bc3460 --- /dev/null +++ b/Models/RFIDRecordQueueHistory.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class RFIDRecordQueueHistory + { + public Nullable Station { get; set; } + public string Dyelot { get; set; } + public int ReDye { get; set; } + public Nullable StepNumber { get; set; } + public string Machine { get; set; } + public Nullable DevideNo { get; set; } + public Nullable TotalBuckets { get; set; } + public Nullable State { get; set; } + public Nullable BucketNo { get; set; } + public string DID { get; set; } + public string ProductCode { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/RecipeDetail.cs b/Models/RecipeDetail.cs new file mode 100644 index 0000000..ab33476 --- /dev/null +++ b/Models/RecipeDetail.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +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 Conc { get; set; } + public Nullable HostRead { get; set; } + public Nullable Created { get; set; } + } +} diff --git a/Models/Customize.cs b/Models/Recipes.cs similarity index 64% rename from Models/Customize.cs rename to Models/Recipes.cs index 2bdcc07..8abf68b 100644 --- a/Models/Customize.cs +++ b/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 StoppageReasons { get; set; } - public string Inefficiencies { get; set; } - public string Company { get; set; } - public string Shifts { get; set; } + public string RcpCode { get; set; } + public string RcpName { get; set; } + public string Unit { get; set; } + public Nullable Created { get; set; } } } diff --git a/Models/SQL_BD.Context.cs b/Models/SQL_BD.Context.cs index 86c322c..98162d8 100644 --- a/Models/SQL_BD.Context.cs +++ b/Models/SQL_BD.Context.cs @@ -25,30 +25,29 @@ namespace Models throw new UnintentionalCodeFirstException(); } - public virtual DbSet Alarms { get; set; } - public virtual DbSet Customize { get; set; } - public virtual DbSet Delays { get; set; } + public virtual DbSet DBRDetail { get; set; } public virtual DbSet DyelotHead { get; set; } - public virtual DbSet DyelotHistories { get; set; } public virtual DbSet Dyelots { get; set; } - public virtual DbSet DyelotsByShift { get; set; } + public virtual DbSet DyelotsBulkedRecipe { get; set; } public virtual DbSet Machines { get; set; } public virtual DbSet MachineState { get; set; } - public virtual DbSet ProgramGroups { get; set; } - public virtual DbSet Programs { get; set; } - public virtual DbSet ProgramsUsed { get; set; } - public virtual DbSet record { get; set; } public virtual DbSet SchedulingLog { get; set; } - public virtual DbSet Steps { get; set; } - public virtual DbSet StepVisits { get; set; } - public virtual DbSet Stoppages { get; set; } + public virtual DbSet AuxDslvQueue { get; set; } + public virtual DbSet AuxDslvQueueHistory { get; set; } + public virtual DbSet BucketCrane { get; set; } + public virtual DbSet BucketCraneHistory { get; set; } public virtual DbSet BucketInfo { get; set; } public virtual DbSet BucketShelf { get; set; } public virtual DbSet BucketShelfHistory { get; set; } public virtual DbSet BucketShelfQueue { get; set; } public virtual DbSet BucketShelfQueueHistory { get; set; } + public virtual DbSet CleanDevice { get; set; } + public virtual DbSet DispenserEvent { get; set; } + public virtual DbSet DispenserLifeStatus { get; set; } public virtual DbSet Dispensers { get; set; } public virtual DbSet DispenserUtilization { get; set; } + public virtual DbSet DissolveArt { get; set; } + public virtual DbSet DissolveArtHistory { get; set; } public virtual DbSet DyelotBuckets { get; set; } public virtual DbSet DyelotBucketsHistory { get; set; } public virtual DbSet DyelotBucketSummary { get; set; } @@ -56,23 +55,37 @@ namespace Models public virtual DbSet DyelotDslvQueue { get; set; } public virtual DbSet DyelotDslvQueueHistory { get; set; } public virtual DbSet DyelotsBatch { get; set; } - public virtual DbSet DyelotsBulkedRecipe { get; set; } public virtual DbSet DyelotsBulkedRecipeHistory { get; set; } public virtual DbSet DyelotsHistory { get; set; } public virtual DbSet DyelotsInAuto { get; set; } public virtual DbSet DyelotsInAutoHistory { get; set; } public virtual DbSet EventList { get; set; } + public virtual DbSet LA571Tanks { get; set; } + public virtual DbSet LabDyeDslvQueue { get; set; } + public virtual DbSet LabDyeDslvQueueHistory { get; set; } public virtual DbSet MachinesHistory { get; set; } + public virtual DbSet MachinesHistoryOld { get; set; } public virtual DbSet MachineStateHistory { get; set; } public virtual DbSet ManualWeightQueue { get; set; } public virtual DbSet ManualWeightQueueHistory { get; set; } public virtual DbSet PartsStatus { get; set; } public virtual DbSet PartsStatusHistory { get; set; } - public virtual DbSet PipeHistory { get; set; } + public virtual DbSet PipeRefill { get; set; } + public virtual DbSet PipeRefillHistory { get; set; } public virtual DbSet Pipes { get; set; } + public virtual DbSet ProductLocation { get; set; } + public virtual DbSet ProductLocationHistory { get; set; } public virtual DbSet RecipeDeduct { get; set; } public virtual DbSet RecipeDeductHistory { get; set; } + public virtual DbSet RecipeDetail { get; set; } + public virtual DbSet Recipes { get; set; } public virtual DbSet RFIDRecordQueue { get; set; } + public virtual DbSet RFIDRecordQueueHistory { get; set; } + public virtual DbSet SampleDyeDslvQueue { get; set; } public virtual DbSet SampleDyeDslvQueueHistory { get; set; } + public virtual DbSet ScheduledDyelot { get; set; } + public virtual DbSet ScheduledDyelotHistory { get; set; } + public virtual DbSet Shelf { get; set; } + public virtual DbSet TagShelf { get; set; } } } diff --git a/Models/SQL_BD.Designer.cs b/Models/SQL_BD.Designer.cs index f689657..649b6a5 100644 --- a/Models/SQL_BD.Designer.cs +++ b/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”。当在设计器中打开该模型时，此属性会出现在 // “属性”窗口中。 diff --git a/Models/SQL_BD.edmx b/Models/SQL_BD.edmx index b06b103..cb392cd 100644 --- a/Models/SQL_BD.edmx +++ b/Models/SQL_BD.edmx @@ -5,26 +5,74 @@ - + + - + + - - + + - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,6 +107,9 @@ + + + @@ -81,6 +132,9 @@ + + + @@ -122,35 +176,83 @@ - + - + - - - - - + + + - + - + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,6 +268,9 @@ + + + @@ -181,14 +286,22 @@ - + + + + + + - + + + + @@ -197,8 +310,27 @@ + - --> + + + + + + + + + + + + + + + + + + @@ -395,15 +531,6 @@ - - - - - - - - - @@ -441,39 +568,23 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -503,14 +614,9 @@ - - - - @@ -555,8 +661,8 @@ - - + + @@ -565,17 +671,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + + @@ -635,20 +744,6 @@ - - - - - - - - - - - - - - @@ -736,10 +831,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -811,40 +946,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -982,6 +1129,7 @@ + @@ -1005,6 +1153,7 @@ + @@ -1019,22 +1168,38 @@ +警告 6002: 表/视图“BatchDyeingCentral.dbo.PipeRefill”未定义主键。已推断出该键，并将定义创建为只读的表/视图。--> + + + + + + + + + + + + + + + + - +警告 6002: 表/视图“BatchDyeingCentral.dbo.PipeRefillHistory”未定义主键。已推断出该键，并将定义创建为只读的表/视图。--> + - - + + - - + + @@ -1049,6 +1214,7 @@ + @@ -1073,54 +1239,55 @@ --> - + + - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + - + + - - - - - - - - - - - + + + + + + + + + + + + + + @@ -1159,13 +1326,32 @@ - + + - + + - - - + + + + + + + + + + + + + + + + + + @@ -1184,12 +1370,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1214,124 +1437,152 @@ --> - + + + - + - - - - - - - + + + + + + + + + + - +警告 6002: 表/视图“BatchDyeingCentral.dbo.ScheduledDyelotHistory”未定义主键。已推断出该键，并将定义创建为只读的表/视图。--> + + + - + - - - - - - - - - - - - + + + + + + + + - + - + + - + - - - - - - - - - - - - - - - - - - - - + + + + - + + - + - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + - - + - - - - - - - + + SELECT + [AuxDslvQueue].[TankNo] AS [TankNo], + [AuxDslvQueue].[Dyelot] AS [Dyelot], + [AuxDslvQueue].[ReDye] AS [ReDye], + [AuxDslvQueue].[StepNumber] AS [StepNumber], + [AuxDslvQueue].[Station] AS [Station], + [AuxDslvQueue].[Industry] AS [Industry], + [AuxDslvQueue].[State] AS [State], + [AuxDslvQueue].[Machine] AS [Machine], + [AuxDslvQueue].[Volume] AS [Volume], + [AuxDslvQueue].[ShelfID] AS [ShelfID], + [AuxDslvQueue].[Updated] AS [Updated] + FROM [dbo].[AuxDslvQueue] AS [AuxDslvQueue] + + + SELECT + [AuxDslvQueueHistory].[TankNo] AS [TankNo], + [AuxDslvQueueHistory].[Dyelot] AS [Dyelot], + [AuxDslvQueueHistory].[ReDye] AS [ReDye], + [AuxDslvQueueHistory].[StepNumber] AS [StepNumber], + [AuxDslvQueueHistory].[Station] AS [Station], + [AuxDslvQueueHistory].[Industry] AS [Industry], + [AuxDslvQueueHistory].[State] AS [State], + [AuxDslvQueueHistory].[Machine] AS [Machine], + [AuxDslvQueueHistory].[Volume] AS [Volume], + [AuxDslvQueueHistory].[ShelfID] AS [ShelfID], + [AuxDslvQueueHistory].[Created] AS [Created] + FROM [dbo].[AuxDslvQueueHistory] AS [AuxDslvQueueHistory] + + + SELECT + [BucketCrane].[Dyelot] AS [Dyelot], + [BucketCrane].[ReDye] AS [ReDye], + [BucketCrane].[StepNumber] AS [StepNumber], + [BucketCrane].[DevideNo] AS [DevideNo], + [BucketCrane].[BucketNo] AS [BucketNo], + [BucketCrane].[DID] AS [DID], + [BucketCrane].[State] AS [State], + [BucketCrane].[Updated] AS [Updated] + FROM [dbo].[BucketCrane] AS [BucketCrane] + + + SELECT + [BucketCraneHistory].[Dyelot] AS [Dyelot], + [BucketCraneHistory].[ReDye] AS [ReDye], + [BucketCraneHistory].[StepNumber] AS [StepNumber], + [BucketCraneHistory].[DevideNo] AS [DevideNo], + [BucketCraneHistory].[BucketNo] AS [BucketNo], + [BucketCraneHistory].[DID] AS [DID], + [BucketCraneHistory].[State] AS [State], + [BucketCraneHistory].[Created] AS [Created] + FROM [dbo].[BucketCraneHistory] AS [BucketCraneHistory] + SELECT [BucketInfo].[BucketNo] AS [BucketNo], @@ -1357,7 +1608,10 @@ [BucketShelf].[YPos] AS [YPos], [BucketShelf].[State] AS [State], [BucketShelf].[OnShelfTime] AS [OnShelfTime], - [BucketShelf].[UserAccount] AS [UserAccount] + [BucketShelf].[UserAccount] AS [UserAccount], + [BucketShelf].[Locked] AS [Locked], + [BucketShelf].[ProductCode] AS [ProductCode], + [BucketShelf].[OriginDyelot] AS [OriginDyelot] FROM [dbo].[BucketShelf] AS [BucketShelf] @@ -1375,7 +1629,10 @@ [BucketShelfHistory].[YPos] AS [YPos], [BucketShelfHistory].[State] AS [State], [BucketShelfHistory].[OnShelfTime] AS [OnShelfTime], - [BucketShelfHistory].[UserAccount] AS [UserAccount] + [BucketShelfHistory].[UserAccount] AS [UserAccount], + [BucketShelfHistory].[Locked] AS [Locked], + [BucketShelfHistory].[ProductCode] AS [ProductCode], + [BucketShelfHistory].[OriginDyelot] AS [OriginDyelot] FROM [dbo].[BucketShelfHistory] AS [BucketShelfHistory] @@ -1407,6 +1664,43 @@ [BucketShelfQueueHistory].[State] AS [State], [BucketShelfQueueHistory].[Created] AS [Created] FROM [dbo].[BucketShelfQueueHistory] AS [BucketShelfQueueHistory] + + + SELECT + [CleanDevice].[ID] AS [ID], + [CleanDevice].[State] AS [State], + [CleanDevice].[Enabled] AS [Enabled] + FROM [dbo].[CleanDevice] AS [CleanDevice] + + + SELECT + [DispenserEvent].[EventID] AS [EventID], + [DispenserEvent].[EventType] AS [EventType], + [DispenserEvent].[Dispenser] AS [Dispenser], + [DispenserEvent].[Device] AS [Device], + [DispenserEvent].[Dyelot] AS [Dyelot], + [DispenserEvent].[ReDye] AS [ReDye], + [DispenserEvent].[StepNumber] AS [StepNumber], + [DispenserEvent].[Code] AS [Code], + [DispenserEvent].[Description] AS [Description], + [DispenserEvent].[Description_BIG] AS [Description_BIG], + [DispenserEvent].[Description_GB] AS [Description_GB], + [DispenserEvent].[CreateDate] AS [CreateDate], + [DispenserEvent].[ConfirmDate] AS [ConfirmDate], + [DispenserEvent].[FinishDate] AS [FinishDate], + [DispenserEvent].[Shift] AS [Shift], + [DispenserEvent].[UserAccount] AS [UserAccount] + FROM [dbo].[DispenserEvent] AS [DispenserEvent] + + + SELECT + [DispenserLifeStatus].[Dispenser] AS [Dispenser], + [DispenserLifeStatus].[Device] AS [Device], + [DispenserLifeStatus].[HeartBeat] AS [HeartBeat], + [DispenserLifeStatus].[LifeTime] AS [LifeTime], + [DispenserLifeStatus].[UpdateDate] AS [UpdateDate], + [DispenserLifeStatus].[Created] AS [Created] + FROM [dbo].[DispenserLifeStatus] AS [DispenserLifeStatus] SELECT @@ -1419,6 +1713,9 @@ [Dispensers].[Station] AS [Station], [Dispensers].[State] AS [State], [Dispensers].[Status] AS [Status], + [Dispensers].[Action] AS [Action], + [Dispensers].[ProductCode] AS [ProductCode], + [Dispensers].[SN] AS [SN], [Dispensers].[Automatic] AS [Automatic], [Dispensers].[Enabled] AS [Enabled], [Dispensers].[HeartBeat] AS [HeartBeat], @@ -1431,10 +1728,45 @@ SELECT [DispenserUtilization].[Dispenser] AS [Dispenser], - [DispenserUtilization].[UtilDate] AS [UtilDate], + [DispenserUtilization].[Device] AS [Device], + [DispenserUtilization].[Dyelot] AS [Dyelot], + [DispenserUtilization].[ReDye] AS [ReDye], + [DispenserUtilization].[StepNumber] AS [StepNumber], + [DispenserUtilization].[UtilStartDate] AS [UtilStartDate], + [DispenserUtilization].[UtilEndDate] AS [UtilEndDate], [DispenserUtilization].[UtilTimes] AS [UtilTimes], [DispenserUtilization].[UserAccount] AS [UserAccount] FROM [dbo].[DispenserUtilization] AS [DispenserUtilization] + + + SELECT + [DissolveArt].[Name] AS [Name], + [DissolveArt].[ProductClass] AS [ProductClass], + [DissolveArt].[LiquidRatio] AS [LiquidRatio], + [DissolveArt].[MinWeight] AS [MinWeight], + [DissolveArt].[MaxWeight] AS [MaxWeight], + [DissolveArt].[DissolveTemperature] AS [DissolveTemperature], + [DissolveArt].[UseLiquidDye] AS [UseLiquidDye], + [DissolveArt].[UseChemical] AS [UseChemical], + [DissolveArt].[Process] AS [Process], + [DissolveArt].[TankSize] AS [TankSize], + [DissolveArt].[Created] AS [Created] + FROM [dbo].[DissolveArt] AS [DissolveArt] + + + SELECT + [DissolveArtHistory].[Name] AS [Name], + [DissolveArtHistory].[ProductClass] AS [ProductClass], + [DissolveArtHistory].[LiquidRatio] AS [LiquidRatio], + [DissolveArtHistory].[MinWeight] AS [MinWeight], + [DissolveArtHistory].[MaxWeight] AS [MaxWeight], + [DissolveArtHistory].[DissolveTemperature] AS [DissolveTemperature], + [DissolveArtHistory].[UseLiquidDye] AS [UseLiquidDye], + [DissolveArtHistory].[UseChemical] AS [UseChemical], + [DissolveArtHistory].[Process] AS [Process], + [DissolveArtHistory].[TankSize] AS [TankSize], + [DissolveArtHistory].[Updated] AS [Updated] + FROM [dbo].[DissolveArtHistory] AS [DissolveArtHistory] SELECT @@ -1553,74 +1885,6 @@ [DyelotsBatch].[SchDispenseTime] AS [SchDispenseTime], [DyelotsBatch].[UserAccount] AS [UserAccount] FROM [dbo].[DyelotsBatch] AS [DyelotsBatch] - - - SELECT - [DyelotsBulkedRecipe].[ID] AS [ID], - [DyelotsBulkedRecipe].[Dyelot] AS [Dyelot], - [DyelotsBulkedRecipe].[ReDye] AS [ReDye], - [DyelotsBulkedRecipe].[StepNumber] AS [StepNumber], - [DyelotsBulkedRecipe].[Station] AS [Station], - [DyelotsBulkedRecipe].[DevideNo] AS [DevideNo], - [DyelotsBulkedRecipe].[ShotNo] AS [ShotNo], - [DyelotsBulkedRecipe].[ProductCode] AS [ProductCode], - [DyelotsBulkedRecipe].[ProductName] AS [ProductName], - [DyelotsBulkedRecipe].[ProductType] AS [ProductType], - [DyelotsBulkedRecipe].[ProductLot] AS [ProductLot], - [DyelotsBulkedRecipe].[ProductClass] AS [ProductClass], - [DyelotsBulkedRecipe].[SN] AS [SN], - [DyelotsBulkedRecipe].[Amount] AS [Amount], - [DyelotsBulkedRecipe].[Grams] AS [Grams], - [DyelotsBulkedRecipe].[Created] AS [Created], - [DyelotsBulkedRecipe].[DispenseStartTime] AS [DispenseStartTime], - [DyelotsBulkedRecipe].[DispenseEndTime] AS [DispenseEndTime], - [DyelotsBulkedRecipe].[DispenseTime] AS [DispenseTime], - [DyelotsBulkedRecipe].[DispenseGrams] AS [DispenseGrams], - [DyelotsBulkedRecipe].[DispenseResult] AS [DispenseResult], - [DyelotsBulkedRecipe].[LADispenseResult] AS [LADispenseResult], - [DyelotsBulkedRecipe].[Volume] AS [Volume], - [DyelotsBulkedRecipe].[HostRead] AS [HostRead], - [DyelotsBulkedRecipe].[State] AS [State], - [DyelotsBulkedRecipe].[NeedDispense] AS [NeedDispense], - [DyelotsBulkedRecipe].[MixTankNo] AS [MixTankNo], - [DyelotsBulkedRecipe].[DyeWeightTime] AS [DyeWeightTime], - [DyelotsBulkedRecipe].[Process] AS [Process], - [DyelotsBulkedRecipe].[FinalProcess] AS [FinalProcess], - [DyelotsBulkedRecipe].[Dispenser] AS [Dispenser], - [DyelotsBulkedRecipe].[TankNo] AS [TankNo], - [DyelotsBulkedRecipe].[Error] AS [Error], - [DyelotsBulkedRecipe].[BucketNo] AS [BucketNo], - [DyelotsBulkedRecipe].[DID] AS [DID], - [DyelotsBulkedRecipe].[StepDevideNo] AS [StepDevideNo], - [DyelotsBulkedRecipe].[StepTotalBuckets] AS [StepTotalBuckets], - [DyelotsBulkedRecipe].[ReferenceDyelot] AS [ReferenceDyelot], - [DyelotsBulkedRecipe].[DispenseWater] AS [DispenseWater], - [DyelotsBulkedRecipe].[DrainWater] AS [DrainWater], - [DyelotsBulkedRecipe].[DissolveTemperature] AS [DissolveTemperature], - [DyelotsBulkedRecipe].[SchDispenseTime] AS [SchDispenseTime], - [DyelotsBulkedRecipe].[UserAccount] AS [UserAccount], - [DyelotsBulkedRecipe].[TargetGrams] AS [TargetGrams], - [DyelotsBulkedRecipe].[ActualGrams] AS [ActualGrams], - [DyelotsBulkedRecipe].[FinishTime] AS [FinishTime], - [DyelotsBulkedRecipe].[Tagged] AS [Tagged], - [DyelotsBulkedRecipe].[TotalBuckets] AS [TotalBuckets], - [DyelotsBulkedRecipe].[Final] AS [Final], - [DyelotsBulkedRecipe].[DissolveManual] AS [DissolveManual], - [DyelotsBulkedRecipe].[Concentration] AS [Concentration], - [DyelotsBulkedRecipe].[DeductTotalBuckets] AS [DeductTotalBuckets], - [DyelotsBulkedRecipe].[DeductBuckets] AS [DeductBuckets], - [DyelotsBulkedRecipe].[Kilograms] AS [Kilograms], - [DyelotsBulkedRecipe].[DKilograms] AS [DKilograms], - [DyelotsBulkedRecipe].[DyelotID] AS [DyelotID], - [DyelotsBulkedRecipe].[MixTemperature] AS [MixTemperature], - [DyelotsBulkedRecipe].[MixVolume] AS [MixVolume], - [DyelotsBulkedRecipe].[MixTime] AS [MixTime], - [DyelotsBulkedRecipe].[MixWater] AS [MixWater], - [DyelotsBulkedRecipe].[RoWater] AS [RoWater], - [DyelotsBulkedRecipe].[Notes] AS [Notes], - [DyelotsBulkedRecipe].[ProductIndex] AS [ProductIndex], - [DyelotsBulkedRecipe].[GRAVITY] AS [GRAVITY] - FROM [dbo].[DyelotsBulkedRecipe] AS [DyelotsBulkedRecipe] SELECT @@ -1746,6 +2010,41 @@ [EventList].[Description_GB] AS [Description_GB], [EventList].[CreateDate] AS [CreateDate] FROM [dbo].[EventList] AS [EventList] + + + SELECT + [LA571Tanks].[Name] AS [Name], + [LA571Tanks].[Station] AS [Station], + [LA571Tanks].[Tank] AS [Tank], + [LA571Tanks].[Volume] AS [Volume], + [LA571Tanks].[State] AS [State] + FROM [dbo].[LA571Tanks] AS [LA571Tanks] + + + SELECT + [LabDyeDslvQueue].[TankNo] AS [TankNo], + [LabDyeDslvQueue].[Dyelot] AS [Dyelot], + [LabDyeDslvQueue].[ReDye] AS [ReDye], + [LabDyeDslvQueue].[StepNumber] AS [StepNumber], + [LabDyeDslvQueue].[State] AS [State], + [LabDyeDslvQueue].[ShelfID] AS [ShelfID], + [LabDyeDslvQueue].[DistID] AS [DistID], + [LabDyeDslvQueue].[SchDispenseTime] AS [SchDispenseTime], + [LabDyeDslvQueue].[Updated] AS [Updated] + FROM [dbo].[LabDyeDslvQueue] AS [LabDyeDslvQueue] + + + SELECT + [LabDyeDslvQueueHistory].[TankNo] AS [TankNo], + [LabDyeDslvQueueHistory].[Dyelot] AS [Dyelot], + [LabDyeDslvQueueHistory].[ReDye] AS [ReDye], + [LabDyeDslvQueueHistory].[StepNumber] AS [StepNumber], + [LabDyeDslvQueueHistory].[State] AS [State], + [LabDyeDslvQueueHistory].[ShelfID] AS [ShelfID], + [LabDyeDslvQueueHistory].[DistID] AS [DistID], + [LabDyeDslvQueueHistory].[SchDispenseTime] AS [SchDispenseTime], + [LabDyeDslvQueueHistory].[Created] AS [Created] + FROM [dbo].[LabDyeDslvQueueHistory] AS [LabDyeDslvQueueHistory] SELECT @@ -1776,8 +2075,44 @@ [MachinesHistory].[HostRead] AS [HostRead], [MachinesHistory].[DyeDispenseDyelot] AS [DyeDispenseDyelot], [MachinesHistory].[DyeDispenseReDye] AS [DyeDispenseReDye], + [MachinesHistory].[CheDispenseDyelot] AS [CheDispenseDyelot], + [MachinesHistory].[CheDispenseReDye] AS [CheDispenseReDye], + [MachinesHistory].[PwdDispenseDyelot] AS [PwdDispenseDyelot], + [MachinesHistory].[PwdDispenseReDye] AS [PwdDispenseReDye], [MachinesHistory].[Updated] AS [Updated] FROM [dbo].[MachinesHistory] AS [MachinesHistory] + + + SELECT + [MachinesHistoryOld].[Machine] AS [Machine], + [MachinesHistoryOld].[DispenseDyelot] AS [DispenseDyelot], + [MachinesHistoryOld].[DispenseReDye] AS [DispenseReDye], + [MachinesHistoryOld].[ChemicalCallOff] AS [ChemicalCallOff], + [MachinesHistoryOld].[ChemicalState] AS [ChemicalState], + [MachinesHistoryOld].[ChemicalTank] AS [ChemicalTank], + [MachinesHistoryOld].[ChemicalTankSize] AS [ChemicalTankSize], + [MachinesHistoryOld].[ChemicalDispenser] AS [ChemicalDispenser], + [MachinesHistoryOld].[ChemicalError] AS [ChemicalError], + [MachinesHistoryOld].[ChemicalCallOff2] AS [ChemicalCallOff2], + [MachinesHistoryOld].[ChemicalState2] AS [ChemicalState2], + [MachinesHistoryOld].[ChemicalTank2] AS [ChemicalTank2], + [MachinesHistoryOld].[DyeCallOff] AS [DyeCallOff], + [MachinesHistoryOld].[DyeState] AS [DyeState], + [MachinesHistoryOld].[DyeTank] AS [DyeTank], + [MachinesHistoryOld].[DyeTankSize] AS [DyeTankSize], + [MachinesHistoryOld].[DyeDispenser] AS [DyeDispenser], + [MachinesHistoryOld].[DyeError] AS [DyeError], + [MachinesHistoryOld].[PowderCallOff] AS [PowderCallOff], + [MachinesHistoryOld].[PowderState] AS [PowderState], + [MachinesHistoryOld].[PowderTank] AS [PowderTank], + [MachinesHistoryOld].[PowderTankSize] AS [PowderTankSize], + [MachinesHistoryOld].[PowderDispenser] AS [PowderDispenser], + [MachinesHistoryOld].[PowderError] AS [PowderError], + [MachinesHistoryOld].[HostRead] AS [HostRead], + [MachinesHistoryOld].[DyeDispenseDyelot] AS [DyeDispenseDyelot], + [MachinesHistoryOld].[DyeDispenseReDye] AS [DyeDispenseReDye], + [MachinesHistoryOld].[Updated] AS [Updated] + FROM [dbo].[MachinesHistoryOld] AS [MachinesHistoryOld] SELECT @@ -1839,6 +2174,7 @@ SELECT [PartsStatus].[CUST_CODE] AS [CUST_CODE], [PartsStatus].[Dispenser] AS [Dispenser], + [PartsStatus].[Device] AS [Device], [PartsStatus].[PartsCode] AS [PartsCode], [PartsStatus].[PartsName] AS [PartsName], [PartsStatus].[PartsType] AS [PartsType], @@ -1857,6 +2193,7 @@ SELECT [PartsStatusHistory].[CUST_CODE] AS [CUST_CODE], [PartsStatusHistory].[Dispenser] AS [Dispenser], + [PartsStatusHistory].[Device] AS [Device], [PartsStatusHistory].[PartsCode] AS [PartsCode], [PartsStatusHistory].[PartsName] AS [PartsName], [PartsStatusHistory].[PartsType] AS [PartsType], @@ -1871,25 +2208,42 @@ [PartsStatusHistory].[UserAccount] AS [UserAccount] FROM [dbo].[PartsStatusHistory] AS [PartsStatusHistory] - + + SELECT + [PipeRefill].[ProductCode] AS [ProductCode], + [PipeRefill].[ProductName] AS [ProductName], + [PipeRefill].[ProductType] AS [ProductType], + [PipeRefill].[ProductLot] AS [ProductLot], + [PipeRefill].[Dispenser] AS [Dispenser], + [PipeRefill].[No] AS [No], + [PipeRefill].[Qty] AS [Qty], + [PipeRefill].[Percentage] AS [Percentage], + [PipeRefill].[RefillTime] AS [RefillTime], + [PipeRefill].[AlarmTime] AS [AlarmTime], + [PipeRefill].[Updated] AS [Updated] + FROM [dbo].[PipeRefill] AS [PipeRefill] + + SELECT - [PipeHistory].[ProductCode] AS [ProductCode], - [PipeHistory].[ProductName] AS [ProductName], - [PipeHistory].[ProductType] AS [ProductType], - [PipeHistory].[Dispenser] AS [Dispenser], - [PipeHistory].[No] AS [No], - [PipeHistory].[Qty] AS [Qty], - [PipeHistory].[StartTime] AS [StartTime], - [PipeHistory].[EndTime] AS [EndTime], - [PipeHistory].[AlarmTime] AS [AlarmTime], - [PipeHistory].[Created] AS [Created] - FROM [dbo].[PipeHistory] AS [PipeHistory] + [PipeRefillHistory].[ProductCode] AS [ProductCode], + [PipeRefillHistory].[ProductName] AS [ProductName], + [PipeRefillHistory].[ProductType] AS [ProductType], + [PipeRefillHistory].[ProductLot] AS [ProductLot], + [PipeRefillHistory].[Dispenser] AS [Dispenser], + [PipeRefillHistory].[No] AS [No], + [PipeRefillHistory].[Qty] AS [Qty], + [PipeRefillHistory].[Percentage] AS [Percentage], + [PipeRefillHistory].[RefillTime] AS [RefillTime], + [PipeRefillHistory].[AlarmTime] AS [AlarmTime], + [PipeRefillHistory].[Created] AS [Created] + FROM [dbo].[PipeRefillHistory] AS [PipeRefillHistory] SELECT [Pipes].[ProductCode] AS [ProductCode], [Pipes].[ProductName] AS [ProductName], [Pipes].[ProductType] AS [ProductType], + [Pipes].[ProductLot] AS [ProductLot], [Pipes].[Dispenser] AS [Dispenser], [Pipes].[Enabled] AS [Enabled], [Pipes].[No] AS [No], @@ -1901,6 +2255,39 @@ [Pipes].[Gravity] AS [Gravity], [Pipes].[Alarm] AS [Alarm] FROM [dbo].[Pipes] AS [Pipes] + + + SELECT + [ProductLocation].[ProductCode] AS [ProductCode], + [ProductLocation].[ProductName] AS [ProductName], + [ProductLocation].[Type] AS [Type], + [ProductLocation].[Dispenser] AS [Dispenser], + [ProductLocation].[Position] AS [Position], + [ProductLocation].[TablePosition] AS [TablePosition], + [ProductLocation].[StockDate] AS [StockDate], + [ProductLocation].[StockUsage] AS [StockUsage], + [ProductLocation].[StockOnHand] AS [StockOnHand], + [ProductLocation].[Alarm] AS [Alarm], + [ProductLocation].[AlarmTime] AS [AlarmTime], + [ProductLocation].[Enabled] AS [Enabled] + FROM [dbo].[ProductLocation] AS [ProductLocation] + + + SELECT + [ProductLocationHistory].[ProductCode] AS [ProductCode], + [ProductLocationHistory].[ProductName] AS [ProductName], + [ProductLocationHistory].[Type] AS [Type], + [ProductLocationHistory].[Dispenser] AS [Dispenser], + [ProductLocationHistory].[Position] AS [Position], + [ProductLocationHistory].[TablePosition] AS [TablePosition], + [ProductLocationHistory].[StockDate] AS [StockDate], + [ProductLocationHistory].[StockUsage] AS [StockUsage], + [ProductLocationHistory].[StockOnHand] AS [StockOnHand], + [ProductLocationHistory].[Alarm] AS [Alarm], + [ProductLocationHistory].[AlarmTime] AS [AlarmTime], + [ProductLocationHistory].[Enabled] AS [Enabled], + [ProductLocationHistory].[Updated] AS [Updated] + FROM [dbo].[ProductLocationHistory] AS [ProductLocationHistory] SELECT @@ -1932,6 +2319,24 @@ [RecipeDeductHistory].[UserAccount] AS [UserAccount], [RecipeDeductHistory].[Updated] AS [Updated] FROM [dbo].[RecipeDeductHistory] AS [RecipeDeductHistory] + + + SELECT + [RecipeDetail].[RcpCode] AS [RcpCode], + [RecipeDetail].[ProductCode] AS [ProductCode], + [RecipeDetail].[ProductName] AS [ProductName], + [RecipeDetail].[Conc] AS [Conc], + [RecipeDetail].[HostRead] AS [HostRead], + [RecipeDetail].[Created] AS [Created] + FROM [dbo].[RecipeDetail] AS [RecipeDetail] + + + SELECT + [Recipes].[RcpCode] AS [RcpCode], + [Recipes].[RcpName] AS [RcpName], + [Recipes].[Unit] AS [Unit], + [Recipes].[Created] AS [Created] + FROM [dbo].[Recipes] AS [Recipes] SELECT @@ -1945,8 +2350,41 @@ [RFIDRecordQueue].[State] AS [State], [RFIDRecordQueue].[BucketNo] AS [BucketNo], [RFIDRecordQueue].[DID] AS [DID], + [RFIDRecordQueue].[Source] AS [Source], + [RFIDRecordQueue].[Dest] AS [Dest], + [RFIDRecordQueue].[ProductCode] AS [ProductCode], [RFIDRecordQueue].[Updated] AS [Updated] FROM [dbo].[RFIDRecordQueue] AS [RFIDRecordQueue] + + + SELECT + [RFIDRecordQueueHistory].[Station] AS [Station], + [RFIDRecordQueueHistory].[Dyelot] AS [Dyelot], + [RFIDRecordQueueHistory].[ReDye] AS [ReDye], + [RFIDRecordQueueHistory].[StepNumber] AS [StepNumber], + [RFIDRecordQueueHistory].[Machine] AS [Machine], + [RFIDRecordQueueHistory].[DevideNo] AS [DevideNo], + [RFIDRecordQueueHistory].[TotalBuckets] AS [TotalBuckets], + [RFIDRecordQueueHistory].[State] AS [State], + [RFIDRecordQueueHistory].[BucketNo] AS [BucketNo], + [RFIDRecordQueueHistory].[DID] AS [DID], + [RFIDRecordQueueHistory].[ProductCode] AS [ProductCode], + [RFIDRecordQueueHistory].[Created] AS [Created] + FROM [dbo].[RFIDRecordQueueHistory] AS [RFIDRecordQueueHistory] + + + SELECT + [SampleDyeDslvQueue].[TankNo] AS [TankNo], + [SampleDyeDslvQueue].[Dyelot] AS [Dyelot], + [SampleDyeDslvQueue].[ReDye] AS [ReDye], + [SampleDyeDslvQueue].[StepNumber] AS [StepNumber], + [SampleDyeDslvQueue].[State] AS [State], + [SampleDyeDslvQueue].[PassAuto] AS [PassAuto], + [SampleDyeDslvQueue].[ShelfID] AS [ShelfID], + [SampleDyeDslvQueue].[Machine] AS [Machine], + [SampleDyeDslvQueue].[SchDispenseTime] AS [SchDispenseTime], + [SampleDyeDslvQueue].[Updated] AS [Updated] + FROM [dbo].[SampleDyeDslvQueue] AS [SampleDyeDslvQueue] SELECT @@ -1962,56 +2400,94 @@ [SampleDyeDslvQueueHistory].[Created] AS [Created] FROM [dbo].[SampleDyeDslvQueueHistory] AS [SampleDyeDslvQueueHistory] - - - - + + SELECT + [ScheduledDyelot].[ID] AS [ID], + [ScheduledDyelot].[Dyelot] AS [Dyelot], + [ScheduledDyelot].[ReDye] AS [ReDye], + [ScheduledDyelot].[StepNumber] AS [StepNumber], + [ScheduledDyelot].[Process] AS [Process], + [ScheduledDyelot].[Dispenser] AS [Dispenser], + [ScheduledDyelot].[Machine] AS [Machine], + [ScheduledDyelot].[TankNo] AS [TankNo], + [ScheduledDyelot].[ScheduledTime] AS [ScheduledTime], + [ScheduledDyelot].[Checked] AS [Checked], + [ScheduledDyelot].[UserAccount] AS [UserAccount] + FROM [dbo].[ScheduledDyelot] AS [ScheduledDyelot] + + + SELECT + [ScheduledDyelotHistory].[ID] AS [ID], + [ScheduledDyelotHistory].[Dyelot] AS [Dyelot], + [ScheduledDyelotHistory].[ReDye] AS [ReDye], + [ScheduledDyelotHistory].[StepNumber] AS [StepNumber], + [ScheduledDyelotHistory].[Process] AS [Process], + [ScheduledDyelotHistory].[Dispenser] AS [Dispenser], + [ScheduledDyelotHistory].[Machine] AS [Machine], + [ScheduledDyelotHistory].[TankNo] AS [TankNo], + [ScheduledDyelotHistory].[ScheduledTime] AS [ScheduledTime], + [ScheduledDyelotHistory].[Checked] AS [Checked], + [ScheduledDyelotHistory].[UserAccount] AS [UserAccount], + [ScheduledDyelotHistory].[Updated] AS [Updated] + FROM [dbo].[ScheduledDyelotHistory] AS [ScheduledDyelotHistory] + + + SELECT + [Shelf].[ShelfID] AS [ShelfID], + [Shelf].[MaxLayer] AS [MaxLayer], + [Shelf].[MaxPosition] AS [MaxPosition] + FROM [dbo].[Shelf] AS [Shelf] + + + SELECT + [TagShelf].[BucketNo] AS [BucketNo], + [TagShelf].[Dyelot] AS [Dyelot], + [TagShelf].[Machines] AS [Machines], + [TagShelf].[TagManagerNo] AS [TagManagerNo], + [TagShelf].[ReDye] AS [ReDye], + [TagShelf].[StepNumber] AS [StepNumber], + [TagShelf].[DID] AS [DID], + [TagShelf].[TotalBuckets] AS [TotalBuckets], + [TagShelf].[DevideNo] AS [DevideNo], + [TagShelf].[OnShelfTime] AS [OnShelfTime] + FROM [dbo].[TagShelf] AS [TagShelf] + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -2066,15 +2542,6 @@ - - - - - - - - - @@ -2112,92 +2579,134 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2231,36 +2740,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2290,63 +2772,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2361,69 +2786,65 @@ - + - + + - - + + - - - - - - - - - - - - + + + + + + + - + - + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -2455,6 +2876,9 @@ + + + @@ -2475,6 +2899,9 @@ + + + @@ -2510,6 +2937,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2523,6 +2992,9 @@ + + + @@ -2536,10 +3008,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2674,78 +3183,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2879,7 +3316,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2981,6 +3495,7 @@ + @@ -3002,6 +3517,7 @@ + @@ -3015,19 +3531,35 @@ - + - - + + - - + + + + + + + + + + + + + + + + + + @@ -3040,6 +3572,7 @@ + @@ -3051,6 +3584,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3084,80 +3654,187 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - - - - - - + + + + + + + - + + + + + + + + + + - + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - + - - + - - - - - - - + + + + + + + + + @@ -3165,28 +3842,38 @@ - + + + + - + + + + + + + + - - - - + + + + @@ -3194,47 +3881,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -3291,15 +3962,6 @@ - - - - - - - - - @@ -3335,54 +3997,96 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3456,36 +4160,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -3518,64 +4195,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3590,70 +4209,65 @@ - - - - + + + + - - - - - - - - - - - - + + + + + + + - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + @@ -3686,6 +4300,9 @@ + + + @@ -3706,6 +4323,9 @@ + + + @@ -3743,6 +4363,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3755,6 +4418,9 @@ + + + @@ -3765,13 +4431,52 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3907,76 +4612,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4112,9 +4747,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4213,6 +4927,7 @@ + @@ -4233,6 +4948,7 @@ + @@ -4248,17 +4964,35 @@ - - - + + + + - - + + + + + + + + + + + + + + + + + + + @@ -4270,6 +5004,7 @@ + @@ -4283,6 +5018,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4318,6 +5090,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -4331,6 +5125,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4351,6 +5182,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Models/SQL_BD.edmx.diagram b/Models/SQL_BD.edmx.diagram index fb35108..4496477 100644 --- a/Models/SQL_BD.edmx.diagram +++ b/Models/SQL_BD.edmx.diagram @@ -4,57 +4,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Models/DyelotsByShift.cs b/Models/SampleDyeDslvQueue.cs similarity index 58% rename from Models/DyelotsByShift.cs rename to Models/SampleDyeDslvQueue.cs index f5c296e..55fa023 100644 --- a/Models/DyelotsByShift.cs +++ b/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 TankNo { get; set; } public string Dyelot { get; set; } public int ReDye { get; set; } + public Nullable StepNumber { get; set; } + public Nullable State { get; set; } + public Nullable PassAuto { get; set; } + public Nullable ShelfID { get; set; } public string Machine { get; set; } - public System.DateTime StartTime { get; set; } - public System.DateTime EndTime { get; set; } - public double Duration { get; set; } - public string Shift { get; set; } - public string SingleShift { get; set; } + public Nullable SchDispenseTime { get; set; } + public Nullable Updated { get; set; } } } diff --git a/Models/Alarms.cs b/Models/ScheduledDyelot.cs similarity index 62% rename from Models/Alarms.cs rename to Models/ScheduledDyelot.cs index e11a077..8fa19e3 100644 --- a/Models/Alarms.cs +++ b/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 StepNumber { get; set; } + public string Process { get; set; } + public string Dispenser { get; set; } public string Machine { get; set; } - public string Name { get; set; } - public string Category { get; set; } - public string Variable { get; set; } - public System.DateTime StartTime { get; set; } - public System.DateTime EndTime { get; set; } - public double Duration { get; set; } - public string Shift { get; set; } + public Nullable TankNo { get; set; } + public Nullable ScheduledTime { get; set; } + public string Checked { get; set; } + public string UserAccount { get; set; } } } diff --git a/Models/Delays.cs b/Models/ScheduledDyelotHistory.cs similarity index 58% rename from Models/Delays.cs rename to Models/ScheduledDyelotHistory.cs index 4060a96..60485d4 100644 --- a/Models/Delays.cs +++ b/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 StepNumber { get; set; } + public string Process { get; set; } + public string Dispenser { get; set; } public string Machine { get; set; } - public string Name { get; set; } - public int Number { get; set; } - public System.DateTime StartTime { get; set; } - public System.DateTime EndTime { get; set; } - public double Duration { get; set; } - public string Shift { get; set; } + public Nullable TankNo { get; set; } + public Nullable ScheduledTime { get; set; } + public string Checked { get; set; } + public string UserAccount { get; set; } + public Nullable Updated { get; set; } } } diff --git a/Models/DyelotHistories.cs b/Models/Shelf.cs similarity index 73% rename from Models/DyelotHistories.cs rename to Models/Shelf.cs index cc9d7aa..faca010 100644 --- a/Models/DyelotHistories.cs +++ b/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 ReDye { get; set; } - public byte[] History { get; set; } + public int ShelfID { get; set; } + public Nullable MaxLayer { get; set; } + public Nullable MaxPosition { get; set; } } } diff --git a/Models/StepVisits.cs b/Models/StepVisits.cs deleted file mode 100644 index 5a5b27e..0000000 --- a/Models/StepVisits.cs +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -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 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 PlannedDuration { get; set; } - public Nullable OverRun { get; set; } - public Nullable TemperatureAfter { get; set; } - public string ProgramNumber { get; set; } - public Nullable StepNumber { get; set; } - public Nullable StartTemperature { get; set; } - public Nullable EndTemperature { get; set; } - } -} diff --git a/Models/Steps.cs b/Models/Steps.cs deleted file mode 100644 index 10437d8..0000000 --- a/Models/Steps.cs +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -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 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 PlannedDuration { get; set; } - public Nullable ActualDuration { get; set; } - public Nullable OverRun { get; set; } - public Nullable TemperatureAfter { get; set; } - public string ProgramNumber { get; set; } - public Nullable StepNumber { get; set; } - } -} diff --git a/Models/Stoppages.cs b/Models/Stoppages.cs deleted file mode 100644 index b147a06..0000000 --- a/Models/Stoppages.cs +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码已从模板生成。 -// -// 手动更改此文件可能导致应用程序出现意外的行为。 -// 如果重新生成代码，将覆盖对此文件的手动更改。 -// -//------------------------------------------------------------------------------ - -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 EndTime { get; set; } - public string Notes { get; set; } - public Nullable Duration { get; set; } - public string Shift { get; set; } - public string SingleShift { get; set; } - } -} diff --git a/Models/TagShelf.cs b/Models/TagShelf.cs new file mode 100644 index 0000000..f41643f --- /dev/null +++ b/Models/TagShelf.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// +// 此代码已从模板生成。 +// +// 手动更改此文件可能导致应用程序出现意外的行为。 +// 如果重新生成代码，将覆盖对此文件的手动更改。 +// +//------------------------------------------------------------------------------ + +namespace Models +{ + using System; + using System.Collections.Generic; + + public partial class TagShelf + { + public Nullable BucketNo { get; set; } + public string Dyelot { get; set; } + public string Machines { get; set; } + public Nullable TagManagerNo { get; set; } + public int ReDye { get; set; } + public Nullable StepNumber { get; set; } + public string DID { get; set; } + public Nullable TotalBuckets { get; set; } + public Nullable DevideNo { get; set; } + public Nullable OnShelfTime { get; set; } + } +}