Browse Source

颜色绑定先进行全字匹配

洺瑀 葛 1 year ago
parent
commit
976103a71c
3 changed files with 11 additions and 3 deletions
  1. 7 1
      SIMDP.BLL/BlColorContrast.cs
  2. 1 1
      SIMDP.Project/App.config
  3. 3 1
      SIMDP.Project/Form/MainForm.cs

+ 7 - 1
SIMDP.BLL/BlColorContrast.cs

@@ -24,8 +24,14 @@ namespace SIMDP.BLL
         {
         {
             if (string.IsNullOrEmpty(colorCard)) return -1;
             if (string.IsNullOrEmpty(colorCard)) return -1;
 
 
-            string sql = $"select top 1 paint_line from color_contrast where color_card like '{colorCard}%'";
+            string sql = $"select top 1 paint_line from color_contrast where color_card = '{colorCard}'";
             var list = dalData.SqlValueList(sql);
             var list = dalData.SqlValueList(sql);
+            if (string.IsNullOrEmpty(list))
+            {
+                sql = $"select top 1 paint_line from color_contrast where color_card like '{colorCard}%'";
+                list = dalData.SqlValueList(sql);
+            }
+
             if (string.IsNullOrEmpty(list)) return -1;
             if (string.IsNullOrEmpty(list)) return -1;
             else return Convert.ToInt32(list);
             else return Convert.ToInt32(list);
         }
         }

+ 1 - 1
SIMDP.Project/App.config

@@ -10,7 +10,7 @@
 		<add key="ComponentDbType" value="sqlserver" />
 		<add key="ComponentDbType" value="sqlserver" />
 		<!--默认登陆的用户ID-->
 		<!--默认登陆的用户ID-->
 		<add key="DefaultUser" value="123" />
 		<add key="DefaultUser" value="123" />
-		<add key="Version" value="1.8.2" />
+		<add key="Version" value="1.8.3" />
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 	</appSettings>
 	</appSettings>
 	<connectionStrings>
 	<connectionStrings>

+ 3 - 1
SIMDP.Project/Form/MainForm.cs

@@ -34,6 +34,8 @@ namespace SIMDP.Project
 
 
         public MainForm()
         public MainForm()
         {
         {
+           // BLLFactory<BlColorContrast>.Instance.GetPaintLinebyColorCard("R565M");
+
             InitializeComponent();
             InitializeComponent();
 
 
             DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Office 2019 Colorful");
             DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Office 2019 Colorful");
@@ -56,7 +58,7 @@ namespace SIMDP.Project
                 LogIn();
                 LogIn();
             }
             }
             InitRibbonPage();
             InitRibbonPage();
-            InitMonitor();
+           // InitMonitor();
 
 
             SysSubscribeEvent();
             SysSubscribeEvent();
             barButtonItemReset_ItemClick(this, null);
             barButtonItemReset_ItemClick(this, null);