版本-V1.0.1 现场使用加入钢网检测,优化部分功能

MaiMuAOI/MaiMuAOI/ImageProcessing/DefectLib.cs

@@ -37,6 +37,8 @@ namespace MaiMuAOI.ImageProcessing
         private List<DefectTask> taskList = new List<DefectTask>(); 
         private List<DefectTask> taskOperationList = new List<DefectTask>();
         private List<DefectTask> taskTagList = new List<DefectTask>();
+
+        private string t_ClaseeName = "";
         public DefectLib()
         {
         } 
@@ -68,7 +70,8 @@ namespace MaiMuAOI.ImageProcessing
                 t_task_operation2 = new System.Threading.Thread(run2);
                 t_task_operation2.IsBackground = true;
                 t_task_operation2.Start();
-               
+
+                t_ClaseeName = "";
                 return true;
             }
             catch (Exception ex)
@@ -125,7 +128,7 @@ namespace MaiMuAOI.ImageProcessing
             catch { }
         }
         private string _preLoadONNXFilePath;//记录上次成功加载的模型，不重复加载
-        public void loadModelFile(string onnxFilePath)
+        public void loadModelFile(string onnxFilePath, string ClassName = "")
         {
             //string modelFilePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\DevCfg\\best.onnx";
             //不重复加载
@@ -148,6 +151,8 @@ namespace MaiMuAOI.ImageProcessing
             }
             _onnxSession = yolo1.LoadModel(onnxFilePath, true);//false-CPU true-显卡
             _preLoadONNXFilePath = onnxFilePath;
+
+            t_ClaseeName = ClassName;
         }
         /// <summary>
         /// 保存图片
@@ -261,7 +266,11 @@ namespace MaiMuAOI.ImageProcessing
                         stopwatch.Start();
                         IDisposableReadOnlyCollection<DisposableNamedOnnxValue>[] results = yolo1.RunModlel(_onnxSession, task.tensors);
                         liStep = 1; 
-                        task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+                        if(t_ClaseeName == "钢网")
+                            task.informationList = yolo1.ScreeningResults_YD_GW(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+                        else
+                            task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
+                        
                         liStep = 2;
                          
                         //当前大图上缺陷个数

MaiMuAOI/MaiMuAOI/MaiMuAOI.csproj

@@ -118,7 +118,7 @@
     </Reference>
     <Reference Include="Service, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Service\bin\Release\Service.dll</HintPath>
+      <HintPath>..\Service\bin\Debug\Service.dll</HintPath>
     </Reference>
     <Reference Include="SixLabors.ImageSharp">
       <HintPath>Dlls\SixLabors.ImageSharp.dll</HintPath>
@@ -175,24 +175,48 @@
     <Compile Include="SysCtrl\ConfMgr.cs" />
     <Compile Include="SysCtrl\SysEnum.cs" />
     <Compile Include="SysCtrl\SysMgr.cs" />
+    <Compile Include="SysUI\DefectPicShow\AmendantRecordFrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\AmendantRecordFrm.Designer.cs">
+      <DependentUpon>AmendantRecordFrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\DefectPicShow\CamImageFrm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SysUI\DefectPicShow\CamImageFrm.Designer.cs">
       <DependentUpon>CamImageFrm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysUI\DefectPicShow\DataQueryFrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\DataQueryFrm.Designer.cs">
+      <DependentUpon>DataQueryFrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\DefectPicShow\DebugTestFrm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SysUI\DefectPicShow\DebugTestFrm.Designer.cs">
       <DependentUpon>DebugTestFrm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysUI\DefectPicShow\HistoryViewFrm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\HistoryViewFrm.Designer.cs">
+      <DependentUpon>HistoryViewFrm.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\DefectPicShow\ImageShowFrm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="SysUI\DefectPicShow\ImageShowFrm.Designer.cs">
       <DependentUpon>ImageShowFrm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysUI\DefectPicShow\PageCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SysUI\DefectPicShow\PageCtrl.Designer.cs">
+      <DependentUpon>PageCtrl.cs</DependentUpon>
+    </Compile>
     <Compile Include="SysUI\Load\InitFrm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -387,15 +411,27 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="SysUI\DefectPicShow\AmendantRecordFrm.resx">
+      <DependentUpon>AmendantRecordFrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\DefectPicShow\CamImageFrm.resx">
       <DependentUpon>CamImageFrm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysUI\DefectPicShow\DataQueryFrm.resx">
+      <DependentUpon>DataQueryFrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\DefectPicShow\DebugTestFrm.resx">
       <DependentUpon>DebugTestFrm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysUI\DefectPicShow\HistoryViewFrm.resx">
+      <DependentUpon>HistoryViewFrm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\DefectPicShow\ImageShowFrm.resx">
       <DependentUpon>ImageShowFrm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysUI\DefectPicShow\PageCtrl.resx">
+      <DependentUpon>PageCtrl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SysUI\Load\InitFrm.resx">
       <DependentUpon>InitFrm.cs</DependentUpon>
     </EmbeddedResource>

MaiMuAOI/MaiMuAOI/MainFrm.Designer.cs

@@ -29,11 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.tsmSysmgr = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmStepMgr = new System.Windows.Forms.ToolStripMenuItem();
@@ -97,10 +97,11 @@
             this.tsslLoginInfo = new System.Windows.Forms.ToolStripStatusLabel();
             this.tslabelTime = new System.Windows.Forms.ToolStripStatusLabel();
             this.lblTimeLen = new System.Windows.Forms.Label();
-            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
             this.chkDoorSensor = new System.Windows.Forms.CheckBox();
             this.chkBuzzer = new System.Windows.Forms.CheckBox();
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.defectString = new System.Windows.Forms.Label();
             this.menuStrip1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -508,27 +509,27 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvProcess.BackgroundColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            this.dgvProcess.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvProcess.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvProcess.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCode,
             this.colProcessName,
             this.colValue});
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.Black;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle14;
+            this.dgvProcess.DefaultCellStyle = dataGridViewCellStyle4;
             this.dgvProcess.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(72)))), ((int)(((byte)(92)))), ((int)(((byte)(172)))));
             this.dgvProcess.Location = new System.Drawing.Point(2, 16);
             this.dgvProcess.Margin = new System.Windows.Forms.Padding(2);
@@ -537,8 +538,8 @@
             this.dgvProcess.ReadOnly = true;
             this.dgvProcess.RowHeadersVisible = false;
             this.dgvProcess.RowHeadersWidth = 62;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvProcess.RowTemplate.Height = 30;
             this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvProcess.Size = new System.Drawing.Size(449, 51);
@@ -557,9 +558,9 @@
             // colProcessName
             // 
             this.colProcessName.DataPropertyName = "ProcessName";
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.colProcessName.DefaultCellStyle = dataGridViewCellStyle12;
+            this.colProcessName.DefaultCellStyle = dataGridViewCellStyle2;
             this.colProcessName.HeaderText = "工序名称";
             this.colProcessName.MinimumWidth = 8;
             this.colProcessName.Name = "colProcessName";
@@ -570,8 +571,8 @@
             // colValue
             // 
             this.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
-            this.colValue.DefaultCellStyle = dataGridViewCellStyle13;
+            this.colValue.DefaultCellStyle = dataGridViewCellStyle3;
             this.colValue.HeaderText = "内容";
             this.colValue.MinimumWidth = 8;
             this.colValue.Name = "colValue";
@@ -608,6 +609,7 @@
             // 
             // splitContainer3.Panel2
             // 
+            this.splitContainer3.Panel2.Controls.Add(this.defectString);
             this.splitContainer3.Panel2.Controls.Add(this.label5);
             this.splitContainer3.Panel2.Controls.Add(this.lblDefectResult);
             this.splitContainer3.Panel2.Controls.Add(this.label7);
@@ -892,16 +894,6 @@
             this.lblTimeLen.TabIndex = 23;
             this.lblTimeLen.Text = "检测时长: 0 秒";
             // 
-            // uiTitel1
-            // 
-            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
-            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.uiTitel1.FatherForm = null;
-            this.uiTitel1.Location = new System.Drawing.Point(0, 43);
-            this.uiTitel1.Name = "uiTitel1";
-            this.uiTitel1.Size = new System.Drawing.Size(1031, 46);
-            this.uiTitel1.TabIndex = 0;
-            // 
             // backgroundWorker1
             // 
             this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
@@ -934,6 +926,25 @@
             this.chkBuzzer.Text = "禁用蜂鸣器";
             this.chkBuzzer.UseVisualStyleBackColor = false;
             // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 43);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(1031, 46);
+            this.uiTitel1.TabIndex = 0;
+            // 
+            // defectString
+            // 
+            this.defectString.AutoSize = true;
+            this.defectString.Location = new System.Drawing.Point(29, 59);
+            this.defectString.Name = "defectString";
+            this.defectString.Size = new System.Drawing.Size(53, 12);
+            this.defectString.TabIndex = 12;
+            this.defectString.Text = "缺陷详情";
+            // 
             // MainFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1062,6 +1073,7 @@
         private System.ComponentModel.BackgroundWorker backgroundWorker1;
         private System.Windows.Forms.CheckBox chkDoorSensor;
         private System.Windows.Forms.CheckBox chkBuzzer;
+        private System.Windows.Forms.Label defectString;
     }
 }
 

MaiMuAOI/MaiMuAOI/MainFrm.cs

@@ -73,6 +73,7 @@ namespace MaiMuAOI
             this.chkBuzzer.Top = toolStrip1.Top + 20;
             this.chkDoorSensor.Top = toolStrip1.Top + 20;
 
+            this.defectString.Text = "";
         }
 
         #region 私有方法
@@ -131,6 +132,7 @@ namespace MaiMuAOI
 
             this.lblCompareResult.Text = this.lblDefectResult.Text = "无";
 
+            this.defectString.Text = "";
             //
             this.lblCompareResult.ForeColor = this.lblDefectResult.ForeColor = Color.White;
 
@@ -143,6 +145,9 @@ namespace MaiMuAOI
 
             this.tsbtnStop.Enabled = false;
 
+            this.cbProductCode.Enabled = true;
+            this.cbProductSN.Enabled = true;
+
             this.splitContainer3.SplitterDistance = this.splitContainer3.Width / 2 - 30;
 
             lblTimeLen.Text = "检测时长: 0 秒";
@@ -185,7 +190,11 @@ namespace MaiMuAOI
                 if (InitSystem())
                 {
                     this.Cursor = Cursors.WaitCursor;
-                    this.WindowState = FormWindowState.Maximized;
+                    //this.WindowState = FormWindowState.Maximized;
+                    this.Top = 0;
+                    this.Left = 0;
+                    this.Width = SystemInformation.WorkingArea.Width;
+                    this.Height = SystemInformation.WorkingArea.Height;
                     this.splitContainer1.SplitterDistance = this.Width / 3;
                     
                     this.dgvProcess.AutoGenerateColumns = false;
@@ -314,11 +323,15 @@ namespace MaiMuAOI
         }
         private void tsmSysDataFind_Click(object sender, EventArgs e)
         {
-            //WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B",
+            DataQueryFrm frm = new DataQueryFrm();
-            //    "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort.ToString() + "/static/index.html#/");
-            WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B", "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort + "/static/index.html#/");
             frm.WindowState = FormWindowState.Maximized;
             frm.Show();
+
+            //WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B",
+            //    "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort.ToString() + "/static/index.html#/");
+            //WebFrm frm = new WebFrm("查询统计", $"reportRecordSN?CustomerVer=B", "http://127.0.0.1:" + ConfMgr.Instance.SysConfigParams.HttpServerPort + "/static/index.html#/");
+            //frm.WindowState = FormWindowState.Maximized;
+            //frm.Show();
         }
         private void 系统管理ToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -470,6 +483,8 @@ namespace MaiMuAOI
                     {
                         lblDefectResult.Text = "未通过";
 
+                        defectString.Text = e.ResultStr;
+
                         this.lblDefectResult.Text = (e.CompareResult ? "通过" : "未通过");
                         if (!e.CompareResult)
                         {
@@ -497,6 +512,9 @@ namespace MaiMuAOI
                     {
                         this.tsbtnStart.Enabled = true;
                         this.tsbtnStop.Enabled = false;
+
+                        this.cbProductCode.Enabled = true;
+                        this.cbProductSN.Enabled = true;
                     }
                 }
                 catch { }
@@ -659,6 +677,9 @@ namespace MaiMuAOI
                     {
                         this.tsbtnStop.Enabled = true;
                         this.tsbtnStart.Enabled = false;
+                        //锁定信息
+                        this.cbProductCode.Enabled = false;
+                        this.cbProductSN.Enabled = false;
                         //记录开始运行时间
                         RunStartTime.Restart();
                     }

MaiMuAOI/MaiMuAOI/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

MaiMuAOI/MaiMuAOI/SysCtrl/SysEnum.cs

@@ -125,6 +125,22 @@ namespace MaiMuAOI.SysCtrl
         栅线,
         断栅
     }
+
+    public enum DefectCode2Enum
+    {
+        [Description("钢丝")]
+        gs,
+        [Description("脏污")]
+        zw,
+        [Description("正常")]
+        zc,
+    }
+    public enum DefectName2Enum
+    {
+        钢丝,
+        脏污,
+        正常,
+    }
     public enum ValType
     {
         字符串,

MaiMuAOI/MaiMuAOI/SysCtrl/SysMgr.cs

@@ -73,7 +73,7 @@ namespace MaiMuAOI.SysCtrl
         }
         #endregion
         //系统信息
-        public string Info = "软件名称：AOI\r\n软件版本：V1.0.0\r\n公司：迈沐智能科技有限公司\r\n地址：";
+        public string Info = "软件名称：AOI\r\n软件版本：V1.0.1\r\n公司：迈沐智能科技有限公司\r\n地址：";
 
         public CameraEnumType SysUseCam = CameraEnumType.MVSCamera_CC;
         public LightDevNameEnum SysUseLight = LightDevNameEnum.CST;
@@ -108,12 +108,17 @@ namespace MaiMuAOI.SysCtrl
         private List<string> productCodeList = new List<string>();
         public List<string> ProductCodeList { get { return productCodeList; } }
 
+        //产品ID列表
+        private List<int> productIdList = new List<int>();
+        public List<int> ProductIdList { get { return productIdList; } }
+
         //近期SN列表
         private List<string> productSNList = new List<string>();
         public List<string> ProductSNList { get { return productSNList; } }
 
         Service.ProductService PdtService;
         Service.OrderService OrderService;
+        Service.ClassesService ClassesService;
 
         //可用步骤
         public static Dictionary<string, string> dicDevType = new Dictionary<string, string>();
@@ -210,6 +215,7 @@ namespace MaiMuAOI.SysCtrl
             Service.InitDB.ConnectionString = confMgr.DBConStr;
             PdtService = new Service.ProductService();
             OrderService = new OrderService();
+            ClassesService = new ClassesService();
             webService = new WebService();
 
             scannerGBmpQueue = new Queue<scannerGBmpLoc>();
