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

ViewModel/MainWindowViewModel.cs

@@ -1861,12 +1861,18 @@ namespace DyeingComputer.ViewModel
             {
                 switch (STEP_ID)
                 {
-                    case "015":
-
-                        break;//溢流水洗
                     case "017":
-
+                        if (errTabler.Rows.Count == 0) Status_Str = Resources.Washing + "(" + Properties.Resources.Cooling + ")";
-                        break;//降温水洗                     
+                        break;//降温水洗
+                    case "050":
+                        if (STEP_P1 < Selet_dtm("1010")) Updata_dtd("3007", true);
+                        if (STEP_P2 >= Selet_dta("4011")) { STEP_finish = true; Updata_dtd("3007", false); }
+                        if (125 <= Selet_dtm("1010")) { STEP_finish = true; Updata_dtd("3007", false); }
+                        break;//主缸加压
+                    case "051":
+                        if (STEP_P1 > Selet_dtm("1010")) Updata_dtd("3008", true);
+                        if (STEP_P2 > Selet_dta("4011")) STEP_finish = true;
+                        break;//主缸减压
                     case "064":
                         if ((STEP_P1 == 1) || (STEP_P1 == 0))
                         {
@@ -2046,9 +2052,6 @@ namespace DyeingComputer.ViewModel
                         }//药缸3
                          //STEP_finish = true;
                         break;//呼叫输送
-                    case "067":
-
-                        break;//等待输送
                     case "090":
                         if (((STEP_P1 - 1) < Selet_dtm("1010")) && (Selet_dtm("1010") < (STEP_P1 + 1))) PH_start = true;//达到温度开始ph控制
                         if (PH_start)
@@ -2088,6 +2091,19 @@ namespace DyeingComputer.ViewModel
                         }
                         if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHDetection + "(" + STEP_TIME + ")";
                         break;//PH检测
+                    case "094":
+                        if (STEP_TIME <= 0)//控制时间到达结束
+                        {
+                            PH_start = false;
+                            STEP_finish = true;
+                        }
+                        else
+                        {
+                            PH_start = true;
+                            STEP_TIME--;
+                        }
+                        if (errTabler.Rows.Count == 0) Status_Str = "PH" + Resources.PHControl + "(" + STEP_TIME + "S)";
+                        break;//PH控制(时间)
                     default:
                         break;
                 }

Windows/ViewStep.xaml.cs

@@ -340,10 +340,10 @@ namespace DyeingComputer.Windows
         }
 
 
-        private readonly string[] id_dat = {"001","007","008","013","015" , "020", "022", "031", "035", 
+        private readonly string[] id_dat = {"001","007","008","013","015" , "020", "022", "031", "035", "036", 
-            "036", "039", "040", "041", "049", "050", "051", "054", "055", "056","064","065","066","067"};
+            "039", "040", "041", "049", "050", "051", "054", "055", "056","064","065","066","067", "090","091",
-        private readonly string[] id_datp = {" " ,"017", "050", "051", "064", "066","067","090","091",
             "093","094" };
+        private readonly string[] id_datp = {" " ,"017", "050", "051", "064", "066","090","091", "093","094" };
 
         private void Form1_Load()
         {
@@ -370,6 +370,10 @@ namespace DyeingComputer.Windows
             this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
             this.boxID.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066
             this.boxID.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067
+            this.boxIDp.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
+            this.boxIDp.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
+            this.boxIDp.Items.Add(Properties.Resources.PHDetection);//ph检测093
+            this.boxIDp.Items.Add(Properties.Resources.PHControl);//ph控制094
 
 
             this.boxIDp.Items.Add("");//
@@ -378,7 +382,6 @@ namespace DyeingComputer.Windows
             this.boxIDp.Items.Add(Properties.Resources.Depressurized);//减压051
             this.boxIDp.Items.Add(Properties.Resources.PrepareMedications);//备药064
             this.boxIDp.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066
-            this.boxIDp.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067
             this.boxIDp.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
             this.boxIDp.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
             this.boxIDp.Items.Add(Properties.Resources.PHDetection);//ph检测093