Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

UserClass/Json.cs

@@ -58,9 +58,40 @@ namespace DyeingComputer.UserClass
         public string Remark { get; set; }
         public string ProcessID { get; set; }
         public int State { get; set; }
-        public int _lock { get; set; }
+        public int lock_ { get; set; }
+    }
+    public class RUN_
+    {
+        public string Program { get; set; }
+        public int Step { get; set; }
+        public string StepID { get; set; }
+        public string StepName { get; set; }
+        public string ParameterName { get; set; }
+        public double Parameter1 { get; set; }
+        public double Parameter2 { get; set; }
+        public double Parameter3 { get; set; }
+        public double Parameter4 { get; set; }
+        public double Parameter5 { get; set; }
+        public double Parameter6 { get; set; }
+        public double Parameter7 { get; set; }
+        public double Parameter8 { get; set; }
+        public double Parameter9 { get; set; }
+        public double Parameter10 { get; set; }
+        public string Remark { get; set; }
+        public int Run { get; set; }
+        public string Ryelot { get; set; }
+    }
+    public class DyelotHistory_ 
+    {
+        public DateTime TIME { get; set;}
+        public string WorkOrder { get; set; }
+        public string Dyelot { get; set; }
+        public int Tank { get; set; }
+        public int Step { get; set; }
+        public int State { get; set; }
+        public int Redye { get; set; }
+        public int Type { get; set; }
+        public string Machine { get; set; }
     }
 
-
-
 }