选择程序界面条码匹配规则修改

DeviceLibrary/bean/BoardInfo.cs

@@ -12,7 +12,19 @@ namespace TSA_V.DeviceLibrary
 {
 {
     public class BoardInfo
     public class BoardInfo
     {
     {
+        public string boardShowName
+        {
+            get
+            {
 
 
+                if (String.IsNullOrEmpty(boardCode))
+                {
+                    return boardName;
+                }
+                return boardName + "(" + boardCode + ")";
+            }
+            set { }
+        }
         /// <summary>
         /// <summary>
         /// 电路板ID
         /// 电路板ID
         /// </summary>
         /// </summary>

TSA-V/App.config

@@ -105,7 +105,7 @@
     <!--组装完成后上传数据的服务器地址-->
     <!--组装完成后上传数据的服务器地址-->
     <!--<add key="DCSServerAddr" value="http://192.168.8.1:1007/DCS_Integration/Cartridge.asmx?op=CartridgeInfo" />-->
     <!--<add key="DCSServerAddr" value="http://192.168.8.1:1007/DCS_Integration/Cartridge.asmx?op=CartridgeInfo" />-->
     <!--组装工作前，需要输入pcb板条码-->
     <!--组装工作前，需要输入pcb板条码-->
-    <add key="NeedPCBCode" value="1" />
+    <add key="NeedPCBCode" value="0" />
   </appSettings>
   </appSettings>
   <log4net>
   <log4net>
     <appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">
     <appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">

TSA-V/workForm/FrmBoardSelect.cs

@@ -46,7 +46,7 @@ namespace TSA_V
             board.boardName = "";
             board.boardName = "";
             list.Insert(0, board);
             list.Insert(0, board);
             cmbBoardList.DataSource = list;
             cmbBoardList.DataSource = list;
-            cmbBoardList.DisplayMember = "boardName";
+            cmbBoardList.DisplayMember = "boardShowName";
             cmbBoardList.ValueMember = "boardId";
             cmbBoardList.ValueMember = "boardId";
         }
         }
         int preIndex = -1;
         int preIndex = -1;
@@ -102,7 +102,11 @@ namespace TSA_V
             if (!code.Equals(""))
             if (!code.Equals(""))
             {
             {
                 int index = -1;
                 int index = -1;
-                List<BoardInfo> list = (from m in BoardManager.boardList where m.boardCode.Equals(code) select m).ToList<BoardInfo>();
+                List<BoardInfo> list = (from m in BoardManager.boardList where m.boardCode.StartsWith(code) select m).ToList<BoardInfo>();
+                if (list.Count <= 0)
+                {
+                    list = (from m in BoardManager.boardList where code.StartsWith(m.boardCode) select m).ToList<BoardInfo>();
+                }
                 if (list.Count > 0)
                 if (list.Count > 0)
                 {
                 {
                     foreach (BoardInfo board in BoardManager.boardList)
                     foreach (BoardInfo board in BoardManager.boardList)

TSA-V/记录.txt

@@ -88,3 +88,9 @@ SmartWorkstation.exe.config文件需要增加参数：
 2.增加通用IO端口值判断，调宽电机原点返回时如果已在原点，先相对走-1000.
 2.增加通用IO端口值判断，调宽电机原点返回时如果已在原点，先相对走-1000.
 3.原点返回过程中，工作界面点结束会卡死
 3.原点返回过程中，工作界面点结束会卡死
 4.主界面增加设备状态显示。
 4.主界面增加设备状态显示。
+
+
+
+20210518
+1.条码根据开头的匹配
+2.
\ No newline at end of file