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

DyeingComputer.csproj

@@ -425,6 +425,8 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="Lmage\ID051.png" />
+    <Resource Include="Lmage\ID050.png" />
     <Resource Include="Lmage\ADD.jpg" />
     <Resource Include="Lmage\ERR.png" />
     <Resource Include="Lmage\ID093.png" />

ViewModel/MainWindowViewModel.cs

@@ -315,11 +315,9 @@ namespace DyeingComputer.ViewModel
         public int MI02;//喷射流量信息
         public int MI03;//动态压力
         public int MI04;//能耗信息
-
         private double MS01;//1缸温度偏差
         private double MS02;//2缸温度偏差
         private double MS03;//3缸温度偏差
-
         public int MS17;//副缸
         public int MS18;//副缸
         public int MS19;//副缸
@@ -2060,14 +2058,17 @@ namespace DyeingComputer.ViewModel
             if (SK5 == "1")//是否检查原料类型
             {
                 SQLI = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " +
-                    "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "' AND State = '101' AND ProductType='" + Type + "'", null).Tables[0].Rows.Count;
+                    "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + 
+                    "' AND State = '101' AND ProductType='" + Type + "'", null).Tables[0].Rows.Count;
             }
             else
             {
                 SQLI = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where " +
-                    "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "' AND State = '101'", null).Tables[0].Rows.Count;
+                    "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + 
+                    "' AND State = '101'", null).Tables[0].Rows.Count;
             }
-            if (SQLI > 0) SQLiteHelpers.Update("Dyelot", dat_FR, "Dyelot = '" + Dyelot + "' AND Step = '" + STEP + "' AND Redye ='" + SYS_REDYE + "'", null);//行更新         
+            if (SQLI > 0) SQLiteHelpers.Update("Dyelot", dat_FR, "Dyelot = '" + Dyelot + "' AND Step = '" +
+                STEP + "' AND Redye ='" + SYS_REDYE + "'", null);//行更新         
             SQLiteHelpers.Close();  //关闭连接
         }