From 69ee76c13978285f07e183e013bd601cb72afc92 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期三, 27 八月 2025 16:45:24 +0800
Subject: [PATCH] PLC报警添加种类分别存储

---
 src/Bro.M141.Process/UI/UIPrinter.cs           |  186 ++++++++++++++++++++++++------
 src/Bro.M141.Process/M141Config.cs             |    7 +
 src/Bro.M141.Process/M141Process.cs            |  130 +++++++++++++++++----
 src/Bro.M141.Process/M141Process_ImageCheck.cs |    2 
 4 files changed, 257 insertions(+), 68 deletions(-)

diff --git a/src/Bro.M141.Process/M141Config.cs b/src/Bro.M141.Process/M141Config.cs
index 576f8cd..786e81b 100644
--- a/src/Bro.M141.Process/M141Config.cs
+++ b/src/Bro.M141.Process/M141Config.cs
@@ -386,6 +386,7 @@
         public string plcname { get; set; } = "";
 
 
+
         [Category("PLC閰嶇疆")]
         [DisplayName("鏄惁鍚敤")]
         [Description("鏄惁鍚敤")]
@@ -422,6 +423,12 @@
         [Description("鎶ヨ鍚嶇О")]
         public string alarmname { get; set; } = "";
 
+        [Category("閰嶇疆")]
+        [DisplayName("鎶ヨ绉嶇被")]
+        [Description("鎶ヨ绉嶇被")]
+        public string alarmtype { get; set; } = "";
+
+
         [Browsable(false)]
         [JsonIgnore]
         public int value { get; set; } = -1;
diff --git a/src/Bro.M141.Process/M141Process.cs b/src/Bro.M141.Process/M141Process.cs
index be2c952..4c0649f 100644
--- a/src/Bro.M141.Process/M141Process.cs
+++ b/src/Bro.M141.Process/M141Process.cs
@@ -13,6 +13,7 @@
 using MySql.Data.MySqlClient;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Function;
 using NPOI.SS.Formula.Functions;
 using Org.BouncyCastle.Asn1.X509;
 using Org.BouncyCastle.Ocsp;
@@ -189,6 +190,8 @@
 
 
             Dictionary<string, List<int>> StateDIC = new Dictionary<string, List<int>>();
+            List<string> AlarmTypeList = new List<string>();
+
             int numplc = 0;
             while (true)
             {
@@ -285,16 +288,15 @@
                                 }
 
                                 var alrams = item1.AlarmDetails;
+
                                 var plcdev = DeviceCollection.FirstOrDefault(u => u.Id == item1.plcname) as PLCBase;
 
-                                if (!StateDIC.ContainsKey(plcdev.Name))
-                                {
-                                    StateDIC[plcdev.Name] = new List<int>();
-                                }
-
+                                  
+                                
                                 foreach (var item in alrams.GroupBy(u => u.address))
                                 {
                                     int add = item.Key;
+
                                     var readres = plcdev.Read(add, 1, out _)[0];
 
                                     var Allbin = Convert.ToString(readres, 2).PadLeft(16, '0').Select(c => c - '0').ToArray();
@@ -304,39 +306,103 @@
                                     foreach (var item2 in item)
                                     {
                                         item2.value = Allbin[item2.address2];
+
+                                        if (!AlarmTypeList.Contains(item2.alarmtype))
+                                        {
+
+                                            AlarmTypeList.Add(item2.alarmtype);
+
+                                            LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{item2.alarmtype}鍔犲叆闃熷垪,闃熷垪涓暟涓簕AlarmTypeList.Count}");
+                                        }
                                     }
                                 }
+
+                                string StateDICKey = "";
+
+                                foreach (var item in AlarmTypeList)
+                                {
+
+                                    StateDICKey = plcdev.Name +"_"+ item;
+
+                                    if (!StateDIC.ContainsKey(StateDICKey))
+                                    {
+
+                                        StateDIC[StateDICKey] = new List<int>();
+
+                                        LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{StateDICKey}鍔犲叆瀛楀吀锛歋tateDIC");
+
+                                    }
+
+                                    //if (!StateDIC.ContainsKey(plcdev.Name))
+                                    //{
+
+                                    //       StateDIC[plcdev.Name] = new List<int>();
+                                    //}
+                                }
+
+                                Dictionary<string, AlarmTypeData> AlarmType = new Dictionary<string, AlarmTypeData>();
+
                                 List<int> list = new List<int>();
