Merge branch 'NS100_WPF' of http://106.15.194.121:8083/zdl/NS100 into NS100_WPF

SmartScan/SetControl/WPF/WPF_MaterialTemplate.xaml.cs

@@ -94,10 +94,6 @@ namespace SmartScan.SetControl.WPF
                     
                     
                     var bitMap= (Bitmap)ObjConversion.ReadImageFile(iamgepath);
                     var bitMap= (Bitmap)ObjConversion.ReadImageFile(iamgepath);
                     int contenI = 1;
                     int contenI = 1;
-
-                    //给条码加上识别数字
-                    //kmon
-                    //2025-6-25
                     mateCopy[mateIndex].Code.ForEach(codeInfo =>
                     mateCopy[mateIndex].Code.ForEach(codeInfo =>
                     {
                     {
                         PointF ConterPoint;
                         PointF ConterPoint;
@@ -124,6 +120,9 @@ namespace SmartScan.SetControl.WPF
                         data3.SelectedIndex = -1;
                         data3.SelectedIndex = -1;
                     bmp = (Bitmap)ImgShow.Image;
                     bmp = (Bitmap)ImgShow.Image;
 
 
+                    //给条码加上识别数字
+                    //kmon
+                    //2025-6-25
 
 
                 }
                 }
                 else
                 else