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

Properties/Resources.Designer.cs

@@ -258,6 +258,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Cycletime 的本地化字符串。
+        /// </summary>
+        public static string Cycletime {
+            get {
+                return ResourceManager.GetString("Cycletime", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Delete 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -462,4 +462,7 @@
   <data name="ClothWheel" xml:space="preserve">
     <value>Cloth Wheel</value>
   </data>
+  <data name="Cycletime" xml:space="preserve">
+    <value>Cycle time</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -462,4 +462,7 @@
   <data name="ClothWheel" xml:space="preserve">
     <value>ClothWheel</value>
   </data>
+  <data name="Cycletime" xml:space="preserve">
+    <value>Cycletime</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -462,4 +462,7 @@
   <data name="ClothWheel" xml:space="preserve">
     <value>布轮</value>
   </data>
+  <data name="Cycletime" xml:space="preserve">
+    <value>行布周期</value>
+  </data>
 </root>

ViewModel/MainWindowViewModel.cs

@@ -74,11 +74,14 @@ namespace DyeingComputer.ViewModel
         private static int MT05;//主缸排水延时
         private static int MT06;//主缸排水延时
         private static double MT16;//流量计数系数
+        private int MT18;//主缸管数
         private static double MT33;//主缸温度偏差
         private int MT38;//高水位
         private int MT39;//中水位
         private int MT40;//低水位
         private static int MT90;//呼叫操作员
+
+        private int S16;//机型
         private int SM01;//副缸
         private int SM02;//副缸
         private int SM03;//副缸
@@ -101,12 +104,14 @@ namespace DyeingComputer.ViewModel
             MT05 = Convert.ToInt16(Selet_con("MT05"));//主缸排水延时
             MT06 = Convert.ToInt16(Selet_con("MT06"));//动力排水延时
             MT16 = Convert.ToDouble(Selet_con("MT16"));//流量计数系数
+            MT18 = Convert.ToInt16(Selet_con("MT18"));//
             MT33 = Convert.ToDouble(Selet_con("MT33"));//温度偏差参数
             MT38 = Convert.ToInt16(Selet_con("MT38"));//
             MT39 = Convert.ToInt16(Selet_con("MT39"));//
             MT40 = Convert.ToInt16(Selet_con("MT40"));//
             MT90 = Convert.ToInt16(Selet_con("MT90"));//呼叫操作员
 
+            S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息
             SM01 = Convert.ToInt16(Selet_sys("SM01"));//FG
             SM02 = Convert.ToInt16(Selet_sys("SM02"));//FG
             SM03 = Convert.ToInt16(Selet_sys("SM03"));//FG
@@ -935,9 +940,9 @@ namespace DyeingComputer.ViewModel
         void LOG_view()//细节页面
         {
             Sys_log = Resources.Target + Resources.Temperature + ":" + string.Format(" {0:###.#}", TEMP_tar) + "°C";//显示目标温度
+            Sys_log = Sys_log + " | " + Resources.MasterCylinder + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1010"))) + "°C";//显示实际温度
             Sys_log = Sys_log + "\n" + Resources.Compute + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1005"))) + "°C";//显示计算温度
-            Sys_log = Sys_log + "\n" + Resources.MasterCylinder + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1010"))) + "°C";//显示实际温度
+            Sys_log = Sys_log + " | " + Resources.ProportionalValves + ":" + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1004"))) + "%";//显示比例
-            Sys_log = Sys_log + "\n" + Resources.ProportionalValves  + ":" + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1004"))) + "%";//显示比例
             int IO1015 = Convert.ToInt16(Selet_dtm("1015"));
             if (IO1015 < MT39)
             {
@@ -960,7 +965,33 @@ namespace DyeingComputer.ViewModel
                 Sys_log = Sys_log + "\n" + Resources.PumpSpeed + ":" + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1020"))) + "% => [" + Resources.PumpStops + "]";//主泵状态
             }
             Sys_log = Sys_log + "\n-------------------------------------------------------";
-            Sys_log = Sys_log + "\n" + Resources.ClothWheel;
+            if (S16 == 0)
+            {
+                Sys_log = Sys_log + "\n" + Resources.ClothWheel + "1 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1022")));
+                if (MT18 >= 2) Sys_log = Sys_log + " | " + Resources.ClothWheel + "2 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1023")));
+                if (MT18 >= 3) Sys_log = Sys_log + " | " + Resources.ClothWheel + "3 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1024")));
+                if (MT18 >= 4) Sys_log = Sys_log + "\n" + Resources.ClothWheel + "4 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1025")));
+                if (MT18 >= 5) Sys_log = Sys_log + " | " + Resources.ClothWheel + "5 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1026")));
+                if (MT18 >= 6) Sys_log = Sys_log + " | " + Resources.ClothWheel + "6 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1027")));
+                if (MT18 >= 7) Sys_log = Sys_log + "\n" + Resources.ClothWheel + "7 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1028")));
+                if (MT18 >= 8) Sys_log = Sys_log + " | " + Resources.ClothWheel + "8 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1029")));
+                if (MT18 >= 9) Sys_log = Sys_log + " | " + Resources.ClothWheel + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1030")));
+                if (MT18 >= 10) Sys_log = Sys_log + "\n" + Resources.ClothWheel + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1031")));
+                Sys_log = Sys_log + "\n" + Resources.Cycletime + "1 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1032")));
+                if (MT18 >= 2) Sys_log = Sys_log + " | " + Resources.Cycletime + "2 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1033")));
+                if (MT18 >= 3) Sys_log = Sys_log + " | " + Resources.Cycletime + "3 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1034")));
+                if (MT18 >= 4) Sys_log = Sys_log + "\n" + Resources.Cycletime + "4 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1035")));
+                if (MT18 >= 5) Sys_log = Sys_log + " | " + Resources.Cycletime + "5 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1036")));
+                if (MT18 >= 6) Sys_log = Sys_log + " | " + Resources.Cycletime + "6 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1037")));
+                if (MT18 >= 7) Sys_log = Sys_log + "\n" + Resources.Cycletime + "7 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1038")));
+                if (MT18 >= 8) Sys_log = Sys_log + " | " + Resources.Cycletime + "8 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1039")));
+                if (MT18 >= 9) Sys_log = Sys_log + " | " + Resources.Cycletime + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1040")));
+                if (MT18 >= 10) Sys_log = Sys_log + "\n" + Resources.Cycletime + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1041")));
+            }//溢流/o型
+            else if (S16 == 1) //气流
+            { }
+            else if (S16 == 2) //桶纱
+            { }
             Sys_log = Sys_log + "\n-------------------------------------------------------";
             if (SM01 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "1 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1017"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1012"))) + "°C]";
             if (SM02 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "2 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1018"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1013"))) + "°C]";