+                             
                                 foreach (var item in alrams)
                                 {
-                                    csvhead += $",{item.alarmname}";
-                                    csvdata += $",{(item.value == 1 ? "1" : "")}";
-                                    list.Add(item.value);
-                                }
+                                    if (!AlarmType.ContainsKey(item.alarmtype))
+                                    {
+                                        AlarmType.Add(item.alarmtype, new AlarmTypeData()
+                                        {
+                                            CSVhead = csvhead,
+                                            CSVdata = csvdata,
+                                        });
 
-                                if (!StateDIC[plcdev.Name].SequenceEqual(list))
+                                    }
+
+                                    if (AlarmType.ContainsKey(item.alarmtype))
+                                    {
+                                        AlarmType[item.alarmtype].CSVhead += $",{item.alarmname}";
+
+                                        AlarmType[item.alarmtype].CSVdata += $",{(item.value == 1 ? "1" : "")}";
+
+                                        AlarmType[item.alarmtype].AlarmTypeValue.Add(item.value);
+
+                                        LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"鎶ヨ绫诲埆{item.alarmtype}锛涙暟鍊納item.value}鍔犲叆瀛楀吀锛欰larmType");
+                                    }
+                                    
+                                }
+                                foreach(var item in AlarmType.Keys)
                                 {
-                                    StateDIC[plcdev.Name].Clear();
-                                    StateDIC[plcdev.Name].AddRange(list);
 
-                                    CSVRecordAsync($"PLCstate_{plcdev.Name}.csv", csvdata, csvhead);
+                                    list = AlarmType[item].AlarmTypeValue;
 
-                                    var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
+                                    string key = plcdev.Name+"_"+item;
 
-                                    if (showdata == null)
+                                    if (!StateDIC[key].SequenceEqual(list))
                                     {
-                                        showdata = new List<string>();
+                                        LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ绫诲瀷锛歿item}鐨勪俊鍙峰彂鐢熷彉鍖�");
+
+                                        StateDIC[key].Clear();
+
+                                        StateDIC[key].AddRange(list);
+
+                                        CSVRecordAsync($"PLCstate_{key}.csv", AlarmType[item].CSVhead, AlarmType[item].CSVdata);
+
+                                        var showdata = alrams.Where(u => u.value == 1).Select(u => u.alarmname).ToList();
+
+                                        if (showdata == null)
+                                        {
+                                            showdata = new List<string>();
+                                        }
+
+                                        if (showdata.Count > 0)
+                                        {
+                                            LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"{plcdev.Name}鎶ヨ 涓暟:{showdata.Count}  {string.Join(',', showdata)}");
+                                        }
+                                        else
+                                        {
+                                            LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ 涓暟:0");
+                                        }
                                     }
 
-                                    if (showdata.Count > 0)
-                                    {
-                                        LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"{plcdev.Name}鎶ヨ 涓暟:{showdata.Count}  {string.Join(',', showdata)}");
-                                    }
-                                    else
-                                    {
-                                        LogAsync(DateTime.Now, EnumHelper.LogLevel.Detail, $"{plcdev.Name}鎶ヨ 涓暟:0");
-                                    }
-                                }
+                                }                                
                             }
                             catch
                             {
@@ -350,8 +416,6 @@
                 {
 
                 }
-
-
 
                 try
                 {
@@ -376,6 +440,18 @@
             }
         }
 
+        public class AlarmTypeData
+        {
+            public List <int> AlarmTypeValue;
+
+            public string CSVhead;
+
+            public string CSVdata;
+
+        }
+
+
+
         /// <summary>
         /// 缃戠粶棰勭儹
         /// </summary>
diff --git a/src/Bro.M141.Process/M141Process_ImageCheck.cs b/src/Bro.M141.Process/M141Process_ImageCheck.cs
index 854498c..794d46a 100644
--- a/src/Bro.M141.Process/M141Process_ImageCheck.cs
+++ b/src/Bro.M141.Process/M141Process_ImageCheck.cs
@@ -714,6 +714,8 @@
 
             Plc2 = invokeDevice as PLCBase;
             string message = "";
+
+
             StartPrinter.Invoke(message);
             return msg;
         }
diff --git a/src/Bro.M141.Process/UI/UIPrinter.cs b/src/Bro.M141.Process/UI/UIPrinter.cs
index 08daaa9..d44f6f1 100644
--- a/src/Bro.M141.Process/UI/UIPrinter.cs
+++ b/src/Bro.M141.Process/UI/UIPrinter.cs
@@ -17,6 +17,7 @@
 using System.Windows.Forms;
 using ZXing;
 using ZXing.Common;
