推送暂存更改

SlnMesnac.Business/TagScanBusiness.cs

@@ -85,14 +85,17 @@ namespace SlnMesnac.Business
                         {
                             if (str.Length == 2)
                             {
-                                int number;
-                                bool isNumber = int.TryParse(str, out number);
-                                if (isNumber && str[0] == '1')
+                                if(str != "00")
                                 {
-                                    camList.Add(str);
-                                    continue;
+                                    int number;
+                                    bool isNumber = int.TryParse(str, out number);
+                                    if (isNumber && str[0] == '1')
+                                    {
+                                        camList.Add(str);
+                                        continue;
+                                    }
+                                    rfidList.Add(str);
                                 }
-                                rfidList.Add(str);
                             }
                         }
 

SlnMesnac.TouchSocket/ApiServer.cs

@@ -77,8 +77,12 @@ namespace SlnMesnac.TouchSocket
                 else
                 {
                     string rfidStr = hk.rfid;
-                    AnasysBuffer(ref rfidStr);
-                    hk.rfid = rfidStr;
+                    if (!string.IsNullOrEmpty(hk.rfid))
+                    {
+                        AnasysBuffer(ref rfidStr);
+                        hk.rfid = rfidStr;
+                    }
+                    
                 }
 
                 ScanLogSocket scan = new ScanLogSocket()

SlnMesnac.WPF/Page/IndexControl.xaml

@@ -149,7 +149,7 @@
                       Foreground="#31446E" x:Name="dataGrid" Margin="10,0,10,0">
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding CreateTime ,StringFormat=\{0:HH:mm:ss.fff\}}" Header="记录时间" Width="1.5*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding Rfid}" Header="RFID" Width="2*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding Code}" Header="ATR" Width="2*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding Ocr}" Header="OCR" Width="2*" IsReadOnly="True"/>

SlnMesnac.WPF/appsettings.json

@@ -13,7 +13,7 @@
       {
         "configId": "mes",
         "dbType": 4,
-        "connStr": "PORT=5432;DATABASE=daxing;HOST=192.168.0.101;PASSWORD=123456;USER ID=postgres"
+        "connStr": "PORT=5432;DATABASE=daxing;HOST=127.0.0.1;PASSWORD=123456;USER ID=postgres"
       }
     ]
   }