Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

ConvertMoels/ProductTypeSQLConvert.cs

@@ -19,7 +19,7 @@ namespace Audit.ConvertMoels
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             string ProductType = System.Convert.ToString(value);
-            if (ProductType == "0")//类型0：染料，1：助剂，2：粉体助剂，3：液体染料，其它:未知
+            if (ProductType == "0")//类型0：染料，1：助剂，2：粉体助剂，其它:未知
             {
                 return "染料";
             }
@@ -36,19 +36,12 @@ namespace Audit.ConvertMoels
                         return "粉体助剂";
                     }
                     else
-                    {
-                        if (ProductType == "3")
-                        {
-                            return "液体染料";
-                        }
-                        else
                     {
                         return "未知类型";
                     }
             }
         }
         }
-        }
         /// <summary> 
         /// </summary>
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)