+using ZXing.QrCode;
 using static System.Windows.Forms.AxHost;
 
 //using System.Printing;
@@ -102,55 +103,85 @@
                 //int height = 160 * Scale;
                 var g = e.Graphics;
 
-                Font font = new Font("Arial", 8 * Scale);//璁剧疆瀛椾綋棰滆壊
-                Font font2 = new Font("Arial", 11 * Scale);//璁剧疆瀛椾綋棰滆壊
-                Font font3 = new Font("Arial", 36 * Scale);//璁剧疆瀛椾綋棰滆壊
-                Font font4 = new Font("Arial", 12 * Scale);//璁剧疆瀛椾綋棰滆壊
+                //Font font = new Font("Arial", 8 * Scale);//璁剧疆瀛椾綋棰滆壊
+                //Font font2 = new Font("Arial", 11 * Scale);//璁剧疆瀛椾綋棰滆壊
+                //Font font3 = new Font("Arial", 36 * Scale);//璁剧疆瀛椾綋棰滆壊
+                //Font font4 = new Font("Arial", 12 * Scale);//璁剧疆瀛椾綋棰滆壊
 
 
-                Pen p = new Pen(Color.Black, Scale);//瀹氫箟浜嗕竴涓粦鑹�,瀹藉害涓�1鐨勭敾绗�
+                //Pen p = new Pen(Color.Black, Scale);//瀹氫箟浜嗕竴涓粦鑹�,瀹藉害涓�1鐨勭敾绗�
                 g.Clear(Color.White);
