Merge branch 'SO00075(SO1164)扫码贴标机' of http://106.15.194.121:8083/liutao/SO827-A…

…utoScanAndLabel into SO00075(SO1164)扫码贴标机

DeviceLibrary/AutoScanAndLabel/Common.cs

@@ -126,8 +126,8 @@ namespace DeviceLibrary
             int srcbitmap_Width = srcbitmap.Width;
             int srcbitmap_Width = srcbitmap.Width;
             srcbitmap.Dispose();
             srcbitmap.Dispose();
 
 
-            bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
-
+            //bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);//格力
+            bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
 
 
             Size pointsize = new Size(30, 30);
             Size pointsize = new Size(30, 30);
             int widthOffset = 0;
             int widthOffset = 0;
@@ -272,7 +272,9 @@ namespace DeviceLibrary
                     {
                     {
                         newcodeInfos.Add(ci);
                         newcodeInfos.Add(ci);
                         //labelParam.codeInfos.Remove(ci);
                         //labelParam.codeInfos.Remove(ci);
-                        labelParam.QTY = int.Parse(m.Groups[1].Value);
+                        if (!int.TryParse(m.Groups[1].Value, out int qty))
+                            break;
+                        labelParam.QTY = qty;
                         debugmsg += $"匹配到QTY:{labelParam.QTY}\r\n命中规则:{qtyreg}\r\n";
                         debugmsg += $"匹配到QTY:{labelParam.QTY}\r\n命中规则:{qtyreg}\r\n";
                         break;
                         break;
                     }
                     }