@@ -951,14 +957,16 @@ namespace MaiMuAOI.SysCtrl
         {
             try
             {
-                productCodeList = PdtService.GetList().Select(m => m.Code).OrderBy(m => m).ToList();
+                //productCodeList = PdtService.GetList().Select(m => m.Code).OrderBy(m => m).ToList();
+                productCodeList = PdtService.GetList().Select(m => m.Code).ToList();
+                productIdList = PdtService.GetList().Select(m => m.Id).ToList();
 
-                string[] array = ReadSNText();
+                //string[] array = ReadSNText();
-                if (array != null && array.Length > 0)
+                //if (array != null && array.Length > 0)
-                {    
+                //{    
-                    for (int i = 0; i < array.Length; i++)
+                //    for (int i = 0; i < array.Length; i++)
-                        productSNList.Add(array[i]);
+                //        productSNList.Add(array[i]);
-                }
+                //}
             }
             catch (Exception ex)
             {
@@ -1374,7 +1382,10 @@ namespace MaiMuAOI.SysCtrl
                         onnxFile = $"{ConfMgr.Instance.SysConfigParams.AIModelPath}\\{model.DefectModelFile}";
                     else
                         onnxFile = $"{ConfMgr.Instance.SysConfigParams.AIModelPath}\\default.onnx";
-                    defectLib.loadModelFile(onnxFile);
+
+                   Classes classTemp = this.ClassesService.GetById(model.ClassesId);
+                   
+                    defectLib.loadModelFile(onnxFile, classTemp.Name);
 
                     //输入SN
                     errStep = 2;
@@ -1398,7 +1409,7 @@ namespace MaiMuAOI.SysCtrl
                     Log("运行", $"料号：{code}，网版编码：{sn}");
 
                     //记忆
-                    Remind(sn);
+                    //Remind(sn);
                     //查询SN是否重复
                     var findSN = OrderService.GetModelNav(sn);
                     if (findSN != null)
@@ -1813,7 +1824,13 @@ namespace MaiMuAOI.SysCtrl
             //    if (!dic.ContainsKey(code))
             //        dic.Add(code, 0);
             //}
-            var lstDefect = ConfMgr.GetArrayList<DefectCodeEnum>();
+            Classes classtemp = ClassesService.GetById(m.ClassesId);
+
+            ArrayList lstDefect;
+            if ((classtemp != null) && (classtemp.Name == "钢网"))
+                lstDefect = ConfMgr.GetArrayList<DefectCode2Enum>();
+            else
+                lstDefect = ConfMgr.GetArrayList<DefectCodeEnum>();
             foreach (DictionaryEntry item in lstDefect)
             {
                 string code = item.Value.ToString();
@@ -1838,6 +1855,9 @@ namespace MaiMuAOI.SysCtrl
                     case "zw":
                         order.ZWCount++;
                         break;
+                    case "gs":
+                        order.GSYCCount++;
+                        break;
                     case "gsyc":
                         order.GSYCCount++;
                         break;
@@ -2371,6 +2391,10 @@ namespace MaiMuAOI.SysCtrl
                                             }
                                             else
                                             {
+                                                //不合格
+                                                order.Qualified = false;
+                                                order.CompareResult = 2;
+                                                                                               
                                                 SizeNGCnt++;
                                                 OnAutoRuning(new RunEventArgs(3, false, SizeNGCnt));
                                                 OnAutoRuning(new RunEventArgs(liStatocStepIndex, $"index:{res.index}，图像比对失败！"));
@@ -2793,39 +2817,124 @@ namespace MaiMuAOI.SysCtrl
 
                     //判断是否合格 
                     DefectCodeEnum defectCode;
+                    DefectCode2Enum defectCode2;
                     string defectNames = "";
-                    if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                    //if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                    //{
+                    //    int itemDefectCount;
+                    //    foreach (var item in model.QualifiedCriterionList)
+                    //    {
+                    //        Classes classtemp = ClassesService.GetById(model.ClassesId);
+                    //        if ((classtemp != null) && (classtemp.Name == "钢网"))
+                    //        {
+                    //            defectCode2 = EnumExtension.Convert2Enum<DefectCode2Enum>(item.DefectCode);
+                    //            itemDefectCount = getDefectCountFromCode(order, defectCode2);
+                    //            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                    //            {
+                    //                order.Qualified = false;
+                    //                defectNames += $"{EnumExtension.GetEnumDescription(defectCode2)}({itemDefectCount}),";
+                    //            }
+                    //        }
+                    //        else
+                    //        {
+                    //            defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                    //            itemDefectCount = getDefectCountFromCode(order, defectCode);
+                    //            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                    //            {
+                    //                order.Qualified = false;
+                    //                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                    //            }
+                    //        }   
+                            
+                    //    }
+                    //}
+                    //else
                     {
+                        Log("结果", "结果判断");
                         int itemDefectCount;
-                        foreach (var item in model.QualifiedCriterionList)
+                        bool isGetQua = false;
+                        Classes classtemp = ClassesService.GetById(model.ClassesId);
+                        if ((classtemp != null) && (classtemp.Name == "钢网"))
                         {
-                            defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                            Log("结果", $"类别判断:{classtemp.Name}");
-                            itemDefectCount = getDefectCountFromCode(order, defectCode);
+                            for (int enumcnt = 0; enumcnt < 3; enumcnt++)
-                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
                             {
-                                order.Qualified = false;
+                                isGetQua = false;
-                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                //判断是否是过滤项
+                                if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                                {
+                                    foreach (var item in model.QualifiedCriterionList)
+                                    {
+                                        defectCode2 = EnumExtension.Convert2Enum<DefectCode2Enum>(item.DefectCode);
+                                        //是过滤
+                                        if (defectCode2 == (DefectCode2Enum)enumcnt)
+                                        {
+                                            isGetQua = true;
+                                            itemDefectCount = getDefectCountFromCode(order, defectCode2);
+                                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                            {
+                                                order.Qualified = false;
+                                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode2)}({itemDefectCount}),";
+                                            }
+                                        }
+                                    }
+                                }
+                                if (!isGetQua)
+                                {
+                                    itemDefectCount = getDefectCountFromCode(order, (DefectCode2Enum)enumcnt);
+                                    if (itemDefectCount > 0)
+                                    {
+                                        order.Qualified = false;
+                                        defectNames += $"{EnumExtension.GetEnumDescription((DefectCode2Enum)enumcnt)}({itemDefectCount}),";
+                                    }
+                                }
                             }
                         }
-                    }
+                        else
-                    else
-                    {
-                        Log("结果", "默认判断");
-                        int itemDefectCount;
-                        for(int enumcnt = 0; enumcnt < 12; enumcnt++)
                         {
-                            itemDefectCount = getDefectCountFromCode(order, (DefectCodeEnum)enumcnt);
+                            if (classtemp != null)
-                            if ( itemDefectCount >0)
+                                Log("结果", $"类别判断:{classtemp.Name}");
+                            else
+                                Log("结果", $"类别默认");
+                            for (int enumcnt = 0; enumcnt < 12; enumcnt++)
                             {
-                                order.Qualified = false;
+                                isGetQua = false;
-                                defectNames += $"{EnumExtension.GetEnumDescription((DefectCodeEnum)enumcnt)}({itemDefectCount}),";
+                                //判断是否是过滤项
+                                if (model.QualifiedCriterionList != null && model.QualifiedCriterionList.Count > 0)
+                                {
+                                    foreach (var item in model.QualifiedCriterionList)
+                                    {
+                                        defectCode = EnumExtension.Convert2Enum<DefectCodeEnum>(item.DefectCode);
+                                        //是过滤
+                                        if (defectCode == (DefectCodeEnum)enumcnt)
+                                        {
+                                            isGetQua = true;
+                                            itemDefectCount = getDefectCountFromCode(order, defectCode);
+                                            if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
+                                            {
+                                                order.Qualified = false;
+                                                defectNames += $"{EnumExtension.GetEnumDescription(defectCode)}({itemDefectCount}),";
+                                            }
+                                        }
+                                    }
+                                }
+                                if (!isGetQua)
+                                {
+                                    itemDefectCount = getDefectCountFromCode(order, (DefectCodeEnum)enumcnt);
+                                    if (itemDefectCount > 0)
+                                    {
+                                        order.Qualified = false;
+                                        defectNames += $"{EnumExtension.GetEnumDescription((DefectCodeEnum)enumcnt)}({itemDefectCount}),";
+                                    }
+                                }
                             }
+
                         }
                     }
 
                     stopWatch.Stop();
                     long timeLen = stopWatch.ElapsedMilliseconds / 1000;
-                    OnAutoRuning(new RunEventArgs(4, defectNames == "",0));
+                    OnAutoRuning(new RunEventArgs(4, defectNames == "",0, defectNames));
                     OnAutoRuning(new RunEventArgs(timeLen));
                     //界面显示
 
@@ -2916,6 +3025,19 @@ namespace MaiMuAOI.SysCtrl
                     return 0;
             }
         }
+
+        private int getDefectCountFromCode(Order order, DefectCode2Enum defectCodeEnum)
+        {
+            switch (defectCodeEnum)
+            {
+                case DefectCode2Enum.gs:
+                    return order.GSYCCount;
+                case DefectCode2Enum.zw:
+                    return order.ZWCount;
+                default:
+                    return 0;
+            }
+        }
         #endregion
 
         #region 日志图片删除
@@ -2925,7 +3047,7 @@ namespace MaiMuAOI.SysCtrl
             //删除文件
             Task.Factory.StartNew(() =>
             {
-
+                //图片
                 if (confMgr.SysConfigParams.DefectBigImag.AutoDelete)
                     statusMgr.DeleteFiles(confMgr.SysConfigParams.DefectBigImag.SavePath, confMgr.SysConfigParams.DefectBigImag.AutoDeleteDays, true);
                 if (confMgr.SysConfigParams.DefectSmallImag.AutoDelete)
@@ -2938,7 +3060,9 @@ namespace MaiMuAOI.SysCtrl
                     statusMgr.DeleteFiles(confMgr.SysConfigParams.SizeNGImag.SavePath, confMgr.SysConfigParams.SizeNGImag.AutoDeleteDays, true);
                 if (confMgr.SysConfigParams.SizeRepairImag.AutoDelete)
                     statusMgr.DeleteFiles(confMgr.SysConfigParams.SizeRepairImag.SavePath, confMgr.SysConfigParams.SizeRepairImag.AutoDeleteDays, true);
-  
+                //日志
+                if (confMgr.SysConfigParams.AutoDeleteLog)
+                    statusMgr.DeleteFiles(confMgr.SysConfigParams.LogPath, confMgr.SysConfigParams.AutoDeleteLogData, true);
             });
         }
         #endregion
@@ -3138,6 +3262,9 @@ namespace MaiMuAOI.SysCtrl
         private bool _compareResult;
         public bool CompareResult {  get { return _compareResult; } }
 
+        private string _resultStr;
+        public string ResultStr { get { return _resultStr; } }
+
         private long _time;
         public long Time { get { return _time; } }
         private long _cnt;
@@ -3159,11 +3286,12 @@ namespace MaiMuAOI.SysCtrl
             this._stepIndex = stepIndex;
             _mesg = mesg;
         }