-                g.DrawRectangle(p, startX * Scale, startY * Scale, 70 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(10,10),瀹戒负80,楂樹负20
-                g.DrawRectangle(p, startX * Scale, startY * Scale, 280 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(90,10),瀹戒负80,楂樹负20
-                g.DrawString("鍘傚晢", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
-                g.DrawString("鍢夊桨绉戞妧", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);
+
+                BarcodeWriter writer = new BarcodeWriter();
+                writer.Format = BarcodeFormat.QR_CODE;
+                QrCodeEncodingOptions options = new QrCodeEncodingOptions()
+                {
+                    DisableECI = true,//璁剧疆鍐呭缂栫爜
+                    CharacterSet = "UTF-8",  //璁剧疆浜岀淮鐮佺殑瀹藉害鍜岄珮搴�
+                    Width = 123,
+                    Height = 123,
+                    Margin = 1//璁剧疆浜岀淮鐮佺殑杈硅窛,鍗曚綅涓嶆槸鍥哄畾鍍忕礌
+                };
+
+                writer.Options = options;
+                Bitmap map = writer.Write(numvalue);
+                e.Graphics.DrawImage(map, new System.Drawing.Point(90, 10));
 
 
-                //绗簩琛屾暟鎹�
-                g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
-                g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 280 * Scale, 20 * Scale);
-                g.DrawString("鍝佸悕", font, brush, (startX + 20) * Scale, (startY + 25) * Scale);
-                g.DrawString(@"COVER LG208H-RC100 #2", font4, brush, (startX + 71) * Scale, (startY + 22) * Scale);
+                // 鍦ㄤ簩缁寸爜涓嬫柟鐢诲唴瀹规枃瀛�
+                using (Font font = new Font("Arial", 10))
+                using (Brush brush3 = new SolidBrush(Color.Black))
+                {
+                    // 璁╂枃瀛楀眳涓埌浜岀淮鐮佷笅鏂�
+                    SizeF textSize = e.Graphics.MeasureString(numvalue, font);
+                    float textX = 90 + (map.Width - textSize.Width) / 2;
+                    float textY = 10 + map.Height;
 
-                //绗笁琛屾暟鎹�
-                g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 70 * Scale, 20 * Scale);
-                g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 280 * Scale, 20 * Scale);
-                g.DrawString("鏂欏彿", font, brush, (startX + 20) * Scale, (startY + 45) * Scale);
-                g.DrawString(@"436LG208I000", font2, brush, (startX + 130) * Scale, (startY + 43) * Scale);
-
-                //绗洓琛屾暟鎹�
-                g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 70 * Scale, 20 * Scale);
-                g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 210 * Scale, 20 * Scale);
-                g.DrawString("鏁伴噺", font, brush, (startX + 20) * Scale, (startY + 65) * Scale);
-                g.DrawString(@"50PCS", font2, brush, (startX + 120) * Scale, (startY + 62) * Scale);
-
-                //绗簲琛屾暟鎹�
-                g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 70 * Scale, 20 * Scale);
-                g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 210 * Scale, 20 * Scale);
-                g.DrawString("鐢熶骇鏃ユ湡", font, brush, (startX + 10) * Scale, (startY + 85) * Scale);
-                g.DrawString($"{DateTime.Now.ToString("yyyy.MM.dd")}", font2, brush, (startX + 105) * Scale, (startY + 82) * Scale);
-
-                //绗叚琛屾暟鎹�
-                g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 70 * Scale, 20 * Scale);
-                g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 140 * Scale, 20 * Scale);
-                g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 210 * Scale, 20 * Scale);
-                g.DrawString("MARK1", font, brush, (startX + 15) * Scale, (startY + 104) * Scale);
-                g.DrawString("MARK2", font, brush, (startX + 155) * Scale, (startY + 104) * Scale);
+                    e.Graphics.DrawString(numvalue, font, brush3, textX, textY);
+                }
 
 
-                //渚ч潰
-                g.DrawRectangle(p, (startX + 210) * Scale, (startY + 60) * Scale, 70 * Scale, 60 * Scale);
-                g.DrawString(@"#2", font3, brush, (startX + 210) * Scale, (startY + 62) * Scale);
+                //g.DrawRectangle(p, startX * Scale, startY * Scale, 70 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(10,10),瀹戒负80,楂樹负20
+                //g.DrawRectangle(p, startX * Scale, startY * Scale, 280 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(90,10),瀹戒负80,楂樹负20
+                //g.DrawString("鍘傚晢", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
+                //g.DrawString("鍢夊桨绉戞妧", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);
+
+
+                ////绗簩琛屾暟鎹�
+                //g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
+                //g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 280 * Scale, 20 * Scale);
+                //g.DrawString("鍝佸悕", font, brush, (startX + 20) * Scale, (startY + 25) * Scale);
+                //g.DrawString(@"COVER LG208H-RC100 #2", font4, brush, (startX + 71) * Scale, (startY + 22) * Scale);
+
+                ////绗笁琛屾暟鎹�
+                //g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 70 * Scale, 20 * Scale);
+                //g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 280 * Scale, 20 * Scale);
+                //g.DrawString("鏂欏彿", font, brush, (startX + 20) * Scale, (startY + 45) * Scale);
+                //g.DrawString(@"436LG208I000", font2, brush, (startX + 130) * Scale, (startY + 43) * Scale);
+
+                ////绗洓琛屾暟鎹�
+                //g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 70 * Scale, 20 * Scale);
+                //g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 210 * Scale, 20 * Scale);
+                //g.DrawString("鏁伴噺", font, brush, (startX + 20) * Scale, (startY + 65) * Scale);
+                //g.DrawString(@"50PCS", font2, brush, (startX + 120) * Scale, (startY + 62) * Scale);
+
+                ////绗簲琛屾暟鎹�
+                //g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 70 * Scale, 20 * Scale);
+                //g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 210 * Scale, 20 * Scale);
+                //g.DrawString("鐢熶骇鏃ユ湡", font, brush, (startX + 10) * Scale, (startY + 85) * Scale);
+                //g.DrawString($"{DateTime.Now.ToString("yyyy.MM.dd")}", font2, brush, (startX + 105) * Scale, (startY + 82) * Scale);
+
+                ////绗叚琛屾暟鎹�
+                //g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 70 * Scale, 20 * Scale);
+                //g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 140 * Scale, 20 * Scale);
+                //g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 210 * Scale, 20 * Scale);
+                //g.DrawString("MARK1", font, brush, (startX + 15) * Scale, (startY + 104) * Scale);
+                //g.DrawString("MARK2", font, brush, (startX + 155) * Scale, (startY + 104) * Scale);
+
+
+                ////渚ч潰
+                //g.DrawRectangle(p, (startX + 210) * Scale, (startY + 60) * Scale, 70 * Scale, 60 * Scale);
+                //g.DrawString(@"#2", font3, brush, (startX + 210) * Scale, (startY + 62) * Scale);
             }
             catch (Exception ee)
             {
@@ -158,6 +189,79 @@
             }
         }
 
