模板拍照时直接读取ID条码

SmartScan/SetControl/WPF/WPF_MaterialTemplate.xaml.cs

@@ -377,18 +377,26 @@ namespace SmartScan.SetControl.WPF
         private void UsrMaterialTemplate_BtnCameraImage_Click(object sender, RoutedEventArgs e)
         private void UsrMaterialTemplate_BtnCameraImage_Click(object sender, RoutedEventArgs e)
         {
         {
             if (mateIndex < 0) return;
             if (mateIndex < 0) return;
-            Bitmap[] result = Camera.Capture();
-            if (result.Length == 0) return;
+            if (Camera.useIDCamera)
+            {
+                bmp = null;
+                UsrMaterialTemplate_BtnScanCode_Click(sender, e);
+            }
+            else
+            {
+                Bitmap[] result = Camera.Capture();
+                if (result.Length == 0) return;
 
 
-            bmp = result[0];
-            data3.ItemsSource = null;
-            ImgShow.Image = null;
+                bmp = result[0];
+                data3.ItemsSource = null;
+                ImgShow.Image = null;
 
 
-            mateCopy[mateIndex].State = TemplateState.Unsaved;
-            mateCopy[mateIndex].ImagePath = "";
-            mateCopy[mateIndex].Image = bmp;
-            ImgShow.Image = bmp;
-            iscamp = true;
+                mateCopy[mateIndex].State = TemplateState.Unsaved;
+                mateCopy[mateIndex].ImagePath = "";
+                mateCopy[mateIndex].Image = bmp;
+                ImgShow.Image = bmp;
+                iscamp = true;
+            }
         }
         }
 
 
         private void UsrMaterialTemplate_BtnScanCode_Click(object sender, RoutedEventArgs e)
         private void UsrMaterialTemplate_BtnScanCode_Click(object sender, RoutedEventArgs e)