-        public RunEventArgs(int cmd, bool rel, int cnt)
+        public RunEventArgs(int cmd, bool rel, int cnt, string str = "")
         {
             this._cmd = cmd;
             this._compareResult = rel;
             this._cnt = cnt;
+            this._resultStr = str;
         }
         public RunEventArgs(long time )
         {

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.Designer.cs

@@ -0,0 +1,513 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class AmendantRecordFrm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.skinButton3 = new CCWin.SkinControl.SkinButton();
+            this.skinButton1 = new CCWin.SkinControl.SkinButton();
+            this.numericUpDown22 = new System.Windows.Forms.NumericUpDown();
+            this.label24 = new System.Windows.Forms.Label();
+            this.numericUpDown21 = new System.Windows.Forms.NumericUpDown();
+            this.label23 = new System.Windows.Forms.Label();
+            this.numericUpDown20 = new System.Windows.Forms.NumericUpDown();
+            this.label22 = new System.Windows.Forms.Label();
+            this.numericUpDown19 = new System.Windows.Forms.NumericUpDown();
+            this.label21 = new System.Windows.Forms.Label();
+            this.numericUpDown18 = new System.Windows.Forms.NumericUpDown();
+            this.label20 = new System.Windows.Forms.Label();
+            this.numericUpDown17 = new System.Windows.Forms.NumericUpDown();
+            this.label19 = new System.Windows.Forms.Label();
+            this.numericUpDown16 = new System.Windows.Forms.NumericUpDown();
+            this.label18 = new System.Windows.Forms.Label();
+            this.numericUpDown15 = new System.Windows.Forms.NumericUpDown();
+            this.label17 = new System.Windows.Forms.Label();
+            this.numericUpDown14 = new System.Windows.Forms.NumericUpDown();
+            this.label16 = new System.Windows.Forms.Label();
+            this.numericUpDown13 = new System.Windows.Forms.NumericUpDown();
+            this.label15 = new System.Windows.Forms.Label();
+            this.numericUpDown12 = new System.Windows.Forms.NumericUpDown();
+            this.label14 = new System.Windows.Forms.Label();
+            this.radioButton3 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 0);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(810, 46);
+            this.uiTitel1.TabIndex = 37;
+            // 
+            // skinButton3
+            // 
+            this.skinButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton3.BackColor = System.Drawing.Color.White;
+            this.skinButton3.BaseColor = System.Drawing.Color.Red;
+            this.skinButton3.BorderColor = System.Drawing.Color.Red;
+            this.skinButton3.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton3.DownBack = null;
+            this.skinButton3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.skinButton3.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton3.InnerBorderColor = System.Drawing.Color.Red;
+            this.skinButton3.Location = new System.Drawing.Point(736, 66);
+            this.skinButton3.MouseBack = null;
+            this.skinButton3.Name = "skinButton3";
+            this.skinButton3.NormlBack = null;
+            this.skinButton3.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton3.Size = new System.Drawing.Size(61, 27);
+            this.skinButton3.TabIndex = 153;
+            this.skinButton3.Text = "取消";
+            this.skinButton3.UseVisualStyleBackColor = false;
+            this.skinButton3.Click += new System.EventHandler(this.skinButton3_Click);
+            // 
+            // skinButton1
+            // 
+            this.skinButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton1.BackColor = System.Drawing.Color.White;
+            this.skinButton1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton1.DownBack = null;
+            this.skinButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.skinButton1.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton1.InnerBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.Location = new System.Drawing.Point(661, 66);
+            this.skinButton1.MouseBack = null;
+            this.skinButton1.Name = "skinButton1";
+            this.skinButton1.NormlBack = null;
+            this.skinButton1.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton1.Size = new System.Drawing.Size(61, 27);
+            this.skinButton1.TabIndex = 152;
+            this.skinButton1.Text = "保存";
+            this.skinButton1.UseVisualStyleBackColor = false;
+            this.skinButton1.Click += new System.EventHandler(this.skinButton1_Click);
+            // 
+            // numericUpDown22
+            // 
+            this.numericUpDown22.Location = new System.Drawing.Point(505, 261);
+            this.numericUpDown22.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown22.Name = "numericUpDown22";
+            this.numericUpDown22.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown22.TabIndex = 151;
+            this.numericUpDown22.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.Location = new System.Drawing.Point(404, 263);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(59, 12);
+            this.label24.TabIndex = 150;
+            this.label24.Text = "栅线数量:";
+            // 
+            // numericUpDown21
+            // 
+            this.numericUpDown21.Location = new System.Drawing.Point(287, 261);
+            this.numericUpDown21.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown21.Name = "numericUpDown21";
+            this.numericUpDown21.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown21.TabIndex = 149;
+            this.numericUpDown21.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.Location = new System.Drawing.Point(204, 263);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(59, 12);
+            this.label23.TabIndex = 148;
+            this.label23.Text = "斜边数量:";
+            // 
+            // numericUpDown20
+            // 
+            this.numericUpDown20.Location = new System.Drawing.Point(98, 261);
+            this.numericUpDown20.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown20.Name = "numericUpDown20";
+            this.numericUpDown20.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown20.TabIndex = 147;
+            this.numericUpDown20.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Location = new System.Drawing.Point(15, 263);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(59, 12);
+            this.label22.TabIndex = 146;
+            this.label22.Text = "压线数量:";
+            // 
+            // numericUpDown19
+            // 
+            this.numericUpDown19.Location = new System.Drawing.Point(698, 219);
+            this.numericUpDown19.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown19.Name = "numericUpDown19";
+            this.numericUpDown19.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown19.TabIndex = 145;
+            this.numericUpDown19.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Location = new System.Drawing.Point(609, 221);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(59, 12);
+            this.label21.TabIndex = 144;
+            this.label21.Text = "划伤数量:";
+            // 
+            // numericUpDown18
+            // 
+            this.numericUpDown18.Location = new System.Drawing.Point(505, 219);
+            this.numericUpDown18.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown18.Name = "numericUpDown18";
+            this.numericUpDown18.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown18.TabIndex = 143;
+            this.numericUpDown18.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.Location = new System.Drawing.Point(404, 221);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(59, 12);
+            this.label20.TabIndex = 142;
+            this.label20.Text = "泡泡数量:";
+            // 
+            // numericUpDown17
+            // 
+            this.numericUpDown17.Location = new System.Drawing.Point(287, 219);
+            this.numericUpDown17.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown17.Name = "numericUpDown17";
+            this.numericUpDown17.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown17.TabIndex = 141;
+            this.numericUpDown17.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Location = new System.Drawing.Point(204, 221);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(59, 12);
+            this.label19.TabIndex = 140;
+            this.label19.Text = "针孔数量:";
+            // 
+            // numericUpDown16
+            // 
+            this.numericUpDown16.Location = new System.Drawing.Point(98, 219);
+            this.numericUpDown16.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown16.Name = "numericUpDown16";
+            this.numericUpDown16.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown16.TabIndex = 139;
+            this.numericUpDown16.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label18
+            // 
+            this.label18.AutoSize = true;
+            this.label18.Location = new System.Drawing.Point(15, 221);
+            this.label18.Name = "label18";
+            this.label18.Size = new System.Drawing.Size(59, 12);
+            this.label18.TabIndex = 138;
+            this.label18.Text = "缺口数量:";
+            // 
+            // numericUpDown15
+            // 
+            this.numericUpDown15.Location = new System.Drawing.Point(698, 177);
+            this.numericUpDown15.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown15.Name = "numericUpDown15";
+            this.numericUpDown15.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown15.TabIndex = 137;
+            this.numericUpDown15.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Location = new System.Drawing.Point(609, 179);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(71, 12);
+            this.label17.TabIndex = 136;
+            this.label17.Text = "纤维丝数量:";
+            // 
+            // numericUpDown14
+            // 
+            this.numericUpDown14.Location = new System.Drawing.Point(505, 177);
+            this.numericUpDown14.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown14.Name = "numericUpDown14";
+            this.numericUpDown14.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown14.TabIndex = 135;
+            this.numericUpDown14.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(404, 179);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(83, 12);
+            this.label16.TabIndex = 134;
+            this.label16.Text = "钢丝异常数量:";
+            // 
+            // numericUpDown13
+            // 
+            this.numericUpDown13.Location = new System.Drawing.Point(287, 175);
+            this.numericUpDown13.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown13.Name = "numericUpDown13";
+            this.numericUpDown13.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown13.TabIndex = 133;
+            this.numericUpDown13.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.Location = new System.Drawing.Point(204, 177);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(59, 12);
+            this.label15.TabIndex = 132;
+            this.label15.Text = "脏污数量:";
+            // 
+            // numericUpDown12
+            // 
+            this.numericUpDown12.Location = new System.Drawing.Point(98, 177);
+            this.numericUpDown12.Maximum = new decimal(new int[] {
+            100000000,
+            0,
+            0,
+            0});
+            this.numericUpDown12.Name = "numericUpDown12";
+            this.numericUpDown12.Size = new System.Drawing.Size(89, 21);
+            this.numericUpDown12.TabIndex = 131;
+            this.numericUpDown12.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Location = new System.Drawing.Point(15, 179);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(59, 12);
+            this.label14.TabIndex = 130;
+            this.label14.Text = "堵孔数量:";
+            // 
+            // radioButton3
+            // 
+            this.radioButton3.AutoSize = true;
+            this.radioButton3.Location = new System.Drawing.Point(258, 125);
+            this.radioButton3.Name = "radioButton3";
+            this.radioButton3.Size = new System.Drawing.Size(59, 16);
+            this.radioButton3.TabIndex = 107;
+            this.radioButton3.TabStop = true;
+            this.radioButton3.Text = "未通过";
+            this.radioButton3.UseVisualStyleBackColor = true;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Location = new System.Drawing.Point(181, 125);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(47, 16);
+            this.radioButton2.TabIndex = 106;
+            this.radioButton2.TabStop = true;
+            this.radioButton2.Text = "通过";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Location = new System.Drawing.Point(98, 125);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(59, 16);
+            this.radioButton1.TabIndex = 105;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "未比对";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(15, 127);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(59, 12);
+            this.label2.TabIndex = 104;
+            this.label2.Text = "比对结果:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(12, 63);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(96, 28);
+            this.label1.TabIndex = 103;
+            this.label1.Text = "修改记录";
+            // 
+            // AmendantRecordFrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.ControlLightLight;
+            this.ClientSize = new System.Drawing.Size(810, 314);
+            this.Controls.Add(this.skinButton3);
+            this.Controls.Add(this.skinButton1);
+            this.Controls.Add(this.numericUpDown22);
+            this.Controls.Add(this.label24);
+            this.Controls.Add(this.numericUpDown21);
+            this.Controls.Add(this.label23);
+            this.Controls.Add(this.numericUpDown20);
+            this.Controls.Add(this.label22);
+            this.Controls.Add(this.numericUpDown19);
+            this.Controls.Add(this.label21);
+            this.Controls.Add(this.numericUpDown18);
+            this.Controls.Add(this.label20);
+            this.Controls.Add(this.numericUpDown17);
+            this.Controls.Add(this.label19);
+            this.Controls.Add(this.numericUpDown16);
+            this.Controls.Add(this.label18);
+            this.Controls.Add(this.numericUpDown15);
+            this.Controls.Add(this.label17);
+            this.Controls.Add(this.numericUpDown14);
+            this.Controls.Add(this.label16);
+            this.Controls.Add(this.numericUpDown13);
+            this.Controls.Add(this.label15);
+            this.Controls.Add(this.numericUpDown12);
+            this.Controls.Add(this.label14);
+            this.Controls.Add(this.radioButton3);
+            this.Controls.Add(this.radioButton2);
+            this.Controls.Add(this.radioButton1);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.uiTitel1);
+            this.Name = "AmendantRecordFrm";
+            this.Text = "修改记录";
+            this.Load += new System.EventHandler(this.AmendantRecordFrm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private MaiMuControl.UIKits.MaiMuMenu.UITitel uiTitel1;
+        private CCWin.SkinControl.SkinButton skinButton3;
+        private CCWin.SkinControl.SkinButton skinButton1;
+        private System.Windows.Forms.NumericUpDown numericUpDown22;
+        private System.Windows.Forms.Label label24;
+        private System.Windows.Forms.NumericUpDown numericUpDown21;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.NumericUpDown numericUpDown20;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.NumericUpDown numericUpDown19;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.NumericUpDown numericUpDown18;
+        private System.Windows.Forms.Label label20;
+        private System.Windows.Forms.NumericUpDown numericUpDown17;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.NumericUpDown numericUpDown16;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.NumericUpDown numericUpDown15;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.NumericUpDown numericUpDown14;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.NumericUpDown numericUpDown13;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.NumericUpDown numericUpDown12;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.RadioButton radioButton3;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.cs

@@ -0,0 +1,150 @@
+using MaiMuAOI.SysCtrl;
+using Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class AmendantRecordFrm : Form
+    {
+        Service.OrderService OrderService = new Service.OrderService();
+        Order _order;
+        List<OrderHistory> _OrderHistoryList = new List<OrderHistory>();
+
+        public AmendantRecordFrm(Order order)
+        {
+            InitializeComponent();
+            UIStyle.SetUIStyle(this);
+            this.uiTitel1.FatherForm = this;
+
+            _order = order;
+            _OrderHistoryList = _order.OrderHistoryList;
+            this.BackColor = Color.White;
+        }
+
+        private void AmendantRecordFrm_Load(object sender, EventArgs e)
+        {
+            if (_order.CompareResult == 2)
+                radioButton3.Checked = true;
+            else if (_order.CompareResult == 1)
+                radioButton2.Checked = true;
+            else
+                radioButton1.Checked = true;
+
+            numericUpDown12.Value = (decimal)_order.DKCount;
+            numericUpDown13.Value = (decimal)_order.ZWCount;
+            numericUpDown14.Value = (decimal)_order.GSYCCount;
+            numericUpDown15.Value = (decimal)_order.XWSCount;
+            numericUpDown16.Value = (decimal)_order.QKCount;
+            numericUpDown17.Value = (decimal)_order.ZKCount;
+            numericUpDown18.Value = (decimal)_order.PPCount;
+            numericUpDown19.Value = (decimal)_order.HSCount;
+            numericUpDown20.Value = (decimal)_order.YXCount;
+            numericUpDown21.Value = (decimal)_order.XBCount;
+            numericUpDown22.Value = (decimal)_order.SXCount;
+        }
+
+        #region 取消
+
+        private void skinButton3_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        #endregion
+
+        #region 保存
+
+        private bool IsModify()
+        {
+            bool ret = true;
+            if ((_order.CompareResult == 2) && (radioButton3.Checked))
+                ret = ret & true;
+            else if ((_order.CompareResult == 1) && (radioButton2.Checked))
+                ret = ret & true;
+            else if ((_order.CompareResult == 0) && (radioButton1.Checked))
+                ret = ret & true;
+            else
+                ret = ret & false;
+
+            ret = ret & (_order.DKCount == (int)numericUpDown12.Value);
+            ret = ret & (_order.ZWCount == (int)numericUpDown13.Value);
+            ret = ret & (_order.GSYCCount == (int)numericUpDown14.Value);
+            ret = ret & (_order.XWSCount == (int)numericUpDown15.Value);
+            ret = ret & (_order.QKCount == (int)numericUpDown16.Value);
+            ret = ret & (_order.ZKCount == (int)numericUpDown17.Value);
+            ret = ret & (_order.PPCount == (int)numericUpDown18.Value);
+            ret = ret & (_order.HSCount == (int)numericUpDown19.Value);
+            ret = ret & (_order.YXCount == (int)numericUpDown20.Value);
+            ret = ret & (_order.XBCount == (int)numericUpDown21.Value);
+            ret = ret & (_order.SXCount == (int)numericUpDown22.Value);
+
+            return !ret;
+        }
+
+        private void skinButton1_Click(object sender, EventArgs e)
+        {
+            if (IsModify())
+            {
+                if (_OrderHistoryList == null)
+                    _OrderHistoryList = new List<OrderHistory>();
+
+                _OrderHistoryList.Add(new OrderHistory()
+                {  
+                    CompareResult = _order.CompareResult,
+                    Qualified = _order.Qualified,
+
+                    DKCount = _order.DKCount,
+                    ZWCount = _order.ZWCount,
+                    GSYCCount = _order.GSYCCount,
+                    XWSCount = _order.XWSCount,
+                    QKCount = _order.QKCount,
+                    ZKCount = _order.ZKCount,
+                    PPCount = _order.PPCount,
+                    HSCount = _order.HSCount,
+                    XBCount = _order.XBCount,
+                    YXCount = _order.YXCount,
+                    SXCount = _order.SXCount,
+                    CreateUserCode = SysMgr.Instance.UserMgr.LoginUser.Code,
+                    ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code
+                });
+
+                _order.HistoryCount++;
+                _order.CompareResult = radioButton3.Checked ? 2 : radioButton2.Checked ? 1 : 0;
+
+                _order.DKCount = (int)numericUpDown12.Value;
+                _order.ZWCount = (int)numericUpDown13.Value;
+                _order.GSYCCount = (int)numericUpDown14.Value;
+                _order.XWSCount = (int)numericUpDown15.Value;
+                _order.QKCount = (int)numericUpDown16.Value;
+                _order.ZKCount = (int)numericUpDown17.Value;
+                _order.PPCount = (int)numericUpDown18.Value;
+                _order.HSCount = (int)numericUpDown19.Value;
+                _order.YXCount = (int)numericUpDown20.Value;
+                _order.XBCount = (int)numericUpDown21.Value;
+                _order.SXCount = (int)numericUpDown22.Value;
+
+                _order.OrderHistoryList = _OrderHistoryList;
+                _order.ModifyUserCode = SysMgr.Instance.UserMgr.LoginUser.Code;
+
+                bool qua = true;
+                qua = qua & (_order.CompareResult == 1);
+                
+                _order.Qualified = qua;
+
+                bool result = OrderService.UpdateableListEx(_order);
+                if (result)
+                    MessageBox.Show("修改成功", "完成");
+                else
+                    MessageBox.Show("修改失败", "失败", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        #endregion
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/AmendantRecordFrm.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.Designer.cs

@@ -0,0 +1,427 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class DataQueryFrm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DataQueryFrm));
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.MainPanel = new System.Windows.Forms.Panel();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBox3 = new System.Windows.Forms.ComboBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.btnClear = new System.Windows.Forms.PictureBox();
+            this.skinButton3 = new CCWin.SkinControl.SkinButton();
+            this.skinButton1 = new CCWin.SkinControl.SkinButton();
+            this.skinButton2 = new CCWin.SkinControl.SkinButton();
+            this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
+            this.comboBox2 = new System.Windows.Forms.ComboBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.cbProductCode = new System.Windows.Forms.ComboBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.pageCtrl1 = new MaiMuAOI.SysUI.DefectPicShow.PageCtrl();
+            this.MainPanel.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.btnClear)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 0);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(1337, 46);
+            this.uiTitel1.TabIndex = 36;
+            // 
+            // MainPanel
+            // 
+            this.MainPanel.BackColor = System.Drawing.SystemColors.ControlLightLight;
+            this.MainPanel.Controls.Add(this.tableLayoutPanel1);
+            this.MainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.MainPanel.Location = new System.Drawing.Point(0, 46);
+            this.MainPanel.Name = "MainPanel";
+            this.MainPanel.Size = new System.Drawing.Size(1337, 547);
+            this.MainPanel.TabIndex = 37;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 1;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.pageCtrl1, 0, 2);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 3;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 55F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 44F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1337, 547);
+            this.tableLayoutPanel1.TabIndex = 1;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.comboBox1);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.comboBox3);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.btnClear);
+            this.panel1.Controls.Add(this.skinButton3);
+            this.panel1.Controls.Add(this.skinButton1);
+            this.panel1.Controls.Add(this.skinButton2);
+            this.panel1.Controls.Add(this.dateTimePicker2);
+            this.panel1.Controls.Add(this.label6);
+            this.panel1.Controls.Add(this.label5);
+            this.panel1.Controls.Add(this.dateTimePicker1);
+            this.panel1.Controls.Add(this.comboBox2);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.cbProductCode);
+            this.panel1.Controls.Add(this.label3);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(3, 3);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1331, 49);
+            this.panel1.TabIndex = 0;
+            // 
+            // comboBox1
+            // 
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Items.AddRange(new object[] {
+            "",
+            "未比对",
+            "通过",
+            "未通过"});
+            this.comboBox1.Location = new System.Drawing.Point(379, 13);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(73, 28);
+            this.comboBox1.TabIndex = 105;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.ForeColor = System.Drawing.Color.Black;
+            this.label1.Location = new System.Drawing.Point(323, 16);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(51, 20);
+            this.label1.TabIndex = 104;
+            this.label1.Text = "比对：";
+            // 
+            // comboBox3
+            // 
+            this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox3.FormattingEnabled = true;
+            this.comboBox3.Items.AddRange(new object[] {
+            "",
+            "未修复",
+            "修复",
+            "异常"});
+            this.comboBox3.Location = new System.Drawing.Point(647, 12);
+            this.comboBox3.Name = "comboBox3";
+            this.comboBox3.Size = new System.Drawing.Size(73, 28);
+            this.comboBox3.TabIndex = 103;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.ForeColor = System.Drawing.Color.Black;
+            this.label4.Location = new System.Drawing.Point(591, 16);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(51, 20);
+            this.label4.TabIndex = 102;
+            this.label4.Text = "修复：";
+            // 
+            // btnClear
+            // 
+            this.btnClear.Image = ((System.Drawing.Image)(resources.GetObject("btnClear.Image")));
+            this.btnClear.Location = new System.Drawing.Point(253, 17);
+            this.btnClear.Margin = new System.Windows.Forms.Padding(2);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(21, 19);
+            this.btnClear.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.btnClear.TabIndex = 101;
+            this.btnClear.TabStop = false;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            // 
+            // skinButton3
+            // 
+            this.skinButton3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton3.BackColor = System.Drawing.Color.White;
+            this.skinButton3.BaseColor = System.Drawing.Color.Red;
+            this.skinButton3.BorderColor = System.Drawing.Color.Red;
+            this.skinButton3.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton3.DownBack = null;
+            this.skinButton3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton3.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.skinButton3.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton3.InnerBorderColor = System.Drawing.Color.Red;
+            this.skinButton3.Location = new System.Drawing.Point(1260, 11);
+            this.skinButton3.MouseBack = null;
+            this.skinButton3.Name = "skinButton3";
+            this.skinButton3.NormlBack = null;
+            this.skinButton3.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton3.Size = new System.Drawing.Size(61, 27);
+            this.skinButton3.TabIndex = 100;
+            this.skinButton3.Text = "删除";
+            this.skinButton3.UseVisualStyleBackColor = false;
+            this.skinButton3.Click += new System.EventHandler(this.skinButton3_Click);
+            // 
+            // skinButton1
+            // 
+            this.skinButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton1.BackColor = System.Drawing.Color.White;
+            this.skinButton1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton1.DownBack = null;
+            this.skinButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton1.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.skinButton1.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton1.InnerBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(112)))), ((int)(((byte)(193)))), ((int)(((byte)(64)))));
+            this.skinButton1.Location = new System.Drawing.Point(1185, 11);
+            this.skinButton1.MouseBack = null;
+            this.skinButton1.Name = "skinButton1";
+            this.skinButton1.NormlBack = null;
+            this.skinButton1.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton1.Size = new System.Drawing.Size(61, 27);
+            this.skinButton1.TabIndex = 99;
+            this.skinButton1.Text = "导出";
+            this.skinButton1.UseVisualStyleBackColor = false;
+            this.skinButton1.Click += new System.EventHandler(this.skinButton1_Click);
+            // 
+            // skinButton2
+            // 
+            this.skinButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.skinButton2.BackColor = System.Drawing.Color.Transparent;
+            this.skinButton2.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.skinButton2.DownBack = null;
+            this.skinButton2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.skinButton2.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.skinButton2.GlowColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.InnerBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(87)))), ((int)(((byte)(157)))), ((int)(((byte)(253)))));
+            this.skinButton2.Location = new System.Drawing.Point(1110, 11);
+            this.skinButton2.MouseBack = null;
+            this.skinButton2.Name = "skinButton2";
+            this.skinButton2.NormlBack = null;
+            this.skinButton2.RoundStyle = CCWin.SkinClass.RoundStyle.All;
+            this.skinButton2.Size = new System.Drawing.Size(61, 27);
+            this.skinButton2.TabIndex = 98;
+            this.skinButton2.Text = "查询";
+            this.skinButton2.UseVisualStyleBackColor = false;
+            this.skinButton2.Click += new System.EventHandler(this.skinButton2_Click);
+            // 
+            // dateTimePicker2
+            // 
+            this.dateTimePicker2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.dateTimePicker2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dateTimePicker2.Location = new System.Drawing.Point(963, 12);
+            this.dateTimePicker2.Name = "dateTimePicker2";
+            this.dateTimePicker2.Size = new System.Drawing.Size(130, 26);
+            this.dateTimePicker2.TabIndex = 20;
+            // 
+            // label6
+            // 
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.ForeColor = System.Drawing.Color.Black;
+            this.label6.Location = new System.Drawing.Point(935, 16);
+            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(23, 20);
+            this.label6.TabIndex = 21;
+            this.label6.Text = "至";
+            // 
+            // label5
+            // 
+            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.ForeColor = System.Drawing.Color.Black;
+            this.label5.Location = new System.Drawing.Point(744, 16);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(51, 20);
+            this.label5.TabIndex = 20;
+            this.label5.Text = "日期：";
+            // 
+            // dateTimePicker1
+            // 
+            this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.dateTimePicker1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dateTimePicker1.Location = new System.Drawing.Point(800, 12);
+            this.dateTimePicker1.Name = "dateTimePicker1";
+            this.dateTimePicker1.Size = new System.Drawing.Size(130, 26);
+            this.dateTimePicker1.TabIndex = 19;
+            // 
+            // comboBox2
+            // 
+            this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.comboBox2.FormattingEnabled = true;
+            this.comboBox2.Items.AddRange(new object[] {
+            "",
+            "合格",
+            "不合格"});
+            this.comboBox2.Location = new System.Drawing.Point(513, 13);
+            this.comboBox2.Name = "comboBox2";
+            this.comboBox2.Size = new System.Drawing.Size(73, 28);
+            this.comboBox2.TabIndex = 16;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(457, 16);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(51, 20);
+            this.label2.TabIndex = 15;
+            this.label2.Text = "合格：";
+            // 
+            // cbProductCode
+            // 
+            this.cbProductCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbProductCode.FormattingEnabled = true;
+            this.cbProductCode.Items.AddRange(new object[] {
+            "1",
+            "2",
+            "3",
+            "4",
+            "5"});
+            this.cbProductCode.Location = new System.Drawing.Point(58, 13);
+            this.cbProductCode.Name = "cbProductCode";
+            this.cbProductCode.Size = new System.Drawing.Size(190, 28);
+            this.cbProductCode.TabIndex = 12;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.ForeColor = System.Drawing.Color.Black;
+            this.label3.Location = new System.Drawing.Point(2, 16);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(51, 20);
+            this.label3.TabIndex = 11;
+            this.label3.Text = "料号：";
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
+            this.dataGridView1.AllowUserToResizeRows = false;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(3, 58);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(1331, 442);
+            this.dataGridView1.TabIndex = 1;
+            this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
+            // 
+            // pageCtrl1
+            // 
+            this.pageCtrl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pageCtrl1.Location = new System.Drawing.Point(3, 506);
+            this.pageCtrl1.Name = "pageCtrl1";
+            this.pageCtrl1.PageIndex = 1;
+            this.pageCtrl1.PageSize = 30;
+            this.pageCtrl1.RecordCount = 0;
+            this.pageCtrl1.Size = new System.Drawing.Size(1331, 38);
+            this.pageCtrl1.TabIndex = 2;
+            // 
+            // DataQueryFrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1337, 593);
+            this.Controls.Add(this.MainPanel);
+            this.Controls.Add(this.uiTitel1);
+            this.Name = "DataQueryFrm";
+            this.Text = "数据查询";
+            this.Load += new System.EventHandler(this.DataQueryFrm_Load);
+            this.SizeChanged += new System.EventHandler(this.DataQueryFrm_SizeChanged);
+            this.MainPanel.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.btnClear)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private MaiMuControl.UIKits.MaiMuMenu.UITitel uiTitel1;
+        private System.Windows.Forms.Panel MainPanel;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.PictureBox btnClear;
+        private CCWin.SkinControl.SkinButton skinButton3;
+        private CCWin.SkinControl.SkinButton skinButton1;
+        private CCWin.SkinControl.SkinButton skinButton2;
+        private System.Windows.Forms.DateTimePicker dateTimePicker2;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.DateTimePicker dateTimePicker1;
+        private System.Windows.Forms.ComboBox comboBox2;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.DataGridView dataGridView1;
+        private PageCtrl pageCtrl1;
+        private System.Windows.Forms.ComboBox cbProductCode;
+        private System.Windows.Forms.ComboBox comboBox3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.Label label1;
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.cs