+
+        //private void printDocument_Print(object sender, PrintPageEventArgs e)
+        //{
+        //    Font fntTxt = new Font("榛戜綋", 15, System.Drawing.FontStyle.Bold);//姝f枃鏂囧瓧               
+        //    System.Drawing.Brush brush = new SolidBrush(System.Drawing.Color.Black);//鐢诲埛           
+        //    try
+        //    {
+        //        string numvalue = message;
+
+        //        float Scale = (float)0.95;
+        //        int startX = 10;
+        //        int startY = 25;
+
+        //        //int length = 320 * Scale;
+        //        //int height = 160 * Scale;
+        //        var g = e.Graphics;
+
+        //        Font font = new Font("Arial", 8 * Scale);//璁剧疆瀛椾綋棰滆壊
+        //        Font font2 = new Font("Arial", 11 * Scale);//璁剧疆瀛椾綋棰滆壊
+        //        Font font3 = new Font("Arial", 36 * Scale);//璁剧疆瀛椾綋棰滆壊
+        //        Font font4 = new Font("Arial", 12 * Scale);//璁剧疆瀛椾綋棰滆壊
+
+
+        //        Pen p = new Pen(Color.Black, Scale);//瀹氫箟浜嗕竴涓粦鑹�,瀹藉害涓�1鐨勭敾绗�
+        //        g.Clear(Color.White);
+        //        g.DrawRectangle(p, startX * Scale, startY * Scale, 70 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(10,10),瀹戒负80,楂樹负20
+        //        g.DrawRectangle(p, startX * Scale, startY * Scale, 280 * Scale, 20 * Scale);//鍦ㄧ敾鏉夸笂鐢荤煩褰�,璧峰鍧愭爣涓�(90,10),瀹戒负80,楂樹负20
+        //        g.DrawString("鍘傚晢", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
+        //        g.DrawString("鍢夊桨绉戞妧", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);
+
+
+        //        //绗簩琛屾暟鎹�
+        //        g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);
+        //        g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 280 * Scale, 20 * Scale);
+        //        g.DrawString("鍝佸悕", font, brush, (startX + 20) * Scale, (startY + 25) * Scale);
+        //        g.DrawString(@"COVER LG208H-RC100 #2", font4, brush, (startX + 71) * Scale, (startY + 22) * Scale);
+
+        //        //绗笁琛屾暟鎹�
+        //        g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 70 * Scale, 20 * Scale);
+        //        g.DrawRectangle(p, startX * Scale, (startY + 40) * Scale, 280 * Scale, 20 * Scale);
+        //        g.DrawString("鏂欏彿", font, brush, (startX + 20) * Scale, (startY + 45) * Scale);
+        //        g.DrawString(@"436LG208I000", font2, brush, (startX + 130) * Scale, (startY + 43) * Scale);
+
+        //        //绗洓琛屾暟鎹�
+        //        g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 70 * Scale, 20 * Scale);
+        //        g.DrawRectangle(p, startX * Scale, (startY + 60) * Scale, 210 * Scale, 20 * Scale);
+        //        g.DrawString("鏁伴噺", font, brush, (startX + 20) * Scale, (startY + 65) * Scale);
+        //        g.DrawString(@"50PCS", font2, brush, (startX + 120) * Scale, (startY + 62) * Scale);
+
+        //        //绗簲琛屾暟鎹�
+        //        g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 70 * Scale, 20 * Scale);
+        //        g.DrawRectangle(p, startX * Scale, (startY + 80) * Scale, 210 * Scale, 20 * Scale);
+        //        g.DrawString("鐢熶骇鏃ユ湡", font, brush, (startX + 10) * Scale, (startY + 85) * Scale);
+        //        g.DrawString($"{DateTime.Now.ToString("yyyy.MM.dd")}", font2, brush, (startX + 105) * Scale, (startY + 82) * Scale);
+
+        //        //绗叚琛屾暟鎹�
+        //        g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 70 * Scale, 20 * Scale);
+        //        g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 140 * Scale, 20 * Scale);
+        //        g.DrawRectangle(p, startX * Scale, (startY + 100) * Scale, 210 * Scale, 20 * Scale);
+        //        g.DrawString("MARK1", font, brush, (startX + 15) * Scale, (startY + 104) * Scale);
+        //        g.DrawString("MARK2", font, brush, (startX + 155) * Scale, (startY + 104) * Scale);
+
+
+        //        //渚ч潰
+        //        g.DrawRectangle(p, (startX + 210) * Scale, (startY + 60) * Scale, 70 * Scale, 60 * Scale);
+        //        g.DrawString(@"#2", font3, brush, (startX + 210) * Scale, (startY + 62) * Scale);
+        //    }
+        //    catch (Exception ee)
+        //    {
+        //        MessageBox.Show(ee.Message);
+        //    }
+        //}
+
         private void printDocument_Print222(object sender, PrintPageEventArgs e)
         {
             Font fntTxt = new Font("榛戜綋", 15, System.Drawing.FontStyle.Bold);//姝f枃鏂囧瓧               

--
Gitblit v1.8.0