@@ -0,0 +1,880 @@
+using MaiMuAOI.SysCtrl;
+using Models;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class DataQueryFrm : Form
+    {
+        Service.OrderService OrderService = new Service.OrderService();
+        List<Order> QueryOrders = new List<Order>();
+        List<Order> QueryAllOrders = new List<Order>();
+
+        public DataQueryFrm()
+        {
+            InitializeComponent();
+            UIStyle.SetUIStyle(this);
+            this.uiTitel1.FatherForm = this;
+        }
+
+        private void DataQueryFrm_Load(object sender, EventArgs e)
+        {
+            LoadPdtList(SysMgr.Instance.ProductCodeList);
+
+            //激活OnPageChanged事件
+            pageCtrl1.OnPageChanged += new EventHandler(pagerControl1_OnPageChanged);
+        }
+
+        #region 切页
+        /// <summary>
+        /// 页数变化时调用绑定数据方法
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void pagerControl1_OnPageChanged(object sender, EventArgs e)
+        {
+            QueryData();
+        }
+        #endregion
+
+        #region 加载料号
+        private string[] pdtlistData;
+        private void LoadPdtList(List<string> list)
+        {
+            this.cbProductCode.Items.Clear();
+            this.pdtlistData = list.ToArray();
+            cbProductCode.Items.AddRange(pdtlistData);//比使用DataSource速度要快一些
+            cbProductCode.TextUpdate += cobList_TextUpdate;//重新绑定事件
+            cbProductCode.KeyDown += CobList_KeyDown;
+            this.cbProductCode.Text = "";
+            cbProductCode.Focus();
+            cbProductCode.SelectAll();
+        }
+        private void CobList_KeyDown(object sender, KeyEventArgs e)
+        {
+            ComboBox ctrl = sender as ComboBox;
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (ctrl.Items.Count == 1)
+                    ctrl.Text = ctrl.Items[0].ToString();
+            }
+        }
+
+        private void cobList_TextUpdate(object sender, EventArgs e)
+        {
+            ComboBox ctrl = sender as ComboBox;
+            if (ctrl.Text != null)
+            {
+                string str = ctrl.Text;  //获取cb_material控件输入内 
+                                         //清空combobox
+                ctrl.DataSource = null;
+                ctrl.Items.Clear();
+
+                string[] workOrderFiltered;
+
+                workOrderFiltered = pdtlistData.Where(x => x.IndexOf(str, StringComparison.CurrentCultureIgnoreCase) != -1).ToArray();//忽略大小写
+                ctrl.Items.AddRange(workOrderFiltered);//比使用DataSource速度要快一些
+
+                // 不存在符合条件时
+                //设置光标位置，若不设置：光标位置始终保持在第一列，造成输入关键词的倒序排列
+                ctrl.Cursor = Cursors.Default; //保持鼠标指针原来状态，有时候鼠标指针会被下拉框覆盖，所以要进行一次设置 
+                if (workOrderFiltered.Length > 0)
+                {
+                    if (!ctrl.DroppedDown)
+                        ctrl.DroppedDown = true; // 自动弹出下拉框 
+                }
+
+                ctrl.SelectionStart = str.Length;  // 设置光标位置，若不设置：光标位置始终保持在第一列，造成输入关键词的倒序排列
+            }
+        }
+
+        #endregion
+
+        #region 查询数据
+
+        #region 数据库查询
+        private class domainItem
+        {
+            public string FieldName { get; set; }
+            public string FieldValue { get; set; }
+            public int ConditionalType { get; set; }
+        }
+        private class QueryOrderData
+        {
+            public string model { get; set; }
+            public string fields { get; set; }
+            public List<domainItem> domain { get; set; }
+            public string order { get; set; }
+
+            public int pageNum { get; set; }
+            public int pageSize { get; set; }
+
+        }
+        private List<Order> getTableList(JObject req, out int TotalCnt)
+        {
+            try
+            {
+                string model, fields = "", domain = "", order = "";
+                int pageNum = 0, pageSize = 0, totalCount = 0;
+
+                model = req.Value<string>("model");
+                if (req.ContainsKey("fields")) fields = req.Value<string>("fields");
+                if (req.ContainsKey("domain")) domain = req.Value<JArray>("domain").ToString();
+                if (req.ContainsKey("order")) order = req.Value<string>("order");
+
+                if (req.ContainsKey("pageNum")) pageNum = req.Value<int>("pageNum");
+                if (req.ContainsKey("pageSize")) pageSize = req.Value<int>("pageSize");
+
+                //创建表达式
+                var exp1 = Expressionable.Create<Order>()
+                                //.AndIF((int)cobProductList.SelectedValue > 0, it => it.ProductId == (int)cobProductList.SelectedValue)
+                                //.AndIF((int)cobStepList.SelectedValue > 0, it => it.StepId == (int)cobStepList.SelectedValue)
+                                //.AndIF(dateTimePicker1.Checked, it => it.CreateTime >= dateTimePicker1.Value)
+                                //.AndIF(dateTimePicker2.Checked, it => it.CreateTime < dateTimePicker2.Value)
+                                .ToExpression();//注意 这一句 不能少
+
+
+                var list = OrderService.GetListEx(fields, domain, order, pageNum, pageSize, ref totalCount);
+                TotalCnt = totalCount;
+                //var list = svcOrder.GetListNav(pageNum, pageSize, ref totalCount, exp1);
+                return list;
+            }
+            catch (Exception ex)
+            {
+                ;
+            }
+            TotalCnt = 0;
+            return null;
+        }
+        #endregion
+
+        #region 新老流程数据分析
+        private void ShowDataTableEx(List<Order> list)
+        {
+            dataGridView1.Columns.Clear();
+            //记录数据类型列数
+            Dictionary<string, int> dataCnt = new Dictionary<string, int>();
+            DataTable dt = new DataTable(); //建立个数据表
+            //通用列
+            DataGridViewCheckBoxColumn chk = new DataGridViewCheckBoxColumn();
+            chk.Name = "Select";
+            chk.HeaderText = "选择";
+            dataGridView1.Columns.Add(chk);
+            dt.Columns.Add(new DataColumn("检验日期", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("产品名称", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("料号", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("网版编码", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("批次", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("合格", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
+
+            dt.Columns.Add(new DataColumn("堵孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("脏污数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("钢丝异常数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("纤维丝数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("缺口数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("针孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("泡泡数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("划伤数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列        
+
+            dataGridView1.DataSource = dt;
+            //在datagridview中添加button按钮
+            DataGridViewButtonColumn btn = new DataGridViewButtonColumn();
+            btn.Name = "Modify";
+            btn.HeaderText = "操作";
+            btn.DefaultCellStyle.NullValue = "修改";
+            dataGridView1.Columns.Add(btn);
+            DataGridViewButtonColumn btn2 = new DataGridViewButtonColumn();
+            btn2.Name = "HistoryView";
+            btn2.HeaderText = "查看";
+            btn2.DefaultCellStyle.NullValue = "历史";
+            dataGridView1.Columns.Add(btn2);
+
+            
+            DataTable dts = (DataTable)dataGridView1.DataSource;
+            dts.Clear();
+            foreach (var item in list)
+            {
+                //新增
+                DataRow dr;//行
+                dr = dts.NewRow();
+                //dr["选择"] = false;
+                dr["检验日期"] = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                dr["产品名称"] = item.ProductInfo.Name;
+                dr["料号"] = item.ProductInfo.Code;
+                dr["网版编码"] = item.SN;
+                dr["批次"] = item.BatchId;
+                dr["合格"] = item.Qualified ? "合格" : "不合格";
+                dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
+                dr["异常情况"] = item.Abnormalities;
+                dr["修复人员"] = item.RepairCode;
+                dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
+
+                dr["堵孔数量"] = item.DKCount;
+                dr["脏污数量"] = item.ZWCount;
+                dr["钢丝异常数量"] = item.GSYCCount;
+                dr["纤维丝数量"] = item.XWSCount;
+                dr["缺口数量"] = item.QKCount;
+                dr["针孔数量"] = item.ZKCount;
+                dr["泡泡数量"] = item.PPCount;
+                dr["划伤数量"] = item.HSCount;
+                dr["压线数量"] = item.YXCount;
+                dr["斜边数量"] = item.XBCount;
+                dr["栅线数量"] = item.SXCount;
+
+                dts.Rows.Add(dr);//在表的对象的行里添加此行                  
+            }
+
+            //dts.DefaultView.Sort = "时间戳 desc";
+            //dts = dts.DefaultView.ToTable();
+
+            dataGridView1.DataSource = dts;
+
+            this.dataGridView1.Columns[0].Width = 50;
+            this.dataGridView1.Columns[1].Width = 120;
+
+            for (int i = 0; i < 11; i++)
+            {
+                this.dataGridView1.Columns[i].Frozen = true;
+            }
+            
+            return;
+        }
+        #endregion
+
+        private void QueryData()
+        {
+            QueryOrderData queryOrderData = new QueryOrderData();
+            queryOrderData.model = "order";
+            queryOrderData.fields = "*";
+            queryOrderData.order = "id desc";
+            queryOrderData.pageNum = this.pageCtrl1.PageIndex;
+            queryOrderData.pageSize = this.pageCtrl1.PageSize;
+            queryOrderData.domain = new List<domainItem>();
+
+            domainItem startTime = new domainItem();
+            startTime.FieldName = "CreateTime";
+            startTime.FieldValue = dateTimePicker1.Value.ToString("yyyy-M-d");
+            startTime.ConditionalType = 3;
+            queryOrderData.domain.Add(startTime);
+
+            domainItem endTime = new domainItem();
+            endTime.FieldName = "CreateTime";
+            endTime.FieldValue = dateTimePicker2.Value.ToString("yyyy-M-d") + " 23:59:59";
+            endTime.ConditionalType = 5;
+            queryOrderData.domain.Add(endTime);
+            //OrderService.GetList
+            
+            //产品条件
+            if (!string.IsNullOrEmpty(cbProductCode.Text))
+            {
+                domainItem ProductCode = new domainItem();
+                ProductCode.FieldName = "ProductId";
+                ProductCode.FieldValue = SysMgr.Instance.ProductIdList[cbProductCode.SelectedIndex].ToString();
+                ProductCode.ConditionalType = 6;
+                queryOrderData.domain.Add(ProductCode);
+            }
+            //合格条件
+            if (!string.IsNullOrEmpty(comboBox2.Text))
+            {
+                domainItem CompareResult = new domainItem();
+                CompareResult.FieldName = "Qualified";
+                CompareResult.FieldValue = comboBox2.Text == "合格" ? "1" : "0";
+                CompareResult.ConditionalType = 0;
+                queryOrderData.domain.Add(CompareResult);
+            }
+            //比对条件
+            if (!string.IsNullOrEmpty(comboBox1.Text))
+            {
+                domainItem CompareResultOptions = new domainItem();
+                CompareResultOptions.FieldName = "CompareResult";
+                CompareResultOptions.FieldValue = comboBox1.Text == "通过" ? "1" : comboBox1.Text == "未通过" ? "2" : "0";
+                CompareResultOptions.ConditionalType = 0;
+                queryOrderData.domain.Add(CompareResultOptions);
+            }
+            //异常条件
+            if (!string.IsNullOrEmpty(comboBox3.Text))
+            {
+                domainItem State = new domainItem();
+                State.FieldName = "State";
+                State.FieldValue = comboBox3.Text == "修复" ? "5" : comboBox3.Text == "未修复" ? "0" : "10";
+                State.ConditionalType = 0;
+                queryOrderData.domain.Add(State);
+            }
+            
+            int totalcnt = 0;
+            JObject str = JObject.Parse(JsonConvert.SerializeObject(queryOrderData));
+            var list = getTableList(str, out totalcnt);
+            this.pageCtrl1.DrawControl(totalcnt);
+
+            QueryOrders = list;
+            //自动生成表格
+            ShowDataTableEx(list);
+
+            //总数居
+            queryOrderData.pageNum = 0;
+            queryOrderData.pageSize = 0;
+            JObject str2 = JObject.Parse(JsonConvert.SerializeObject(queryOrderData));
+            var list2 = getTableList(str2, out totalcnt);
+            QueryAllOrders = list2;
+        }
+        private void skinButton2_Click(object sender, EventArgs e)
+        {
+            pageCtrl1.PageIndex = 1;
+            QueryData();
+        }
+        #endregion
+
+        #region 表格单击
+
+        #region 更新数据
+
+        #endregion
+        private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            
+            int Index = this.dataGridView1.CurrentRow.Index;//获取当前选中行的索引 
+            if (Index < this.dataGridView1.Rows.Count && this.dataGridView1.Columns[this.dataGridView1.CurrentCell.ColumnIndex].HeaderText.ToString() == "操作")
+            {
+                AmendantRecordFrm recordFrm = new AmendantRecordFrm(QueryOrders[Index]);
+                recordFrm.ShowDialog();
+                //重新显示
+                QueryData();
+            }
+            else if (Index < this.dataGridView1.Rows.Count && this.dataGridView1.Columns[this.dataGridView1.CurrentCell.ColumnIndex].HeaderText.ToString() == "查看")
+            {
+                HistoryViewFrm Frm = new HistoryViewFrm(QueryOrders[Index]);
+                Frm.ShowDialog();
+
+            }
+            else if (Index < this.dataGridView1.Rows.Count && this.dataGridView1.Columns[this.dataGridView1.CurrentCell.ColumnIndex].HeaderText.ToString() == "选择")
+            {
+                DataGridViewCheckBoxCell checkCell = (DataGridViewCheckBoxCell)dataGridView1.Rows[Index].Cells[0];
+                Boolean flag = Convert.ToBoolean(checkCell.Value);
+                if (flag == true)     //查找被选择的数据行  
+                {
+                    checkCell.Value = false;
+                }
+                else
+                    checkCell.Value = true;
+            }
+        }
+        #endregion
+
+        #region 界面调整
+        private void DataQueryFrm_SizeChanged(object sender, EventArgs e)
+        {
+            if (this.WindowState == FormWindowState.Maximized)
+            {
+                this.WindowState = FormWindowState.Normal;
+                this.Top = 0;
+                this.Left = 0;
+                this.Width = SystemInformation.WorkingArea.Width;
+                this.Height = SystemInformation.WorkingArea.Height;
+            }
+        }
+        #endregion
+
+        #region 删除
+        private int delTableList(JObject req)
+        {
+            JObject res = new JObject();
+            try
+            {
+                string model = req.Value<string>("model");
+                string domain = req.Value<JArray>("domain").ToString();
+                //var idArr = req.Value<JArray>("idList"); 
+                //List<int> ids = new List<int>();
+                //foreach (int id in idArr) ids.Add(id);
+                int result = OrderService.DeleteList(model, domain);
+                return 1;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return 0;
+        }
+        private void skinButton3_Click(object sender, EventArgs e)
+        {
+
+
+            for (int i = 0; i < dataGridView1.Rows.Count; i++)
+            {
+                DataGridViewCheckBoxCell checkCell = (DataGridViewCheckBoxCell)dataGridView1.Rows[i].Cells[0];
+                Boolean flag = Convert.ToBoolean(checkCell.Value);
+                if (flag == true)
+                {
+                    QueryOrderData delOrderData = new QueryOrderData();
+                    delOrderData.model = "order";
+                    delOrderData.domain = new List<domainItem>();
+                    domainItem doitem = new domainItem();
+                    doitem.FieldName = "Id";
+                    doitem.FieldValue = QueryOrders[i].Id.ToString();
+                    doitem.ConditionalType = 6;
+                    delOrderData.domain.Add(doitem);
+                    JObject str = JObject.Parse(JsonConvert.SerializeObject(delOrderData));
+                    int ret = delTableList(str);
+                    if (ret == 1)
+                    {
+                        //删除历史
+                        QueryOrderData HistoryOrderData = new QueryOrderData();
+                        HistoryOrderData.model = "OrderHistory";
+                        HistoryOrderData.domain = new List<domainItem>();
+
+                        domainItem doitem2 = new domainItem();
+                        doitem2.FieldName = "Pid";
+                        doitem2.FieldValue = QueryOrders[i].Id.ToString();
+                        doitem2.ConditionalType = 6;
+                        HistoryOrderData.domain.Add(doitem2);
+
+
+                        JObject str2 = JObject.Parse(JsonConvert.SerializeObject(HistoryOrderData));
+                        delTableList(str2);
+                    }
+                }
+            }
+
+
+
+            //重新显示
+            QueryData();
+        }
+        #endregion
+
+        #region Excel导出
+        private void ShowAllDataTableEx(string filePath)
+        {
+            /*
+            //记录数据类型列数
+            Dictionary<string, int> dataCnt = new Dictionary<string, int>();
+            DataTable dt = new DataTable(); //建立个数据表
+            //通用列
+            dt.Columns.Add(new DataColumn("检验日期", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("检测单号", typeof(string)));//在表中添加string类型的列 
+            dt.Columns.Add(new DataColumn("产品名称", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("料号", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("网版编码", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("批次", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("合格", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("修复", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("异常情况", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("修复人员", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
+
+            foreach (var item in QueryAllOrders)
+            {
+                //老流程
+                if (item.StepInfo == null || item.StepInfo.ProcessType != "快速流程")
+                {
+                    //加入数据表
+                    if (item.SizeDefectInfoList == null)
+                        item.SizeDefectInfoList = new List<SizeDefectInfo>();
+                    #region 张力
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension4,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Tension",
+                        Data = item.Tension5,
+                    });
+                    #endregion
+                    #region 厚度
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height4,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Height",
+                        Data = item.Height5,
+                    });
+                    #endregion
+                    #region YPT
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT5,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "Y轴方向PT值检测",
+                        Data = item.PT6,
+                    });
+                    #endregion
+                    #region 线宽
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth1,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth2,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth3,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth4,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth5,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth6,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth7,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth8,
+                    });
+                    item.SizeDefectInfoList.Add(new SizeDefectInfo()
+                    {
+                        PointCode = "线宽正面",
+                        Data = item.LineWidth9,
+                    });
+                    #endregion
+                    if (!dataCnt.ContainsKey("Tension"))
+                        dataCnt.Add("Tension", 5);
+                    else
+                        if (dataCnt["Tension"] < 5)
+                        dataCnt["Tension"] = 5;
+
+                    if (!dataCnt.ContainsKey("Height"))
+                        dataCnt.Add("Height", 5);
+                    else
+                        if (dataCnt["Height"] < 5)
+                        dataCnt["Height"] = 5;
+
+                    if (!dataCnt.ContainsKey("Y轴方向PT值检测"))
+                        dataCnt.Add("Y轴方向PT值检测", 5);
+                    else
+                        if (dataCnt["Y轴方向PT值检测"] < 5)
+                        dataCnt["Y轴方向PT值检测"] = 5;
+
+                    if (!dataCnt.ContainsKey("线宽正面"))
+                        dataCnt.Add("线宽正面", 9);
+                    else
+                        if (dataCnt["线宽正面"] < 9)
+                        dataCnt["线宽正面"] = 9;
+                }
+                else
+                {
+                    string[] pointType = new string[11] {"Tension", "Height", "Y轴方向PT值检测" , "线宽正面" , "反面检测" ,
+                                "X轴方向PT值检测","主栅连接线检测","主栅宽度检测","主栅间距","细栅间距检测","背极宽度"};
+                    for (int i = 0; i < pointType.Length; i++)
+                    {
+                        List<SizeDefectInfo> t = item.SizeDefectInfoList.Where(q => q.PointCode == pointType[i]).ToList();
+                        if (t.Count > 0)
+                        {
+                            if (!dataCnt.ContainsKey(pointType[i]))
+                                dataCnt.Add(pointType[i], t.Count);
+                            else
+                                if (dataCnt[pointType[i]] < t.Count)
+                                dataCnt[pointType[i]] = t.Count;
+                        }
+                    }
+                }
+            }
+            foreach (var item in dataCnt)
+            {
+                switch (item.Key)
+                {
+                    case "Tension":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"张力{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("张力均值", typeof(string)));
+                        break;
+                    case "Height":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"厚度{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("厚度均值", typeof(string)));
+                        break;
+                    case "Y轴方向PT值检测":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"Y轴方向PT值{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("Y轴方向PT值均值", typeof(string)));
+                        break;
+                    case "线宽正面":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"线宽正面{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("线宽正面均值", typeof(string)));
+                        break;
+                    case "X轴方向PT值检测":
+                        for (int i = 0; i < item.Value; i++)
+                            dt.Columns.Add(new DataColumn($"X轴方向PT值{i + 1}", typeof(string)));
+                        dt.Columns.Add(new DataColumn("X轴方向PT值均值", typeof(string)));
+                        break;
+                }
+
+            }
+
+            dt.Columns.Add(new DataColumn("堵孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("脏污数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("钢丝异常数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("纤维丝数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("缺口数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("针孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("泡泡数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("划伤数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列        
+
+
+            foreach (var item in QueryAllOrders)
+            {
+                //新增
+                DataRow dr;//行
+                dr = dt.NewRow();
+                //dr["选择"] = false;
+                dr["检验日期"] = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                dr["检测单号"] = item.DetectOrder;
+                dr["产品名称"] = item.ProductInfo.Name;
+                dr["料号"] = item.ProductInfo.Code;
+                dr["网版编码"] = item.SN;
+                dr["批次"] = item.BatchId;
+                dr["合格"] = item.Qualified ? "不合格" : "合格";
+                dr["修复"] = item.State == 10 ? "异常" : item.State == 5 ? "修复" : "待修复";
+                dr["异常情况"] = item.Abnormalities;
+                dr["修复人员"] = item.RepairCode;
+                dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
+
+                List<SizeDefectInfo> tempd = new List<SizeDefectInfo>();
+                foreach (var tdata in dataCnt)
+                {
+                    switch (tdata.Key)
+                    {
+                        case "Tension":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "Tension").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"张力{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["张力均值"] = item.TensionValue.ToString("0.00");
+                            break;
+                        case "Height":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "Height").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"厚度{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["厚度均值"] = item.HeightValue.ToString("0.00");
+                            break;
+                        case "Y轴方向PT值检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "Y轴方向PT值检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"Y轴方向PT值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["Y轴方向PT值均值"] = item.PTValue.ToString("0.0000");
+                            break;
+                        case "线宽正面":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "线宽正面").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"线宽正面{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["线宽正面均值"] = item.PTValue.ToString("0.00");
+                            break;
+                        case "反面检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "反面检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"反面检测{i + 1}"] = tempd[i].Data.ToString("0.00");
+                            dr["反面检测均值"] = item.PTValue.ToString("0.00");
+                            break;
+                        case "X轴方向PT值检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "X轴方向PT值检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"X轴方向PT值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["X轴方向PT值均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "主栅连接线检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "主栅连接线检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"主栅连接线检测值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["主栅连接线检测均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "主栅宽度检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "主栅宽度检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"主栅宽度检测值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["主栅宽度检测均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "主栅间距":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "主栅间距").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"主栅间距值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["主栅间距均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "细栅间距检测":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "细栅间距检测").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"细栅间距检测值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["细栅间距检测均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                        case "背极宽度":
+                            tempd = item.SizeDefectInfoList.Where(q => q.PointCode == "背极宽度").ToList();
+                            for (int i = 0; i < tempd.Count; i++)
+                                dr[$"背极宽度值{i + 1}"] = tempd[i].Data.ToString("0.0000");
+                            dr["背极宽度均值"] = item.XPTValue.ToString("0.0000");
+                            break;
+                    }
+
+                }
+
+                dr["堵孔数量"] = item.DKCount;
+                dr["脏污数量"] = item.ZWCount;
+                dr["钢丝异常数量"] = item.GSYCCount;
+                dr["纤维丝数量"] = item.XWSCount;
+                dr["缺口数量"] = item.QKCount;
+                dr["针孔数量"] = item.ZKCount;
+                dr["泡泡数量"] = item.PPCount;
+                dr["划伤数量"] = item.HSCount;
+                dr["压线数量"] = item.YXCount;
+                dr["斜边数量"] = item.XBCount;
+                dr["栅线数量"] = item.SXCount;
+
+                dt.Rows.Add(dr);//在表的对象的行里添加此行                  
+            }
+
+            try
+            {
+                // 创建一个新的CSV文件并写入数据
+                using (StreamWriter writer = new StreamWriter(filePath, false, UnicodeEncoding.GetEncoding("GB2312")))
+                {
+                    // 写入CSV文件的标题行
+                    for (int i = 0; i < dt.Columns.Count; i++)
+                    {
+                        writer.Write(dt.Columns[i].ColumnName + ",");
+                    }
+                    writer.Write("\r\n");
+
+                    for (int i = 0; i < dt.Rows.Count; i++)
+                    {
+                        // 写入数据行
+                        for (int j = 0; j < dt.Columns.Count; j++)
+                        {
+                            writer.Write(dt.Rows[i][j] + ",");
+                        }
+                        writer.Write("\r\n");
+                        //Console.WriteLine("CSV文件写入成功！");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("数据导出失败！error:" + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            */
+            return;
+        }
+        private void skinButton1_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dataGridView1.DataSource;
+            if (dt.Rows.Count > 0)
+            {
+                SaveFileDialog fileDialog = new SaveFileDialog();
+                fileDialog.Filter = "数据文件(*.csv)|*.csv";
+                fileDialog.Title = "保存数据";
+                //保存对话框是否记忆上次打开的目录
+                fileDialog.RestoreDirectory = true;
+
+                if (fileDialog.ShowDialog() == DialogResult.OK)
+                {
+                    try
+                    {
+                        string filePath = fileDialog.FileName; // CSV文件路径
+                        ShowAllDataTableEx(filePath);
+                        MessageBox.Show("数据导出成功！", "完成", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show("数据导出失败！error:" + ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+        #endregion
+
+        private void btnClear_Click(object sender, EventArgs e)
+        {
+            cbProductCode.Text = "";
+        }
+
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/DataQueryFrm.resx

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnClear.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
+        DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
+        VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
+        XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
+        4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
+        UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
+        qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
+        NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
+        sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
+        IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
+        wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
+        XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
+        AABJRU5ErkJggg==
+</value>
+  </data>
+</root>

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.Designer.cs

@@ -0,0 +1,109 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class HistoryViewFrm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // uiTitel1
+            // 
+            this.uiTitel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(8)))), ((int)(((byte)(31)))), ((int)(((byte)(120)))));
+            this.uiTitel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiTitel1.FatherForm = null;
+            this.uiTitel1.Location = new System.Drawing.Point(0, 0);
+            this.uiTitel1.Name = "uiTitel1";
+            this.uiTitel1.Size = new System.Drawing.Size(1060, 46);
+            this.uiTitel1.TabIndex = 38;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(12, 49);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(138, 28);
+            this.label1.TabIndex = 39;
+            this.label1.Text = "修改历史记录";
+            // 
+            // panel1
+            // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.Controls.Add(this.dataGridView1);
+            this.panel1.Location = new System.Drawing.Point(0, 80);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1060, 473);
+            this.panel1.TabIndex = 40;
+            // 
+            // dataGridView1
+            // 
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
+            this.dataGridView1.AllowUserToResizeRows = false;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridView1.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
+            this.dataGridView1.RowTemplate.Height = 23;
+            this.dataGridView1.Size = new System.Drawing.Size(1060, 473);
+            this.dataGridView1.TabIndex = 2;
+            // 
+            // HistoryViewFrm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1060, 554);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.uiTitel1);
+            this.Name = "HistoryViewFrm";
+            this.Text = "历史记录";
+            this.Load += new System.EventHandler(this.HistoryViewFrm_Load);
+            this.panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private MaiMuControl.UIKits.MaiMuMenu.UITitel uiTitel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.DataGridView dataGridView1;
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.cs

@@ -0,0 +1,78 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class HistoryViewFrm : Form
+    {
+        Order _order;
+        public HistoryViewFrm(Order order)
+        {
+            InitializeComponent();
+            UIStyle.SetUIStyle(this);
+            this.uiTitel1.FatherForm = this;
+
+            _order = order;
+            this.BackColor = Color.White;
+        }
+
+        private void HistoryViewFrm_Load(object sender, EventArgs e)
+        {
+            dataGridView1.Columns.Clear();
+            DataTable dt = new DataTable(); //建立个数据表
+
+            dt.Columns.Add(new DataColumn("修改日期", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("修改账号", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("合格", typeof(string)));//在表中添加string类型的列
+            dt.Columns.Add(new DataColumn("比对", typeof(string)));//在表中添加string类型的列
+
+            dt.Columns.Add(new DataColumn("堵孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("脏污数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("钢丝异常数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("纤维丝数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("缺口数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("针孔数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("泡泡数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("划伤数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("压线数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("斜边数量", typeof(int)));//在表中添加int类型的列
+            dt.Columns.Add(new DataColumn("栅线数量", typeof(int)));//在表中添加int类型的列      
+
+            foreach (var item in _order.OrderHistoryList)
+            {
+                //新增
+                DataRow dr;//行
+                dr = dt.NewRow();
+                //dr["选择"] = false;
+                dr["修改日期"] = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
+                dr["修改账号"] = item.CreateUserCode;
+
+                dr["合格"] = item.Qualified ? "不合格" : "合格";
+                dr["比对"] = item.CompareResult == 2 ? "不通过" : item.CompareResult == 1 ? "通过" : "未比对";
+
+                dr["堵孔数量"] = item.DKCount;
+                dr["脏污数量"] = item.ZWCount;
+                dr["钢丝异常数量"] = item.GSYCCount;
+                dr["纤维丝数量"] = item.XWSCount;
+                dr["缺口数量"] = item.QKCount;
+                dr["针孔数量"] = item.ZKCount;
+                dr["泡泡数量"] = item.PPCount;
+                dr["划伤数量"] = item.HSCount;
+                dr["压线数量"] = item.YXCount;
+                dr["斜边数量"] = item.XBCount;
+                dr["栅线数量"] = item.SXCount;
+
+                dt.Rows.Add(dr);//在表的对象的行里添加此行     
+            }
+            dataGridView1.DataSource = dt;
+        }
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/HistoryViewFrm.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.Designer.cs

@@ -0,0 +1,312 @@
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    partial class PageCtrl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btnGo = new System.Windows.Forms.Button();
+            this.linkNext = new System.Windows.Forms.LinkLabel();
+            this.linkPrevious = new System.Windows.Forms.LinkLabel();
+            this.linkLast = new System.Windows.Forms.LinkLabel();
+            this.linkFirst = new System.Windows.Forms.LinkLabel();
+            this.numGoto = new System.Windows.Forms.NumericUpDown();
+            this.numPageDataCount = new System.Windows.Forms.NumericUpDown();
+            this.lblTotalCount = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.lblPageCount = new System.Windows.Forms.Label();
+            this.lblCurrentPage = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.numGoto)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numPageDataCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // btnGo
+            // 
+            this.btnGo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnGo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnGo.Location = new System.Drawing.Point(823, 4);
+            this.btnGo.Name = "btnGo";
+            this.btnGo.Size = new System.Drawing.Size(47, 28);
+            this.btnGo.TabIndex = 32;
+            this.btnGo.Text = "跳转";
+            this.btnGo.UseVisualStyleBackColor = true;
+            this.btnGo.Click += new System.EventHandler(this.btnGo_Click);
+            // 
+            // linkNext
+            // 
+            this.linkNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkNext.AutoSize = true;
+            this.linkNext.Location = new System.Drawing.Point(658, 12);
+            this.linkNext.Name = "linkNext";
+            this.linkNext.Size = new System.Drawing.Size(17, 12);
+            this.linkNext.TabIndex = 31;
+            this.linkNext.TabStop = true;
+            this.linkNext.Text = ">>";
+            this.linkNext.Click += new System.EventHandler(this.linkNext_Click);
+            // 
+            // linkPrevious
+            // 
+            this.linkPrevious.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkPrevious.AutoSize = true;
+            this.linkPrevious.Location = new System.Drawing.Point(618, 12);
+            this.linkPrevious.Name = "linkPrevious";
+            this.linkPrevious.Size = new System.Drawing.Size(17, 12);
+            this.linkPrevious.TabIndex = 30;
+            this.linkPrevious.TabStop = true;
+            this.linkPrevious.Text = "<<";
+            this.linkPrevious.Click += new System.EventHandler(this.linkPrevious_Click);
+            // 
+            // linkLast
+            // 
+            this.linkLast.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkLast.AutoSize = true;
+            this.linkLast.Location = new System.Drawing.Point(698, 12);
+            this.linkLast.Name = "linkLast";
+            this.linkLast.Size = new System.Drawing.Size(29, 12);
+            this.linkLast.TabIndex = 29;
+            this.linkLast.TabStop = true;
+            this.linkLast.Text = "尾页";
+            this.linkLast.Click += new System.EventHandler(this.linkLast_Click);
+            // 
+            // linkFirst
+            // 
+            this.linkFirst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.linkFirst.AutoSize = true;
+            this.linkFirst.Location = new System.Drawing.Point(566, 12);
+            this.linkFirst.Name = "linkFirst";
+            this.linkFirst.Size = new System.Drawing.Size(29, 12);
+            this.linkFirst.TabIndex = 28;
+            this.linkFirst.TabStop = true;
+            this.linkFirst.Text = "首页";
+            this.linkFirst.Click += new System.EventHandler(this.linkFirst_Click);
+            // 
+            // numGoto
+            // 
+            this.numGoto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.numGoto.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numGoto.Location = new System.Drawing.Point(750, 7);
+            this.numGoto.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.numGoto.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.numGoto.Name = "numGoto";
+            this.numGoto.Size = new System.Drawing.Size(67, 23);
+            this.numGoto.TabIndex = 27;
+            this.numGoto.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.numGoto.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.numGoto.ValueChanged += new System.EventHandler(this.txtPageNum_TextChanged);
+            this.numGoto.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPageNum_KeyPress);
+            // 
+            // numPageDataCount
+            // 
+            this.numPageDataCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.numPageDataCount.Location = new System.Drawing.Point(52, 5);
+            this.numPageDataCount.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.numPageDataCount.Minimum = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+            this.numPageDataCount.Name = "numPageDataCount";
+            this.numPageDataCount.Size = new System.Drawing.Size(72, 23);
+            this.numPageDataCount.TabIndex = 26;
+            this.numPageDataCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.numPageDataCount.Value = new decimal(new int[] {
+            30,
+            0,
+            0,
+            0});
+            this.numPageDataCount.ValueChanged += new System.EventHandler(this.txtPageSize_TextChanged);
+            this.numPageDataCount.Leave += new System.EventHandler(this.txtPageSize_Leave);
+            // 
+            // lblTotalCount
+            // 
+            this.lblTotalCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblTotalCount.AutoSize = true;
+            this.lblTotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblTotalCount.ForeColor = System.Drawing.SystemColors.Highlight;
+            this.lblTotalCount.Location = new System.Drawing.Point(429, 9);
+            this.lblTotalCount.Name = "lblTotalCount";
+            this.lblTotalCount.Size = new System.Drawing.Size(64, 17);
+            this.lblTotalCount.TabIndex = 25;
+            this.lblTotalCount.Text = "10000000";
+            // 
+            // label8
+            // 
+            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(499, 9);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(44, 17);
+            this.label8.TabIndex = 24;
+            this.label8.Text = "条记录";
+            // 
+            // label7
+            // 
+            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(403, 9);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(20, 17);
+            this.label7.TabIndex = 23;
+            this.label7.Text = "共";
+            // 
+            // lblPageCount
+            // 
+            this.lblPageCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblPageCount.AutoSize = true;
+            this.lblPageCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblPageCount.ForeColor = System.Drawing.SystemColors.Highlight;
+            this.lblPageCount.Location = new System.Drawing.Point(340, 9);
+            this.lblPageCount.Name = "lblPageCount";
+            this.lblPageCount.Size = new System.Drawing.Size(43, 17);
+            this.lblPageCount.TabIndex = 22;
+            this.lblPageCount.Text = "10000";
+            // 
+            // lblCurrentPage
+            // 
+            this.lblCurrentPage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblCurrentPage.AutoSize = true;
+            this.lblCurrentPage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblCurrentPage.ForeColor = System.Drawing.SystemColors.Highlight;
+            this.lblCurrentPage.Location = new System.Drawing.Point(272, 9);
+            this.lblCurrentPage.Name = "lblCurrentPage";
+            this.lblCurrentPage.Size = new System.Drawing.Size(43, 17);
+            this.lblCurrentPage.TabIndex = 21;
+            this.lblCurrentPage.Text = "10000";
+            // 
+            // label4
+            // 
+            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(321, 9);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(13, 17);
+            this.label4.TabIndex = 20;
+            this.label4.Text = "/";
+            // 
+            // label3
+            // 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(205, 9);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(44, 17);
+            this.label3.TabIndex = 19;
+            this.label3.Text = "当前页";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(130, 9);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(20, 17);
+            this.label2.TabIndex = 18;
+            this.label2.Text = "条";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(14, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(32, 17);
+            this.label1.TabIndex = 17;
+            this.label1.Text = "每页";
+            // 
+            // PageCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.btnGo);
+            this.Controls.Add(this.linkNext);
+            this.Controls.Add(this.linkPrevious);
+            this.Controls.Add(this.linkLast);
+            this.Controls.Add(this.linkFirst);
+            this.Controls.Add(this.numGoto);
+            this.Controls.Add(this.numPageDataCount);
+            this.Controls.Add(this.lblTotalCount);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.lblPageCount);
+            this.Controls.Add(this.lblCurrentPage);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.label1);
+            this.Name = "PageCtrl";
+            this.Size = new System.Drawing.Size(885, 36);
+            ((System.ComponentModel.ISupportInitialize)(this.numGoto)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numPageDataCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnGo;
+        private System.Windows.Forms.LinkLabel linkNext;
+        private System.Windows.Forms.LinkLabel linkPrevious;
+        private System.Windows.Forms.LinkLabel linkLast;
+        private System.Windows.Forms.LinkLabel linkFirst;
+        private System.Windows.Forms.NumericUpDown numGoto;
+        private System.Windows.Forms.NumericUpDown numPageDataCount;
+        private System.Windows.Forms.Label lblTotalCount;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label lblPageCount;
+        private System.Windows.Forms.Label lblCurrentPage;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.cs

@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace MaiMuAOI.SysUI.DefectPicShow
+{
+    public partial class PageCtrl : UserControl
+    {
+        public PageCtrl()
+        {
+            InitializeComponent();
+
+            numPageDataCount.Controls[0].Visible = false;
+            numGoto.Controls[0].Visible = false;
+        }
+
+        #region 分页字段和属性
+
+        private int pageIndex = 1;
+        /// <summary>
+        /// 当前页数
+        /// </summary>
+        public virtual int PageIndex
+        {
+            get { return pageIndex; }
+            set { pageIndex = value; }
+        }
+
+        private int pageSize = 10;
+        /// <summary>
+        /// 每页记录数
+        /// </summary>
+        public virtual int PageSize
+        {
+            get { return pageSize; }
+            set { pageSize = value; }
+        }
+
+        private int recordCount = 0;
+        /// <summary>
+        /// 总记录数
+        /// </summary>
+        public virtual int RecordCount
+        {
+            get { return recordCount; }
+            set { recordCount = value; }
+        }
+
+        private int pageCount = 0;
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        public int PageCount
+        {
+            get
+            {
+                if (pageSize != 0)
+                {
+                    pageCount = GetPageCount();
+                }
+                return pageCount;
+            }
+        }
+
+        #endregion
+
+        #region 页码变化时触发事件
+
+        public event EventHandler OnPageChanged;
+
+        #endregion
+
+        #region 分页及相关事件功能实现
+
+        /// <summary>
+        /// 设窗体控件全部可用
+        /// </summary>
+        private void SetFormCtrEnabled()
+        {
+            linkFirst.Enabled = true;
+            linkPrevious.Enabled = true;
+            linkNext.Enabled = true;
+            linkLast.Enabled = true;
+            btnGo.Enabled = true;
+        }
+
+        /// <summary>
+        /// 计算总页数
+        /// </summary>
+        /// <returns></returns>
+        private int GetPageCount()
+        {
+            if (PageSize == 0)
+            {
+                return 0;
+            }
+            int pageCount = RecordCount / PageSize;
+            if (RecordCount % PageSize == 0)
+            {
+                pageCount = RecordCount / PageSize;
+            }
+            else
+            {
+                pageCount = RecordCount / PageSize + 1;
+            }
+            return pageCount;
+        }
+        /// <summary>
+        /// 用于客户端调用
+        /// </summary>
+        public void DrawControl(int count)
+        {
+            recordCount = count;
+            DrawControl(false);
+        }
+        /// <summary>
+        /// 根据不同的条件，改变页面控件的呈现状态
+        /// </summary>
+        private void DrawControl(bool callEvent)
+        {
+
+            lblCurrentPage.Text = PageIndex.ToString();
+            lblPageCount.Text = PageCount.ToString();
+            lblTotalCount.Text = RecordCount.ToString();
+            numPageDataCount.Value = PageSize;
+
+            if (callEvent && OnPageChanged != null)
+            {
+                OnPageChanged(this, null);//当前分页数字改变时，触发委托事件
+            }
+            SetFormCtrEnabled();
+            if (PageCount == 1)//有且仅有一页时
+            {
+                linkFirst.Enabled = false;
+                linkPrevious.Enabled = false;
+                linkNext.Enabled = false;
+                linkLast.Enabled = false;
+                btnGo.Enabled = false;
+            }
+            else if (PageIndex == 1)//当前页为第一页时
+            {
+                linkFirst.Enabled = false;
+                linkPrevious.Enabled = false;
+            }
+            else if (PageIndex == PageCount)//当前页为最后一页时
+            {
+                linkNext.Enabled = false;
+                linkLast.Enabled = false;
+            }
+        }
+
+        #endregion
+
+        #region 相关控件事件
+
+        //首页按钮
+        private void linkFirst_Click(object sender, EventArgs e)
+        {
+            PageIndex = 1;
+            DrawControl(true);
+        }
+
+        //上一页按钮
+        private void linkPrevious_Click(object sender, EventArgs e)
+        {
+            PageIndex = Math.Max(1, PageIndex - 1);
+            DrawControl(true);
+        }
+
+        //下一页按钮
+        private void linkNext_Click(object sender, EventArgs e)
+        {
+            PageIndex = Math.Min(PageCount, PageIndex + 1);
+            DrawControl(true);
+        }
+
+        //尾页按钮
+        private void linkLast_Click(object sender, EventArgs e)
+        {
+            PageIndex = PageCount;
+            DrawControl(true);
+        }
+
+        /// <summary>
+        /// 按下enter键，执行跳转页面功能
+        /// </summary>
+        private void txtPageNum_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            btnGo_Click(null, null);
+        }
+
+        /// <summary>
+        /// 跳转页数限制
+        /// </summary>
+        private void txtPageNum_TextChanged(object sender, EventArgs e)
+        {
+            int num = 0;
+            if (int.TryParse(numGoto.Value.ToString(), out num) && num > 0)
+            {   //TryParse 函数，将字符串转换成等效的整数，返回bool型，判断是否转换成功。
+                //输入除数字以外的字符是转换不成功的
+
+                if (num > PageCount)   //输入数量大于最大页数时，文本框自动显示最大页数
+                {
+                    numGoto.Value = PageCount;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 跳转按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnGo_Click(object sender, EventArgs e)
+        {
+            int num = 0;
+            if (int.TryParse(numGoto.Value.ToString(), out num) && num > 0)
+            {
+                PageIndex = num;
+                DrawControl(true);
+            }
+        }
+
+        #endregion
+
+        bool isTextChanged = false;
+        /// <summary>
+        /// 每页显示的记录数改变时
+        /// </summary>
+        private void txtPageSize_TextChanged(object sender, EventArgs e)
+        {
+            int num = 0;
+            //输入不符合规范时，默认设置为100
+            if (!int.TryParse(numPageDataCount.Text.Trim(), out num) || num <= 0)
+            {
+                num = 100;
+                numPageDataCount.Value = 100;
+            }
+            else
+            {
+                isTextChanged = true;
+
+            }
+            pageSize = num;
+        }
+        /// <summary>
+        /// 光标离开 每页设置文本框时，显示到首页
+        private void txtPageSize_Leave(object sender, EventArgs e)
+        {
+            if (isTextChanged)
+            {
+                isTextChanged = false;
+                linkFirst_Click(null, null);
+            }
+        }
+    }
+}

MaiMuAOI/MaiMuAOI/SysUI/DefectPicShow/PageCtrl.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.Designer.cs

@@ -30,10 +30,10 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductInfoFrm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.uiTitel1 = new MaiMuControl.UIKits.MaiMuMenu.UITitel();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbtnSave = new System.Windows.Forms.ToolStripButton();
@@ -71,6 +71,9 @@
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.panel5 = new System.Windows.Forms.Panel();
+            this.label25 = new System.Windows.Forms.Label();
+            this.cbMainGrid = new System.Windows.Forms.CheckBox();
+            this.cbMarkDisturb = new System.Windows.Forms.CheckBox();
             this.label21 = new System.Windows.Forms.Label();
             this.numMarkSize = new System.Windows.Forms.NumericUpDown();
             this.label20 = new System.Windows.Forms.Label();
@@ -78,6 +81,8 @@
             this.label19 = new System.Windows.Forms.Label();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.label24 = new System.Windows.Forms.Label();
+            this.textBoxPath = new System.Windows.Forms.TextBox();
             this.btnOpenFile = new System.Windows.Forms.LinkLabel();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.groupBox10 = new System.Windows.Forms.GroupBox();
@@ -117,11 +122,6 @@
             this.tabPage4 = new System.Windows.Forms.TabPage();
             this.flpQualifiedPannel = new System.Windows.Forms.FlowLayoutPanel();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.textBoxPath = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label25 = new System.Windows.Forms.Label();
-            this.cbMainGrid = new System.Windows.Forms.CheckBox();
-            this.cbMarkDisturb = new System.Windows.Forms.CheckBox();
             this.toolStrip1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -325,6 +325,7 @@
             this.cmbDefectModelFile.Name = "cmbDefectModelFile";
             this.cmbDefectModelFile.Size = new System.Drawing.Size(125, 20);
             this.cmbDefectModelFile.TabIndex = 38;
+            this.cmbDefectModelFile.SelectedIndexChanged += new System.EventHandler(this.cmbDefectModelFile_SelectedIndexChanged);
             // 
             // label29
             // 
@@ -370,6 +371,7 @@
             this.cmbClasses.Name = "cmbClasses";
             this.cmbClasses.Size = new System.Drawing.Size(125, 20);
             this.cmbClasses.TabIndex = 35;
+            this.cmbClasses.SelectedValueChanged += new System.EventHandler(this.cmbClasses_SelectedValueChanged);
             // 
             // label17
             // 
@@ -403,46 +405,46 @@
             // 
             this.dgvBatchList.AllowUserToAddRows = false;
             this.dgvBatchList.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvBatchList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvBatchList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvBatchList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvBatchList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colBatchId,
             this.colTargetCount,
             this.colCompleteCount,
             this.colCreateTime});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvBatchList.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvBatchList.DefaultCellStyle = dataGridViewCellStyle6;
             this.dgvBatchList.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvBatchList.Location = new System.Drawing.Point(2, 16);
             this.dgvBatchList.Margin = new System.Windows.Forms.Padding(2);
             this.dgvBatchList.MultiSelect = false;
             this.dgvBatchList.Name = "dgvBatchList";
             this.dgvBatchList.ReadOnly = true;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvBatchList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvBatchList.RowHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvBatchList.RowHeadersVisible = false;
             this.dgvBatchList.RowHeadersWidth = 62;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvBatchList.RowsDefaultCellStyle = dataGridViewCellStyle4;
+            this.dgvBatchList.RowsDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvBatchList.RowTemplate.Height = 30;
             this.dgvBatchList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvBatchList.Size = new System.Drawing.Size(532, 262);
@@ -628,6 +630,38 @@
             this.panel5.Size = new System.Drawing.Size(537, 237);
             this.panel5.TabIndex = 0;
             // 
+            // label25
+            // 
+            this.label25.AutoSize = true;
+            this.label25.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.label25.Location = new System.Drawing.Point(60, 116);
+            this.label25.Name = "label25";
+            this.label25.Size = new System.Drawing.Size(161, 12);
+            this.label25.TabIndex = 8;
+            this.label25.Text = "在非[默认Mark]的情况下生效";
+            // 
+            // cbMainGrid
+            // 
+            this.cbMainGrid.AutoSize = true;
+            this.cbMainGrid.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.cbMainGrid.Location = new System.Drawing.Point(229, 145);
+            this.cbMainGrid.Name = "cbMainGrid";
+            this.cbMainGrid.Size = new System.Drawing.Size(72, 16);
+            this.cbMainGrid.TabIndex = 7;
+            this.cbMainGrid.Text = "是否主栅";
+            this.cbMainGrid.UseVisualStyleBackColor = true;
+            // 
+            // cbMarkDisturb
+            // 
+            this.cbMarkDisturb.AutoSize = true;
+            this.cbMarkDisturb.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.cbMarkDisturb.Location = new System.Drawing.Point(62, 145);
+            this.cbMarkDisturb.Name = "cbMarkDisturb";
+            this.cbMarkDisturb.Size = new System.Drawing.Size(120, 16);
+            this.cbMarkDisturb.TabIndex = 6;
+            this.cbMarkDisturb.Text = "是否存在Mark干扰";
+            this.cbMarkDisturb.UseVisualStyleBackColor = true;
+            // 
             // label21
             // 
             this.label21.AutoSize = true;
@@ -668,9 +702,9 @@
             "空心圆",
             "实心圆带栅线",
             "空心圆带栅线",
-            "圆环",
+            "矩形",
-            "半圆环",
+            "候补1",
-            "十字线"});
+            "候补2"});
             this.cbMarkType.Location = new System.Drawing.Point(100, 67);
             this.cbMarkType.Margin = new System.Windows.Forms.Padding(2);
             this.cbMarkType.Name = "cbMarkType";
@@ -719,6 +753,24 @@
             this.panel4.Size = new System.Drawing.Size(537, 103);
             this.panel4.TabIndex = 0;
             // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.label24.Location = new System.Drawing.Point(17, 66);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(35, 12);
+            this.label24.TabIndex = 4;
+            this.label24.Text = "路径:";
+            // 
+            // textBoxPath
+            // 
+            this.textBoxPath.Location = new System.Drawing.Point(58, 63);
+            this.textBoxPath.Name = "textBoxPath";
+            this.textBoxPath.ReadOnly = true;
+            this.textBoxPath.Size = new System.Drawing.Size(465, 21);
+            this.textBoxPath.TabIndex = 3;
+            // 
             // btnOpenFile
             // 
             this.btnOpenFile.AutoSize = true;
@@ -1215,56 +1267,6 @@
             this.flpQualifiedPannel.Size = new System.Drawing.Size(547, 391);
             this.flpQualifiedPannel.TabIndex = 0;
             // 
-            // textBoxPath
-            // 
-            this.textBoxPath.Location = new System.Drawing.Point(58, 63);
-            this.textBoxPath.Name = "textBoxPath";
-            this.textBoxPath.ReadOnly = true;
-            this.textBoxPath.Size = new System.Drawing.Size(465, 21);
-            this.textBoxPath.TabIndex = 3;
-            // 
-            // label24
-            // 
-            this.label24.AutoSize = true;
-            this.label24.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label24.Location = new System.Drawing.Point(17, 66);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(35, 12);
-            this.label24.TabIndex = 4;
-            this.label24.Text = "路径:";
-            // 
-            // label25
-            // 
-            this.label25.AutoSize = true;
-            this.label25.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label25.Location = new System.Drawing.Point(60, 116);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(161, 12);
-            this.label25.TabIndex = 8;
-            this.label25.Text = "在非[默认Mark]的情况下生效";
-            // 
-            // cbMainGrid
-            // 
-            this.cbMainGrid.AutoSize = true;
-            this.cbMainGrid.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.cbMainGrid.Location = new System.Drawing.Point(229, 145);
-            this.cbMainGrid.Name = "cbMainGrid";
-            this.cbMainGrid.Size = new System.Drawing.Size(72, 16);
-            this.cbMainGrid.TabIndex = 7;
-            this.cbMainGrid.Text = "是否主栅";
-            this.cbMainGrid.UseVisualStyleBackColor = true;
-            // 
-            // cbMarkDisturb
-            // 
-            this.cbMarkDisturb.AutoSize = true;
-            this.cbMarkDisturb.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.cbMarkDisturb.Location = new System.Drawing.Point(62, 145);
-            this.cbMarkDisturb.Name = "cbMarkDisturb";
-            this.cbMarkDisturb.Size = new System.Drawing.Size(120, 16);
-            this.cbMarkDisturb.TabIndex = 6;
-            this.cbMarkDisturb.Text = "是否存在Mark干扰";
-            this.cbMarkDisturb.UseVisualStyleBackColor = true;
-            // 
             // ProductInfoFrm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

MaiMuAOI/MaiMuAOI/SysUI/ProductAndStep/ProductInfoFrm.cs

@@ -1,5 +1,6 @@
 using MaiMuAOI.SysCtrl;
 using MaiMuControl.Utils;
+using Models;
 using OpenCvSharp;
 using ProductionControl.UI;
 using ProductionControl.UIExtend;
@@ -94,8 +95,8 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                     }
                     else
                         this.btnOpenFile.Left = 20;
-
+                    this.textBoxPath.Text = ConfMgr.Instance.ProjectDir + $"\\{model.Id}\\" + attachmentFile.Name;
-                    this.textBoxPath.Text = ConfMgr.Instance.ProjectDir + $"\\{model.Id}\\" + attachmentFile.NameTimestamp + attachmentFile.Name;
+                    //this.textBoxPath.Text = ConfMgr.Instance.ProjectDir + $"\\{model.Id}\\" + attachmentFile.NameTimestamp + attachmentFile.Name;
                 }
 
             }
@@ -126,13 +127,17 @@ namespace MaiMuAOI.SysUI.ProductAndStep
         {
             try
             {
+                Classes classtemp = null;
                 //显示的数据 
                 this.cmbClasses.DisplayMember = "Name";
                 this.cmbClasses.ValueMember = "Id";
                 var list = svcClasses.GetListNav(0);
                 this.cmbClasses.DataSource = list;
                 if (model.ClassesId > 0)
+                {
                     this.cmbClasses.SelectedValue = model.ClassesId;
+                    classtemp = svcClasses.GetById(model.ClassesId);
+                }
 
                 //缺陷项
                 //ArrayList lstDefect = new ArrayList();
@@ -142,7 +147,7 @@ namespace MaiMuAOI.SysUI.ProductAndStep
                 //    DefectCountOfSizeControl userCon = new DefectCountOfSizeControl();
                 //    userCon.Code = item.ToString();
                 //    userCon.Title = EnumExtension.GetEnumDescription((DefectCodeEnum)item);
-                    
+
                 //    if (model != null && model.QualifiedCriterionList != null)
                 //    {
                 //        var qalifiedItem = model.QualifiedCriterionList.FirstOrDefault(m => m.DefectCode == userCon.Code);
@@ -156,12 +161,21 @@ namespace MaiMuAOI.SysUI.ProductAndStep
 
                 //    this.flpQualifiedPannel.Controls.Add(userCon);
                 //}
-                var lstDefect = GetArrayList<DefectCodeEnum>();
+                ArrayList lstDefect;
+                if ((classtemp != null) && (classtemp.Name == "钢网"))
+                    lstDefect = GetArrayList<DefectCode2Enum>();
+                else
+                    lstDefect = GetArrayList<DefectCodeEnum>();
+                this.flpQualifiedPannel.Controls.Clear();
                 foreach (DictionaryEntry item in lstDefect)
                 {
+                    
                     DefectCountOfSizeControl userCon = new DefectCountOfSizeControl();
                     userCon.Code = item.Value.ToString();
-                    userCon.Title = ((DefectNameEnum)(int)item.Key).ToString();
+                    if ((classtemp != null) && (classtemp.Name == "钢网"))
+                        userCon.Title = ((DefectName2Enum)(int)item.Key).ToString();
+                    else
+                        userCon.Title = ((DefectNameEnum)(int)item.Key).ToString();
                     if (model != null && model.QualifiedCriterionList != null)
                     {
                         var qalifiedItem = model.QualifiedCriterionList.FirstOrDefault(m => m.DefectCode == userCon.Code);
@@ -524,5 +538,45 @@ namespace MaiMuAOI.SysUI.ProductAndStep
 
             model = service.GetModelNav(model.Code);
         }
+
+        private void cmbDefectModelFile_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            
+        }
+
+        private void cmbClasses_SelectedValueChanged(object sender, EventArgs e)
+        {
+            this.flpQualifiedPannel.Controls.Clear();
+
+            Classes classtemp = svcClasses.GetById(this.cmbClasses.SelectedValue);
+
+            ArrayList lstDefect;
+            if ((classtemp != null) && (classtemp.Name == "钢网"))
+                lstDefect = GetArrayList<DefectCode2Enum>();
+            else
+                lstDefect = GetArrayList<DefectCodeEnum>();
+
+            foreach (DictionaryEntry item in lstDefect)
+            {
+                DefectCountOfSizeControl userCon = new DefectCountOfSizeControl();
+                userCon.Code = item.Value.ToString();
+                if ((classtemp != null) && (classtemp.Name == "钢网"))
+                    userCon.Title = ((DefectName2Enum)(int)item.Key).ToString();
+                else
+                    userCon.Title = ((DefectNameEnum)(int)item.Key).ToString();
+                if (model != null && model.QualifiedCriterionList != null)
+                {
+                    var qalifiedItem = model.QualifiedCriterionList.FirstOrDefault(m => m.DefectCode == userCon.Code);
+                    if (qalifiedItem != null)
+                    {
+                        userCon.Checked = true;
+                        userCon.SizeValue = (decimal)qalifiedItem.Size;
+                        userCon.MaxDefectCount = qalifiedItem.MaxDefectCount;
+                    }
+                }
+
+                this.flpQualifiedPannel.Controls.Add(userCon);
+            }
+        }
     }
 }

MaiMuAOI/MaiMuAOI/SysUI/StepUI/FrmGetPosByPic.cs

@@ -180,11 +180,5 @@ namespace ProductionControl.UI
                 }
             }
         }
-
-        private void tsbtnDelectPos_Click(object sender, EventArgs e)
-        {
-            this.imageBox1.DelectOntPoint();
-            this.pickARoi.RemoveAt(pickARoi.Count - 1);
-        }
     }
 }

MaiMuAOI/MaiMuAOI/bin/x64/Debug/ConfigFiles/SysParamsConfig.ini

@@ -57,7 +57,7 @@ DisableCam=False
 DisableLight=False
 [Sys]
 ImageProcessPath=C:\Users\user\AppData\Local\Programs\MVTec\HALCON-21.05-Progress\procedures\general
-AIModelPath=D:\AOI\Debug\ConfigFiles\onnxFiles
+AIModelPath=E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\ConfigFiles\onnxFiles
 HttpServerIP=127.0.0.1
 HttpServerPort=18082
 [ShowMainWin]

MaiMuAOI/MaiMuAOI/bin/x64/Debug/ImageBox.xml

@@ -123,7 +123,12 @@
         </member>
         <member name="F:ImageToolKits.ImageBox.CursorModeEnum.Low">
             <summary>
-            特色模式
+            低配选点模式
+            </summary>
+        </member>
+        <member name="F:ImageToolKits.ImageBox.CursorModeEnum.Point">
+            <summary>
+            高配选点模式
             </summary>
         </member>
         <member name="T:ImageToolKits.ImageBox.ImageModeEnum">
@@ -247,6 +252,11 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:ImageToolKits.ImageBox.ColorDrawParam">
+            <summary>
+            区域+颜色类型
+            </summary>
+        </member>
         <member name="T:ImageToolKits.ImageBox.Point">
             <summary>
             点类型
@@ -502,6 +512,15 @@
             <param name="gpROI">ROI图形路径</param>
             <param name="gpInteractive">交互图形路径</param>
         </member>
+        <member name="M:ImageToolKits.ImageBox.DrawROIByGraphicsPath(System.Drawing.Graphics,System.Drawing.Drawing2D.GraphicsPath,System.Drawing.Drawing2D.GraphicsPath,System.Drawing.Color)">
+            <summary>
+            根据绘图路径绘制ROI
+            </summary>
+            <param name="g"></param>
+            <param name="gpROI">ROI图形路径</param>
+            <param name="gpInteractive">交互图形路径</param>
+            <param name="color">颜色</param>
+        </member>
         <member name="M:ImageToolKits.ImageBox.GetInsideIndex(System.Drawing.PointF)">
             <summary>
             计算某个点是否在某些点内部
@@ -705,6 +724,14 @@
             <param name="region">一个或多个区域</param>
             <param name="imageMode">图像显示方式，见枚举ImageModeEnum</param>
         </member>
+        <member name="M:ImageToolKits.ImageBox.RefreshWindow(OpenCvSharp.Mat,System.Collections.Generic.List{ImageToolKits.ImageBox.ColorDrawParam},ImageToolKits.ImageBox.ImageModeEnum)">
+            <summary>
+            显示图像与区域
+            </summary>
+            <param name="image">图像</param>
+            <param name="colorRegion">一个或多个不同颜色区域</param>
+            <param name="imageMode">图像显示方式，见枚举ImageModeEnum</param>
+        </member>
         <member name="M:ImageToolKits.ImageBox.RefreshWindow(OpenCvSharp.Mat,ImageToolKits.ImageBox.BaseDrawParam,ImageToolKits.ImageBox.ImageModeEnum)">
             <summary>
             显示图像与区域
@@ -726,6 +753,12 @@
             </summary>
             <param name="lDrawParam">多个区域</param>
         </member>
+        <member name="M:ImageToolKits.ImageBox.DisplayROIs(System.Collections.Generic.List{ImageToolKits.ImageBox.ColorDrawParam})">
+            <summary>
+            显示多个区域分色
+            </summary>
+            <param name="lDrawParam">多个区域</param>
+        </member>
         <member name="M:ImageToolKits.ImageBox.DisplayROI(ImageToolKits.ImageBox.BaseDrawParam)">
             <summary>
             显示一个区域

MaiMuAOI/MaiMuAOI/bin/x64/Debug/Log.txt

@@ -106,3 +106,19 @@ Global捕获到未处理异常：System.ArgumentOutOfRangeException
    在 System.Windows.Forms.ComboBox.WndProc(Message& m)
    在 System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)
 
+2024-02-01 08:38:01
+Global捕获到未处理异常：System.IndexOutOfRangeException
+异常信息：索引超出了数组界限。
+异常堆栈：   在 MaiMuControl.Device.AxisDev.Advantech.AdvantechMotion.GetAxisVelocity(Int32 Axis_no) 位置 E:\CPL\迈沐智能项目\模块化\Code\MaiMuControl\MaiMuControl\Device\AxisDev\Advantech\AdvantechMotion.cs:行号 452
+   在 ProductionControl.UI.UIAxisDev.refreshAxisVelParam() 位置 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\SysUI\StepUI\UIAxisDev.cs:行号 148
+   在 ProductionControl.UI.UIAxisDev.propertyGrid1_PropertyValueChanged(Object s, PropertyValueChangedEventArgs e) 位置 E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\SysUI\StepUI\UIAxisDev.cs:行号 258
+   在 System.Windows.Forms.PropertyGrid.OnPropertyValueChanged(PropertyValueChangedEventArgs e)
+   在 System.Windows.Forms.PropertyGrid.OnPropertyValueSet(GridItem changedItem, Object oldValue)
+   在 System.Windows.Forms.PropertyGridInternal.PropertyGridView.CommitValue(GridEntry ipeCur, Object value, Boolean closeDropDown)
+   在 System.Windows.Forms.PropertyGridInternal.PropertyGridView.OnListClick(Object sender, EventArgs e)
+   在 System.Windows.Forms.Control.OnMouseUp(MouseEventArgs e)
+   在 System.Windows.Forms.Control.WmMouseUp(Message& m, MouseButtons button, Int32 clicks)
+   在 System.Windows.Forms.Control.WndProc(Message& m)
+   在 System.Windows.Forms.ListBox.WndProc(Message& m)
+   在 System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)
+

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.371 44a8 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
+2024/01/19-08:39:49.017 5cc0 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
-2023/12/18-10:15:50.371 44a8 Recovering log #3
+2024/01/19-08:39:49.017 5cc0 Recovering log #3
-2023/12/18-10:15:50.372 44a8 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 
+2024/01/19-08:39:49.155 5cc0 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Extension State/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.831 b0dc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
+2023/12/18-10:15:50.371 44a8 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/MANIFEST-000001
-2023/12/18-10:15:20.832 b0dc Recovering log #3
+2023/12/18-10:15:50.371 44a8 Recovering log #3
-2023/12/18-10:15:20.832 b0dc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 
+2023/12/18-10:15:50.372 44a8 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Extension State/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.361 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
+2024/01/19-08:39:49.022 ef9c Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
-2023/12/18-10:15:50.364 cca4 Recovering log #3
+2024/01/19-08:39:49.024 ef9c Recovering log #3
-2023/12/18-10:15:50.366 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 
+2024/01/19-08:39:49.026 ef9c Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Local Storage/leveldb/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.824 c8bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
+2023/12/18-10:15:50.361 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/MANIFEST-000001
-2023/12/18-10:15:20.827 c8bc Recovering log #3
+2023/12/18-10:15:50.364 cca4 Recovering log #3
-2023/12/18-10:15:20.831 c8bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 
+2023/12/18-10:15:50.366 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Local Storage\leveldb/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.445 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
+2024/01/19-08:39:49.635 ef9c Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
-2023/12/18-10:15:50.446 cca4 Recovering log #3
+2024/01/19-08:39:49.636 ef9c Recovering log #3
-2023/12/18-10:15:50.448 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 
+2024/01/19-08:39:49.716 ef9c Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Session Storage/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.844 c8bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
+2023/12/18-10:15:50.445 cca4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/MANIFEST-000001
-2023/12/18-10:15:20.845 c8bc Recovering log #3
+2023/12/18-10:15:50.446 cca4 Recovering log #3
-2023/12/18-10:15:20.848 c8bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 
+2023/12/18-10:15:50.448 cca4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Session Storage/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.260 b7bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
+2024/01/19-08:39:48.753 b84 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
-2023/12/18-10:15:50.261 b7bc Recovering log #3
+2024/01/19-08:39:48.754 b84 Recovering log #3
-2023/12/18-10:15:50.261 b7bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 
+2024/01/19-08:39:48.853 b84 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Site Characteristics Database/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.719 aa58 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
+2023/12/18-10:15:50.260 b7bc Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/MANIFEST-000001
-2023/12/18-10:15:20.719 aa58 Recovering log #3
+2023/12/18-10:15:50.261 b7bc Recovering log #3
-2023/12/18-10:15:20.719 aa58 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 
+2023/12/18-10:15:50.261 b7bc Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Site Characteristics Database/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.260 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
+2024/01/19-08:39:48.753 7f94 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
-2023/12/18-10:15:50.260 420 Recovering log #3
+2024/01/19-08:39:48.754 7f94 Recovering log #3
-2023/12/18-10:15:50.261 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 
+2024/01/19-08:39:48.754 7f94 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/Sync Data/LevelDB/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.718 25a0 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
+2023/12/18-10:15:50.260 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/MANIFEST-000001
-2023/12/18-10:15:20.718 25a0 Recovering log #3
+2023/12/18-10:15:50.260 420 Recovering log #3
-2023/12/18-10:15:20.719 25a0 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 
+2023/12/18-10:15:50.261 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\Sync Data\LevelDB/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.290 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
+2024/01/19-08:39:49.017 6bc4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
-2023/12/18-10:15:50.290 420 Recovering log #3
+2024/01/19-08:39:49.017 6bc4 Recovering log #3
-2023/12/18-10:15:50.290 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 
+2024/01/19-08:39:49.167 6bc4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.747 aa58 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
+2023/12/18-10:15:50.290 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/MANIFEST-000001
-2023/12/18-10:15:20.747 aa58 Recovering log #3
+2023/12/18-10:15:50.290 420 Recovering log #3
-2023/12/18-10:15:20.748 aa58 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 
+2023/12/18-10:15:50.290 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG

@@ -1,3 +1,3 @@
-2023/12/18-10:15:50.286 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
+2024/01/19-08:39:48.776 6bc4 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
-2023/12/18-10:15:50.287 420 Recovering log #3
+2024/01/19-08:39:48.776 6bc4 Recovering log #3
-2023/12/18-10:15:50.287 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 
+2024/01/19-08:39:48.838 6bc4 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Default/shared_proto_db/metadata/LOG.old

@@ -1,3 +1,3 @@
-2023/12/18-10:15:20.744 aa58 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
+2023/12/18-10:15:50.286 420 Reusing MANIFEST E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/MANIFEST-000001
-2023/12/18-10:15:20.744 aa58 Recovering log #3
+2023/12/18-10:15:50.287 420 Recovering log #3
-2023/12/18-10:15:20.744 aa58 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 
+2023/12/18-10:15:50.287 420 Reusing old log E:\CPL\迈沐智能项目\2023\AOI 版博士\程序\MaiMuAOI\MaiMuAOI\bin\x64\Debug\MaiMuAOI.exe.WebView2\EBWebView\Default\shared_proto_db\metadata/000003.log 

MaiMuAOI/MaiMuAOI/bin/x64/Debug/MaiMuAOI.exe.WebView2/EBWebView/Last Version

@@ -1 +1 @@
-120.0.2210.77
+120.0.2210.133